From 930236800135851dc8a272d4ab0de2790ccaa196 Mon Sep 17 00:00:00 2001 From: Gowtham M Date: Fri, 24 Oct 2025 11:39:19 +0530 Subject: [PATCH] .. --- app/Controllers/StaffController.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/Controllers/StaffController.php b/app/Controllers/StaffController.php index e2fac8c..1cc8965 100644 --- a/app/Controllers/StaffController.php +++ b/app/Controllers/StaffController.php @@ -272,11 +272,8 @@ class StaffController extends ResourceController $db = \Config\Database::connect(); $builder = $db->table('partner_staff_attendance a'); - $builder->select('a.staff_id , s.name AS staff_name, DATE_FORMAT(a.login_datetime, "%Y-%m") AS month, COUNT(a.id) AS login_count'); + $builder->select('a.staff_id , s.name AS staff_name, DATE_FORMAT(a.login_datetime, "%Y-%m") AS month, COUNT(a.id) AS login_count, s.manager_id'); $builder->join('partner_staff s', 's.id = a.staff_id', 'left'); - if (!empty($manager_id)) { - $builder->where('s.manager_id', $manager_id); - } $builder->where('a.login_datetime >=', $startDateTime); $builder->where('a.login_datetime <=', $endDateTime); $builder->groupBy('a.staff_id'); @@ -286,6 +283,11 @@ class StaffController extends ResourceController $result = $builder->get()->getResultArray(); foreach ($result as $key => $value) { + // Skip (remove) rows that don't match the requested manager_id + if (!empty($manager_id) && $value['manager_id'] != $manager_id) { + unset($result[$key]); + continue; + } $result[$key]['month'] = date('M Y', strtotime($value['month'])); }