diff --git a/app/Controllers/DashboardController.php b/app/Controllers/DashboardController.php index 5694a3d..d369b63 100644 --- a/app/Controllers/DashboardController.php +++ b/app/Controllers/DashboardController.php @@ -128,13 +128,7 @@ class DashboardController extends ResourceController ps.id AS staff_id, ps.handler_id, COUNT(pe.id) AS total_assigned, - SUM(CASE - WHEN pe.enquiry_status = 'Assigned' - AND DATE(pe.created_on) = CURDATE() - THEN 1 - ELSE 0 - END - ) AS today_assigned, + 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 @@ -212,17 +206,11 @@ 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 = 'Assigned' - AND 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 total_assigned, + 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 - ") + ") ->join('partner_staff ps', 'ps.id = pe.assigned_to', 'left') ->groupStart()