|
|
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 |
|
|
|
765e155b25
|
hide the pivot table data
|
2024-12-24 14:16:36 +03:30 |
|
|
|
70872af9ac
|
fix the relation
|
2024-12-24 13:57:13 +03:30 |
|
|
|
39f7c12df1
|
seperate machine code from road item table
|
2024-12-24 13:42:42 +03:30 |
|
|
|
e72b29de67
|
Merge branch 'feature/FMSMachineService' into 'develop'
create fms service
See merge request witelgroup/rms_v2!48
|
2024-12-24 09:44:36 +00:00 |
|
|
|
dd616551af
|
create fms service
|
2024-12-24 11:55:20 +03:30 |
|
|
|
8155cd9796
|
Merge branch 'feature/MachineIdObjectReturned' into 'develop'
Feature/machine id object returned
See merge request witelgroup/rms_v2!47
|
2024-12-23 12:35:08 +00:00 |
|
|
|
70e0f67e18
|
fix the return type
|
2024-12-23 08:44:28 +00:00 |
|
|
|
e9ca94f089
|
change datatable to accept multisort
|
2024-12-23 07:50:36 +00:00 |
|
|
|
dbbc25ac7b
|
comment the resize facade
|
2024-12-23 06:46:18 +00:00 |
|
|
|
7c63cc1e14
|
refactore the relation
|
2024-12-22 12:55:55 +00:00 |
|
|
|
945ac4269b
|
add cmms machine relation
|
2024-12-22 15:21:57 +03:30 |
|
|
|
e2b95f45e5
|
Merge branch 'feature/V3Tests' into 'develop'
Feature/v3 tests
See merge request witelgroup/rms_v2!46
|
2024-12-21 11:16:06 +00:00 |
|
|
|
8b71bcab2f
|
add nullable for v2
|
2024-12-21 14:44:21 +03:30 |
|
|
|
48a966a34f
|
returned the road item object in the model
|
2024-12-21 14:22:17 +03:30 |
|
|
|
767830cf47
|
create many to many relation between rahdaran and road item
|
2024-12-19 08:15:40 +00:00 |
|
|
|
549bd8ebe1
|
add new column for filtering
|
2024-12-18 12:30:01 +00:00 |
|
|
|
a8efd6aac0
|
write test for search codes
|
2024-12-18 14:00:29 +03:30 |
|
|
|
b8f5ed10ba
|
write test for the lists
|
2024-12-18 13:03:42 +03:30 |
|
|
|
d2d433f2b7
|
Merge branch 'feature/MachinCodeList' into 'develop'
Feature/machin code list
See merge request witelgroup/rms_v2!45
|
2024-12-17 07:08:58 +00:00 |
|
|
|
c3c21d09d2
|
add cmms machines aql file
|
2024-12-16 14:40:26 +03:30 |
|
|
|
9fa04fe203
|
return original date time format
|
2024-12-16 14:18:13 +03:30 |
|
|
|
ff6326f4da
|
create list api for machines and rahdaran
|
2024-12-16 14:09:18 +03:30 |
|
|
|
c480ee3bf9
|
Merge branch 'feature/AddRahdarIdToRoadItems' into 'develop'
add rahdar id to road item project
See merge request witelgroup/rms_v2!44
|
2024-12-15 06:52:15 +00:00 |
|
|
|
1b60739a14
|
add rahdar id to road item project
|
2024-12-15 10:08:49 +03:30 |
|
|
|
e7163490c9
|
Merge branch 'feature/CreateRahdaranTable' into 'develop'
create rahdaran table and factory
See merge request witelgroup/rms_v2!43
|
2024-12-14 07:30:02 +00:00 |
|
|
|
a0b40d85dd
|
create rahdaran table and factory
|
2024-12-14 10:19:13 +03:30 |
|
|
|
598331d1d4
|
Merge branch 'feature/AddMachineCodeToRoadItem' into 'develop'
transfer all api's from v2 road items to v3
See merge request witelgroup/rms_v2!42
|
2024-12-11 07:14:42 +00:00 |
|
|
|
7e19ec294f
|
debug the command
|
2024-12-11 10:41:08 +03:30 |
|
|
|
07a157e47b
|
transfer all api's from v2 road items to v3
|
2024-12-11 09:59:36 +03:30 |
|
|
|
0131cb9c55
|
Merge branch 'feature/TransferRoadItemProjects' into 'develop'
transfer road item project from v2 to v3
See merge request witelgroup/rms_v2!41
|
2024-12-10 06:05:22 +00:00 |
|
|
|
8d5ad5069e
|
accept the query parameter
|
2024-12-10 09:36:15 +03:30 |
|
|
|
82e6ccd9c1
|
transfer road item project from v2 to v3
|
2024-12-09 12:09:53 +03:30 |
|
|
|
e54a0d13bc
|
Merge branch 'feature/CMMSMachineCode' into 'develop'
create cmms machine service with tests
See merge request witelgroup/rms_v2!40
|
2024-12-08 06:58:13 +00:00 |
|
|
|
c8e024981e
|
create cmms machine service with tests
|
2024-12-08 10:27:14 +03:30 |
|
|
|
5d316c9132
|
Merge branch 'develop' into 'main'
Develop
See merge request witelgroup/rms_v2!39
|
2024-12-02 07:29:49 +00:00 |
|
|
|
822b2ae526
|
Merge branch 'feature/AddColumnToAzmayeshTable' into 'develop'
Feature/add column to azmayesh table
See merge request witelgroup/rms_v2!38
|
2024-12-02 07:28:09 +00:00 |
|
|
|
49c27d8c54
|
customize the message
|
2024-12-02 10:56:07 +03:30 |
|
|
|
985fda5cce
|
resolve constrained delete
|
2024-12-02 10:44:25 +03:30 |
|
|
|
a706406261
|
add user id column to azmayesh table
|
2024-12-02 10:37:48 +03:30 |
|
|
|
f890f418ea
|
Merge branch 'develop' into 'main'
Develop
See merge request witelgroup/rms_v2!37
|
2024-12-01 13:00:22 +00:00 |
|
|
|
cc0eb78a53
|
Merge branch 'feature/AzmayeshSort' into 'develop'
Feature/azmayesh sort
See merge request witelgroup/rms_v2!36
|
2024-12-01 12:59:01 +00:00 |
|
|
|
6d376baf18
|
add log out route
|
2024-12-01 16:24:54 +03:30 |
|
|
|
32d8e06d16
|
azmayesh sort columns
|
2024-12-01 16:19:56 +03:30 |
|
|
|
c9d2c8a0de
|
Merge branch 'develop' into 'main'
Develop
See merge request witelgroup/rms_v2!35
|
2024-12-01 11:56:10 +00:00 |
|
|
|
fa723a2fea
|
Merge branch 'feature/changeStepNameOfSafeteyAndPrivacy' into 'develop'
change step 2 name of safetyAndPrivacy
See merge request witelgroup/rms_v2!34
|
2024-12-01 11:54:41 +00:00 |
|
|
|
f47e2bc50b
|
change step 2 name of safetyAndPrivacy
|
2024-12-01 15:23:56 +03:30 |
|
Hamidreza Ranjbarpour
|
286aab7499
|
Merge branch 'develop' into 'main'
merge Develop into Main
See merge request witelgroup/rms_v2!33
|
2024-11-19 10:42:29 +00:00 |
|
|
|
4b622f801d
|
Merge branch 'feature/AzmayeshPermission' into 'develop'
create two permissions for azmayesh panel
See merge request witelgroup/rms_v2!32
|
2024-11-19 06:26:46 +00:00 |
|
