modul : revisi dashboard

status : selesai
keterangan : menambahkan kondisi, jika belum melakukan lembur selesai notif lembur dan detail lembut di dashboard tidak tampil

application/controllers/Dashboard.php

@@ -263,9 +263,8 @@ class Dashboard extends MY_Controller {
             if($level == '1'){
                 $query = $this->db->select("lembur_mulai.id_lemmulai, lembur_mulai.jam_absen, lembur_mulai.tgl_input, data_karyawan.nama_lengkap")->from("lembur_mulai")
                 ->join("data_karyawan", "data_karyawan.id_karyawan = lembur_mulai.id_karyawan", "left")
+                ->join("lembur_selesai","lembur_selesai.id_lemmulai = lembur_mulai.id_lemmulai")
                 ->where("lembur_mulai.approval_hrd", '1')
-                ->where("data_karyawan.id_cabang", $id_cabang)
-                ->where("data_karyawan.id_departemen", $id_departemen)
                 ->where("lembur_mulai.id_company", $id_company)
                 ->order_by('lembur_mulai.tgl_input', 'desc')
                 ->get();
@@ -273,6 +272,7 @@ class Dashboard extends MY_Controller {
             }else if($level == '2'){
                 $query = $this->db->select("lembur_mulai.id_lemmulai, lembur_mulai.jam_absen, lembur_mulai.tgl_input, data_karyawan.nama_lengkap")->from("lembur_mulai")
                         ->join("data_karyawan", "data_karyawan.id_karyawan = lembur_mulai.id_karyawan", "left")
+                        ->join("lembur_selesai","lembur_selesai.id_lemmulai = lembur_mulai.id_lemmulai")
                         ->where("lembur_mulai.approval_kedep", '1')
                         ->where("data_karyawan.id_cabang", $id_cabang)
                         ->where("data_karyawan.id_departemen", $id_departemen)
@@ -283,6 +283,7 @@ class Dashboard extends MY_Controller {
             }else if($level == '5'){
                 $query = $this->db->select("lembur_mulai.id_lemmulai, lembur_mulai.jam_absen, lembur_mulai.tgl_input, data_karyawan.nama_lengkap")->from("lembur_mulai")
                         ->join("data_karyawan", "data_karyawan.id_karyawan = lembur_mulai.id_karyawan", "left")
+                        ->join("lembur_selesai","lembur_selesai.id_lemmulai = lembur_mulai.id_lemmulai")
                         ->where("lembur_mulai.approval_kacab", '1')
                         ->where("data_karyawan.id_cabang", $id_cabang)
                         ->where("lembur_mulai.id_company", $id_company)
@@ -299,6 +300,7 @@ class Dashboard extends MY_Controller {
 
                 $query = $this->db->select("lembur_mulai.id_lemmulai, lembur_mulai.jam_absen, lembur_mulai.tgl_input, data_karyawan.nama_lengkap")->from("lembur_mulai")
                         ->join("data_karyawan", "data_karyawan.id_karyawan = lembur_mulai.id_karyawan", "left")
+                        ->join("lembur_selesai","lembur_selesai.id_lemmulai = lembur_mulai.id_lemmulai")
                         ->where("lembur_mulai.approval_spv", '1')
                         ->where("data_karyawan.id_cabang", $id_cabang)
                         ->where("data_karyawan.id_departemen", $id_departemen)
@@ -310,6 +312,7 @@ class Dashboard extends MY_Controller {
             }elseif ($level == '4') {
                 $query = $this->db->select("lembur_mulai.id_lemmulai, lembur_mulai.jam_absen, lembur_mulai.tgl_input, data_karyawan.nama_lengkap")->from("lembur_mulai")
                         ->join("data_karyawan", "data_karyawan.id_karyawan = lembur_mulai.id_karyawan", "left")
+                        ->join("lembur_selesai","lembur_selesai.id_lemmulai = lembur_mulai.id_lemmulai")
                         ->where("lembur_mulai.approval_direksi", '1')
                         ->where("lembur_mulai.id_company", $id_company)
                         ->order_by('lembur_mulai.tgl_input', 'desc')

application/models/Dashboard_m.php

@@ -292,6 +292,7 @@ class Dashboard_m extends CI_Model {
         $this->db->group_end();
         // $this->db->where('lembur_mulai.status', '1');
         $this->db->join('data_karyawan', 'lembur_mulai.id_karyawan = data_karyawan.id_karyawan');
+        $this->db->join('lembur_selesai', 'lembur_selesai.id_lemmulai = lembur_mulai.id_lemmulai');
         $this->db->order_by('lembur_mulai.tgl_absen', 'desc');
         $this->db->limit(3);
         return $this->db->get();