Commit Graph

Select branches

Hide Pull Requests

develop

feature/AddDriverInMission

feature/AddItemInMission

feature/AddThreeItemInViolation

feature/FixReport

feature/FixReportMission

feature/FixViewLetter

feature/MachineAndDriverInMission

feature/MachineReport

feature/MachineReportExcel

feature/MissionMachinesReport

feature/NewReportMachines

feature/PolyLineEncoderCommand

feature/dockerize

feature/validation

main

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#4

#5

#6

#7

#8

#9

Mono Color

• cf5b7c037b Merge pull request 'develop' (#35) from develop into main main amirghasempoor 2026-07-14 11:15:45 +00:00
• eedc24c625 Merge pull request 'create new stracture for Report in mission and fix form request' (#31) from feature/FormRequestMission into develop develop amirghasempoor 2026-07-14 11:14:39 +00:00
• 89972b57f4 remove the validation amirghasempoor 2026-07-14 14:44:02 +03:30
• 961e4c40c9 make reports datatable amirghasempoor 2026-07-14 14:38:17 +03:30
• d58ca6b685 add machine id amirghasempoor 2026-07-11 09:40:50 +03:30
• 7a981ee421 creat new column for CmmsMachines and improve notification for mission and valdation for formrequest faezeh 2026-06-28 15:39:38 +03:30
• da82c7841b create excel for report faezeh 2026-06-27 17:07:13 +03:30
• aa468b592b fix conflict faezeh 2026-06-27 10:53:31 +03:30
• 43a8acca14 Merge pull request 'develop' (#34) from develop into main amirghasempoor 2026-06-22 12:03:10 +00:00
• 0291ee6716 Merge pull request 'add validation' (#33) from feature/validation into develop amirghasempoor 2026-06-22 12:01:28 +00:00
• 0befa33b0f add validation feature/validation amirghasempoor 2026-06-22 15:30:35 +03:30
• 3708e2ebfb Merge pull request 'add two item in mission and create migration for them' (#32) from feature/AddItemInMission into develop amirghasempoor 2026-06-22 09:46:08 +00:00
• 3fb1474b80 fix code in mission controller and form request feature/AddItemInMission faezeh 2026-06-21 16:11:42 +03:30
• bab99f7f89 add two item in mission and create migration for them faezeh 2026-06-21 13:49:01 +03:30
• 2aa9ae1455 Merge pull request 'fix machine report excel export' (#30) from feature/MachineReportExcel into develop amirghasempoor 2026-06-20 06:37:30 +00:00
• 6fc073c7e8 fix service machine faezeh 2026-06-17 15:19:34 +03:30
• 8da1ae1d74 create new stracture for Report in mission and fix form request faezeh 2026-06-17 14:48:42 +03:30
• 80c4eeaefb Add machine report excel export feature/MachineReportExcel faezeh 2026-06-15 17:13:21 +03:30
• 75c2fce369 Merge pull request 'develop' (#28) from develop into main amirghasempoor 2026-06-15 11:32:19 +00:00
• c9e779d726 Merge pull request 'correct the excels' (#27) from feature/MachineExcels into develop amirghasempoor 2026-06-15 11:29:20 +00:00
• 72fa9d4ea3 correct the excels amirghasempoor 2026-06-15 14:59:12 +03:30
• d50749fd20 Merge pull request #132 from witelgroup/feature/PushToGithub Amir Ghasempoor 2026-06-15 11:34:42 +03:30
• ad01e4718d fix the .env.example amirghasempoor 2026-06-15 11:33:06 +03:30
• 3dd49494f4 Merge pull request 'add requested machines' (#26) from feature/AddEndKm into develop amirghasempoor 2026-06-15 07:37:52 +00:00
• 3045f60f1e add requested machines amirghasempoor 2026-06-15 11:08:03 +03:30
• 2a6d44885c Merge pull request 'add end_km to violations' (#25) from feature/AddEndKm into develop amirghasempoor 2026-06-15 07:02:21 +00:00
• 439f69af29 add end_km to violations amirghasempoor 2026-06-15 10:32:04 +03:30
• 1be9315b73 Merge pull request 'feature/MachineTypesDetails' (#24) from feature/MachineTypesDetails into develop amirghasempoor 2026-06-14 10:45:44 +00:00
• 39752fd5ba create excel for report in mission amirghasempoor 2026-06-14 14:14:30 +03:30
• ab9838c1bc create amirghasempoor 2026-06-14 14:13:44 +03:30
• 92d806497d Merge pull request 'change command signature' (#23) from feature/PolyLineEncoderCommand into develop amirghasempoor 2026-06-14 09:49:40 +00:00
• 7ac07692a2 change command signature feature/PolyLineEncoderCommand amirghasempoor 2026-06-14 13:19:56 +03:30
• ca51f65da4 Merge pull request 'fix route' (#22) from feature/MachineTypesDetails into develop amirghasempoor 2026-06-14 08:09:14 +00:00
• 5edb061a24 Merge pull request 'remove exit station' (#21) from feature/PolyLineEncoderCommand into develop amirghasempoor 2026-06-14 07:51:27 +00:00
• 0f65437bfa remove exit station amirghasempoor 2026-06-14 11:21:30 +03:30
• 75c649c48e fix route amirghasempoor 2026-06-14 11:19:11 +03:30
• fc853d318e Merge pull request 'create two record for report' (#20) from feature/MachineTypesDetails into develop amirghasempoor 2026-06-14 07:16:11 +00:00
• 5a2a477789 fix route amirghasempoor 2026-06-14 10:46:31 +03:30
• a45b4955db create two record for report amirghasempoor 2026-06-14 10:40:54 +03:30
• ace0b018e7 Merge pull request 'fix the command' (#19) from feature/PolyLineEncoderCommand into develop amirghasempoor 2026-06-14 06:34:52 +00:00
• 0b7b22ff87 fix the command amirghasempoor 2026-06-14 10:05:13 +03:30
• e7ced6267d Merge pull request 'use polyline encoder for command' (#18) from feature/MissionMachinesReport into develop amirghasempoor 2026-06-14 05:20:44 +00:00
• 17a6e903ae use polyline encoder for command feature/MissionMachinesReport amirghasempoor 2026-06-14 08:50:36 +03:30
• 55c736ac3e Merge pull request 'add extra reports' (#17) from feature/MissionMachinesReport into develop amirghasempoor 2026-06-13 10:53:24 +00:00
• 5f2d214a56 resolve the conflicts amirghasempoor 2026-06-13 14:23:03 +03:30
• a8c71de069 add extra reports amirghasempoor 2026-06-13 14:09:17 +03:30
• 1e106a0c87 Merge pull request 'add time for type 2' (#15) from feature/MissionMachinesReport into develop amirghasempoor 2026-06-10 11:56:23 +00:00
• 1937f57dd3 Merge pull request 'create list for province and city' (#16) from feature/MachineAndDriverInMission into develop amirghasempoor 2026-06-10 11:56:15 +00:00
• 72462e8016 create list for province and city feature/MachineAndDriverInMission faezehzafarbakhsh 2026-06-10 15:24:50 +03:30
• 55b40eb0cc replace encoded_route amirghasempoor 2026-06-10 15:17:54 +03:30
• 6db1933046 add time for type 2 amirghasempoor 2026-06-10 14:56:22 +03:30
• b5aa3371da Merge pull request 'fix bugs' (#14) from feature/MissionMachinesReport into develop amirghasempoor 2026-06-10 11:08:00 +00:00
• 5d2a6d045b fix bugs amirghasempoor 2026-06-10 14:37:36 +03:30
• eeff2861e5 Merge pull request 'add report for machines' (#13) from feature/MissionMachinesReport into develop amirghasempoor 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 amirghasempoor 2026-06-10 07:46:30 +00:00
• 6b81075e40 add report for machines amirghasempoor 2026-06-10 11:16:08 +03:30
• 235111ee57 fix database for add driver mission feature/AddDriverInMission faezehzafarbakhsh 2026-06-10 11:15:54 +03:30
• ccacb2f916 fix code for confilict faezehzafarbakhsh 2026-06-10 11:07:06 +03:30
• aeb58ed27f fix code faezehzafarbakhsh 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 amirghasempoor 2026-06-10 05:18:39 +00:00
• 92cf157b29 Merge pull request 'merge develop to origin' (#10) from feature/MachineReport into develop amirghasempoor 2026-06-10 05:15:12 +00:00
• 5004b99d03 fix list and crate update machine and change state for mission feature/AddThreeItemInViolation faezehzafarbakhsh 2026-06-09 14:50:13 +03:30
• 2f3ebf5808 add driver_id and driver_name in mission faezehzafarbakhsh 2026-06-09 09:16:50 +03:30
• a0ee7cccd3 fix situation logo in report feature/MachineReport faezehzafarbakhsh 2026-05-30 09:15:51 +03:30
• 25e2883e9c fix controller faezehzafarbakhsh 2026-05-26 15:59:04 +03:30
• 23dd62550d prefix code and write route faezehzafarbakhsh 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 faezehzafarbakhsh 2026-05-25 16:25:56 +03:30
• 7d7507411d merge develop to origin faezehzafarbakhsh 2026-05-24 09:00:16 +03:30
• e0edcf6db2 Merge pull request 'fix permission route' (#8) from feature/FixReportMission into develop amirghasempoor 2026-05-23 10:21:21 +00:00
• 893edea5a9 fix permission route feature/FixReportMission faezehzafarbakhsh 2026-05-23 13:23:05 +03:30
• ec1358e85f Merge branch 'main' of rms-develop-main-branch-26-23-5.bundle Hamidreza Ranjbarpour 2026-05-23 09:29:54 +00:00
• 21e9931298 producion changes Hamidreza Ranjbarpour 2026-05-23 09:28:21 +00:00
• 23ab4d2bff Merge branch 'main' of rms_production.bundle amirghasempoor 2026-05-23 09:17:47 +00:00
• 4138ac7620 Merge pull request 'develop' (#7) from develop into main amirghasempoor 2026-05-23 07:38:15 +00:00
• 57d59b79b4 Merge pull request 'change name for date az to_date in date_to' (#6) from feature/FixReportMission into develop amirghasempoor 2026-05-23 07:34:55 +00:00
• 9f394abc3e change name for date az to_date in date_to faezehzafarbakhsh 2026-05-23 10:10:52 +03:30
• 08db103f26 add station id to create user amirghasempoor 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 amirghasempoor 2026-05-18 08:12:53 +00:00
• ad70874bde fix migration feature/FixViewLetter faezehzafarbakhsh 2026-05-18 11:39:30 +03:30
• 6a1513a72f add toll house to user management amirghasempoor 2026-05-18 08:09:27 +00:00
• f798d05a3c create one item for mission and fix in another table faezehzafarbakhsh 2026-05-18 11:01:20 +03:30
• 96960f5e8f create one item for mission and fix in another table faezehzafarbakhsh 2026-05-18 10:52:29 +03:30
• 3ca710228f create new object for user faezehzafarbakhsh 2026-05-16 10:22:02 +03:30
• a1bca2d80f fix view for receipt in insurance letter faezehzafarbakhsh 2026-05-16 09:18:50 +03:30
• d309c406ef fix time for tradod in mission feature/FixReport faezehzafarbakhsh 2026-02-18 16:00:51 +03:30
• 79cb2394f8 for mission and webservic harim feature/NewReportMachines faezehzafarbakhsh 2026-02-18 14:01:07 +03:30
• 048219f92e Merge pull request 'add db config' (#3) from feature/dockerize into develop amirghasempoor 2026-02-07 11:28:37 +00:00
• d833f4dc0d add db config feature/dockerize amirghasempoor 2026-02-07 14:57:26 +03:30
• a7fce4ca94 Merge pull request 'debug the image' (#2) from feature/dockerize into develop amirghasempoor 2026-02-07 10:52:46 +00:00
• 5f19a26f67 debug the image amirghasempoor 2026-02-07 14:21:53 +03:30
• 4c6f6d66f4 Merge pull request 'dockerize the project' (#1) from feature/dockerize into develop amirghasempoor 2026-02-07 10:07:34 +00:00
• dff218541c dockerize the project amirghasempoor 2026-02-07 13:35:54 +03:30
• 4a2612837b Merge pull request #131 from witelgroup/develop Amir Ghasempoor 2026-01-31 13:52:02 +03:30
• 6e261d3780 add middleware amirghasempoor 2026-01-31 13:43:07 +03:30
• 66d1b70f35 add middleware amirghasempoor 2026-01-31 13:42:13 +03:30
• 7651920494 Merge pull request #130 from witelgroup/develop Amir Ghasempoor 2026-01-31 13:23:28 +03:30
• 5989ba7df3 Merge pull request #129 from witelgroup/feature/MissionReports Amir Ghasempoor 2026-01-31 09:29:18 +03:30
• fe8c71fe16 Merge pull request 'debug the excels' (#6) from feature/MissionReportExcel into develop amirghasempoor 2026-01-27 08:25:27 +00:00
• f1c560928e debug the excels amirghasempoor 2026-01-27 11:54:14 +03:30
• 8db5650c4c Merge pull request 'feature/FixReportExcel' (#5) from feature/FixReportExcel into develop amirghasempoor 2026-01-27 08:03:20 +00:00