Skip to content

M
master-absenku-custom
Commit b2a36c53 by nurchamim
Options

modul: bug master komponen 

status: selesai
keterangan:
1. bug fix no urut
parent d2ac3ac2
Showing with 60 additions and 50 deletions
application/controllers/payroll/Master_komponen.php
<?php <?php
defined('BASEPATH') OR exit('No direct script access allowed'); defined('BASEPATH') or exit('No direct script access allowed');
class Master_komponen extends MY_Controller{ class Master_komponen extends MY_Controller
{
public function __construct(){ public function __construct()
{
parent::__construct(); parent::__construct();
$this->load->model('payroll/Master_komponen_m', 'model'); $this->load->model('payroll/Master_komponen_m', 'model');
} }
public function index_pendapatan(){ public function index_pendapatan()
{
$data['judul'] = 'Master Komponen'; $data['judul'] = 'Master Komponen';
$data['aktif'] = 'master_komponen'; $data['aktif'] = 'master_komponen';
$data['menu'] = $this->load->view('main_menu', $data, true); $data['menu'] = $this->load->view('main_menu', $data, true);
...@@ -16,7 +19,8 @@ class Master_komponen extends MY_Controller{ ...@@ -16,7 +19,8 @@ class Master_komponen extends MY_Controller{
$this->load->view('main_template', $data, false); $this->load->view('main_template', $data, false);
} }
public function index_potongan(){ public function index_potongan()
{
$data['judul'] = 'Master Komponen'; $data['judul'] = 'Master Komponen';
$data['aktif'] = 'master_komponen'; $data['aktif'] = 'master_komponen';
$data['menu'] = $this->load->view('main_menu', $data, true); $data['menu'] = $this->load->view('main_menu', $data, true);
...@@ -24,65 +28,70 @@ class Master_komponen extends MY_Controller{ ...@@ -24,65 +28,70 @@ class Master_komponen extends MY_Controller{
$this->load->view('main_template', $data, false); $this->load->view('main_template', $data, false);
} }
public function list_data($master = 'pendapatan'){ public function list_data($master = 'pendapatan')
{
$list = $this->model->get_datatables($master); $list = $this->model->get_datatables($master);
$data = array(); $data = array();
$no = $_GET['start']; $no = $_GET['start'];
foreach ($list as $field) { foreach ($list as $field) {
$no++; $no++;
$row = array(); $row = array();
$row[] = '<i class="fa fa-sort" style="cursor: -webkit-grab; cursor: grab;" title="Tarik keatas / kebawah" data-key="'.$field->id_item.'"></i>'; $row[] = '<i class="fa fa-sort" style="cursor: -webkit-grab; cursor: grab;" title="Tarik keatas / kebawah" data-key="' . $field->id_item . '"></i>';
$row[] = $no; $row[] = $no;
$row[] = $field->jenis_komponen; $row[] = $field->jenis_komponen;
$row[] = $field->nm_komponen; $row[] = $field->nm_komponen;
if ($field->jenis_komponen == 'tetap') { if ($field->jenis_komponen == 'tetap') {
$row[] = ($field->flag_persentase_gapok == '1') ? '<i class="text-success fa fa-check"></i>' : '<i class="text-danger fa fa-close"></i>'; $row[] = ($field->flag_persentase_gapok == '1') ? '<i class="text-success fa fa-check"></i>' : '<i class="text-danger fa fa-close"></i>';
}else{ } else {
$row[] = '-'; $row[] = '-';
} }
$row[] = ($field->flag_persentase_gapok == '1') ? $field->gapok_persen.' %' : '-' ; $row[] = ($field->flag_persentase_gapok == '1') ? $field->gapok_persen . ' %' : '-';
if ($master == 'pendapatan') { if ($master == 'pendapatan') {
if ($field->jenis_komponen == 'tetap') { if ($field->jenis_komponen == 'tetap') {
$row[] = ($field->flag_bpjs == '1') ? '<i class="text-success fa fa-check"></i>' : '<i class="text-danger fa fa-close"></i>'; $row[] = ($field->flag_bpjs == '1') ? '<i class="text-success fa fa-check"></i>' : '<i class="text-danger fa fa-close"></i>';
$row[] = ($field->flag_pph21 == '1') ? '<i class="text-success fa fa-check"></i>' : '<i class="text-danger fa fa-close"></i>'; $row[] = ($field->flag_pph21 == '1') ? '<i class="text-success fa fa-check"></i>' : '<i class="text-danger fa fa-close"></i>';
$row[] = ($field->flag_pot_absensi == '1') ? '<i class="text-success fa fa-check"></i>' : '<i class="text-danger fa fa-close"></i>'; $row[] = ($field->flag_pot_absensi == '1') ? '<i class="text-success fa fa-check"></i>' : '<i class="text-danger fa fa-close"></i>';
}else{ } else {
$row[] = '-'; $row[] = '-';
$row[] = '-'; $row[] = '-';
$row[] = '-'; $row[] = '-';
} }
} }
$btn_edit = '<a href="#" class="text-warning" title="EDIT"> <i id="'.md5($field->id_item).'" class="btn_edit fa fa-edit (alias) "> </i></a>'; $btn_edit = '<a href="#" class="text-warning" title="EDIT"> <i id="' . md5($field->id_item) . '" class="btn_edit fa fa-edit (alias) "> </i></a>';
$btn_hapus = '<a href="#" class="text-danger" title="HAPUS"><i id="'.md5($field->id_item).'" class="btn_delete fa fa-trash"></i></a>'; $btn_hapus = '<a href="#" class="text-danger" title="HAPUS"><i id="' . md5($field->id_item) . '" class="btn_delete fa fa-trash"></i></a>';
$row[] = $btn_edit.' '.$btn_hapus; $row[] = $btn_edit . ' ' . $btn_hapus;
$data[] = $row; $data[] = $row;
} }
$output = array("draw" => $_GET['draw'], $output = array(
"draw" => $_GET['draw'],
"recordsTotal" => $this->model->count_all($master), "recordsTotal" => $this->model->count_all($master),
"recordsFiltered" => $this->model->count_filtered($master), "recordsFiltered" => $this->model->count_filtered($master),
"data" => $data); "data" => $data
);
$output = __response($this->MY_response, $output); $output = __response($this->MY_response, $output);
echo json_encode($output); echo json_encode($output);
} }
public function form($master = 'pendapatan', $id=null){ public function form($master = 'pendapatan', $id = null)
if($id==null){ {
if ($id == null) {
$data['master'] = $master; $data['master'] = $master;
$this->load->view('payroll/master_komponen/form', $data); $this->load->view('payroll/master_komponen/form', $data);
}else{ } else {
$data['data'] = $this->model->getDataById($id, $master); $data['data'] = $this->model->getDataById($id, $master);
$data['master'] = $master; $data['master'] = $master;
$this->load->view('payroll/master_komponen/form', $data); $this->load->view('payroll/master_komponen/form', $data);
} }
} }
public function save($master = 'pendapatan'){ public function save($master = 'pendapatan')
{
$flag_jenis = $this->input->post('flag_jenis'); $flag_jenis = $this->input->post('flag_jenis');
$nm_komponen = $this->input->post('nm_komponen'); $nm_komponen = $this->input->post('nm_komponen');
$flag_persentase = $this->input->post('flag_persentase'); $flag_persentase = $this->input->post('flag_persentase');
...@@ -90,7 +99,6 @@ class Master_komponen extends MY_Controller{ ...@@ -90,7 +99,6 @@ class Master_komponen extends MY_Controller{
$flag_bpjs = $this->input->post('flag_bpjs'); $flag_bpjs = $this->input->post('flag_bpjs');
$flag_pph21 = $this->input->post('flag_pph21'); $flag_pph21 = $this->input->post('flag_pph21');
$flag_pot_absensi = $this->input->post('flag_pot_absensi'); $flag_pot_absensi = $this->input->post('flag_pot_absensi');
$no_urut = $this->input->post('no_urut');
$data = array( $data = array(
'jenis_master' => $master, 'jenis_master' => $master,
...@@ -101,13 +109,14 @@ class Master_komponen extends MY_Controller{ ...@@ -101,13 +109,14 @@ class Master_komponen extends MY_Controller{
'flag_bpjs' => ($master == 'pendapatan' && $flag_jenis == 'tetap') ? $flag_bpjs : '0', 'flag_bpjs' => ($master == 'pendapatan' && $flag_jenis == 'tetap') ? $flag_bpjs : '0',
'flag_pph21' => ($master == 'pendapatan' && $flag_jenis == 'tetap') ? $flag_pph21 : '0', 'flag_pph21' => ($master == 'pendapatan' && $flag_jenis == 'tetap') ? $flag_pph21 : '0',
'flag_pot_absensi' => ($master == 'pendapatan' && $flag_jenis == 'tetap') ? $flag_pot_absensi : '0', 'flag_pot_absensi' => ($master == 'pendapatan' && $flag_jenis == 'tetap') ? $flag_pot_absensi : '0',
'no_urut' => $no_urut, 'no_urut' => 0,
); );
$this->model->save($data, $master); $this->model->save($data, $master);
} }
public function update($master = 'pendapatan'){ public function update($master = 'pendapatan')
{
$jenis = $this->input->post('jenis'); // tetap / tidak tetap $jenis = $this->input->post('jenis'); // tetap / tidak tetap
$id_item = $this->input->post('key'); $id_item = $this->input->post('key');
$flag_jenis = $this->input->post('flag_jenis'); $flag_jenis = $this->input->post('flag_jenis');
...@@ -117,7 +126,6 @@ class Master_komponen extends MY_Controller{ ...@@ -117,7 +126,6 @@ class Master_komponen extends MY_Controller{
$flag_bpjs = $this->input->post('flag_bpjs'); $flag_bpjs = $this->input->post('flag_bpjs');
$flag_pph21 = $this->input->post('flag_pph21'); $flag_pph21 = $this->input->post('flag_pph21');
$flag_pot_absensi = $this->input->post('flag_pot_absensi'); $flag_pot_absensi = $this->input->post('flag_pot_absensi');
$no_urut = $this->input->post('no_urut');
$data = array( $data = array(
'jenis_master' => $master, 'jenis_master' => $master,
...@@ -128,19 +136,20 @@ class Master_komponen extends MY_Controller{ ...@@ -128,19 +136,20 @@ class Master_komponen extends MY_Controller{
'flag_bpjs' => ($master == 'pendapatan' && $flag_jenis == 'tetap') ? $flag_bpjs : '0', 'flag_bpjs' => ($master == 'pendapatan' && $flag_jenis == 'tetap') ? $flag_bpjs : '0',
'flag_pph21' => ($master == 'pendapatan' && $flag_jenis == 'tetap') ? $flag_pph21 : '0', 'flag_pph21' => ($master == 'pendapatan' && $flag_jenis == 'tetap') ? $flag_pph21 : '0',
'flag_pot_absensi' => ($master == 'pendapatan' && $flag_jenis == 'tetap') ? $flag_pot_absensi : '0', 'flag_pot_absensi' => ($master == 'pendapatan' && $flag_jenis == 'tetap') ? $flag_pot_absensi : '0',
'no_urut' => $no_urut, 'no_urut' => 0,
); );
$this->model->update($data, $master, $id_item, $jenis); $this->model->update($data, $master, $id_item, $jenis);
} }
public function update_order(){ public function update_order()
{
$order = $this->input->post('order'); $order = $this->input->post('order');
$data = array(); $data = array();
foreach ($order as $key) { foreach ($order as $key) {
$data[] = [ $data[] = [
'concat(id_item,id_company)' => $key['id_item'].$this->id_company, 'concat(id_item,id_company)' => $key['id_item'] . $this->id_company,
'no_urut' => $key['no_urut'] 'no_urut' => $key['no_urut']
]; ];
} }
...@@ -148,7 +157,8 @@ class Master_komponen extends MY_Controller{ ...@@ -148,7 +157,8 @@ class Master_komponen extends MY_Controller{
$this->model->update_order($data); $this->model->update_order($data);
} }
public function delete($master = 'pendapatan', $bulan = null){ public function delete($master = 'pendapatan', $bulan = null)
{
$id_item = $this->input->post('key'); $id_item = $this->input->post('key');
$this->model->delete($id_item, $master, $bulan); $this->model->delete($id_item, $master, $bulan);
} }
......
application/views/payroll/master_komponen/form.php
...@@ -3,16 +3,16 @@ ...@@ -3,16 +3,16 @@
function formatangka(objek) { function formatangka(objek) {
a = objek.value; a = objek.value;
b = a.replace(/[^\d]/g,""); b = a.replace(/[^\d]/g, "");
c = ""; c = "";
panjang = b.length; panjang = b.length;
j = 0; j = 0;
for (i = panjang; i > 0; i--) { for (i = panjang; i > 0; i--) {
j = j + 1; j = j + 1;
if (((j % 3) == 1) && (j != 1)) { if (((j % 3) == 1) && (j != 1)) {
c = b.substr(i-1,1) + "." + c; c = b.substr(i - 1, 1) + "." + c;
} else { } else {
c = b.substr(i-1,1) + c; c = b.substr(i - 1, 1) + c;
} }
} }
objek.value = c; objek.value = c;
...@@ -20,36 +20,36 @@ ...@@ -20,36 +20,36 @@
function showPersentase(val) { function showPersentase(val) {
if (val == "1") { if (val == "1") {
$("#form_persentase").attr("class","form-group"); $("#form_persentase").attr("class", "form-group");
$("#persentase").focus(); $("#persentase").focus();
}else{ } else {
$("#form_persentase").attr("class","form-group hidden"); $("#form_persentase").attr("class", "form-group hidden");
} }
} }
function showPersentaseGapok(val) { function showPersentaseGapok(val) {
if (val == "tetap") { if (val == "tetap") {
$("#form_persentase_gapok").attr("class","form-group"); $("#form_persentase_gapok").attr("class", "form-group");
showPersentase($("#form_persentase_gapok input[type='radio']:checked").val()); showPersentase($("#form_persentase_gapok input[type='radio']:checked").val());
<?php <?php
if ($master != 'potongan') { if ($master != 'potongan') {
?> ?>
$("#form_diikutsertakan").attr("class","form-group mt-3"); $("#form_diikutsertakan").attr("class", "form-group mt-3");
<?php <?php
}else{ } else {
?> ?>
$("#form_diikutsertakan").attr("class","form-group mt-3 hidden"); $("#form_diikutsertakan").attr("class", "form-group mt-3 hidden");
<?php <?php
} }
?> ?>
}else{ } else {
$("#form_persentase_gapok").attr("class","form-group hidden"); $("#form_persentase_gapok").attr("class", "form-group hidden");
showPersentase($("#form_persentase_gapok input[type='radio']:checked").val()); showPersentase($("#form_persentase_gapok input[type='radio']:checked").val());
$("#form_persentase").attr("class","form-group hidden"); $("#form_persentase").attr("class", "form-group hidden");
<?php <?php
if ($master != 'potongan') { if ($master != 'potongan') {
?> ?>
$("#form_diikutsertakan").attr("class","form-group mt-3 hidden"); $("#form_diikutsertakan").attr("class", "form-group mt-3 hidden");
<?php <?php
} }
?> ?>
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
$(function() { $(function() {
// event key enter // event key enter
$("#form_input input[type=text]").keydown(function (event) { $("#form_input input[type=text]").keydown(function(event) {
if (event.which == 13) { if (event.which == 13) {
event.preventDefault(); event.preventDefault();
$('.btn_save').click(); $('.btn_save').click();
...@@ -76,9 +76,9 @@ ...@@ -76,9 +76,9 @@
</div> </div>
<div id="form_input" class="card-body" disabled> <div id="form_input" class="card-body" disabled>
<input type="hidden" id="key" value="<?= ((isset($data->id_item))?md5($data->id_item):"") ?>" readonly> <input type="hidden" id="key" value="<?= ((isset($data->id_item)) ? md5($data->id_item) : "") ?>" readonly>
<input type="hidden" id="jenis" value="<?= ((isset($data->jenis_komponen)) ? $data->jenis_komponen : "") ?>" readonly> <input type="hidden" id="jenis" value="<?= ((isset($data->jenis_komponen)) ? $data->jenis_komponen : "") ?>" readonly>
<input type="hidden" id="bulanTdkTetap" value="<?= ((isset($data->id_item) && $data->jenis_komponen == 'tidak tetap')?date('Y-m'):"") ?>" readonly> <input type="hidden" id="bulanTdkTetap" value="<?= ((isset($data->id_item) && $data->jenis_komponen == 'tidak tetap') ? date('Y-m') : "") ?>" readonly>
<div id="form_jenis_komponen" class="form-group"> <div id="form_jenis_komponen" class="form-group">
<div class="row"> <div class="row">
<div class="col-md-5 my-auto"> <div class="col-md-5 my-auto">
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
<label>Nama <?= $master ?><i class="text-danger">*</i></label> <label>Nama <?= $master ?><i class="text-danger">*</i></label>
</div> </div>
<div class="col-md-7"> <div class="col-md-7">
<input type="text" id="nm_komponen" class="form-control" value="<?=((isset($data->nm_komponen))?$data->nm_komponen:"") ?>"> <input type="text" id="nm_komponen" class="form-control" value="<?= ((isset($data->nm_komponen)) ? $data->nm_komponen : "") ?>">
</div> </div>
</div> </div>
</div> </div>
...@@ -131,29 +131,29 @@ ...@@ -131,29 +131,29 @@
</div> </div>
</div> </div>
</div> </div>
<div id="form_persentase" class="form-group <?= ((isset($data)) ? (($data->flag_persentase_gapok == "0") ? "hidden" : "") : "hidden" ) ?>"> <div id="form_persentase" class="form-group <?= ((isset($data)) ? (($data->flag_persentase_gapok == "0") ? "hidden" : "") : "hidden") ?>">
<div class="row"> <div class="row">
<div class="col-md-5 my-auto"> <div class="col-md-5 my-auto">
<label>Persentase<i class="text-danger">*</i></label> <label>Persentase<i class="text-danger">*</i></label>
</div> </div>
<div class="col-md-4 input-group"> <div class="col-md-4 input-group">
<input type="text" id="persentase" class="form-control" value="<?=((isset($data->gapok_persen))?$data->gapok_persen:"") ?>"> <input type="text" id="persentase" class="form-control" value="<?= ((isset($data->gapok_persen)) ? $data->gapok_persen : "") ?>">
<div class="input-group-append"> <div class="input-group-append">
<span class="input-group-text"><b>%</b></span> <span class="input-group-text"><b>%</b></span>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="form-group"> <!-- <div class="form-group">
<div class="row"> <div class="row">
<div class="col-md-5 my-auto"> <div class="col-md-5 my-auto">
<label>Nomor Urut</label> <label>Nomor Urut</label>
</div> </div>
<div class="col-md-7"> <div class="col-md-7">
<input type="text" id="no_urut" class="form-control" value="<?=(isset($data->no_urut) ? $data->no_urut : '1') ?>"> <input type="text" id="no_urut" class="form-control" value="<?= (isset($data->no_urut) ? $data->no_urut : '1') ?>">
</div>
</div> </div>
</div> </div>
</div> -->
<div id="form_diikutsertakan" class="form-group mt-3 <?= ($master == 'potongan' && $data->jenis_komponen != 'tetap') ? 'hidden' : '' ?>"> <div id="form_diikutsertakan" class="form-group mt-3 <?= ($master == 'potongan' && $data->jenis_komponen != 'tetap') ? 'hidden' : '' ?>">
<h6 class="font-weight-bold" style="color: #1c77d4;">Diikutsertakan Hitungan</h6> <h6 class="font-weight-bold" style="color: #1c77d4;">Diikutsertakan Hitungan</h6>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment