76 Commits

Author SHA1 Message Date
eea36a2722 handle delete master modal 2025-09-10 20:01:06 +05:30
6d86362e9e Merge branch 'Landing_pages' into Document_Manag
# Conflicts:
#	src/pages/authentication/LoginPage.jsx
#	src/pages/employee/EmployeeList.jsx
#	src/router/AppRoutes.jsx
2025-09-08 12:34:18 +05:30
698c1b7b16 add new images
replase class= with className=
2025-09-08 12:32:16 +05:30
0194c4427a Merge branch 'UI_Changes_PMS' of https://git.marcoaiot.com/admin/marco.pms.web into UI_Changes_PMS 2025-09-08 11:57:30 +05:30
ea022d37c8 Merge branch 'Document_Manag' of https://git.marcoaiot.com/admin/marco.pms.web into UI_Changes_PMS 2025-09-08 11:50:58 +05:30
e39355c6fd Changes in UI for Masters component. 2025-09-05 12:00:26 +05:30
87221965de Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Document_Manag 2025-09-05 11:52:50 +05:30
8f8cbf27ef Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into UI_Changes_PMS 2025-09-05 11:44:27 +05:30
0db0edec1a Masters Popup all heading show in Center align. 2025-09-05 11:19:35 +05:30
f3913c2824 Change the UI of all components and add stars for all mandatory fields. 2025-09-03 17:19:29 +05:30
a52cf0bc39 allow to delete document category and type and edit type 2025-09-03 15:16:37 +05:30
e007c0e8da allow to add and update document category inside master 2025-09-03 12:56:39 +05:30
f569ed635c Cancel button not closing All fields popup in masters 2025-09-01 09:23:29 +00:00
d4804e4c3f updated Master modal 2025-08-28 06:48:43 +00:00
8df47c1530 In Masters cancel button now cancel or close the form as excepted. 2025-08-14 10:13:17 +05:30
f430e4dc46 created expense masters pages 2025-08-06 00:02:36 +05:30
71376c7706 handle modals of expense 2025-08-06 00:00:43 +05:30
aece14d013 added callBack hook 2025-08-02 17:22:49 +05:30
fa3ccd28fa Responsive grid changes in Create Role and EditRole. 2025-07-30 09:04:05 +00:00
4d4037ed71 Changes in Application Role popup. 2025-07-30 09:04:05 +00:00
91fabf929c Modify Application role popup to look better 2025-07-30 09:04:05 +00:00
Pramod Mahajan
2f110b7ead Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into react-query 2025-07-02 09:49:20 +05:30
Pramod Mahajan
a02a33a247 partially implementation of masters in react query hooks 2025-07-01 13:23:16 +05:30
7615bb9c24 Added line after each module 2025-06-30 17:03:52 +05:30
Pramod Mahajan
f84d04efd5 hide unusefull header for masters 2025-06-20 12:45:10 +05:30
Pramod Mahajan
93c1fb1844 Merge branch 'Feature_Directory' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Directory 2025-06-09 13:21:03 +05:30
Pramod Mahajan
5a701ca9d7 added EditcontactCatgorry component in modal for update 2025-06-09 13:13:57 +05:30
Pramod Mahajan
ded8ab7752 created new component for update contact category 2025-06-09 13:13:33 +05:30
Pramod Mahajan
8999d7bb47 added new modal for edit contact tag and delete contact tag 2025-06-09 13:13:02 +05:30
Pramod Mahajan
5e3c833ca6 added new component for Edit contact Tag 2025-06-09 13:13:02 +05:30
Pramod Mahajan
8d7fcc62a7 added createContactTg component inside MasterModal 2025-06-09 13:10:55 +05:30
Pramod Mahajan
5836a24aed created new createContactMaster component 2025-06-09 13:10:55 +05:30
Pramod Mahajan
a3428fed85 added CreateContactCategory in master modal 2025-06-09 13:10:55 +05:30
Pramod Mahajan
bf0af60c47 created new constact category master 2025-06-09 13:10:55 +05:30
Pramod Mahajan
e83eafddd2 added editcontact tag form inside master modal 2025-06-03 11:48:39 +00:00
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
16f40f7566 Merge branch 'pramod_Task-#358' into Feature_Directory
# Conflicts:
#	src/components/master/MasterModal.jsx
2025-05-26 15:00:25 +05:30
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
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
e659b9bb04 Checking all the popups and adding header on it. 2025-05-19 11:59:34 +05:30
Pramod Mahajan
d8df891370 added createContactTg component inside MasterModal 2025-05-15 21:48:44 +05:30
Pramod Mahajan
dcc611b768 created new createContactMaster component 2025-05-15 21:47:51 +05:30
Pramod Mahajan
40df12de86 added CreateContactCategory in master modal 2025-05-15 12:28:37 +00:00
Pramod Mahajan
74ed8d3c4f created new constact category master 2025-05-15 12:28:37 +00:00
aa0bdb7a57 Implemented Pushover to display permission descriptions when editing or creating application role 2025-05-13 18:48:40 +05:30
96963527df Integrated the Work Category table into the Master module, including popup forms for creation and update, along with delete functionality. 2025-05-10 17:56:35 +05:30
Pramod Mahajan
6c5b62eb40 added delete functionality for each master 2025-05-08 18:23:27 +05:30
Pramod Mahajan
4175fb67c6 showing custom delete confirmation modal in master module until API is ready 2025-05-08 10:13:49 +00:00