diff --git a/app/Controllers/DashboardController.php b/app/Controllers/DashboardController.php index d369b63..0453166 100644 --- a/app/Controllers/DashboardController.php +++ b/app/Controllers/DashboardController.php @@ -128,10 +128,11 @@ class DashboardController extends ResourceController ps.id AS staff_id, ps.handler_id, COUNT(pe.id) AS total_assigned, + SUM(CASE WHEN pe.enquiry_status != 'Completed' THEN 1 ELSE 0 END) AS total_pending, SUM(CASE WHEN DATE(pe.created_on) = CURDATE() THEN 1 ELSE 0 END) AS today_assigned, - SUM(CASE WHEN pe.enquiry_status = 'Assigned' AND DATE(pe.created_on) = CURDATE() THEN 1 ELSE 0 END) AS pending_assigned, - SUM(CASE WHEN pe.enquiry_status = 'In progress' AND DATE(pe.created_on) = CURDATE() THEN 1 ELSE 0 END) AS total_in_progress, - SUM(CASE WHEN pe.enquiry_status = 'Completed' AND DATE(pe.created_on) = CURDATE() THEN 1 ELSE 0 END) AS total_completed + SUM(CASE WHEN pe.enquiry_status = 'Assigned' AND DATE(pe.created_on) = CURDATE() THEN 1 ELSE 0 END) AS today_pending, + SUM(CASE WHEN pe.enquiry_status = 'In progress' AND DATE(pe.created_on) = CURDATE() THEN 1 ELSE 0 END) AS today_in_progress, + SUM(CASE WHEN pe.enquiry_status = 'Completed' AND DATE(pe.created_on) = CURDATE() THEN 1 ELSE 0 END) AS today_completed, ") ->join('partner_staff ps', 'ps.id = pe.assigned_to', 'left') ->where('pe.manager_id', $manager_id) @@ -206,10 +207,12 @@ class DashboardController extends ResourceController ps.name AS staff_name, ps.id AS staff_id, COUNT(pe.id) AS total_assigned, + SUM(CASE WHEN pe.enquiry_status != 'Completed' THEN 1 ELSE 0 END) AS total_pending, SUM(CASE WHEN DATE(pe.created_on) = CURDATE() THEN 1 ELSE 0 END) AS today_assigned, - SUM(CASE WHEN pe.enquiry_status = 'Assigned' AND DATE(pe.created_on) = CURDATE() THEN 1 ELSE 0 END) AS pending_assigned, - SUM(CASE WHEN pe.enquiry_status = 'In progress' AND DATE(pe.created_on) = CURDATE() THEN 1 ELSE 0 END) AS total_in_progress, - SUM(CASE WHEN pe.enquiry_status = 'Completed' AND DATE(pe.created_on) = CURDATE() THEN 1 ELSE 0 END) AS total_completed + SUM(CASE WHEN pe.enquiry_status = 'Assigned' AND DATE(pe.created_on) = CURDATE() THEN 1 ELSE 0 END) AS today_pending, + SUM(CASE WHEN pe.enquiry_status = 'In progress' AND DATE(pe.created_on) = CURDATE() THEN 1 ELSE 0 END) AS today_in_progress, + SUM(CASE WHEN pe.enquiry_status = 'Completed' AND DATE(pe.created_on) = CURDATE() THEN 1 ELSE 0 END) AS today_completed, + ") ->join('partner_staff ps', 'ps.id = pe.assigned_to', 'left')