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

CHANGE__Case_Change_in_MiS_Report__By__VADIVEL_J__2025-10-28_18:18

Browse Source
This commit is contained in:
vadivelJ96 2025-10-28 18:20:14 +05:30
parent bf4e66ff54
commit 51a079504c
3 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Controllers/AuthController.php
View File

@ -124,9 +124,10 @@ class AuthController extends ResourceController
// Format date for FE // Format date for FE
$user = $this->userModel->select('user_id,first_name,last_name,role_id,org_id,group_id,last_login_at')->where('email', $data->email)->first(); $user = $this->userModel->select('user_id,first_name,last_name,role_id,org_id,group_id,last_login_at')->where('email', $data->email)->first();
$user['last_login_at'] = !empty($user['last_login_at']) $user['last_login_at'] = empty($user['last_login_at'])
? date('d, M-Y h:iA', strtotime($user['last_login_at'])) ? null
: null; : date('d, M-Y h:iA', strtotime($user['last_login_at']));
//get service for the organization //get service for the organization

20
app/Controllers/ReportsController.php
View File

@ -43,10 +43,10 @@ class ReportsController extends BaseController
} }
// Separate domestic // Separate domestic
$domestic = array_values(array_filter($result, fn($row) => $row['plan_trip_type'] === 'domestic')); $domestic = array_values(array_filter($result, fn($row) => $row['plan_trip_type'] === 'Domestic'));
// Separate international // Separate international
$international = array_values(array_filter($result, fn($row) => $row['plan_trip_type'] === 'international')); $international = array_values(array_filter($result, fn($row) => $row['plan_trip_type'] === 'International'));
if(isset($data['export'])) if(isset($data['export']))
{ {
@ -108,10 +108,10 @@ class ReportsController extends BaseController
} }
// Separate domestic // Separate domestic
$domestic = array_values(array_filter($flat_result, fn($row) => $row['plan_trip_type'] === 'domestic')); $domestic = array_values(array_filter($flat_result, fn($row) => $row['plan_trip_type'] === 'Domestic'));
// Separate international // Separate international
$international = array_values(array_filter($flat_result, fn($row) => $row['plan_trip_type'] === 'international')); $international = array_values(array_filter($flat_result, fn($row) => $row['plan_trip_type'] === 'International'));
@ -167,10 +167,10 @@ class ReportsController extends BaseController
} }
// Separate domestic // Separate domestic
$domestic = array_values(array_filter($result, fn($row) => $row['plan_trip_type'] === 'domestic')); $domestic = array_values(array_filter($result, fn($row) => $row['plan_trip_type'] === 'Domestic'));
// Separate international // Separate international
$international = array_values(array_filter($result, fn($row) => $row['plan_trip_type'] === 'international')); $international = array_values(array_filter($result, fn($row) => $row['plan_trip_type'] === 'International'));
if(isset($data['export'])) if(isset($data['export']))
{ {
@ -222,10 +222,10 @@ class ReportsController extends BaseController
} }
// Separate domestic // Separate domestic
$domestic = array_values(array_filter($result, fn($row) => $row['plan_trip_type'] === 'domestic')); $domestic = array_values(array_filter($result, fn($row) => $row['plan_trip_type'] === 'Domestic'));
// Separate international // Separate international
$international = array_values(array_filter($result, fn($row) => $row['plan_trip_type'] === 'international')); $international = array_values(array_filter($result, fn($row) => $row['plan_trip_type'] === 'International'));
if(isset($data['export'])) if(isset($data['export']))
@ -324,10 +324,10 @@ class ReportsController extends BaseController
} }
// Separate domestic // Separate domestic
$domestic = array_values(array_filter($result, fn($row) => $row['plan_trip_type'] === 'domestic')); $domestic = array_values(array_filter($result, fn($row) => $row['plan_trip_type'] === 'Domestic'));
// Separate international // Separate international
$international = array_values(array_filter($result, fn($row) => $row['plan_trip_type'] === 'international')); $international = array_values(array_filter($result, fn($row) => $row['plan_trip_type'] === 'International'));
if(isset($data['export'])) if(isset($data['export']))
{ {

20
app/Models/ReportsModel.php
View File

@ -21,8 +21,8 @@ class ReportsModel extends Model
m_plan.so_number, m_plan.so_number,
m_cost_center.name AS cost_center, m_cost_center.name AS cost_center,
CASE CASE
WHEN m_plan.trip_type = 1 THEN 'domestic' WHEN m_plan.trip_type = 1 THEN 'Domestic'
WHEN m_plan.trip_type = 2 THEN 'international' WHEN m_plan.trip_type = 2 THEN 'International'
ELSE 'unknown' ELSE 'unknown'
END AS plan_trip_type, END AS plan_trip_type,
al.Service, al.Service,
@ -124,8 +124,8 @@ class ReportsModel extends Model
'{$serviceAlias}' As 'Service', '{$serviceAlias}' As 'Service',
COUNT(*) AS service_count, COUNT(*) AS service_count,
CASE CASE
WHEN m_plan.trip_type = 1 THEN 'domestic' WHEN m_plan.trip_type = 1 THEN 'Domestic'
WHEN m_plan.trip_type = 2 THEN 'international' WHEN m_plan.trip_type = 2 THEN 'International'
ELSE 'unknown' ELSE 'unknown'
END AS plan_trip_type END AS plan_trip_type
FROM FROM
@ -169,8 +169,8 @@ class ReportsModel extends Model
m_cost_center.name AS cost_center, m_cost_center.name AS cost_center,
c_flight.trip_type AS flight_trip_type, c_flight.trip_type AS flight_trip_type,
CASE CASE
WHEN m_plan.trip_type = 1 THEN 'domestic' WHEN m_plan.trip_type = 1 THEN 'Domestic'
WHEN m_plan.trip_type = 2 THEN 'international' WHEN m_plan.trip_type = 2 THEN 'International'
ELSE 'unknown' ELSE 'unknown'
END AS plan_trip_type, END AS plan_trip_type,
-- CONCAT_WS(' - ', -- CONCAT_WS(' - ',
@ -230,8 +230,8 @@ class ReportsModel extends Model
m_plan.so_number, m_plan.so_number,
m_cost_center.name AS cost_center, m_cost_center.name AS cost_center,
CASE CASE
WHEN m_plan.trip_type = 1 THEN 'domestic' WHEN m_plan.trip_type = 1 THEN 'Domestic'
WHEN m_plan.trip_type = 2 THEN 'international' WHEN m_plan.trip_type = 2 THEN 'International'
ELSE 'unknown' ELSE 'unknown'
END AS plan_trip_type, END AS plan_trip_type,
c_accomodation.hotel_name AS hotel_name, c_accomodation.hotel_name AS hotel_name,
@ -331,8 +331,8 @@ class ReportsModel extends Model
m_cost_center.name AS cost_center, m_cost_center.name AS cost_center,
c_flight.trip_type AS flight_trip_type, c_flight.trip_type AS flight_trip_type,
CASE CASE
WHEN m_plan.trip_type = 1 THEN 'domestic' WHEN m_plan.trip_type = 1 THEN 'Domestic'
WHEN m_plan.trip_type = 2 THEN 'international' WHEN m_plan.trip_type = 2 THEN 'International'
ELSE 'unknown' ELSE 'unknown'
END AS plan_trip_type, END AS plan_trip_type,
CONCAT_WS(' - ', CONCAT_WS(' - ',