63 Commits

Author SHA1 Message Date
Pramod Mahajan
10ee3796d3 Optimized to avoid unnecessary API calls 2025-07-06 22:10:13 +05:30
Pramod Mahajan
80083aa5db updated some queries and mutation for prevent to duplicates calls 2025-07-02 19:42:43 +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
84563812b7 Adding cross button in Employee popup. 2025-06-30 16:42:58 +05:30
562a4ca46d "Changes in the employee popup size." 2025-06-30 16:27:12 +05:30
Pramod Mahajan
7afea8e52a added type of employees, for calling api 2025-06-27 15:53:20 +05:30
Pramod Mahajan
fa32913e34 Replaced normal hooks to react-query Hook - Employee 2025-06-26 12:28:02 +05:30
Pramod Mahajan
22c6072c32 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_Jun_3W 2025-06-24 16:31:54 +05:30
Pramod Mahajan
5c492fc932 changed modal , added global model 2025-06-23 17:40:30 +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
31a9f55b63 - Add shot name in project lobal selection
- Sort jobrole in edit employee
2025-06-13 00:56:02 +05:30
Pramod Mahajan
7dea047536 Cancel button disabled is on when processing form 2025-06-09 15:33:21 +05:30
bf097bc884 Added a popup to allow editing of employee information directly in the Employee Profile. 2025-05-12 15:45:17 +05:30
cf204f376d Changed the first letter of all form field variables to lowercase to follow proper variable naming conventions. 2025-05-12 07:58:33 +00:00
Pramod Mahajan
ae33594691 mobile fied accept first digit 0 to 9 2025-05-09 17:44:55 +05:30
1887ccf2c0 Employee data is now sent as JSON instead of multipart/form-data during creation and update, with the form shown in a popup and Aadhar/PAN fields removed. 2025-05-09 06:36:26 +00:00
Pramod Mahajan
3161288871 handled server negative response, in user readable format 2025-05-08 10:14:54 +00:00
50f48d27f2 Handle menu navigation from shortcut so that smoot navigation happens and page does not reload 2025-05-07 15:53:03 +05:30
Pramod Mahajan
0c0476a86f moved attendance tap at first 2025-05-06 15:38:27 +05:30
3d62071fb6 Remove AADHAR card validation while creating user 2025-05-04 11:41:11 +05:30
1bbc8fd422 Conver Int to Guid 2025-05-03 21:43:15 +05:30
Pramod Mahajan
75507707c0 Handle role deselection and employee switching
- Reset checkboxes when employee changes
- Allow submission when no roles are selected
- Fixed zod validation to support empty selections
2025-04-29 23:56:36 +05:30
Pramod Mahajan
fec6de8a54 removed console 2025-04-29 23:54:59 +05:30
Pramod Mahajan
d88fd3180f modified request for manage role. 2025-04-28 11:36:34 +05:30
Pramod Mahajan
b595fe6a0f added id in roles obj request 2025-04-26 22:56:59 +05:30
Pramod Mahajan
1ca337067a fixed previous role feature to current user role. 2025-04-26 18:31:20 +05:30
Pramod Mahajan
c900dc80a9 hide uneccessary msg or fixed loading condition for create new employee 2025-04-26 18:15:49 +05:30
Pramod Mahajan
637b7990f5 added limitation for phone no 2025-04-20 08:33:59 +00:00
Pramod Mahajan
80fe6d64d1 modified response format 2025-04-20 08:32:14 +00:00
Pramod Mahajan
0798a12598 added character limitation 2025-04-20 08:32:14 +00:00
Pramod Mahajan
5e40817f3c clear cache after update or new create employee. and added character limitation for address and email 2025-04-20 08:32:14 +00:00
a38d811603 Merge branch 'pramod_Bug#29InputLimmit' into Feature_Task_Management 2025-04-19 10:58:10 +05:30
Pramod Mahajan
8715d8e94e added validation for mobile no , address and panCard no, user can't add more than 12 no. and any special or letter character and can't add more than 500 character for address 2025-04-18 23:26:50 +05:30
0cfe9cb917 Update character count messages to use "characters left" for clarity 2025-04-18 17:44:59 +05:30
4a16e27a1e Add character length tracking for address and description fields in employee management forms 2025-04-18 17:40:47 +05:30
83b6c2a307 Merge branch 'pramod_Enhancement#86_plannedDisplayInReport' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Enhancement#86_plannedDisplayInReport 2025-04-17 16:27:07 +05:30
2a221ecf91 refactor(EmployeeNav): update class names for nav links and correct label for account 2025-04-17 16:25:21 +05:30
Pramod Mahajan
fb7c2cd1f4 removed console 2025-04-17 10:46:29 +00:00
Pramod Mahajan
abe53bab7f added vlidation for Emergency ContactPerson field. this field accept only letter. 2025-04-17 12:04:37 +05:30
Pramod Mahajan
15b1979485 manageRole - application role display properly. 2025-04-17 12:04:37 +05:30
b9e3c3b4f8 Include reverted changes during merge 2025-04-17 12:04:36 +05:30
876e2de755 refactor(EmployeeNav): update class names for nav links and correct label for account 2025-04-17 12:04:36 +05:30
Pramod Mahajan
915d68aa91 added new suspend model inside employee list 2025-04-17 12:04:17 +05:30
c93919602e - Change Loader style on Project Details page. Earlier, it was showing multiple glowing circles of various colors. Now only two will be displayed
- Changed Navigation Style for project modules. Earlier, we were using pills; now, tabs are used for better visualization
- Changed Navigation Style for Employee Details Page
2025-04-17 12:04:17 +05:30
Pramod Mahajan
b400acf23f added vlidation for Emergency ContactPerson field. this field accept only letter. 2025-04-17 11:24:20 +05:30
Pramod Mahajan
eb3f2a70af manageRole - application role display properly. 2025-04-17 10:08:08 +05:30
e60be01d97 Include reverted changes during merge 2025-04-16 16:16:06 +05:30
0c48ae70b8 Merge branch 'Feature_Task_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Task_Management 2025-04-16 16:13:12 +05:30
9306c12296 refactor(EmployeeNav): update class names for nav links and correct label for account 2025-04-16 10:35:47 +00:00