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 101 additions and 91 deletions
application/controllers/payroll/Master_komponen.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();
$this->load->model('payroll/Master_komponen_m', 'model');
}
public function index_pendapatan(){
$data['judul'] = 'Master Komponen';
$data['aktif'] = 'master_komponen';
$data['menu'] = $this->load->view('main_menu', $data, true);
$data['content'] = $this->load->view('payroll/master_komponen/pendapatan', $data, true);
$this->load->view('main_template', $data, false);
}
public function index_potongan(){
$data['judul'] = 'Master Komponen';
$data['aktif'] = 'master_komponen';
$data['menu'] = $this->load->view('main_menu', $data, true);
$data['content'] = $this->load->view('payroll/master_komponen/potongan', $data, true);
$this->load->view('main_template', $data, false);
}
public function list_data($master = 'pendapatan'){
$list = $this->model->get_datatables($master);
$data = array();
$no = $_GET['start'];
foreach ($list as $field) {
$no++;
$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[] = $no;
$row[] = $field->jenis_komponen;
$row[] = $field->nm_komponen;
public function index_pendapatan()
{
$data['judul'] = 'Master Komponen';
$data['aktif'] = 'master_komponen';
$data['menu'] = $this->load->view('main_menu', $data, true);
$data['content'] = $this->load->view('payroll/master_komponen/pendapatan', $data, true);
$this->load->view('main_template', $data, false);
}
public function index_potongan()
{
$data['judul'] = 'Master Komponen';
$data['aktif'] = 'master_komponen';
$data['menu'] = $this->load->view('main_menu', $data, true);
$data['content'] = $this->load->view('payroll/master_komponen/potongan', $data, true);
$this->load->view('main_template', $data, false);
}
public function list_data($master = 'pendapatan')
{
$list = $this->model->get_datatables($master);
$data = array();
$no = $_GET['start'];
foreach ($list as $field) {
$no++;
$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[] = $no;
$row[] = $field->jenis_komponen;
$row[] = $field->nm_komponen;
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>';
}else{
} else {
$row[] = '-';
}
$row[] = ($field->flag_persentase_gapok == '1') ? $field->gapok_persen.' %' : '-' ;
$row[] = ($field->flag_persentase_gapok == '1') ? $field->gapok_persen . ' %' : '-';
if ($master == 'pendapatan') {
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_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>';
}else{
} else {
$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_hapus = '<a href="#" class="text-danger" title="HAPUS"><i id="'.md5($field->id_item).'" class="btn_delete fa fa-trash"></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>';
$row[] = $btn_edit.' '.$btn_hapus;
$row[] = $btn_edit . ' ' . $btn_hapus;
$data[] = $row;
}
$data[] = $row;
}
$output = array("draw" => $_GET['draw'],
"recordsTotal" => $this->model->count_all($master),
"recordsFiltered" => $this->model->count_filtered($master),
"data" => $data);
$output = array(
"draw" => $_GET['draw'],
"recordsTotal" => $this->model->count_all($master),
"recordsFiltered" => $this->model->count_filtered($master),
"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){
if($id==null){
public function form($master = 'pendapatan', $id = null)
{
if ($id == null) {
$data['master'] = $master;
$this->load->view('payroll/master_komponen/form', $data);
}else{
} else {
$data['data'] = $this->model->getDataById($id, $master);
$data['master'] = $master;
$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');
$nm_komponen = $this->input->post('nm_komponen');
$flag_persentase = $this->input->post('flag_persentase');
......@@ -90,9 +99,8 @@ class Master_komponen extends MY_Controller{
$flag_bpjs = $this->input->post('flag_bpjs');
$flag_pph21 = $this->input->post('flag_pph21');
$flag_pot_absensi = $this->input->post('flag_pot_absensi');
$no_urut = $this->input->post('no_urut');
$data = array(
$data = array(
'jenis_master' => $master,
'jenis_komponen' => $flag_jenis,
'nm_komponen' => $nm_komponen,
......@@ -101,13 +109,14 @@ class Master_komponen extends MY_Controller{
'flag_bpjs' => ($master == 'pendapatan' && $flag_jenis == 'tetap') ? $flag_bpjs : '0',
'flag_pph21' => ($master == 'pendapatan' && $flag_jenis == 'tetap') ? $flag_pph21 : '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
$id_item = $this->input->post('key');
$flag_jenis = $this->input->post('flag_jenis');
......@@ -117,9 +126,8 @@ class Master_komponen extends MY_Controller{
$flag_bpjs = $this->input->post('flag_bpjs');
$flag_pph21 = $this->input->post('flag_pph21');
$flag_pot_absensi = $this->input->post('flag_pot_absensi');
$no_urut = $this->input->post('no_urut');
$data = array(
$data = array(
'jenis_master' => $master,
'jenis_komponen' => $flag_jenis,
'nm_komponen' => $nm_komponen,
......@@ -128,28 +136,30 @@ class Master_komponen extends MY_Controller{
'flag_bpjs' => ($master == 'pendapatan' && $flag_jenis == 'tetap') ? $flag_bpjs : '0',
'flag_pph21' => ($master == 'pendapatan' && $flag_jenis == 'tetap') ? $flag_pph21 : '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');
$data = array();
foreach ($order as $key) {
$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']
];
}
// print_r($data);exit;
$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');
$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 @@
function formatangka(objek) {
a = objek.value;
b = a.replace(/[^\d]/g,"");
b = a.replace(/[^\d]/g, "");
c = "";
panjang = b.length;
j = 0;
for (i = panjang; i > 0; i--) {
j = j + 1;
if (((j % 3) == 1) && (j != 1)) {
c = b.substr(i-1,1) + "." + c;
c = b.substr(i - 1, 1) + "." + c;
} else {
c = b.substr(i-1,1) + c;
c = b.substr(i - 1, 1) + c;
}
}
objek.value = c;
......@@ -20,36 +20,36 @@
function showPersentase(val) {
if (val == "1") {
$("#form_persentase").attr("class","form-group");
$("#form_persentase").attr("class", "form-group");
$("#persentase").focus();
}else{
$("#form_persentase").attr("class","form-group hidden");
} else {
$("#form_persentase").attr("class", "form-group hidden");
}
}
function showPersentaseGapok(val) {
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());
<?php
if ($master != 'potongan') {
?>
$("#form_diikutsertakan").attr("class","form-group mt-3");
$("#form_diikutsertakan").attr("class", "form-group mt-3");
<?php
}else{
} else {
?>
$("#form_diikutsertakan").attr("class","form-group mt-3 hidden");
$("#form_diikutsertakan").attr("class", "form-group mt-3 hidden");
<?php
}
?>
}else{
$("#form_persentase_gapok").attr("class","form-group hidden");
} else {
$("#form_persentase_gapok").attr("class", "form-group hidden");
showPersentase($("#form_persentase_gapok input[type='radio']:checked").val());
$("#form_persentase").attr("class","form-group hidden");
$("#form_persentase").attr("class", "form-group hidden");
<?php
if ($master != 'potongan') {
?>
$("#form_diikutsertakan").attr("class","form-group mt-3 hidden");
$("#form_diikutsertakan").attr("class", "form-group mt-3 hidden");
<?php
}
?>
......@@ -58,7 +58,7 @@
$(function() {
// event key enter
$("#form_input input[type=text]").keydown(function (event) {
$("#form_input input[type=text]").keydown(function(event) {
if (event.which == 13) {
event.preventDefault();
$('.btn_save').click();
......@@ -76,9 +76,9 @@
</div>
<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="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 class="row">
<div class="col-md-5 my-auto">
......@@ -106,7 +106,7 @@
<label>Nama <?= $master ?><i class="text-danger">*</i></label>
</div>
<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>
......@@ -131,29 +131,29 @@
</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="col-md-5 my-auto">
<label>Persentase<i class="text-danger">*</i></label>
</div>
<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">
<span class="input-group-text"><b>%</b></span>
</div>
</div>
</div>
</div>
<div class="form-group">
<!-- <div class="form-group">
<div class="row">
<div class="col-md-5 my-auto">
<label>Nomor Urut</label>
</div>
<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 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>
......
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