452 Commits

Author SHA1 Message Date
Pramod Mahajan
fa32913e34 Replaced normal hooks to react-query Hook - Employee 2025-06-26 12:28:02 +05:30
Pramod Mahajan
237fea186b Merge branch 'Issues_Jun_3W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_Jun_3W 2025-06-24 16:45:05 +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
e0047378d1 updated reported btn after reported once. 2025-06-24 12:21:25 +05:30
Pramod Mahajan
928a50432d fixed restore selected project when toggling off "Show All Employees" 2025-06-23 21:30:36 +05:30
d8269cfbe8 Changes in search employee when double error message is shown. 2025-06-23 12:30:16 +00:00
589ba569f6 Correction in search function in Employees. 2025-06-23 12:30:16 +00:00
9f6d7580e3 Ensured all table headers and cells are left-aligned for consistent layout and better readability. 2025-06-23 12:30:16 +00:00
Pramod Mahajan
c8707fe7b1 changed input size 2025-06-23 17:43:11 +05:30
Pramod Mahajan
5c492fc932 changed modal , added global model 2025-06-23 17:40:30 +05:30
Pramod Mahajan
cd5e9291ae replace old modal to GlobalModal 2025-06-23 16:39:35 +05:30
Pramod Mahajan
79d6cd2f49 changed class for container "container-xxl" to "container-fluid" 2025-06-23 15:41:23 +05:30
056bd63869 Adding Export button in Directory. 2025-06-20 17:12:50 +05:30
41af98e340 The current behavior is that when the "All Employees" filter is off, the system should display employees only for the globally selected project, not all employees. 2025-06-20 15:55:16 +05:30
c4c3e8d885 The search functionality in the Employees section does not work correctly after applying a filter. 2025-06-20 15:55:16 +05:30
Pramod Mahajan
5a13313bbd refactor: update axios client and auth repository for public/private route handling 2025-06-20 15:55:16 +05:30
38374caab3 Add cards in project list and diectory list views 2025-06-20 15:53:30 +05:30
Pramod Mahajan
52a578972e Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task#505 2025-06-19 16:48:47 +05:30
Pramod Mahajan
4cda7fdcfd added approve task feature 2025-06-19 16:44:41 +05:30
ade3401d02 Persist project changes on multiple create/update operations.Ensures that project information changes (creation or updates) are correctly persisted when performed consecutively in the project list 2025-06-19 10:42:43 +05:30
200ef5ae0a Implemented signalR in Employee module 2025-06-18 11:57:55 +05:30
Pramod Mahajan
f58aa8cb18 added new modal for create sub task 2025-06-17 20:46:46 +05:30
6f247fb0e9 Merge branch 'SingalR_Integration' of https://git.marcoaiot.com/admin/marco.pms.web into SingalR_Integration 2025-06-17 17:19:02 +05:30
fdff7f7b41 Fixed rebase conflicts 2025-06-17 17:18:59 +05:30
24dc481169 Implemented signalR for create and update project 2025-06-17 17:18:28 +05:30
351e5a2b0d Implemented attendance funcationality in attendance module 2025-06-17 17:14:25 +05:30
b767641643 Avoided API calls 2025-06-17 17:11:30 +05:30
b24edba8f7 Implmeneted signalR in today's attendance 2025-06-17 17:11:29 +05:30
8217308db9 Implemented signalr for action assigning employee to project 2025-06-17 17:07:54 +05:30
ab5a598562 Implemented signalr in assign team tab in project details 2025-06-17 17:07:54 +05:30
9530f9ca87 Implemented attendance funcationality in attendance module 2025-06-17 17:07:54 +05:30
5567928c7f Avoided API calls 2025-06-17 17:07:53 +05:30
88efbf5542 Implmeneted signalR in today's attendance 2025-06-17 17:07:53 +05:30
ed2fa2d5b0 Implemented signalR for create and update project 2025-06-17 17:07:53 +05:30
90a77d357f Implemented attendance funcationality in attendance module 2025-06-17 17:07:53 +05:30
36d70b3850 Avoided API calls 2025-06-17 17:07:53 +05:30
a3381bb2e6 Implmeneted signalR in today's attendance 2025-06-17 17:07:53 +05:30
Pramod Mahajan
3b826342ba modified comment state for handle audit and comment form 2025-06-16 19:42:43 +05:30
Pramod Mahajan
f48d05ecee changed hook name , replaced properly related logic name 2025-06-14 10:46:33 +05:30
Pramod Mahajan
dee44c63aa handled loading properly 2025-06-14 10:45:43 +05:30
Pramod Mahajan
7c9607cb78 resolved localCompare error 2025-06-13 18:06:09 +05:30
Pramod Mahajan
cbf376d5b6 added pending filter for attendaces using toggle buttons 2025-06-13 17:52:22 +05:30
Pramod Mahajan
00902fff9f fixed togger for active and inactive employee 2025-06-13 13:27:34 +05:30
dde953fa08 Fixed rebase conflicts 2025-06-13 10:56:37 +05:30
d834aeddce Implemented signalr for action assigning employee to project 2025-06-13 10:53:09 +05:30
ec81377c07 Implemented signalr in assign team tab in project details 2025-06-13 10:53:08 +05:30
5611a46b95 Implemented attendance funcationality in attendance module 2025-06-13 10:50:13 +05:30
31ca0be50d Avoided API calls 2025-06-13 10:47:21 +05:30
b1385d2f2f Implmeneted signalR in today's attendance 2025-06-13 10:47:21 +05:30
70ac3e0344 Changes in Employee form allow searching form all the fields. 2025-06-13 00:22:23 +05:30