From 9dda22a558b1a710ef8849b8b73d249e832072a0 Mon Sep 17 00:00:00 2001
From: VE10-Sanjeev <sanjeev.p@venbainfotech.com>
Date: Wed, 8 May 2024 06:47:55 +0000
Subject: [PATCH] FIX_Leave Dashboard : ps

---
 application/modules/Leave/controllers/Leave.php  |  5 ++---
 application/modules/Leave/models/Leave_model.php |  6 +++---
 application/modules/Leave/views/dashboard.php    | 16 ++++++++--------
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/application/modules/Leave/controllers/Leave.php b/application/modules/Leave/controllers/Leave.php
index c27486c..ef34aa7 100644
--- a/application/modules/Leave/controllers/Leave.php
+++ b/application/modules/Leave/controllers/Leave.php
@@ -188,8 +188,7 @@ public function createLeave()
          $perm_data['status'] = 'pending';
         //  $perm_data['created_date']  = date('d-m-Y');
          $perm_data['created_date_new']  = date('Y-m-d');
-
-         $perm_data['created_time']  = date('H:i A');
+         $perm_data['created_time']  = date('h:i a');
          unset($perm_data['from_date']);
          unset($perm_data['to_date']);
          unset($perm_data['from_date_new']);
@@ -813,7 +812,7 @@ public function dashboard()
     // $this->load->view('Leave/dashboard', $data);
 
     // $data['weekData']  = $this->Leave_model->get_approved_leaves_cur_week($business_id);
-    $data['weekData']  = $this->Leave_model->get_week_leave_count($business_id);
+    $data['weekApprovedData']  = $this->Leave_model->get_week_leave_approved_count($business_id);
     // echo print_r($data['weekData']);die;
     $this->layout->buffer('main_content', 'Leave/dashboard',$data);
     $this->layout->render('Employee_Layout');
diff --git a/application/modules/Leave/models/Leave_model.php b/application/modules/Leave/models/Leave_model.php
index 9362076..596e0bf 100644
--- a/application/modules/Leave/models/Leave_model.php
+++ b/application/modules/Leave/models/Leave_model.php
@@ -1,6 +1,6 @@
 <?php
 class Leave_model extends MY_Model {
-
+    // status // Approved
     public function get_all_leave($business_id)
     {
         $this->db->select('A.*  ,U1.name as emp_name, U2.name as ApproveBy, l1.type as leavetype');
@@ -625,8 +625,7 @@ public function get_approved_leaves_cur_week()
      }
 
 
-
-     public function get_week_leave_count($business_id)
+    public function get_week_leave_approved_count($business_id)
      {
          $startOfWeek = date('Y-m-d', strtotime('monday this week'));
          $endOfWeek = date('Y-m-d', strtotime('sunday this week'));
@@ -637,6 +636,7 @@ public function get_week_leave_count($business_id)
          $this->db->where('A.business_id', $business_id);
          $this->db->where("(A.from_date_new BETWEEN '$startOfWeek' AND '$endOfWeek' OR A.to_date_new BETWEEN '$startOfWeek' AND '$endOfWeek' OR (A.from_date_new < '$startOfWeek' AND A.to_date_new > '$endOfWeek'))");
          $this->db->join('users U1', 'U1.id = A.emp_id', 'left');
+         $this->db->where('A.status', 'Approved');
          $query = $this->db->get();
          $leaveRecords = $query->result();
         //  echo json_encode($leaveRecords);die;
diff --git a/application/modules/Leave/views/dashboard.php b/application/modules/Leave/views/dashboard.php
index d1f9364..ab724bc 100644
--- a/application/modules/Leave/views/dashboard.php
+++ b/application/modules/Leave/views/dashboard.php
@@ -97,17 +97,17 @@
             
             <?php
               // Remove duplicate
-              foreach ($weekData as &$dayData) {
+              foreach ($weekApprovedData as &$dayData) {
                 $dayData = array_unique($dayData);
               }
-              // Assuming $weekData contains the array of arrays you provided
+              // Assuming $weekApprovedData contains the array of arrays you provided
               echo '<tr>';
-              echo '<td>' . implode(',<br>', $weekData['monday']) . '</td>';
-              echo '<td>' . implode(',<br>', $weekData['tuesday']) . '</td>';
-              echo '<td>' . implode(',<br>', $weekData['wednesday']) . '</td>';
-              echo '<td>' . implode(',<br>', $weekData['thursday']) . '</td>';
-              echo '<td>' . implode(',<br>', $weekData['friday']) . '</td>';
-              echo '<td>' . implode(',<br>', $weekData['saturday']) . '</td>';
+              echo '<td>' . implode(',<br>', $weekApprovedData['monday']) . '</td>';
+              echo '<td>' . implode(',<br>', $weekApprovedData['tuesday']) . '</td>';
+              echo '<td>' . implode(',<br>', $weekApprovedData['wednesday']) . '</td>';
+              echo '<td>' . implode(',<br>', $weekApprovedData['thursday']) . '</td>';
+              echo '<td>' . implode(',<br>', $weekApprovedData['friday']) . '</td>';
+              echo '<td>' . implode(',<br>', $weekApprovedData['saturday']) . '</td>';
               echo '</tr>';
 
             ?>