Travel-Spends/tstat_be
Travel-Spends/tstat_be
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

05-07-2025 - vadivel - ts tat minor change in dashboard api

Browse Source
This commit is contained in:
vadivelJ96 2025-07-05 15:46:59 +05:30
parent 1ea1327fa0
commit 08fac98b56
2 changed files with 31 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Config/Routes.php
View File

@ -97,10 +97,6 @@ $routes->post('forgotPassword/changePassword', 'UserController::forgotChangePass
$routes->get('plans/cancle_plan', 'PlanController::canclePlan'); $routes->get('plans/cancle_plan', 'PlanController::canclePlan');
$routes->get('plans/get_plan_approval_status', 'PlanController::get_plan_approval_status'); $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'); $routes->get('plans/plan_pdf', 'PlanController::plan_pdf');
//Master //Master

62
app/Controllers/PlanController.php
View File

@ -1414,9 +1414,9 @@ class PlanController extends ResourceController
$result = [ $result = [
"flightService" => $flightResult , "flight" => $flightResult ,
"acomodationService" => $accomodationResult , "acomodation" => $accomodationResult ,
"forexService" => $forexResult "forex" => $forexResult
]; ];
@ -1425,41 +1425,41 @@ class PlanController extends ResourceController
} }
function splitResultBasedOnTripType(array $result): array public function splitResultBasedOnTripType(array $result): array
{ {
$finalResult = []; $finalResult = [];
$trip_types = ['International', 'Domestic']; $trip_types = ['International', 'Domestic'];
$statuses = ['Pending Approval', 'Partially Approved', 'Approved', 'Rejected', 'Cancelled']; $statuses = ['Pending Approval', 'Partially Approved', 'Approved', 'Rejected', 'Cancelled'];
foreach ($result as $service => $entries) { foreach ($result as $service => $entries) {
$resultSet = [] ; $resultSet = [] ;
foreach ($trip_types as $trip_type) { foreach ($trip_types as $trip_type) {
foreach ($statuses as $status) { foreach ($statuses as $status) {
$resultSet[$service][$trip_type][$status] = 0; $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) { return $finalResult;
$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;
}