Commit 546ddc08 by Rezha Setyo Atmojo Committed by nurchamim

modul: Report Sales Monitoring

status: selesai
keterangan:
- memperbaiki query data jika kosong datanya
parent 215680f8
...@@ -31,8 +31,8 @@ class Aktivitas extends MY_Controller ...@@ -31,8 +31,8 @@ class Aktivitas extends MY_Controller
$table_header = $this->model->table_header($periode_mulai, $periode_selesai, $id_group); $table_header = $this->model->table_header($periode_mulai, $periode_selesai, $id_group);
$get_aktivitas = $this->model->get_total_activity($periode_mulai, $periode_selesai, $id_group, $id_karyawan); $get_aktivitas = $this->model->get_total_activity($periode_mulai, $periode_selesai, $id_group, $id_karyawan);
$list = $this->model->get_datatables($periode_mulai, $periode_selesai, $id_group, $id_karyawan); $list = $this->model->get_datatables($periode_mulai, $periode_selesai, $id_group, $id_karyawan);
$data = array(); $data = array();
$no = $_GET['start']; $no = $_GET['start'];
foreach ($list as $field) { foreach ($list as $field) {
......
...@@ -113,6 +113,7 @@ class Realisasi_nominal extends MY_Controller ...@@ -113,6 +113,7 @@ class Realisasi_nominal extends MY_Controller
$data[] = $row; $data[] = $row;
} }
if(!empty($data)){
// Start Footer Total Target Personil // Start Footer Total Target Personil
$row = array(); $row = array();
$row[] = "<B>Total Target Personil<B>"; $row[] = "<B>Total Target Personil<B>";
...@@ -161,6 +162,7 @@ class Realisasi_nominal extends MY_Controller ...@@ -161,6 +162,7 @@ class Realisasi_nominal extends MY_Controller
$data[] = $row_t_kuartal; $data[] = $row_t_kuartal;
$data[] = $row_t_tahunan; $data[] = $row_t_tahunan;
// End Footer Total Target Tahunan, Kuartal & Bulanan // End Footer Total Target Tahunan, Kuartal & Bulanan
}
$output = array( $output = array(
"draw" => $_GET['draw'], "draw" => $_GET['draw'],
......
...@@ -305,8 +305,8 @@ class Aktivitas_m extends CI_Model ...@@ -305,8 +305,8 @@ class Aktivitas_m extends CI_Model
} }
} }
$binding[] = $periode_mulai; $binding[] = date_format(date_create($periode_mulai),"Y-m-d");
$binding[] = $periode_selesai; $binding[] = date_format(date_create($periode_selesai),"Y-m-d");
if($periode_bulan_mulai < date('Ym') && $periode_bulan_selesai < date('Ym')){ if($periode_bulan_mulai < date('Ym') && $periode_bulan_selesai < date('Ym')){
$select = "SELECT id_karyawan $select = "SELECT id_karyawan
......
...@@ -140,12 +140,15 @@ class Poin_bulanan_m extends CI_Model ...@@ -140,12 +140,15 @@ class Poin_bulanan_m extends CI_Model
if($check_sa['is_atasan'] == true){ if($check_sa['is_atasan'] == true){
$id_karyawan_arr = $check_sa['list_bawahan']; $id_karyawan_arr = $check_sa['list_bawahan'];
if(!empty($id_karyawan_arr)){
$this->db->where_in('stpt.id_karyawan', $id_karyawan_arr); $this->db->where_in('stpt.id_karyawan', $id_karyawan_arr);
}
}else{ }else{
$id_karyawan_arr = $this->_get_id_karyawan_union($periode); $id_karyawan_arr = $this->_get_id_karyawan_union($periode);
if(!empty($id_karyawan_arr)){
$this->db->where_in('stpt.id_karyawan', $id_karyawan_arr); $this->db->where_in('stpt.id_karyawan', $id_karyawan_arr);
}
} }
} }
......
...@@ -49,9 +49,11 @@ class Poin_harian_m extends CI_Model ...@@ -49,9 +49,11 @@ class Poin_harian_m extends CI_Model
if($check_sa['is_atasan'] == true){ if($check_sa['is_atasan'] == true){
$this->db->where_in('trx.id_karyawan', $check_sa['list_bawahan']); $this->db->where_in('trx.id_karyawan', $check_sa['list_bawahan']);
}else{ }else{
if(!empty($id_karyawan_arr)){
$this->db->where_in('trx.id_karyawan', $id_karyawan_arr); $this->db->where_in('trx.id_karyawan', $id_karyawan_arr);
} }
} }
}
$column_search = array('nik', 'nama_karyawan'); $column_search = array('nik', 'nama_karyawan');
$i = 0; $i = 0;
...@@ -181,14 +183,17 @@ class Poin_harian_m extends CI_Model ...@@ -181,14 +183,17 @@ class Poin_harian_m extends CI_Model
if($check_sa['is_atasan'] == true){ if($check_sa['is_atasan'] == true){
$id_karyawan_arr = $check_sa['list_bawahan']; $id_karyawan_arr = $check_sa['list_bawahan'];
if($id_karyawan_arr){
$this->db->where_in('id_karyawan', $id_karyawan_arr); $this->db->where_in('id_karyawan', $id_karyawan_arr);
}
}else{ }else{
$id_karyawan_arr = $this->_get_id_karyawan_union($periode_mulai, $periode_selesai); $id_karyawan_arr = $this->_get_id_karyawan_union($periode_mulai, $periode_selesai);
if($id_karyawan_arr){
$this->db->where_in('id_karyawan', $id_karyawan_arr); $this->db->where_in('id_karyawan', $id_karyawan_arr);
} }
} }
}
$this->db->group_by(['id_karyawan', 'tgl_activity']); $this->db->group_by(['id_karyawan', 'tgl_activity']);
$this->db->order_by('tgl_activity', 'ASC'); $this->db->order_by('tgl_activity', 'ASC');
...@@ -234,11 +239,15 @@ class Poin_harian_m extends CI_Model ...@@ -234,11 +239,15 @@ class Poin_harian_m extends CI_Model
if($check_sa['is_atasan'] == true){ if($check_sa['is_atasan'] == true){
$id_karyawan_arr = $check_sa['list_bawahan']; $id_karyawan_arr = $check_sa['list_bawahan'];
if(!empty($id_karyawan_arr)){
$this->db->where_in('stpt.id_karyawan', $id_karyawan_arr); $this->db->where_in('stpt.id_karyawan', $id_karyawan_arr);
}
}else{ }else{
$id_karyawan_arr = $this->_get_id_karyawan_union($periode_mulai, $periode_selesai); $id_karyawan_arr = $this->_get_id_karyawan_union($periode_mulai, $periode_selesai);
if(!empty($id_karyawan_arr)){
$this->db->where_in('stpt.id_karyawan', $id_karyawan_arr); $this->db->where_in('stpt.id_karyawan', $id_karyawan_arr);
}
} }
} }
...@@ -333,8 +342,8 @@ class Poin_harian_m extends CI_Model ...@@ -333,8 +342,8 @@ class Poin_harian_m extends CI_Model
} }
} }
$binding[] = $periode_mulai; $binding[] = date_format(date_create($periode_mulai),"Y-m-d");
$binding[] = $periode_selesai; $binding[] = date_format(date_create($periode_selesai),"Y-m-d");
if($periode_bulan_mulai < date('Ym') && $periode_bulan_selesai < date('Ym')){ if($periode_bulan_mulai < date('Ym') && $periode_bulan_selesai < date('Ym')){
$select = "SELECT id_karyawan $select = "SELECT id_karyawan
......
...@@ -165,11 +165,15 @@ class Poin_mingguan_m extends CI_Model ...@@ -165,11 +165,15 @@ class Poin_mingguan_m extends CI_Model
if($check_sa['is_atasan'] == true){ if($check_sa['is_atasan'] == true){
$id_karyawan_arr = $check_sa['list_bawahan']; $id_karyawan_arr = $check_sa['list_bawahan'];
if(!empty($id_karyawan_arr)){
$this->db->where_in('stpt.id_karyawan', $id_karyawan_arr); $this->db->where_in('stpt.id_karyawan', $id_karyawan_arr);
}
}else{ }else{
$id_karyawan_arr = $this->_get_id_karyawan_union($periode); $id_karyawan_arr = $this->_get_id_karyawan_union($periode);
if(!empty($id_karyawan_arr)){
$this->db->where_in('stpt.id_karyawan', $id_karyawan_arr); $this->db->where_in('stpt.id_karyawan', $id_karyawan_arr);
}
} }
} }
......
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