Commit b2a36c53 by nurchamim

modul: bug master komponen

status: selesai
keterangan:
1. bug fix no urut
parent d2ac3ac2
<?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);
} }
......
<?php <?php
if ( ! defined('BASEPATH')) exit('No direct script access allowed'); if (!defined('BASEPATH')) exit('No direct script access allowed');
class Master_komponen_m extends CI_Model { class Master_komponen_m extends CI_Model
{
private $table = 'payroll_komponen_m'; private $table = 'payroll_komponen_m';
function get_datatables($master){ function get_datatables($master)
{
$this->_get_datatables_query($master); $this->_get_datatables_query($master);
if($_GET['length'] != -1){ if ($_GET['length'] != -1) {
$this->db->limit($_GET['length'], $_GET['start']); $this->db->limit($_GET['length'], $_GET['start']);
} }
$query = $this->db->get(); $query = $this->db->get();
return $query->result(); return $query->result();
} }
function count_filtered($master){ function count_filtered($master)
{
$this->_get_datatables_query($master); $this->_get_datatables_query($master);
$query = $this->db->get(); $query = $this->db->get();
return $query->num_rows(); return $query->num_rows();
} }
public function count_all($master){ public function count_all($master)
{
$this->_get_datatables_query($master); $this->_get_datatables_query($master);
return $this->db->count_all_results(); return $this->db->count_all_results();
} }
private function _get_datatables_query($master){ private function _get_datatables_query($master)
{
$this->db->select(" $this->db->select("
id_item, id_item,
jenis_komponen, jenis_komponen,
...@@ -44,17 +49,17 @@ class Master_komponen_m extends CI_Model { ...@@ -44,17 +49,17 @@ class Master_komponen_m extends CI_Model {
$column_search = array(''); $column_search = array('');
$i = 0; $i = 0;
foreach ($column_search as $item){ // looping awal foreach ($column_search as $item) { // looping awal
if($_GET['search']['value']){ // jika datatable mengirimkan pencarian dengan metode POST if ($_GET['search']['value']) { // jika datatable mengirimkan pencarian dengan metode POST
if($i===0){ // looping awal if ($i === 0) { // looping awal
$this->db->group_start(); $this->db->group_start();
$this->db->like($item, $_GET['search']['value']); $this->db->like($item, $_GET['search']['value']);
}else{ } else {
$this->db->or_like($item, $_GET['search']['value']); $this->db->or_like($item, $_GET['search']['value']);
} }
if(count($column_search) - 1 == $i){ if (count($column_search) - 1 == $i) {
$this->db->group_end(); $this->db->group_end();
} }
} }
...@@ -64,7 +69,8 @@ class Master_komponen_m extends CI_Model { ...@@ -64,7 +69,8 @@ class Master_komponen_m extends CI_Model {
$this->db->order_by('no_urut', 'ASC'); $this->db->order_by('no_urut', 'ASC');
} }
public function getDataById($id=null, $master){ public function getDataById($id = null, $master)
{
$this->db->select(' $this->db->select('
id_item, id_item,
jenis_komponen, jenis_komponen,
...@@ -85,15 +91,27 @@ class Master_komponen_m extends CI_Model { ...@@ -85,15 +91,27 @@ class Master_komponen_m extends CI_Model {
return $query->row(); return $query->row();
} }
public function save($data, $master, $return = true){ public function save($data, $master, $return = true)
{
$this->db->trans_start(); $this->db->trans_start();
$id_item = $this->fungsi->getNextId($this->table,'id_item',$this->id_company,5); $id_item = $this->fungsi->getNextId($this->table, 'id_item', $this->id_company, 5);
$data["id_item"] = $id_item; $data["id_item"] = $id_item;
$data["id_company"] = $this->id_company; $data["id_company"] = $this->id_company;
$data["user_input"] = $this->nik_karyawan. ' - ' .$this->nm_karyawan; $data["user_input"] = $this->nik_karyawan . ' - ' . $this->nm_karyawan;
$this->db->insert($this->table, $data); $this->db->insert($this->table, $data);
// update urutan master komponen
$reorder = $this->input->post('reorder');
$data_order = array();
foreach ($reorder as $key) {
$data_order[] = [
'concat(id_item,id_company)' => $key['id_item'] . $this->id_company,
'no_urut' => $key['no_urut']
];
}
$this->db->update_batch($this->table, $data_order, 'concat(id_item,id_company)');
$data_pendapatan = []; $data_pendapatan = [];
// get data karyawan aktif // get data karyawan aktif
$karyawan_aktif = $this->db->select('dk.id_karyawan, pg.nominal') $karyawan_aktif = $this->db->select('dk.id_karyawan, pg.nominal')
...@@ -101,8 +119,8 @@ class Master_komponen_m extends CI_Model { ...@@ -101,8 +119,8 @@ class Master_komponen_m extends CI_Model {
->join('payroll_gapok_m as pg', 'pg.id_karyawan = dk.id_karyawan', 'left') ->join('payroll_gapok_m as pg', 'pg.id_karyawan = dk.id_karyawan', 'left')
->join('master_jabatan', 'master_jabatan.id_jabatan = dk.id_jabatan') ->join('master_jabatan', 'master_jabatan.id_jabatan = dk.id_jabatan')
->where('dk.id_company', $this->id_company) ->where('dk.id_company', $this->id_company)
->where_in('dk.status', ['1','2','3','4']) ->where_in('dk.status', ['1', '2', '3', '4'])
->where_not_in("master_jabatan.level_user",["1","6"]) ->where_not_in("master_jabatan.level_user", ["1", "6"])
->get() ->get()
->result(); ->result();
...@@ -119,12 +137,12 @@ class Master_komponen_m extends CI_Model { ...@@ -119,12 +137,12 @@ class Master_komponen_m extends CI_Model {
'flag_persentase_gapok' => $data['flag_persentase_gapok'], 'flag_persentase_gapok' => $data['flag_persentase_gapok'],
'gapok_persen' => $data['gapok_persen'], 'gapok_persen' => $data['gapok_persen'],
'gapok_rp' => $gapok, 'gapok_rp' => $gapok,
'nominal_tunjangan' => ($data['flag_persentase_gapok'] == '1') ? (($data['gapok_persen']/100) * $gapok) : 0, 'nominal_tunjangan' => ($data['flag_persentase_gapok'] == '1') ? (($data['gapok_persen'] / 100) * $gapok) : 0,
'flag_bpjs' => $data['flag_bpjs'], 'flag_bpjs' => $data['flag_bpjs'],
'flag_pph21' => $data['flag_pph21'], 'flag_pph21' => $data['flag_pph21'],
'flag_pot_absensi' => $data['flag_pot_absensi'], 'flag_pot_absensi' => $data['flag_pot_absensi'],
'id_company' => $this->id_company, 'id_company' => $this->id_company,
'user_input' => $this->nik_karyawan. ' - ' .$this->nm_karyawan 'user_input' => $this->nik_karyawan . ' - ' . $this->nm_karyawan
]; ];
} }
...@@ -143,12 +161,12 @@ class Master_komponen_m extends CI_Model { ...@@ -143,12 +161,12 @@ class Master_komponen_m extends CI_Model {
'flag_persentase_gapok' => $data['flag_persentase_gapok'], 'flag_persentase_gapok' => $data['flag_persentase_gapok'],
'gapok_persen' => $data['gapok_persen'], 'gapok_persen' => $data['gapok_persen'],
'gapok_rp' => $gapok, 'gapok_rp' => $gapok,
'nominal_potongan' => ($data['flag_persentase_gapok'] == '1') ? (($data['gapok_persen']/100) * $gapok) : 0, 'nominal_potongan' => ($data['flag_persentase_gapok'] == '1') ? (($data['gapok_persen'] / 100) * $gapok) : 0,
'flag_bpjs' => $data['flag_bpjs'], 'flag_bpjs' => $data['flag_bpjs'],
'flag_pph21' => $data['flag_pph21'], 'flag_pph21' => $data['flag_pph21'],
'flag_pot_absensi' => $data['flag_pot_absensi'], 'flag_pot_absensi' => $data['flag_pot_absensi'],
'id_company' => $this->id_company, 'id_company' => $this->id_company,
'user_input' => $this->nik_karyawan. ' - ' .$this->nm_karyawan 'user_input' => $this->nik_karyawan . ' - ' . $this->nm_karyawan
]; ];
} }
...@@ -159,10 +177,10 @@ class Master_komponen_m extends CI_Model { ...@@ -159,10 +177,10 @@ class Master_komponen_m extends CI_Model {
$this->db->trans_complete(); $this->db->trans_complete();
if ($return) { if ($return) {
if($this->db->trans_status() === FALSE) { if ($this->db->trans_status() === FALSE) {
$this->db->trans_rollback(); $this->db->trans_rollback();
return __response_save(false); return __response_save(false);
}else{ } else {
$this->db->trans_commit(); $this->db->trans_commit();
return __response_save(true); return __response_save(true);
} }
...@@ -179,7 +197,7 @@ class Master_komponen_m extends CI_Model { ...@@ -179,7 +197,7 @@ class Master_komponen_m extends CI_Model {
'id_company' => $this->id_company 'id_company' => $this->id_company
)); ));
$data["user_update"] = $this->nik_karyawan. ' - ' .$this->nm_karyawan; $data["user_update"] = $this->nik_karyawan . ' - ' . $this->nm_karyawan;
$data["tgl_update"] = date('Y-m-d H:i:s'); $data["tgl_update"] = date('Y-m-d H:i:s');
$this->db->update($this->table, $data); $this->db->update($this->table, $data);
...@@ -193,7 +211,7 @@ class Master_komponen_m extends CI_Model { ...@@ -193,7 +211,7 @@ class Master_komponen_m extends CI_Model {
if ($data['jenis_komponen'] != 'tetap') { if ($data['jenis_komponen'] != 'tetap') {
$table_pend = 'payroll_tunj_tdk_tetap_m'; $table_pend = 'payroll_tunj_tdk_tetap_m';
$keyItem = 'concat(id_karyawan,id_item,periode,id_company)'; $keyItem = 'concat(id_karyawan,id_item,periode,id_company)';
$valueItem = date('Y-m').$this->id_company; $valueItem = date('Y-m') . $this->id_company;
$bulan = date('Y-m'); $bulan = date('Y-m');
} }
...@@ -204,7 +222,7 @@ class Master_komponen_m extends CI_Model { ...@@ -204,7 +222,7 @@ class Master_komponen_m extends CI_Model {
$this->db->where('md5(id_item)', $id_item); $this->db->where('md5(id_item)', $id_item);
$this->db->where('id_company', $this->id_company); $this->db->where('id_company', $this->id_company);
$this->db->delete('payroll_tunj_tetap_m'); $this->db->delete('payroll_tunj_tetap_m');
}else{ } else {
// kondisi tidak tetap ke tetap // kondisi tidak tetap ke tetap
// hapus data komponen tunjangan tidak tetap pada bulan berjalan // hapus data komponen tunjangan tidak tetap pada bulan berjalan
$this->db->where('periode', $bulan); $this->db->where('periode', $bulan);
...@@ -218,10 +236,10 @@ class Master_komponen_m extends CI_Model { ...@@ -218,10 +236,10 @@ class Master_komponen_m extends CI_Model {
// panggil fungsi save // panggil fungsi save
$this->save($data, $master, false); $this->save($data, $master, false);
} }
}else{ } else {
// get data karyawan // get data karyawan
$select = $this->db->select('pend.id_karyawan, pend.id_item, pend.flag_persentase_gapok, pend.nominal_tunjangan, pg.nominal') $select = $this->db->select('pend.id_karyawan, pend.id_item, pend.flag_persentase_gapok, pend.nominal_tunjangan, pg.nominal')
->from($table_pend.' AS pend') ->from($table_pend . ' AS pend')
->join('payroll_gapok_m AS pg', 'pg.id_karyawan = pend.id_karyawan', 'left') ->join('payroll_gapok_m AS pg', 'pg.id_karyawan = pend.id_karyawan', 'left')
->where('md5(pend.id_item)', $id_item) ->where('md5(pend.id_item)', $id_item)
->where('pend.id_company', $this->id_company) ->where('pend.id_company', $this->id_company)
...@@ -237,12 +255,12 @@ class Master_komponen_m extends CI_Model { ...@@ -237,12 +255,12 @@ class Master_komponen_m extends CI_Model {
// jika data nominal sebelumnya ada nilainya // jika data nominal sebelumnya ada nilainya
if ($karyawan->nominal_tunjangan > 0) { if ($karyawan->nominal_tunjangan > 0) {
// update yang terbaru // update yang terbaru
$nominal_tunjangan = (($data['gapok_persen']/100) * $gapok); $nominal_tunjangan = (($data['gapok_persen'] / 100) * $gapok);
} }
}else{ } else {
$nominal_tunjangan = (($data['gapok_persen']/100) * $gapok); $nominal_tunjangan = (($data['gapok_persen'] / 100) * $gapok);
} }
}else{ } else {
// jika data nominal sebelumnya ada nilainya // jika data nominal sebelumnya ada nilainya
if ($karyawan->nominal_tunjangan > 0) { if ($karyawan->nominal_tunjangan > 0) {
// update yang terbaru // update yang terbaru
...@@ -250,7 +268,7 @@ class Master_komponen_m extends CI_Model { ...@@ -250,7 +268,7 @@ class Master_komponen_m extends CI_Model {
} }
} }
$data_pendapatan[] = [ $data_pendapatan[] = [
$keyItem => $karyawan->id_karyawan.$karyawan->id_item.$valueItem, $keyItem => $karyawan->id_karyawan . $karyawan->id_item . $valueItem,
'nm_tunjangan' => $data['nm_komponen'], 'nm_tunjangan' => $data['nm_komponen'],
'flag_persentase_gapok' => $data['flag_persentase_gapok'], 'flag_persentase_gapok' => $data['flag_persentase_gapok'],
'gapok_persen' => $data['gapok_persen'], 'gapok_persen' => $data['gapok_persen'],
...@@ -259,7 +277,7 @@ class Master_komponen_m extends CI_Model { ...@@ -259,7 +277,7 @@ class Master_komponen_m extends CI_Model {
'flag_bpjs' => $data['flag_bpjs'], 'flag_bpjs' => $data['flag_bpjs'],
'flag_pph21' => $data['flag_pph21'], 'flag_pph21' => $data['flag_pph21'],
'flag_pot_absensi' => $data['flag_pot_absensi'], 'flag_pot_absensi' => $data['flag_pot_absensi'],
'user_update' => $this->nik_karyawan. ' - ' .$this->nm_karyawan, 'user_update' => $this->nik_karyawan . ' - ' . $this->nm_karyawan,
'tgl_update' => date('Y-m-d H:i:s') 'tgl_update' => date('Y-m-d H:i:s')
]; ];
} }
...@@ -277,7 +295,7 @@ class Master_komponen_m extends CI_Model { ...@@ -277,7 +295,7 @@ class Master_komponen_m extends CI_Model {
if ($data['jenis_komponen'] != 'tetap') { if ($data['jenis_komponen'] != 'tetap') {
$table_pot = 'payroll_pot_tdk_tetap_m'; $table_pot = 'payroll_pot_tdk_tetap_m';
$keyItem = 'concat(id_karyawan,id_item,periode,id_company)'; $keyItem = 'concat(id_karyawan,id_item,periode,id_company)';
$valueItem = date('Y-m').$this->id_company; $valueItem = date('Y-m') . $this->id_company;
$bulan = date('Y-m'); $bulan = date('Y-m');
} }
...@@ -288,7 +306,7 @@ class Master_komponen_m extends CI_Model { ...@@ -288,7 +306,7 @@ class Master_komponen_m extends CI_Model {
$this->db->where('md5(id_item)', $id_item); $this->db->where('md5(id_item)', $id_item);
$this->db->where('id_company', $this->id_company); $this->db->where('id_company', $this->id_company);
$this->db->delete('payroll_pot_tetap_m'); $this->db->delete('payroll_pot_tetap_m');
}else{ } else {
// kondisi tidak tetap ke tetap // kondisi tidak tetap ke tetap
// hapus data komponen potongan tidak tetap pada bulan berjalan // hapus data komponen potongan tidak tetap pada bulan berjalan
$this->db->where('periode', $bulan); $this->db->where('periode', $bulan);
...@@ -302,10 +320,10 @@ class Master_komponen_m extends CI_Model { ...@@ -302,10 +320,10 @@ class Master_komponen_m extends CI_Model {
// panggil fungsi save // panggil fungsi save
$this->save($data, $master, false); $this->save($data, $master, false);
} }
}else{ } else {
// get data karyawan // get data karyawan
$select = $this->db->select('pot.id_karyawan, pot.id_item, pot.flag_persentase_gapok, pot.nominal_potongan, pg.nominal') $select = $this->db->select('pot.id_karyawan, pot.id_item, pot.flag_persentase_gapok, pot.nominal_potongan, pg.nominal')
->from($table_pot.' AS pot') ->from($table_pot . ' AS pot')
->join('payroll_gapok_m AS pg', 'pg.id_karyawan = pot.id_karyawan', 'left') ->join('payroll_gapok_m AS pg', 'pg.id_karyawan = pot.id_karyawan', 'left')
->where('md5(pot.id_item)', $id_item) ->where('md5(pot.id_item)', $id_item)
->where('pot.id_company', $this->id_company) ->where('pot.id_company', $this->id_company)
...@@ -321,12 +339,12 @@ class Master_komponen_m extends CI_Model { ...@@ -321,12 +339,12 @@ class Master_komponen_m extends CI_Model {
// jika data nominal sebelumnya ada nilainya // jika data nominal sebelumnya ada nilainya
if ($karyawan->nominal_potongan > 0) { if ($karyawan->nominal_potongan > 0) {
// update yang terbaru // update yang terbaru
$nominal_potongan = (($data['gapok_persen']/100) * $gapok); $nominal_potongan = (($data['gapok_persen'] / 100) * $gapok);
} }
}else{ } else {
$nominal_potongan = (($data['gapok_persen']/100) * $gapok); $nominal_potongan = (($data['gapok_persen'] / 100) * $gapok);
} }
}else{ } else {
// jika data nominal sebelumnya ada nilainya // jika data nominal sebelumnya ada nilainya
if ($karyawan->nominal_potongan > 0) { if ($karyawan->nominal_potongan > 0) {
// update yang terbaru // update yang terbaru
...@@ -334,7 +352,7 @@ class Master_komponen_m extends CI_Model { ...@@ -334,7 +352,7 @@ class Master_komponen_m extends CI_Model {
} }
} }
$data_potongan[] = [ $data_potongan[] = [
$keyItem => $karyawan->id_karyawan.$karyawan->id_item.$valueItem, $keyItem => $karyawan->id_karyawan . $karyawan->id_item . $valueItem,
'nm_potongan' => $data['nm_komponen'], 'nm_potongan' => $data['nm_komponen'],
'flag_persentase_gapok' => $data['flag_persentase_gapok'], 'flag_persentase_gapok' => $data['flag_persentase_gapok'],
'gapok_persen' => $data['gapok_persen'], 'gapok_persen' => $data['gapok_persen'],
...@@ -343,7 +361,7 @@ class Master_komponen_m extends CI_Model { ...@@ -343,7 +361,7 @@ class Master_komponen_m extends CI_Model {
'flag_bpjs' => $data['flag_bpjs'], 'flag_bpjs' => $data['flag_bpjs'],
'flag_pph21' => $data['flag_pph21'], 'flag_pph21' => $data['flag_pph21'],
'flag_pot_absensi' => $data['flag_pot_absensi'], 'flag_pot_absensi' => $data['flag_pot_absensi'],
'user_update' => $this->nik_karyawan. ' - ' .$this->nm_karyawan, 'user_update' => $this->nik_karyawan . ' - ' . $this->nm_karyawan,
'tgl_update' => date('Y-m-d H:i:s') 'tgl_update' => date('Y-m-d H:i:s')
]; ];
} }
...@@ -351,21 +369,21 @@ class Master_komponen_m extends CI_Model { ...@@ -351,21 +369,21 @@ class Master_komponen_m extends CI_Model {
$this->db->update_batch($table_pot, $data_potongan, $keyItem); $this->db->update_batch($table_pot, $data_potongan, $keyItem);
} }
} }
} }
$this->db->trans_complete(); $this->db->trans_complete();
if($this->db->trans_status() === FALSE) { if ($this->db->trans_status() === FALSE) {
$this->db->trans_rollback(); $this->db->trans_rollback();
return __response_update(false); return __response_update(false);
}else{ } else {
$this->db->trans_commit(); $this->db->trans_commit();
return __response_update(true); return __response_update(true);
} }
} }
public function delete($id=null, $master, $bulan, $return = true){ public function delete($id = null, $master, $bulan, $return = true)
{
$this->db->trans_start(); $this->db->trans_start();
$this->db->where('md5(id_item)', $id); $this->db->where('md5(id_item)', $id);
...@@ -419,10 +437,10 @@ class Master_komponen_m extends CI_Model { ...@@ -419,10 +437,10 @@ class Master_komponen_m extends CI_Model {
$this->db->trans_complete(); $this->db->trans_complete();
if ($return) { if ($return) {
if($this->db->trans_status() === FALSE) { if ($this->db->trans_status() === FALSE) {
$this->db->trans_rollback(); $this->db->trans_rollback();
return __response_delete(false); return __response_delete(false);
}else{ } else {
$this->db->trans_commit(); $this->db->trans_commit();
return __response_delete(true); return __response_delete(true);
} }
...@@ -438,13 +456,12 @@ class Master_komponen_m extends CI_Model { ...@@ -438,13 +456,12 @@ class Master_komponen_m extends CI_Model {
$this->db->trans_complete(); $this->db->trans_complete();
if($this->db->trans_status() === FALSE) { if ($this->db->trans_status() === FALSE) {
$this->db->trans_rollback(); $this->db->trans_rollback();
return __response_update(false); return __response_update(false);
}else{ } else {
$this->db->trans_commit(); $this->db->trans_commit();
return __response_update(true); return __response_update(true);
} }
} }
} }
...@@ -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>
......
...@@ -5,45 +5,53 @@ ...@@ -5,45 +5,53 @@
$(function() { $(function() {
// reconfigure(); // reconfigure();
$.fn.dataTableExt.sErrMode = 'none'; $.fn.dataTableExt.sErrMode = 'none';
list_data = $('#list_data').on('error.dt', function ( e, settings, techNote, message ) { list_data = $('#list_data').on('error.dt', function(e, settings, techNote, message) {
if(confirm('Terjadi kesalahan saat memproses data, muat ulang halaman ?')){ if (confirm('Terjadi kesalahan saat memproses data, muat ulang halaman ?')) {
window.location.reload(); window.location.reload();
} }
}).DataTable({ }).DataTable({
'searching' : false, 'searching': false,
'searchDelay' : 1000, 'searchDelay': 1000,
'paging' : true, 'paging': true,
'lengthChange': true, 'lengthChange': true,
'ordering' : true, 'ordering': true,
'info' : true, 'info': true,
'scrollX' : true, 'scrollX': true,
'stateSave' : true, 'stateSave': true,
// 'scrollCollapse': true, // 'scrollCollapse': true,
// 'fixedColumns': true, // 'fixedColumns': true,
'language' :{ 'language': {
'url' : '<?=base_url("assets/plugins/datatables/dataTables-language-id.json")?>', 'url': '<?= base_url("assets/plugins/datatables/dataTables-language-id.json") ?>',
'sEmptyTable' : 'Tidak ada data untuk ditampilkan', 'sEmptyTable': 'Tidak ada data untuk ditampilkan',
'searchPlaceholder': '' 'searchPlaceholder': ''
}, },
"processing" : true, "processing": true,
"serverSide" : true, "serverSide": true,
"order" : [], "order": [],
"ajax" : { "ajax": {
"url" : "<?= route("payroll.master.komponen.data", ["master" => "pendapatan"]) ?>", "url": "<?= route("payroll.master.komponen.data", ["master" => "pendapatan"]) ?>",
"type" : "GET", "type": "GET",
"data" : function (d) { "data": function(d) {
delete d.columns; delete d.columns;
}, },
"complete" : function(data){ "complete": function(data) {
reconfigure(data); reconfigure(data);
} }
}, },
"aoColumnDefs": [ "aoColumnDefs": [{
{ "aTargets": "_all", "bSortable": false }, "aTargets": "_all",
{ "className": "text-left", "targets": [2,3] }, "bSortable": false
{ "className": "text-center", "targets": "_all" }, },
{
"className": "text-left",
"targets": [2, 3]
},
{
"className": "text-center",
"targets": "_all"
},
] ]
}); });
...@@ -58,7 +66,7 @@ ...@@ -58,7 +66,7 @@
$('#list_data tbody tr').each(function(index, element) { $('#list_data tbody tr').each(function(index, element) {
order.push({ order.push({
id_item: $(this).find("td:eq(0) i").data("key"), id_item: $(this).find("td:eq(0) i").data("key"),
no_urut: index+1 no_urut: index + 1
}); });
}); });
// console.log(order); // console.log(order);
...@@ -67,7 +75,7 @@ ...@@ -67,7 +75,7 @@
dataType: "json", dataType: "json",
url: "<?= route("payroll.master.komponen.order") ?>", url: "<?= route("payroll.master.komponen.order") ?>",
data: { data: {
order:order, order: order,
}, },
success: function(response) { success: function(response) {
if (response.status == "success") { if (response.status == "success") {
...@@ -80,8 +88,8 @@ ...@@ -80,8 +88,8 @@
} }
}); });
$(document).on('click','.btn_tambah',function(){ $(document).on('click', '.btn_tambah', function() {
$('#tampil_form').load("<?= route("payroll.master.komponen.form.tambah", ["master" => "pendapatan"]) ?>",function(){ $('#tampil_form').load("<?= route("payroll.master.komponen.form.tambah", ["master" => "pendapatan"]) ?>", function() {
$('#modal_form').modal('show'); $('#modal_form').modal('show');
$(".title").text("Form Tambah Data Master Komponen"); $(".title").text("Form Tambah Data Master Komponen");
$(".btn_save").addClass("btn_save btn btn-primary"); $(".btn_save").addClass("btn_save btn btn-primary");
...@@ -91,8 +99,8 @@ ...@@ -91,8 +99,8 @@
}); });
}); });
$(document).on('click','.btn_edit',function(){ $(document).on('click', '.btn_edit', function() {
$('#tampil_form').load("<?= route("payroll.master.komponen.form.edit", ["master" => "pendapatan"]) ?>"+"/"+$(this).attr('id'),function(){ $('#tampil_form').load("<?= route("payroll.master.komponen.form.edit", ["master" => "pendapatan"]) ?>" + "/" + $(this).attr('id'), function() {
$('#modal_form').modal('show'); $('#modal_form').modal('show');
$(".title").text("Form Edit Data Master Komponen"); $(".title").text("Form Edit Data Master Komponen");
$(".btn_save").append('<i class="fa fa-edit (alias)"></i> '); $(".btn_save").append('<i class="fa fa-edit (alias)"></i> ');
...@@ -102,22 +110,21 @@ ...@@ -102,22 +110,21 @@
}); });
}); });
$(document).on('click','.btn_delete',function(){ $(document).on('click', '.btn_delete', function() {
$('#tampil_form').load("<?= route("payroll.master.komponen.form.hapus", ["master" => "pendapatan"]) ?>"+"/"+$(this).attr('id'),function(){ $('#tampil_form').load("<?= route("payroll.master.komponen.form.hapus", ["master" => "pendapatan"]) ?>" + "/" + $(this).attr('id'), function() {
$('#modal_form').modal('show'); $('#modal_form').modal('show');
$(".title").text("Apakah Anda ingin menghapus data ini?"); $(".title").text("Apakah Anda ingin menghapus data ini?");
$('#form_input input').prop("disabled",true); $('#form_input input').prop("disabled", true);
$(".btn_save").append('<i class="fa fa-trash"></i> '); $(".btn_save").append('<i class="fa fa-trash"></i> ');
$(".btn_save").append('HAPUS'); $(".btn_save").append('HAPUS');
$(".btn_save").removeClass("btn_save").addClass("btn_hapus btn btn-danger"); $(".btn_save").removeClass("btn_save").addClass("btn_hapus btn btn-danger");
}); });
}); });
$(document).on('click','#btn_new_input', function(){ $(document).on('click', '#btn_new_input', function() {
$('#form_input input[type=text]').prop("disabled",false); $('#form_input input[type=text]').prop("disabled", false);
$('#form_input input[type=radio]').prop("disabled",false); $('#form_input input[type=radio]').prop("disabled", false);
$("#form_input input[type=text]").val(''); $("#form_input input[type=text]").val('');
$("#form_input #no_urut").val('1');
$('.btn_save').show(); $('.btn_save').show();
$('#btn_new_input').hide(); $('#btn_new_input').hide();
...@@ -125,7 +132,7 @@ ...@@ -125,7 +132,7 @@
}); });
// PROSES SAVE // PROSES SAVE
$(document).on("click",".btn_save",function(e){ $(document).on("click", ".btn_save", function(e) {
e.preventDefault(); e.preventDefault();
$('#message').html(""); $('#message').html("");
var loading = Ladda.create(this); var loading = Ladda.create(this);
...@@ -145,16 +152,16 @@ ...@@ -145,16 +152,16 @@
param.flag_bpjs = $("#form_bpjs input[type='radio']:checked").val(); param.flag_bpjs = $("#form_bpjs input[type='radio']:checked").val();
param.flag_pph21 = $("#form_pph21 input[type='radio']:checked").val(); param.flag_pph21 = $("#form_pph21 input[type='radio']:checked").val();
param.flag_pot_absensi = $("#form_pot_absensi input[type='radio']:checked").val(); param.flag_pot_absensi = $("#form_pot_absensi input[type='radio']:checked").val();
param.no_urut = $("#form_input #no_urut").val(); param.reorder = reorder();
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
url: "<?= route('payroll.master.komponen.save', ['master' => 'pendapatan']) ?>", url: "<?= route('payroll.master.komponen.save', ['master' => 'pendapatan']) ?>",
data: param, data: param,
dataType:'JSON', dataType: 'JSON',
success: function(result) { success: function(result) {
if(result.success == true){ if (result.success == true) {
if(result.type == 'save'){ if (result.type == 'save') {
$("#form_input :input").prop("disabled", true); $("#form_input :input").prop("disabled", true);
$('.btn_save').hide(); $('.btn_save').hide();
$('#btn_new_input').show(); $('#btn_new_input').show();
...@@ -165,7 +172,7 @@ ...@@ -165,7 +172,7 @@
$('#message').show(); $('#message').show();
$('#message').html(result.message); $('#message').html(result.message);
}, },
error:function(){ error: function() {
loading.stop(); loading.stop();
$('#message').show(); $('#message').show();
$('#message').html('<font color="#eb3a28"><i class="fa fa-close(alias)">&nbsp;</i><strong>Gagal : Terjadi Kesalahan</strong></font>'); $('#message').html('<font color="#eb3a28"><i class="fa fa-close(alias)">&nbsp;</i><strong>Gagal : Terjadi Kesalahan</strong></font>');
...@@ -174,7 +181,7 @@ ...@@ -174,7 +181,7 @@
}); });
// PROSES UPDATE // PROSES UPDATE
$(document).on("click",".btn_update",function(e){ $(document).on("click", ".btn_update", function(e) {
e.preventDefault(); e.preventDefault();
$('#message').html(""); $('#message').html("");
var loading = Ladda.create(this); var loading = Ladda.create(this);
...@@ -196,20 +203,19 @@ ...@@ -196,20 +203,19 @@
param.flag_bpjs = $("#form_bpjs input[type='radio']:checked").val(); param.flag_bpjs = $("#form_bpjs input[type='radio']:checked").val();
param.flag_pph21 = $("#form_pph21 input[type='radio']:checked").val(); param.flag_pph21 = $("#form_pph21 input[type='radio']:checked").val();
param.flag_pot_absensi = $("#form_pot_absensi input[type='radio']:checked").val(); param.flag_pot_absensi = $("#form_pot_absensi input[type='radio']:checked").val();
param.no_urut = $("#form_input #no_urut").val();
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
url: "<?= route('payroll.master.komponen.update', ['master' => 'pendapatan']) ?>", url: "<?= route('payroll.master.komponen.update', ['master' => 'pendapatan']) ?>",
data: param, data: param,
dataType:'JSON', dataType: 'JSON',
success: function(result) { success: function(result) {
loading.stop(); loading.stop();
$("#form_input #jenis").val(param.flag_jenis); $("#form_input #jenis").val(param.flag_jenis);
$('#message').show(); $('#message').show();
$('#message').html(result.message); $('#message').html(result.message);
}, },
error:function(){ error: function() {
loading.stop(); loading.stop();
$('#message').show(); $('#message').show();
$('#message').html('<font color="#eb3a28"><i class="fa fa-close(alias)">&nbsp;</i><strong>Gagal : Terjadi Kesalahan</strong></font>'); $('#message').html('<font color="#eb3a28"><i class="fa fa-close(alias)">&nbsp;</i><strong>Gagal : Terjadi Kesalahan</strong></font>');
...@@ -218,7 +224,7 @@ ...@@ -218,7 +224,7 @@
}); });
// PROSES DELETE // PROSES DELETE
$(document).on('click','.btn_hapus',function(){ $(document).on('click', '.btn_hapus', function() {
var loading = Ladda.create(this); var loading = Ladda.create(this);
loading.start(); loading.start();
...@@ -231,16 +237,16 @@ ...@@ -231,16 +237,16 @@
type: 'POST', type: 'POST',
url: "<?= route('payroll.master.komponen.delete', ['master' => 'pendapatan', 'bulan' => '"+bulan+"']) ?>", url: "<?= route('payroll.master.komponen.delete', ['master' => 'pendapatan', 'bulan' => '"+bulan+"']) ?>",
data: param, data: param,
dataType:'JSON', dataType: 'JSON',
success: function(result){ success: function(result) {
$("#modal_form .card-body").hide(); $("#modal_form .card-body").hide();
$("#modal_form .card-footer").hide(); $("#modal_form .card-footer").hide();
$("#modal_form .title").html(result.message.replace("009900","FFFFFF")); $("#modal_form .title").html(result.message.replace("009900", "FFFFFF"));
setTimeout(() => { setTimeout(() => {
$("#modal_form").modal('hide'); $("#modal_form").modal('hide');
}, 1000); }, 1000);
}, },
error:function(){ error: function() {
loading.stop(); loading.stop();
$("#modal_form .card-body").hide(); $("#modal_form .card-body").hide();
$("#modal_form .card-footer").hide(); $("#modal_form .card-footer").hide();
...@@ -248,18 +254,28 @@ ...@@ -248,18 +254,28 @@
} }
}); });
}); });
});
function reorder() {
var order = [];
$('#list_data tbody tr').each(function(index, element) {
order.push({
id_item: $(this).find("td:eq(0) i").data("key"),
no_urut: index + 1
}); });
});
return order;
}
function formValidation() { function formValidation() {
if(($("#nm_komponen").val()=="")){ if (($("#nm_komponen").val() == "")) {
$('#message').show(); $('#message').show();
$('#message').html("<font style='color:Crimson'><i class='fa fa-exclamation-triangle'></i> Nama pendapatan belum diisi</font>"); $('#message').html("<font style='color:Crimson'><i class='fa fa-exclamation-triangle'></i> Nama pendapatan belum diisi</font>");
$("#nm_komponen").focus(); $("#nm_komponen").focus();
return false; return false;
} }
if($("#form_persentase_gapok input[type='radio']:checked").val() == "1"){ if ($("#form_persentase_gapok input[type='radio']:checked").val() == "1") {
if ($("#form_input #persentase").val() == "") { if ($("#form_input #persentase").val() == "") {
$('#message').html("<font style='color:Crimson'><i class='fa fa-exclamation-triangle'></i> Persentase harus diisi</font>"); $('#message').html("<font style='color:Crimson'><i class='fa fa-exclamation-triangle'></i> Persentase harus diisi</font>");
$('#form_input #persentase').focus(); $('#form_input #persentase').focus();
......
...@@ -5,45 +5,53 @@ ...@@ -5,45 +5,53 @@
$(function() { $(function() {
// reconfigure(); // reconfigure();
$.fn.dataTableExt.sErrMode = 'none'; $.fn.dataTableExt.sErrMode = 'none';
list_data = $('#list_data').on('error.dt', function ( e, settings, techNote, message ) { list_data = $('#list_data').on('error.dt', function(e, settings, techNote, message) {
if(confirm('Terjadi kesalahan saat memproses data, muat ulang halaman ?')){ if (confirm('Terjadi kesalahan saat memproses data, muat ulang halaman ?')) {
window.location.reload(); window.location.reload();
} }
}).DataTable({ }).DataTable({
'searching' : false, 'searching': false,
'searchDelay' : 1000, 'searchDelay': 1000,
'paging' : true, 'paging': true,
'lengthChange': true, 'lengthChange': true,
'ordering' : true, 'ordering': true,
'info' : true, 'info': true,
'scrollX' : true, 'scrollX': true,
'stateSave' : true, 'stateSave': true,
// 'scrollCollapse': true, // 'scrollCollapse': true,
// 'fixedColumns': true, // 'fixedColumns': true,
'language' :{ 'language': {
'url' : '<?=base_url("assets/plugins/datatables/dataTables-language-id.json")?>', 'url': '<?= base_url("assets/plugins/datatables/dataTables-language-id.json") ?>',
'sEmptyTable' : 'Tidak ada data untuk ditampilkan', 'sEmptyTable': 'Tidak ada data untuk ditampilkan',
'searchPlaceholder': '' 'searchPlaceholder': ''
}, },
"processing" : true, "processing": true,
"serverSide" : true, "serverSide": true,
"order" : [], "order": [],
"ajax" : { "ajax": {
"url" : "<?= route("payroll.master.komponen.data", ["master" => "potongan"]) ?>", "url": "<?= route("payroll.master.komponen.data", ["master" => "potongan"]) ?>",
"type" : "GET", "type": "GET",
"data" : function (d) { "data": function(d) {
delete d.columns; delete d.columns;
}, },
"complete" : function(data){ "complete": function(data) {
reconfigure(data); reconfigure(data);
} }
}, },
"aoColumnDefs": [ "aoColumnDefs": [{
{ "aTargets": "_all", "bSortable": false }, "aTargets": "_all",
{ "className": "text-left", "targets": [2,3] }, "bSortable": false
{ "className": "text-center", "targets": "_all" }, },
{
"className": "text-left",
"targets": [2, 3]
},
{
"className": "text-center",
"targets": "_all"
},
] ]
}); });
...@@ -59,7 +67,7 @@ ...@@ -59,7 +67,7 @@
$('#list_data tbody tr').each(function(index, element) { $('#list_data tbody tr').each(function(index, element) {
order.push({ order.push({
id_item: $(this).find("td:eq(0) i").data("key"), id_item: $(this).find("td:eq(0) i").data("key"),
no_urut: index+1 no_urut: index + 1
}); });
}); });
// console.log(order); // console.log(order);
...@@ -68,7 +76,7 @@ ...@@ -68,7 +76,7 @@
dataType: "json", dataType: "json",
url: "<?= route("payroll.master.komponen.order") ?>", url: "<?= route("payroll.master.komponen.order") ?>",
data: { data: {
order:order, order: order,
}, },
success: function(response) { success: function(response) {
if (response.status == "success") { if (response.status == "success") {
...@@ -81,8 +89,8 @@ ...@@ -81,8 +89,8 @@
} }
}); });
$(document).on('click','.btn_tambah',function(){ $(document).on('click', '.btn_tambah', function() {
$('#tampil_form').load("<?= route("payroll.master.komponen.form.tambah", ["master" => "potongan"]) ?>",function(){ $('#tampil_form').load("<?= route("payroll.master.komponen.form.tambah", ["master" => "potongan"]) ?>", function() {
$('#modal_form').modal('show'); $('#modal_form').modal('show');
$(".title").text("Form Tambah Data Master Komponen"); $(".title").text("Form Tambah Data Master Komponen");
$(".btn_save").addClass("btn_save btn btn-primary"); $(".btn_save").addClass("btn_save btn btn-primary");
...@@ -92,8 +100,8 @@ ...@@ -92,8 +100,8 @@
}); });
}); });
$(document).on('click','.btn_edit',function(){ $(document).on('click', '.btn_edit', function() {
$('#tampil_form').load("<?= route("payroll.master.komponen.form.edit", ["master" => "potongan"]) ?>"+"/"+$(this).attr('id'),function(){ $('#tampil_form').load("<?= route("payroll.master.komponen.form.edit", ["master" => "potongan"]) ?>" + "/" + $(this).attr('id'), function() {
$('#modal_form').modal('show'); $('#modal_form').modal('show');
$(".title").text("Form Edit Data Master Komponen"); $(".title").text("Form Edit Data Master Komponen");
$(".btn_save").append('<i class="fa fa-edit (alias)"></i> '); $(".btn_save").append('<i class="fa fa-edit (alias)"></i> ');
...@@ -103,22 +111,21 @@ ...@@ -103,22 +111,21 @@
}); });
}); });
$(document).on('click','.btn_delete',function(){ $(document).on('click', '.btn_delete', function() {
$('#tampil_form').load("<?= route("payroll.master.komponen.form.hapus", ["master" => "potongan"]) ?>"+"/"+$(this).attr('id'),function(){ $('#tampil_form').load("<?= route("payroll.master.komponen.form.hapus", ["master" => "potongan"]) ?>" + "/" + $(this).attr('id'), function() {
$('#modal_form').modal('show'); $('#modal_form').modal('show');
$(".title").text("Apakah Anda ingin menghapus data ini?"); $(".title").text("Apakah Anda ingin menghapus data ini?");
$('#form_input input').prop("disabled",true); $('#form_input input').prop("disabled", true);
$(".btn_save").append('<i class="fa fa-trash"></i> '); $(".btn_save").append('<i class="fa fa-trash"></i> ');
$(".btn_save").append('HAPUS'); $(".btn_save").append('HAPUS');
$(".btn_save").removeClass("btn_save").addClass("btn_hapus btn btn-danger"); $(".btn_save").removeClass("btn_save").addClass("btn_hapus btn btn-danger");
}); });
}); });
$(document).on('click','#btn_new_input', function(){ $(document).on('click', '#btn_new_input', function() {
$('#form_input input[type=text]').prop("disabled",false); $('#form_input input[type=text]').prop("disabled", false);
$('#form_input input[type=radio]').prop("disabled",false); $('#form_input input[type=radio]').prop("disabled", false);
$("#form_input input[type=text]").val(''); $("#form_input input[type=text]").val('');
$("#form_input #no_urut").val('1');
$('.btn_save').show(); $('.btn_save').show();
$('#btn_new_input').hide(); $('#btn_new_input').hide();
...@@ -126,7 +133,7 @@ ...@@ -126,7 +133,7 @@
}); });
// PROSES SAVE // PROSES SAVE
$(document).on("click",".btn_save",function(e){ $(document).on("click", ".btn_save", function(e) {
e.preventDefault(); e.preventDefault();
$('#message').html(""); $('#message').html("");
var loading = Ladda.create(this); var loading = Ladda.create(this);
...@@ -146,16 +153,16 @@ ...@@ -146,16 +153,16 @@
param.flag_bpjs = $("#form_bpjs input[type='radio']:checked").val(); param.flag_bpjs = $("#form_bpjs input[type='radio']:checked").val();
param.flag_pph21 = $("#form_pph21 input[type='radio']:checked").val(); param.flag_pph21 = $("#form_pph21 input[type='radio']:checked").val();
param.flag_pot_absensi = $("#form_pot_absensi input[type='radio']:checked").val(); param.flag_pot_absensi = $("#form_pot_absensi input[type='radio']:checked").val();
param.no_urut = $("#form_input #no_urut").val(); param.reorder = reorder();
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
url: "<?= route('payroll.master.komponen.save', ['master' => 'potongan']) ?>", url: "<?= route('payroll.master.komponen.save', ['master' => 'potongan']) ?>",
data: param, data: param,
dataType:'JSON', dataType: 'JSON',
success: function(result) { success: function(result) {
if(result.success == true){ if (result.success == true) {
if(result.type == 'save'){ if (result.type == 'save') {
$("#form_input :input").prop("disabled", true); $("#form_input :input").prop("disabled", true);
$('.btn_save').hide(); $('.btn_save').hide();
$('#btn_new_input').show(); $('#btn_new_input').show();
...@@ -166,7 +173,7 @@ ...@@ -166,7 +173,7 @@
$('#message').show(); $('#message').show();
$('#message').html(result.message); $('#message').html(result.message);
}, },
error:function(){ error: function() {
loading.stop(); loading.stop();
$('#message').show(); $('#message').show();
$('#message').html('<font color="#eb3a28"><i class="fa fa-close(alias)">&nbsp;</i><strong>Gagal : Terjadi Kesalahan</strong></font>'); $('#message').html('<font color="#eb3a28"><i class="fa fa-close(alias)">&nbsp;</i><strong>Gagal : Terjadi Kesalahan</strong></font>');
...@@ -175,7 +182,7 @@ ...@@ -175,7 +182,7 @@
}); });
// PROSES UPDATE // PROSES UPDATE
$(document).on("click",".btn_update",function(e){ $(document).on("click", ".btn_update", function(e) {
e.preventDefault(); e.preventDefault();
$('#message').html(""); $('#message').html("");
var loading = Ladda.create(this); var loading = Ladda.create(this);
...@@ -197,20 +204,19 @@ ...@@ -197,20 +204,19 @@
param.flag_bpjs = $("#form_bpjs input[type='radio']:checked").val(); param.flag_bpjs = $("#form_bpjs input[type='radio']:checked").val();
param.flag_pph21 = $("#form_pph21 input[type='radio']:checked").val(); param.flag_pph21 = $("#form_pph21 input[type='radio']:checked").val();
param.flag_pot_absensi = $("#form_pot_absensi input[type='radio']:checked").val(); param.flag_pot_absensi = $("#form_pot_absensi input[type='radio']:checked").val();
param.no_urut = $("#form_input #no_urut").val();
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
url: "<?= route('payroll.master.komponen.update', ['master' => 'potongan']) ?>", url: "<?= route('payroll.master.komponen.update', ['master' => 'potongan']) ?>",
data: param, data: param,
dataType:'JSON', dataType: 'JSON',
success: function(result) { success: function(result) {
loading.stop(); loading.stop();
$("#form_input #jenis").val(param.flag_jenis); $("#form_input #jenis").val(param.flag_jenis);
$('#message').show(); $('#message').show();
$('#message').html(result.message); $('#message').html(result.message);
}, },
error:function(){ error: function() {
loading.stop(); loading.stop();
$('#message').show(); $('#message').show();
$('#message').html('<font color="#eb3a28"><i class="fa fa-close(alias)">&nbsp;</i><strong>Gagal : Terjadi Kesalahan</strong></font>'); $('#message').html('<font color="#eb3a28"><i class="fa fa-close(alias)">&nbsp;</i><strong>Gagal : Terjadi Kesalahan</strong></font>');
...@@ -219,7 +225,7 @@ ...@@ -219,7 +225,7 @@
}); });
// PROSES DELETE // PROSES DELETE
$(document).on('click','.btn_hapus',function(){ $(document).on('click', '.btn_hapus', function() {
var loading = Ladda.create(this); var loading = Ladda.create(this);
loading.start(); loading.start();
...@@ -232,16 +238,16 @@ ...@@ -232,16 +238,16 @@
type: 'POST', type: 'POST',
url: "<?= route('payroll.master.komponen.delete', ['master' => 'potongan', 'bulan' => '"+bulan+"']) ?>", url: "<?= route('payroll.master.komponen.delete', ['master' => 'potongan', 'bulan' => '"+bulan+"']) ?>",
data: param, data: param,
dataType:'JSON', dataType: 'JSON',
success: function(result){ success: function(result) {
$("#modal_form .card-body").hide(); $("#modal_form .card-body").hide();
$("#modal_form .card-footer").hide(); $("#modal_form .card-footer").hide();
$("#modal_form .title").html(result.message.replace("009900","FFFFFF")); $("#modal_form .title").html(result.message.replace("009900", "FFFFFF"));
setTimeout(() => { setTimeout(() => {
$("#modal_form").modal('hide'); $("#modal_form").modal('hide');
}, 1000); }, 1000);
}, },
error:function(){ error: function() {
loading.stop(); loading.stop();
$("#modal_form .card-body").hide(); $("#modal_form .card-body").hide();
$("#modal_form .card-footer").hide(); $("#modal_form .card-footer").hide();
...@@ -252,15 +258,26 @@ ...@@ -252,15 +258,26 @@
}); });
function reorder() {
var order = [];
$('#list_data tbody tr').each(function(index, element) {
order.push({
id_item: $(this).find("td:eq(0) i").data("key"),
no_urut: index + 1
});
});
return order;
}
function formValidation() { function formValidation() {
if(($("#nm_komponen").val()=="")){ if (($("#nm_komponen").val() == "")) {
$('#message').show(); $('#message').show();
$('#message').html("<font style='color:Crimson'><i class='fa fa-exclamation-triangle'></i> Nama potongan belum diisi</font>"); $('#message').html("<font style='color:Crimson'><i class='fa fa-exclamation-triangle'></i> Nama potongan belum diisi</font>");
$("#nm_komponen").focus(); $("#nm_komponen").focus();
return false; return false;
} }
if($("#form_persentase_gapok input[type='radio']:checked").val() == "1"){ if ($("#form_persentase_gapok input[type='radio']:checked").val() == "1") {
if ($("#form_input #persentase").val() == "") { if ($("#form_input #persentase").val() == "") {
$('#message').html("<font style='color:Crimson'><i class='fa fa-exclamation-triangle'></i> Persentase harus diisi</font>"); $('#message').html("<font style='color:Crimson'><i class='fa fa-exclamation-triangle'></i> Persentase harus diisi</font>");
$('#form_input #persentase').focus(); $('#form_input #persentase').focus();
......
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