From 495dff7b004284da439145484a5099136357e3fc Mon Sep 17 00:00:00 2001 From: aadhavan valli Date: Tue, 30 Jul 2024 08:28:17 +0530 Subject: [PATCH 1/4] CHANGE_DASHBOARD_CONROLLED_MERGE_TIME_ERROR : AADHAVAN --- app/Controllers/DashboardController.php | 9 --------- 1 file changed, 9 deletions(-) diff --git a/app/Controllers/DashboardController.php b/app/Controllers/DashboardController.php index b1ed384e..220c7468 100644 --- a/app/Controllers/DashboardController.php +++ b/app/Controllers/DashboardController.php @@ -57,15 +57,6 @@ class DashboardController extends AdminController $pendingActionsController = new PendingActionsController; $pendingActionsData = $pendingActionsController->getPendingActionsForDashBoard(); - $results = $this->clientModel->select('clients.id as client_id, clients.client_name, clients.short_name, - client_branch.id as client_branch_id, client_branch.branch_name, - client_branch.branch_code, employees.id as employee_id, - employees.name as employee_name, employees.relationship, - employees.emp_code, employees.emp_status, auth_history.user_type') - ->join('client_branch', 'clients.id = client_branch.client_id', 'left') - ->join('employees', 'client_branch.id = employees.client_branch_id', 'left') - ->join('auth_history', 'employees.id = auth_history.user_id AND "employee" = auth_history.user_type', 'left') - ->findAll(); $groupedData = []; From a8f0a347628cc60efeb0ee60a4a2ead15b3040c7 Mon Sep 17 00:00:00 2001 From: aadhavan valli Date: Tue, 30 Jul 2024 11:20:35 +0530 Subject: [PATCH 2/4] CHANGE_DASHBOARD_COMPLETE_PUSH : AADHAVAN --- app/Views/enrollment_dash.php | 422 +++++++++++++++++++++++----------- 1 file changed, 291 insertions(+), 131 deletions(-) diff --git a/app/Views/enrollment_dash.php b/app/Views/enrollment_dash.php index f0c1fb79..1a5ba2d9 100644 --- a/app/Views/enrollment_dash.php +++ b/app/Views/enrollment_dash.php @@ -9,6 +9,8 @@ + +