From dbd11a688db5f322e0207b48fd80636eb40fa284 Mon Sep 17 00:00:00 2001 From: venba-Inspriron-3558 Date: Wed, 9 Jul 2025 16:28:16 +0530 Subject: [PATCH] report column seperation --- app/Controllers/PlanController.php | 8 ++++---- app/Models/ReportsModel.php | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/Controllers/PlanController.php b/app/Controllers/PlanController.php index 8801fad..0e05a08 100644 --- a/app/Controllers/PlanController.php +++ b/app/Controllers/PlanController.php @@ -1395,9 +1395,9 @@ class PlanController extends ResourceController $result = [ - "flightService" => $flightResult , - "acomodationService" => $accomodationResult , - "forexService" => $forexResult + "flight" => $flightResult , + "acomodation" => $accomodationResult , + "forex" => $forexResult ]; @@ -1416,7 +1416,7 @@ class PlanController extends ResourceController "flight" => $flightResult , "acomodation" => $accomodationResult , - "forex" => $forexResult + "forex" => $forexResult ]; diff --git a/app/Models/ReportsModel.php b/app/Models/ReportsModel.php index 1830a07..b2a5190 100644 --- a/app/Models/ReportsModel.php +++ b/app/Models/ReportsModel.php @@ -26,8 +26,9 @@ class ReportsModel extends Model ELSE 'unknown' END AS plan_trip_type, al.Service, - m_plan.created_on, - al.FirstTravelDt, + DATE_FORMAT(m_plan.created_on, '%d-%m-%Y') AS created_on, + DATE_FORMAT(m_plan.created_on, '%H:%i:%s') AS created_time, + DATE_FORMAT(al.FirstTravelDt, '%d-%m-%Y') AS FirstTravelDt, DATEDIFF(al.FirstTravelDt, m_plan.created_on) AS AdvPurch FROM @@ -177,8 +178,7 @@ class ReportsModel extends Model CONCAT(acsf.Code, ' - ', acst.Code) ) AS sector, m_dropdown.dropdown_value as flight_class, - cc_flight_trips.date AS flight_travel_date - + DATE_FORMAT(cc_flight_trips.date, '%d-%m-%Y') AS flight_travel_date FROM m_plan JOIN m_users ON m_plan.user_id = m_users.user_id @@ -228,8 +228,8 @@ class ReportsModel extends Model ELSE 'unknown' END AS plan_trip_type, c_accomodation.hotel_name AS hotel_name, - c_accomodation.checkin_date AS check_in_date, - c_accomodation.checkout_date AS check_out_date, + DATE_FORMAT(c_accomodation.checkin_date, '%d-%m-%Y') check_in_date, + DATE_FORMAT(c_accomodation.checkout_date, '%d-%m-%Y') check_out_date, c_accomodation.destination_city AS hotel_city @@ -273,8 +273,8 @@ class ReportsModel extends Model m_plan.so_number, m_cost_center.name AS cost_center, m_country.country_name As visiting_country, - c_forex.start_date As forex_from_date, - c_forex.end_date As forex_to_date, + DATE_FORMAT(c_forex.start_date, '%d-%m-%Y') As forex_from_date, + DATE_FORMAT(c_forex.end_date, '%d-%m-%Y') As forex_to_date, ( c_forex.perdiem_amount + c_forex.transport +