RMS/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: RMS:feature/dockerize
Branches Tags
RMS:develop RMS:main RMS:feature/validation RMS:feature/AddItemInMission RMS:feature/MachineReportExcel RMS:feature/PolyLineEncoderCommand RMS:feature/MissionMachinesReport RMS:feature/MachineAndDriverInMission RMS:feature/AddDriverInMission RMS:feature/AddThreeItemInViolation RMS:feature/MachineReport RMS:feature/FixReportMission RMS:feature/FixViewLetter RMS:feature/FixReport RMS:feature/NewReportMachines RMS:feature/dockerize
..
compare: RMS:feature/FixReport
Branches Tags
RMS:main RMS:develop RMS:feature/validation RMS:feature/AddItemInMission RMS:feature/MachineReportExcel RMS:feature/PolyLineEncoderCommand RMS:feature/MissionMachinesReport RMS:feature/MachineAndDriverInMission RMS:feature/AddDriverInMission RMS:feature/AddThreeItemInViolation RMS:feature/MachineReport RMS:feature/FixReportMission RMS:feature/FixViewLetter RMS:feature/FixReport RMS:feature/NewReportMachines RMS:feature/dockerize

4 Commits
feature/do ... feature/Fi

Author SHA1 Message Date
faezehzafarbakhsh
d309c406ef fix time for tradod in mission 2026-02-18 16:00:51 +03:30
amirghasempoor
048219f92e Merge pull request 'add db config' (#3) from feature/dockerize into develop 
Reviewed-on: http://git.witel.ir/RMS/backend/pulls/3
 2026-02-07 11:28:37 +00:00
amirghasempoor
a7fce4ca94 Merge pull request 'debug the image' (#2) from feature/dockerize into develop 
Reviewed-on: http://git.witel.ir/RMS/backend/pulls/2
 2026-02-07 10:52:46 +00:00
amirghasempoor
4c6f6d66f4 Merge pull request 'dockerize the project' (#1) from feature/dockerize into develop 
Reviewed-on: http://git.witel.ir/RMS/backend/pulls/1
 2026-02-07 10:07:34 +00:00
1 changed files with 8 additions and 8 deletions
Expand all files Collapse all files

16
app/Services/Cartables/Mission/Report/ReportTradodService.php
View File

@@ -37,8 +37,8 @@ class ReportTradodService
-1 AS province_id, -1 AS province_id,
COUNT(m.id) AS total, COUNT(m.id) AS total,
COALESCE(SUM(m.mission_duration != m.in_area_duration), 0) AS khareg_mahdode, COALESCE(SUM(m.mission_duration != m.in_area_duration), 0) AS khareg_mahdode,
COALESCE(SUM(m.in_area_duration), 0) AS gps, SEC_TO_TIME(COALESCE(SUM(m.in_area_duration), 0)) AS gps,
COALESCE(SUM(m.mission_duration), 0) AS durations, SEC_TO_TIME(COALESCE(SUM(m.mission_duration), 0)) AS durations,
COALESCE(SUM(CASE WHEN m.type = 1 THEN 1 ELSE 0 END), 0) AS far_h, COALESCE(SUM(CASE WHEN m.type = 1 THEN 1 ELSE 0 END), 0) AS far_h,
COALESCE(SUM(CASE WHEN m.type = 2 THEN 1 ELSE 0 END), 0) AS far_d, COALESCE(SUM(CASE WHEN m.type = 2 THEN 1 ELSE 0 END), 0) AS far_d,
COALESCE(SUM(CASE WHEN m.type = 3 THEN 1 ELSE 0 END), 0) AS un_far_h, COALESCE(SUM(CASE WHEN m.type = 3 THEN 1 ELSE 0 END), 0) AS un_far_h,
@@ -56,8 +56,8 @@ class ReportTradodService
p.id AS province_id, p.id AS province_id,
COUNT(m.id) AS total, COUNT(m.id) AS total,
COALESCE(SUM(m.mission_duration != m.in_area_duration), 0) AS khareg_mahdode, COALESCE(SUM(m.mission_duration != m.in_area_duration), 0) AS khareg_mahdode,
COALESCE(SUM(m.in_area_duration), 0) AS gps, SEC_TO_TIME(COALESCE(SUM(m.in_area_duration), 0)) AS gps,
COALESCE(SUM(m.mission_duration), 0) AS durations, SEC_TO_TIME(COALESCE(SUM(m.mission_duration), 0)) AS durations,
COALESCE(SUM(CASE WHEN m.type = 1 THEN 1 ELSE 0 END), 0) AS far_h, COALESCE(SUM(CASE WHEN m.type = 1 THEN 1 ELSE 0 END), 0) AS far_h,
COALESCE(SUM(CASE WHEN m.type = 2 THEN 1 ELSE 0 END), 0) AS far_d, COALESCE(SUM(CASE WHEN m.type = 2 THEN 1 ELSE 0 END), 0) AS far_d,
COALESCE(SUM(CASE WHEN m.type = 3 THEN 1 ELSE 0 END), 0) AS un_far_h, COALESCE(SUM(CASE WHEN m.type = 3 THEN 1 ELSE 0 END), 0) AS un_far_h,
@@ -98,8 +98,8 @@ class ReportTradodService
-1 AS city_id, -1 AS city_id,
COUNT(m.id) AS total, COUNT(m.id) AS total,
COALESCE(SUM(m.mission_duration != m.in_area_duration), 0) AS khareg_mahdode, COALESCE(SUM(m.mission_duration != m.in_area_duration), 0) AS khareg_mahdode,
COALESCE(SUM(m.in_area_duration), 0) AS gps, SEC_TO_TIME(COALESCE(SUM(m.in_area_duration), 0)) AS gps,
COALESCE(SUM(m.mission_duration), 0) AS durations, SEC_TO_TIME(COALESCE(SUM(m.mission_duration), 0)) AS durations,
COALESCE(SUM(m.type = 1), 0) AS far_h, COALESCE(SUM(m.type = 1), 0) AS far_h,
COALESCE(SUM(m.type = 2), 0) AS far_d, COALESCE(SUM(m.type = 2), 0) AS far_d,
COALESCE(SUM(m.type = 3), 0) AS un_far_h, COALESCE(SUM(m.type = 3), 0) AS un_far_h,
@@ -118,8 +118,8 @@ class ReportTradodService
c.id AS city_id, c.id AS city_id,
COUNT(m.id) AS total, COUNT(m.id) AS total,
COALESCE(SUM(m.mission_duration != m.in_area_duration), 0) AS khareg_mahdode, COALESCE(SUM(m.mission_duration != m.in_area_duration), 0) AS khareg_mahdode,
COALESCE(SUM(m.in_area_duration), 0) AS gps, SEC_TO_TIME(COALESCE(SUM(m.in_area_duration), 0)) AS gps,
COALESCE(SUM(m.mission_duration), 0) AS durations, SEC_TO_TIME(COALESCE(SUM(m.mission_duration), 0)) AS durations,
COALESCE(SUM(m.type = 1), 0) AS far_h, COALESCE(SUM(m.type = 1), 0) AS far_h,
COALESCE(SUM(m.type = 2), 0) AS far_d, COALESCE(SUM(m.type = 2), 0) AS far_d,
COALESCE(SUM(m.type = 3), 0) AS un_far_h, COALESCE(SUM(m.type = 3), 0) AS un_far_h,