Commit Graph

1006 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
b5aa3371da Merge pull request 'fix bugs' (#14) from feature/MissionMachinesReport into develop
Reviewed-on: #14
2026-06-10 11:08:00 +00:00
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
235111ee57 fix database for add driver mission 2026-06-10 11:15:54 +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
92cf157b29 Merge pull request 'merge develop to origin' (#10) from feature/MachineReport into develop
Reviewed-on: #10
2026-06-10 05:15:12 +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
a0ee7cccd3 fix situation logo in report 2026-05-30 09:15:51 +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
7d7507411d merge develop to origin 2026-05-24 09:00:16 +03:30
e0edcf6db2 Merge pull request 'fix permission route' (#8) from feature/FixReportMission into develop
Reviewed-on: #8
2026-05-23 10:21:21 +00:00
893edea5a9 fix permission route 2026-05-23 13:23:05 +03:30
57d59b79b4 Merge pull request 'change name for date az to_date in date_to' (#6) from feature/FixReportMission into develop
Reviewed-on: #6
2026-05-23 07:34:55 +00:00
9f394abc3e change name for date az to_date in date_to 2026-05-23 10:10:52 +03:30
amirghasempoor
08db103f26 add station id to create user 2026-05-18 08:55:12 +00:00
a5cf79cd1b Merge pull request 'fix view for receipt in insurance letter' (#5) from feature/FixViewLetter into develop
Reviewed-on: #5
2026-05-18 08:12:53 +00:00
ad70874bde fix migration 2026-05-18 11:39:30 +03:30
amirghasempoor
6a1513a72f add toll house to user management 2026-05-18 08:09:27 +00:00
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
a1bca2d80f fix view for receipt in insurance letter 2026-05-16 09:18:50 +03:30
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
d833f4dc0d add db config 2026-02-07 14:57:26 +03:30
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
5f19a26f67 debug the image 2026-02-07 14:21:53 +03:30
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
dff218541c dockerize the project 2026-02-07 13:35:54 +03:30
6e261d3780 add middleware 2026-01-31 10:15:44 +00:00
66d1b70f35 add middleware 2026-01-31 10:15:44 +00:00
Amir Ghasempoor
5989ba7df3 Merge pull request #129 from witelgroup/feature/MissionReports
Feature/mission reports
2026-01-31 09:29:18 +03:30
fe8c71fe16 Merge pull request 'debug the excels' (#6) from feature/MissionReportExcel into develop
Reviewed-on: http://git.witel.ir/RMS/Backend/pulls/6
2026-01-27 08:25:27 +00:00
f1c560928e debug the excels 2026-01-27 11:54:14 +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
d662ff6517 Merge pull request 'debug the reports' (#4) from bugfix/MissionReport into develop
Reviewed-on: http://git.witel.ir/RMS/Backend/pulls/4
2026-01-27 08:02:49 +00:00
ad03609c3d revert the dependencies 2026-01-27 11:32:08 +03:30