107 Commits

Author SHA1 Message Date
Pramod Mahajan
25b2f6973c fixed format planned vs remaining work values to avoid float precision issues in task UI 2025-07-02 20:07:35 +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
f848f97d87 implement partial react-query in task assignment flow 2025-06-30 20:20:52 +05:30
562a4ca46d "Changes in the employee popup size." 2025-06-30 16:27:12 +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
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
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
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
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
cbf376d5b6 added pending filter for attendaces using toggle buttons 2025-06-13 17:52:22 +05:30
dde953fa08 Fixed rebase conflicts 2025-06-13 10:56:37 +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
Pramod Mahajan
3ed5999f29 added attachment views 2025-06-12 22:54:08 +05:30
909a1f72d9 Implemented signalR for create and update project 2025-06-12 20:45:32 +05:30
1c0be858e9 Implemented attendance funcationality in attendance module 2025-06-12 20:45:32 +05:30
b0fd14d0bb Avoided API calls 2025-06-12 20:45:32 +05:30
e349d2622c Implmeneted signalR in today's attendance 2025-06-12 20:45:31 +05:30
32fdc39e5c Changes in Manage Buckets popup and Employess component Checkbox add. 2025-06-12 17:03:35 +05:30
Pramod Mahajan
deaf10c302 handled wrong uel for Breadcrumb 2025-06-11 19:34:28 +05:30
Pramod Mahajan
ce1bdc3df7 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into GlobalSelectProject 2025-06-11 14:15:42 +05:30
500006c1ef Merge branch 'newFeature_Directory' 2025-06-10 20:18:25 +05:30
d3524c40f3 Updation In Daily Progress Report filter icon. 2025-06-10 14:26:57 +00:00
Pramod Mahajan
c1da916ca7 hide select at local level - AttendancePage 2025-06-10 15:35:30 +05:30
Pramod Mahajan
2b8764b402 hide select at local level - DailyTask 2025-06-10 15:31:43 +05:30
Pramod Mahajan
7f1ce2b863 removed unwannted code 2025-06-10 15:29:53 +05:30
Pramod Mahajan
9573daa8b0 changed toggle nutton position for well UI 2025-06-10 11:19:59 +05:30
19f58345d9 add cosmati changes 2025-06-09 11:54:49 +00:00
e2f3814934 Implement a spinner in the Daily Progress Report to indicate when data is being loaded. 2025-06-09 11:54:49 +00:00
945d79a250 Merge branch 'pramod_Task#482' into Issue_Jun_1W_2
# Conflicts:
#	src/pages/authentication/LoginPage.jsx
2025-06-09 11:47:03 +05:30