Commit Graph

498 Commits

Author SHA1 Message Date
5f2d214a56 resolve the conflicts 2026-06-13 14:23:03 +03:30
a8c71de069 add extra reports 2026-06-13 14:09:17 +03:30
1e106a0c87 Merge pull request 'add time for type 2' (#15) from feature/MissionMachinesReport into develop
Reviewed-on: #15
2026-06-10 11:56:23 +00:00
1937f57dd3 Merge pull request 'create list for province and city' (#16) from feature/MachineAndDriverInMission into develop
Reviewed-on: #16
2026-06-10 11:56:15 +00:00
72462e8016 create list for province and city 2026-06-10 15:24:50 +03:30
55b40eb0cc replace encoded_route 2026-06-10 15:17:54 +03:30
6db1933046 add time for type 2 2026-06-10 14:56:22 +03:30
5d2a6d045b fix bugs 2026-06-10 14:37:36 +03:30
eeff2861e5 Merge pull request 'add report for machines' (#13) from feature/MissionMachinesReport into develop
Reviewed-on: #13
2026-06-10 07:46:38 +00:00
6ae3fd3d90 Merge pull request 'add driver_id and driver_name in mission' (#11) from feature/AddDriverInMission into develop
Reviewed-on: #11
2026-06-10 07:46:30 +00:00
6b81075e40 add report for machines 2026-06-10 11:16:08 +03:30
ccacb2f916 fix code for confilict 2026-06-10 11:07:06 +03:30
aeb58ed27f fix code 2026-06-10 11:02:59 +03:30
a8b99706d0 Merge pull request 'fix list and crate update machine and change state for mission' (#12) from feature/AddThreeItemInViolation into develop
Reviewed-on: #12
2026-06-10 05:18:39 +00:00
5004b99d03 fix list and crate update machine and change state for mission 2026-06-09 14:50:13 +03:30
2f3ebf5808 add driver_id and driver_name in mission 2026-06-09 09:16:50 +03:30
25e2883e9c fix controller 2026-05-26 15:59:04 +03:30
23dd62550d prefix code and write route 2026-05-26 13:22:42 +03:30
e3b49ebbb3 crate new repor for machin when they go to the mission and fix bugs in traddod mission 2026-05-25 16:25:56 +03:30
f798d05a3c create one item for mission and fix in another table 2026-05-18 11:01:20 +03:30
96960f5e8f create one item for mission and fix in another table 2026-05-18 10:52:29 +03:30
3ca710228f create new object for user 2026-05-16 10:22:02 +03:30
8db5650c4c Merge pull request 'feature/FixReportExcel' (#5) from feature/FixReportExcel into develop
Reviewed-on: http://git.witel.ir/RMS/Backend/pulls/5
2026-01-27 08:03:20 +00:00
81bd7532e9 fix code in views 2026-01-27 10:26:47 +03:30
acdce4a3bd debug the reports 2026-01-26 16:40:34 +03:30
5b678cd938 Merge pull request 'feature/MissionExportForAll' (#2) from feature/MissionExportForAll into develop
Reviewed-on: http://git.witel.ir/RMS/Backend/pulls/2
2026-01-26 10:35:40 +00:00
1775a8e75e add start and finish time 2026-01-25 16:16:37 +03:30
0763e1732e change Format table report 2026-01-24 19:13:47 +03:30
1981b1eab4 fix code 2026-01-04 14:52:23 +03:30
79a5d56315 crate excel for volation mission 2025-12-31 20:07:07 +03:30
Amir Ghasempoor
cd17555680 Merge pull request #122 from witelgroup/feature/StoreAndDeleteNoProcess
create report service and use in cintroller
2025-12-29 13:23:56 +03:30
971d6fd3dd create report service and use in cintroller 2025-12-29 13:21:10 +03:30
Amir Ghasempoor
4c783e5583 Merge pull request #121 from witelgroup/feature/bugFix
add gps to migration
2025-12-29 11:48:17 +03:30
eb690b59a7 add gps to migration 2025-12-29 11:45:42 +03:30
Amir Ghasempoor
19e8e7d6cc Merge pull request #118 from witelgroup/feature/StoreAndDeleteNoProcess
improve store controller
2025-12-28 12:37:29 +03:30
f7e044f65a change relation 2025-12-28 12:35:49 +03:30
30ba34c5d7 improve store controller 2025-12-27 15:04:27 +03:30
9b094e9016 i create crud for violation 2025-12-27 14:14:15 +03:30
3dc8d60fb8 create form request for mission 2025-12-24 14:07:54 +03:30
Amir Ghasempoor
b8025c7845 Merge pull request #112 from witelgroup/feature/NoProcess
create permission
2025-12-23 11:03:03 +03:30
89a0e1d228 create permission 2025-12-23 11:00:07 +03:30
Amir Ghasempoor
a126ac674c Merge pull request #110 from witelgroup/feature/NoProcess
add city
2025-12-22 11:39:19 +03:30
e8e0f2c724 add city 2025-12-22 11:38:18 +03:30
Amir Ghasempoor
3fa6e97b5b Merge pull request #109 from witelgroup/feature/NoProcess
add station layer
2025-12-22 10:17:40 +03:30
8abfd32be8 add station layer 2025-12-22 09:53:02 +03:30
Amir Ghasempoor
ef40af0661 Merge pull request #108 from witelgroup/feature/NoProcess
add web service
2025-12-21 15:17:16 +03:30
7ba3d53155 add web service 2025-12-21 15:15:24 +03:30
Amir Ghasempoor
3a184b2dea Merge pull request #107 from witelgroup/feature/CmmsStatuse
create new report
2025-12-21 09:05:19 +03:30
053d0cdb96 create new report 2025-12-20 16:00:55 +03:30
e435aa8372 create no process 2025-12-20 15:52:57 +03:30