Commit Graph

395 Commits

Author SHA1 Message Date
613a8f0bd8 refactor blade files 2025-04-15 16:08:16 +03:30
ee933a3f91 order image files 2025-04-15 15:50:14 +03:30
b46bd53254 return the correct data values 2025-04-15 11:14:38 +03:30
8d138b8339 add group by feature to datatable 2025-04-15 10:45:47 +03:30
6f896f4894 Merge branch 'feature/DetailBugs' into 'develop'
Feature/detail bugs

See merge request witelgroup/rms_v2!100
2025-04-14 12:14:27 +00:00
2e0b49df45 create new column for database and improve the controller 2025-04-14 15:40:10 +03:30
a3600c68fa add full url for pictures 2025-04-14 11:14:06 +03:30
b25ce4bfe2 create map for rahdari point 2025-04-14 10:47:11 +03:30
822730afb1 debug rahdari point 2025-04-13 09:54:26 +03:30
52f22656e2 add action date to safety 2025-04-12 16:13:49 +03:30
a643bdf626 debug the index method 2025-04-12 15:06:50 +03:30
c5894051c1 return json type 2025-04-12 14:56:57 +03:30
e5bc66f009 Merge branch 'feature/RahdariPoint' into 'feature/DetailBugs'
create show,store,update and delete for RoadMaintenanceStationController

See merge request witelgroup/rms_v2!99
2025-04-12 11:26:02 +00:00
a1d3b86a69 add map report to safety 2025-04-12 12:55:33 +03:30
21f2dd7c2f create show,store,update and delete for RoadMaintenanceStationController 2025-04-09 16:21:58 +03:30
107f9ff469 add map api to safety 2025-04-08 14:37:44 +03:30
fed15940e4 Merge branch 'feature/RahdariPoint' into 'feature/DetailBugs'
creat index forRoadMaintenanceStationController and write routs for this

See merge request witelgroup/rms_v2!97
2025-04-08 11:07:17 +00:00
93d1775379 add axis type to safety excel 2025-04-08 11:11:26 +03:30
9e1b25d9a1 creat index forRoadMaintenanceStationController and write routs for this 2025-04-07 18:13:23 +03:30
6734eed822 Merge branch 'feature/Tests' into 'develop'
Feature/tests

See merge request witelgroup/rms_v2!94
2025-04-06 07:31:21 +00:00
f295034f4f create test for three item in roaditem project 2025-03-30 13:47:39 +03:30
1c0ebdb9ab wrote test for restore,supervisorIndex,verify 2025-03-12 17:01:14 +03:30
30ff1b022a roll back the wrong commit 2025-03-12 11:53:49 +03:30
2375cd8b88 add update api 2025-03-11 15:38:26 +03:30
c3e6d53ca2 Merge branch 'develop' into 'feature/Tests'
Develop

See merge request witelgroup/rms_v2!93
2025-03-11 10:06:03 +00:00
205eb07ce0 Merge branch 'feature/SafetyAndPrivacyUpdate' into 'develop'
add update api for safetyAndPrivacy

See merge request witelgroup/rms_v2!92
2025-03-11 10:03:15 +00:00
44f604e4e6 add update api for safetyAndPrivacy 2025-03-11 13:31:46 +03:30
6ec1f6c2b4 write test for permission controller 2025-03-11 11:47:43 +03:30
f394f9cd0c Merge branch 'feature/ActivityStatistic' into 'develop'
Feature/activity statistic

See merge request witelgroup/rms_v2!90
2025-03-10 07:56:09 +00:00
3291eba66e refactor the job 2025-03-10 11:24:14 +03:30
0d33693383 Merge branch 'develop' into 'feature/ActivityStatistic'
Develop

See merge request witelgroup/rms_v2!89
2025-03-09 11:09:46 +00:00
e7500ae0ff Merge branch 'feature/Loglist' into 'develop'
creatcrud for loglist

See merge request witelgroup/rms_v2!88
2025-03-09 11:08:18 +00:00
eb75537d9b creatcrud for loglist 2025-03-09 14:29:36 +03:30
905cacbd3b refactor the web services to be cleaner 2025-03-09 13:41:00 +03:30
5f2cbf5f12 refactor the web services 2025-03-08 14:48:03 +03:30
03e2bcfdf9 refactor the speed 2025-03-08 10:28:11 +00:00
4a4a29cfad rewrite the route name 2025-03-08 09:39:28 +03:30
fa108b23d5 create notification controller 2025-03-05 16:11:04 +03:30
96edaaddb4 Merge branch 'feature/Permissions' into 'develop'
create permission crud

See merge request witelgroup/rms_v2!87
2025-03-05 06:27:48 +00:00
01b037f727 debug the return statement 2025-03-05 09:56:13 +03:30
67dbeee57b create permission crud 2025-03-05 09:51:16 +03:30
46c48c776a Merge branch 'feature/SafetyAndPrivacy' into 'develop'
Feature/safety and privacy

See merge request witelgroup/rms_v2!84
2025-03-04 10:56:50 +00:00
df88738827 add namespace to v3 route 2025-03-04 14:25:32 +03:30
e8fd051e47 add routes 2025-03-04 11:41:45 +03:30
ae96f070de Merge branch 'develop' into 'feature/SafetyAndPrivacy'
Develop

See merge request witelgroup/rms_v2!86
2025-03-04 08:10:38 +00:00
f37529ec94 Merge branch 'feature/v2tov3' into 'develop'
upgade code v2 to v3

See merge request witelgroup/rms_v2!85
2025-03-04 08:09:36 +00:00
0813c1f258 upgade code v2 to v3 2025-03-04 11:20:21 +03:30
1e933d8384 debug the return types 2025-03-04 11:10:35 +03:30
9f08804454 debug the report tables 2025-03-03 15:38:06 +03:30
3326ab326e add more detail to api 2025-03-03 11:59:29 +03:30