49 Commits

Author SHA1 Message Date
2aae7194b7 implemented singlR 2025-10-01 13:00:38 +05:30
4e315aafcf added small ui changed like table b-padding, button size and fixd delete activity and group 2025-09-24 12:49:00 +05:30
d975664023 integrated service group wise activity operation delete,edit and create 2025-09-23 17:48:56 +05:30
ca7b0cda13 initially setup of service management 2025-09-22 18:44:05 +05:30
08194dd8ef Creating a Services in Master Compoenents. 2025-09-19 14:18:56 +05:30
a86c815ca2 Asthetic Changes
- Margin on all sides for grid
- Margin for card content
2025-09-16 18:33:48 +05:30
eea36a2722 handle delete master modal 2025-09-10 20:01:06 +05:30
1a7e77c814 structured code 2025-09-10 19:09:55 +05:30
f20c3a64f6 added proper modal size for Master Modal - Application Role 2025-09-10 19:00:07 +05:30
45b21d3e73 restric open modal when came at admisitrator page 2025-09-10 11:33:44 +05:30
3db6cc2100 added modal, that was missing during merged 2025-09-10 11:29:01 +05:30
5ec5218dd6 Merge branch 'Issues_Sep_1W' into Document_Manag
# Conflicts:
#	src/pages/Activities/DailyTask.jsx
#	src/pages/master/MasterPage.jsx
2025-09-10 10:37:38 +05:30
20077a137f Master Page - Grid alignment 2025-09-10 04:42:46 +00:00
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
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
a52cf0bc39 allow to delete document category and type and edit type 2025-09-03 15:16:37 +05:30
79e23fef24 The bottom border of the Master dropdown is not visible. 2025-09-01 09:23:29 +00:00
d42790628c successfully master fetched of documentType and documentCategor 2025-08-28 15:19:15 +05:30
d4804e4c3f updated Master modal 2025-08-28 06:48:43 +00:00
33c8b690ef added dynamically master menu 2025-08-24 14:56:50 +05:30
381019dcaa Missing Bottom Border in Masters Dropdown Menu. 2025-08-06 12:38:03 +05:30
3d7a8a1c94 attachement display horizontically 2025-08-06 10:22:47 +05:30
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
Pramod Mahajan
79d6cd2f49 changed class for container "container-xxl" to "container-fluid" 2025-06-23 15:41:23 +05:30
Pramod Mahajan
7c9607cb78 resolved localCompare error 2025-06-13 18:06:09 +05:30
Pramod Mahajan
a9a5206062 use ITEM_PER_PAGE constant to standardize pagination 2025-06-09 13:12:56 +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
21e4af4e33 Changed header alignment to left-aligned in Project list view, employee list view and master view 2025-05-09 11:53:22 +00:00
Pramod Mahajan
ff7f61b338 added one more property in avoid column 2025-05-09 10:04:50 +05:30
Pramod Mahajan
a9cd2097d6 added isSystem property in hiddenColumns because this field will broken table. 2025-05-08 18:25:18 +05:30
Pramod Mahajan
7c7b5a9be7 changed class to className 2025-05-07 16:42:19 +05:30
Pramod Mahajan
8696070249 pagination only display if have records greather than 20 2025-05-06 22:53:53 +05:30
028f717ae2 Change Page size for master and employees 2025-05-04 13:00:21 +05:30
Pramod Mahajan
048d9bb118 changed Activity Title Name- > Activity, description-> Unit 2025-04-20 23:18:15 +05:30
Pramod Mahajan
23d676c96a added sorting in ascending order 2025-04-17 10:28:07 +00:00
Pramod Mahajan
d1c36dfd97 Changed 'Role' to 'Application Role' 2025-04-15 01:08:59 +05:30
Pramod Mahajan
97606dfef0 added 'checkLists' array inside hiddenColumn 2025-04-14 20:15:39 +05:30
Pramod Mahajan
55b9420b6c Activity master component made and is reday for api integration. 2025-04-11 15:13:08 +05:30
Pramod Mahajan
2428f15f35 integrated activity api and fetch in master seaction. 2025-04-10 03:03:38 +05:30
Pramod Mahajan
e6a687c8e2 added validation for aadhar, pan Number, email, phone number and address length. 2025-04-03 00:22:24 +05:30
Pramod Mahajan
f4af7ccf1c added ascending order list , user-rights, 2025-04-02 17:24:43 +05:30
Pramod Mahajan
79a1a08620 added back button,master-header 2025-04-02 13:42:17 +05:30
Pramod Mahajan
fba9a8fc06 removed "Select Master" option in master dropdown 2025-04-01 20:41:10 +05:30
Pramod Mahajan
5a7ca02952 added use-rights functionality according to users 2025-04-01 17:17:35 +05:30
PramodMahajan14
850b2e6998 update enviroment variable 2025-03-29 14:36:57 +05:30
ba302898b8 Add UserRights branch from github changeset: 10a346901a9018735d9fd70a1a79a737595177ab 2025-03-25 17:22:23 +05:30
11241696b3 Add first version in main branch 2025-03-25 17:14:14 +05:30