From 08fac98b56a15697f2cc8c348b84bb4177a4e52e Mon Sep 17 00:00:00 2001
From: vadivelJ96 <jvadivel.1996@gmail.com>
Date: Sat, 5 Jul 2025 15:46:59 +0530
Subject: [PATCH] 05-07-2025 - vadivel - ts tat  minor change in dashboard api

---
 app/Config/Routes.php              |  4 --
 app/Controllers/PlanController.php | 62 +++++++++++++++---------------
 2 files changed, 31 insertions(+), 35 deletions(-)

diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index f17271d..97bdc9e 100755
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -97,10 +97,6 @@ $routes->post('forgotPassword/changePassword', 'UserController::forgotChangePass
     $routes->get('plans/cancle_plan', 'PlanController::canclePlan');
     $routes->get('plans/get_plan_approval_status', 'PlanController::get_plan_approval_status');
 
-    $routes->get('plans/selectedServiceDashboardWeekly','PlanController::selectedServiceDashboardWeekly');
-
-    $routes->get('plans/selectedServiceDashboardDaily','PlanController::selectedServiceDashboardDaily');
-
     $routes->get('plans/plan_pdf', 'PlanController::plan_pdf');
 
     //Master
diff --git a/app/Controllers/PlanController.php b/app/Controllers/PlanController.php
index ece05dd..8801fad 100644
--- a/app/Controllers/PlanController.php
+++ b/app/Controllers/PlanController.php
@@ -1414,9 +1414,9 @@ class PlanController extends ResourceController
 
         $result = [
 
-            "flightService"             => $flightResult ,
-            "acomodationService"        => $accomodationResult ,
-            "forexService"              => $forexResult 
+            "flight"             => $flightResult ,
+            "acomodation"        => $accomodationResult ,
+            "forex"              => $forexResult 
 
         ];
 
@@ -1425,41 +1425,41 @@ class PlanController extends ResourceController
     }
 
 
-function splitResultBasedOnTripType(array $result): array
-{
-    $finalResult = [];
+    public function splitResultBasedOnTripType(array $result): array
+    {
+        $finalResult = [];
 
-    $trip_types = ['International', 'Domestic'];
-    $statuses   = ['Pending Approval', 'Partially Approved', 'Approved', 'Rejected', 'Cancelled'];
+        $trip_types = ['International', 'Domestic'];
+        $statuses   = ['Pending Approval', 'Partially Approved', 'Approved', 'Rejected', 'Cancelled'];
 
-    foreach ($result as $service => $entries) {
-        $resultSet = [] ;
-        foreach ($trip_types as $trip_type) {
-            foreach ($statuses as $status) {
-                $resultSet[$service][$trip_type][$status] = 0;
+        foreach ($result as $service => $entries) {
+            $resultSet = [] ;
+            foreach ($trip_types as $trip_type) {
+                foreach ($statuses as $status) {
+                    $resultSet[$service][$trip_type][$status] = 0;
+                }
             }
+
+            foreach ($entries as $entry) {
+                $tripType = $entry['trip_type'];
+                $status   = $entry['Status'];
+                $count    = (int) $entry['count'];
+
+                $resultSet[$service][$tripType][$status] += $count;
+            }
+
+            foreach ($statuses as $status) {
+                $resultSet[$service]['Both'][$status] =
+                    $resultSet[$service]['International'][$status] +
+                    $resultSet[$service]['Domestic'][$status];
+            }
+
+            $finalResult [] = $resultSet;
         }
 
-        foreach ($entries as $entry) {
-            $tripType = $entry['trip_type'];
-            $status   = $entry['Status'];
-            $count    = (int) $entry['count'];
-
-            $resultSet[$service][$tripType][$status] += $count;
-        }
-
-        foreach ($statuses as $status) {
-            $resultSet[$service]['Both'][$status] =
-                $resultSet[$service]['International'][$status] +
-                $resultSet[$service]['Domestic'][$status];
-        }
-
-        $finalResult [] = $resultSet;
+        return $finalResult;
     }
 
-    return $finalResult;
-}
-