Commit Graph

241 Commits

Author SHA1 Message Date
e6dcd36fc9 create report views 2025-01-22 11:25:57 +03:30
03fd210671 create excel files 2025-01-21 10:31:25 +03:30
fae721a3f1 create report files 2025-01-20 09:13:22 +03:30
f4fa6421d3 Merge branch 'feature/ReportExcels' into 'develop'
add option to datatable

See merge request witelgroup/rms_v2!62
2025-01-13 07:09:22 +00:00
28ebb84011 add option to datatable 2025-01-12 16:13:13 +03:30
f9215a54c7 Merge branch 'feature/debugPosterController' into 'develop'
debug poster controller

See merge request witelgroup/rms_v2!60
2025-01-12 10:32:27 +00:00
d9de996b02 debug poster controller 2025-01-12 13:56:48 +03:30
3edb3d2f0f Merge branch 'feature/CampFilter' into 'develop'
Feature/camp filter

See merge request witelgroup/rms_v2!58
2025-01-12 08:26:01 +00:00
d05101fe0b add date filter to camp 2025-01-12 08:20:13 +00:00
d3d41f3beb add city filter to camp 2025-01-12 11:23:27 +03:30
1b8de4271a Merge branch 'feature/ActivityReport' into 'develop'
Feature/activity report

See merge request witelgroup/rms_v2!57
2025-01-12 07:43:04 +00:00
8141ecc0c6 add ostan activity to query 2025-01-11 15:43:26 +03:30
a97c8f3f5c add sub_item to allowed filters 2025-01-11 13:44:56 +03:30
8fbae148b7 add more data to api 2025-01-11 13:30:35 +03:30
7288b7fce6 rename the methods 2025-01-11 10:26:58 +03:30
4c4593c032 remove unused elements 2025-01-09 13:03:30 +03:30
1b4a6da397 return more data in api 2025-01-09 12:31:57 +03:30
8060ff2d64 add sub item to api 2025-01-09 11:57:24 +03:30
a246108aca merge the response data to one array 2025-01-09 11:25:51 +03:30
c79caa2193 fix the directory structure 2025-01-09 10:18:33 +03:30
a295c1958b add province to user info 2025-01-08 16:27:13 +03:30
c3d0fec4b6 Merge branch 'feature/Reports' into 'develop'
Feature/reports

See merge request witelgroup/rms_v2!56
2025-01-08 11:26:33 +00:00
f260fdc9de bugfix 2025-01-08 14:16:10 +03:30
72717a19fd change functions name 2025-01-08 13:30:48 +03:30
6b310a099a write meaningful names 2025-01-07 16:53:15 +03:30
53dd73103b remove road patrol summary 2025-01-07 16:06:22 +03:30
90914793ff create report system 2025-01-07 10:04:56 +03:30
dc83feea90 Merge branch 'feature/RoadPatrolStore' into 'develop'
Feature/road patrol store

See merge request witelgroup/rms_v2!55
2025-01-07 06:22:27 +00:00
a4e32d49b2 remove the form request 2025-01-05 09:23:47 +03:30
ad97658216 create road observed filter datatable 2025-01-04 16:04:11 +03:30
49c457107c Merge branch 'feature/AddColumnToRoadPatrol' into 'develop'
add activity for azmayesh

See merge request witelgroup/rms_v2!54
2025-01-04 12:03:33 +00:00
57bb53475c add detail api 2025-01-04 15:24:51 +03:30
e95e4ca8ce fix the name route 2025-01-04 15:02:09 +03:30
311f03921c create datatable for observed item 2025-01-04 14:57:43 +03:30
294f89b4ad create a rule to verify otp 2025-01-04 13:14:14 +03:30
7a761b4fb5 fix the migration type 2025-01-01 16:42:20 +03:30
68109744f0 add new columns to road patrol 2024-12-31 16:40:21 +03:30
b507e706d0 add activity for azmayesh 2024-12-31 11:11:12 +03:30
7d874adc8a Merge branch 'feature/AddMachineToRoadPatrol' into 'develop'
Feature/add machine to road patrol

See merge request witelgroup/rms_v2!53
2024-12-31 06:02:50 +00:00
51161854bd create fms service api 2024-12-28 15:22:32 +03:30
42c3dc4ce8 add machines and rahdaran to road patrols 2024-12-28 11:22:55 +03:30
c25b7ecb32 Merge branch 'feature/AddMachineAndRahdarToRoadPatrol' into 'develop'
Feature/add machine and rahdar to road patrol

See merge request witelgroup/rms_v2!51
2024-12-28 06:51:17 +00:00
83d688af8e fix the polymorph relation 2024-12-25 14:49:33 +03:30
33bcc5e496 Merge branch 'develop' of https://gitlab.com/witelgroup/rms_v2 into feature/AddMachineAndRahdarToRoadPatrol 2024-12-25 14:19:21 +03:30
b14d75105d create many to many polymorphic relation 2024-12-25 14:17:27 +03:30
b1050b5f3e Merge branch 'feature/AddSubContractToAzmayesh' into 'develop'
Feature/add sub contract to azmayesh

See merge request witelgroup/rms_v2!50
2024-12-25 10:39:30 +00:00
0a9f989a27 add nullable to column 2024-12-25 13:32:44 +03:30
91b93e4575 add contract_subitem_id to azmayeshes table 2024-12-25 13:03:09 +03:30
6d9848cbc9 Merge branch 'feature/SeperateMachineRelation' into 'develop'
Feature/seperate machine relation

See merge request witelgroup/rms_v2!49
2024-12-25 05:51:13 +00:00
e6591b0772 add column to show 2024-12-24 14:42:41 +03:30