Commit Graph

1035 Commits

Author SHA1 Message Date
faezeh
3fb1474b80 fix code in mission controller and form request 2026-06-21 16:11:42 +03:30
faezeh
bab99f7f89 add two item in mission and create migration for them 2026-06-21 13:49:01 +03:30
2aa9ae1455 Merge pull request 'fix machine report excel export' (#30) from feature/MachineReportExcel into develop
Reviewed-on: #30
2026-06-20 06:37:30 +00:00
80c4eeaefb Add machine report excel export 2026-06-15 17:13:21 +03:30
c9e779d726 Merge pull request 'correct the excels' (#27) from feature/MachineExcels into develop
Reviewed-on: #27
2026-06-15 11:29:20 +00:00
72fa9d4ea3 correct the excels 2026-06-15 14:59:12 +03:30
Amir Ghasempoor
d50749fd20 Merge pull request #132 from witelgroup/feature/PushToGithub
Feature/push to GitHub
2026-06-15 11:34:42 +03:30
ad01e4718d fix the .env.example 2026-06-15 11:33:06 +03:30
3dd49494f4 Merge pull request 'add requested machines' (#26) from feature/AddEndKm into develop
Reviewed-on: #26
2026-06-15 07:37:52 +00:00
3045f60f1e add requested machines 2026-06-15 11:08:03 +03:30
2a6d44885c Merge pull request 'add end_km to violations' (#25) from feature/AddEndKm into develop
Reviewed-on: #25
2026-06-15 07:02:21 +00:00
439f69af29 add end_km to violations 2026-06-15 10:32:04 +03:30
1be9315b73 Merge pull request 'feature/MachineTypesDetails' (#24) from feature/MachineTypesDetails into develop
Reviewed-on: #24
2026-06-14 10:45:44 +00:00
amirghasempoor
39752fd5ba create excel for report in mission 2026-06-14 14:14:30 +03:30
amirghasempoor
ab9838c1bc create 2026-06-14 14:13:44 +03:30
92d806497d Merge pull request 'change command signature' (#23) from feature/PolyLineEncoderCommand into develop
Reviewed-on: #23
2026-06-14 09:49:40 +00:00
7ac07692a2 change command signature 2026-06-14 13:19:56 +03:30
ca51f65da4 Merge pull request 'fix route' (#22) from feature/MachineTypesDetails into develop
Reviewed-on: #22
2026-06-14 08:09:14 +00:00
0f65437bfa remove exit station 2026-06-14 11:21:30 +03:30
5edb061a24 Merge pull request 'remove exit station' (#21) from feature/PolyLineEncoderCommand into develop
Reviewed-on: #21
2026-06-14 07:51:27 +00:00
amirghasempoor
75c649c48e fix route 2026-06-14 11:19:11 +03:30
amirghasempoor
5a2a477789 fix route 2026-06-14 10:46:31 +03:30
fc853d318e Merge pull request 'create two record for report' (#20) from feature/MachineTypesDetails into develop
Reviewed-on: #20
2026-06-14 07:16:11 +00:00
amirghasempoor
a45b4955db create two record for report 2026-06-14 10:40:54 +03:30
0b7b22ff87 fix the command 2026-06-14 10:05:13 +03:30
ace0b018e7 Merge pull request 'fix the command' (#19) from feature/PolyLineEncoderCommand into develop
Reviewed-on: #19
2026-06-14 06:34:52 +00:00
e7ced6267d Merge pull request 'use polyline encoder for command' (#18) from feature/MissionMachinesReport into develop
Reviewed-on: #18
2026-06-14 05:20:44 +00:00
17a6e903ae use polyline encoder for command 2026-06-14 08:50:36 +03:30
55c736ac3e Merge pull request 'add extra reports' (#17) from feature/MissionMachinesReport into develop
Reviewed-on: #17
2026-06-13 10:53:24 +00:00
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