diff --git a/app/Controllers/DashboardController.php b/app/Controllers/DashboardController.php index ff02e14..5694a3d 100644 --- a/app/Controllers/DashboardController.php +++ b/app/Controllers/DashboardController.php @@ -135,9 +135,9 @@ class DashboardController extends ResourceController ELSE 0 END ) AS today_assigned, - SUM(CASE WHEN pe.enquiry_status = 'Assigned' THEN 1 ELSE 0 END) AS pending_assigned, - SUM(CASE WHEN pe.enquiry_status = 'In progress' THEN 1 ELSE 0 END) AS total_in_progress, - SUM(CASE WHEN pe.enquiry_status = 'Completed' 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 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') ->where('pe.manager_id', $manager_id) @@ -219,9 +219,9 @@ class DashboardController extends ResourceController ELSE 0 END ) AS today_assigned, - SUM(CASE WHEN pe.enquiry_status = 'Assigned' THEN 1 ELSE 0 END) AS total_assigned, - SUM(CASE WHEN pe.enquiry_status = 'In progress' THEN 1 ELSE 0 END) AS total_in_progress, - SUM(CASE WHEN pe.enquiry_status = 'Completed' 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 total_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')