871 Commits

Author SHA1 Message Date
Pramod Mahajan
6605293c47 added sorting button to table header 2025-05-27 22:23:32 +05:30
Pramod Mahajan
c382d9238d created new hook for sorting table data 2025-05-27 22:18:44 +05:30
Pramod Mahajan
45e88c07a9 increased padding for suggestion menu 2025-05-27 22:17:56 +05:30
Pramod Mahajan
eb0e424a18 created new hook useOrganization 2025-05-27 15:05:35 +05:30
Pramod Mahajan
3f7456e5e7 replaced standard input with custom InputSuggestions component for organization field 2025-05-27 15:04:55 +05:30
Pramod Mahajan
478aedf2ae added marign for select item 2025-05-27 15:03:21 +05:30
Pramod Mahajan
866049e385 added mirgin form bottom for select badge 2025-05-27 15:02:42 +05:30
Pramod Mahajan
8786f01b40 created new component for organization sugger field 2025-05-27 15:01:34 +05:30
Pramod Mahajan
d3f7c44922 removed table header icons 2025-05-27 12:53:58 +05:30
Pramod Mahajan
466f11382a removed table header icons 2025-05-27 12:50:47 +05:30
Pramod Mahajan
3072759ba8 incresed modal width for manage buckets 2025-05-27 12:47:47 +05:30
Pramod Mahajan
a17a32a7cf added background color, backdrop 2025-05-27 12:46:36 +05:30
Pramod Mahajan
991a833dbf removed fix height 2025-05-27 12:39:54 +05:30
Pramod Mahajan
5287b40cd0 changed font size 2025-05-27 12:37:02 +05:30
Pramod Mahajan
dd35de14a7 removed project select validation, it no longer required 2025-05-27 12:35:23 +05:30
Pramod Mahajan
8fba237173 changed font-size 2025-05-27 12:33:25 +05:30
Pramod Mahajan
c3643683c8 added filter action while apply filter 2025-05-27 12:31:48 +05:30
Pramod Mahajan
ad145db3c7 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Directory 2025-05-27 10:15:06 +05:30
2224b10842 Merge pull request 'pramod_Task-#355 : implemented Manage Buckets modal with bucket creation and listing' (#145) from pramod_Task-#355 into Feature_Directory
Reviewed-on: #145
2025-05-26 09:36:34 +00:00
Pramod Mahajan
8abb8a3aa5 added API methods for creating and updating directory buckets 2025-05-26 09:36:34 +00:00
Pramod Mahajan
51c3857675 splited Directory component into smaller components 2025-05-26 09:36:34 +00:00
Pramod Mahajan
8f94cf6e2d added new modal for bucket management and splited code 2025-05-26 09:36:34 +00:00
Pramod Mahajan
199cf4867f created new component for bucket managment 2025-05-26 09:36:34 +00:00
Pramod Mahajan
06c0c5ebb3 added schema for bucket form validation 2025-05-26 09:36:34 +00:00
16f40f7566 Merge branch 'pramod_Task-#358' into Feature_Directory
# Conflicts:
#	src/components/master/MasterModal.jsx
2025-05-26 15:00:25 +05:30
d11174984d Merge branch 'pramod_Task-#227' into Feature_Directory
# Conflicts:
#	src/repositories/MastersRepository.jsx
2025-05-26 14:58:56 +05:30
478b0ddad0 Merge pull request 'Dashboard Component View.' (#146) from Kartik_Development#26 into Issue_May_4W
Reviewed-on: #146
2025-05-26 05:52:13 +00:00
4445ef18ab Dashboard Component View. 2025-05-26 11:19:59 +05:30
7a1a55f52f Merge branch 'Kartik_Bug#301' into Issue_May_4W
# Conflicts:
#	src/components/Project/Infrastructure/FloorModel.jsx
2025-05-24 20:48:37 +05:30
ae18b51668 Removing Unnecessary gap in Assign Employee popup from Teams. 2025-05-24 18:52:56 +05:30
ff56245119 Merge pull request 'pramod_Task#351: Contact Tag Delete and Update' (#141) from pramod_Task#351 into Feature_Directory
Reviewed-on: #141
2025-05-24 12:22:59 +00:00
Pramod Mahajan
1cdaefbec4 added EditcontactCatgorry component in modal for update 2025-05-24 17:27:47 +05:30
Pramod Mahajan
36b09747b0 created new component for update contact category 2025-05-24 17:27:03 +05:30
Pramod Mahajan
695369cbf8 modified url endpoint 2025-05-24 17:26:20 +05:30
Pramod Mahajan
dcaa9ae7ec Add support for deleting contact categories 2025-05-24 16:27:11 +05:30
4c73060b82 Merge pull request 'Error message work Properly.' (#140) from Kartik_Enhancement#279 into Issue_May_4W
Reviewed-on: #140
2025-05-24 10:52:41 +00:00
decc388bf1 Error message work Properly. 2025-05-24 10:52:41 +00:00
Pramod Mahajan
79e38f6cd5 modified url for delete and update contact tag 2025-05-24 16:02:46 +05:30
Pramod Mahajan
3593e7d46c added new modal for edit contact tag and delete contact tag 2025-05-24 16:02:16 +05:30
Pramod Mahajan
144817aef6 added new component for Edit contact Tag 2025-05-24 16:00:23 +05:30
7804e44b85 Error message in Manage floor popup in Infrastructure. 2025-05-24 15:54:31 +05:30
9d90f05f1c Merge pull request 'Adding Switch button in attendence component.' (#129) from Kartik_Enhancement#274 into Issue_May_4W
Reviewed-on: #129
2025-05-24 10:17:20 +00:00
8d8a5edb19 Change label from "Pending" to "Pending Actions" 2025-05-24 10:17:20 +00:00
a60d7f7a25 Changes in Attendance Switch on-off button. 2025-05-24 10:17:20 +00:00
3157a30948 Adding Switch button in attendence component. 2025-05-24 10:17:20 +00:00
9b26924eba Merge pull request 'Correction in Assign Task popup.' (#137) from Kartik_Enhancement#352 into Issue_May_4W
Reviewed-on: #137
2025-05-24 10:12:32 +00:00
a6c6a73899 Correction in Assign Task popup. 2025-05-24 14:45:29 +05:30
aa50aeff98 Merge branch 'Kartik_Enhancement#335' into Issue_May_4W
# Conflicts:
#	src/components/Dashboard/Dashboard.jsx
2025-05-24 10:27:20 +05:30
78d7b9b521 Merge branch 'Kartik_Enhancement#336' into Issue_May_4W
# Conflicts:
#	src/components/Dashboard/Dashboard.jsx
2025-05-24 10:26:01 +05:30
7afa4f4449 Merge branch 'Kartik_Enhancement#337' into Issue_May_4W
# Conflicts:
#	src/components/Dashboard/Dashboard.jsx
2025-05-24 10:24:28 +05:30