From 12aa68ebb48b22fe8cf6f6d677dc0dd334623470 Mon Sep 17 00:00:00 2001 From: Gowtham M Date: Sat, 11 Oct 2025 17:42:48 +0530 Subject: [PATCH] GWM --- app/Controllers/DashboardController.php | 2 ++ app/Controllers/MasterController.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Controllers/DashboardController.php b/app/Controllers/DashboardController.php index fd97493..b2e1719 100644 --- a/app/Controllers/DashboardController.php +++ b/app/Controllers/DashboardController.php @@ -124,6 +124,7 @@ class DashboardController extends ResourceController ->select(" ps.name AS staff_name, ps.id AS staff_id, + ph.name AS handler_name, COUNT(pe.id) AS total_assigned, SUM(CASE WHEN pe.status = 'Awaiting Quotation' THEN 1 ELSE 0 END) AS awaiting_quotation, SUM(CASE WHEN pe.status = 'Quotation Created' THEN 1 ELSE 0 END) AS pending_quotation_approval, @@ -131,6 +132,7 @@ class DashboardController extends ResourceController SUM(CASE WHEN pe.status = 'Policy Created' THEN 1 ELSE 0 END) AS policy_created ") ->join('partner_staff ps', 'ps.id = pe.assigned_to', 'left') + ->join('partner_staff ph', 'ph.id = ps.handler_id', 'left') ->where('pe.manager_id', $manager_id) ->where('pe.is_active', 1) ->groupBy('pe.assigned_to') diff --git a/app/Controllers/MasterController.php b/app/Controllers/MasterController.php index 95f2f75..7b1a9f7 100644 --- a/app/Controllers/MasterController.php +++ b/app/Controllers/MasterController.php @@ -47,7 +47,7 @@ class MasterController extends ResourceController public function getRoleMaster() { - $data = $this->RoleMasterModel->findAll(); + $data = $this->RoleMasterModel->whereIn('id',[2,3])->findAll(); if (!$data) { return $this->failNotFound('No data found');