57 Commits

Author SHA1 Message Date
7ed6a7e5b9 UI Changes in Assign Employee popup, Attendance tabs, Dashboard heading will be same. 2025-09-05 16:53:48 +05:30
4369705a2d Merge branch 'Issues_Aug_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_Aug_2W 2025-09-05 10:53:35 +05:30
34654aae0a : rename component from checkoutcheckou to checkInCheckOut and useSelectedproject to useSelectedProject 2025-09-05 10:53:05 +05:30
fc5f47536f Filter Applied Without Clicking on "Apply" Button in Daily Progress Report 2025-09-01 08:56:20 +00:00
2377a1b869 removed unused code 2025-08-24 16:10:25 +05:30
75c81ecc0c added regular date formate and prevent to call api without param. 2025-08-24 14:26:32 +05:30
d1ff7321e9 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Tenant_Manag 2025-08-23 17:25:50 +05:30
9f9bfbe922 Selected Project Resets to "All Projects" After Page Refresh in Daily Task Planning 2025-08-23 04:36:31 +00:00
9720206150 Inconsistent Filter Icon in Daily Progress Report section. 2025-08-18 12:07:05 +05:30
4bff065153 added pagination and partially added filter 2025-08-09 10:30:06 +05:30
47e458fe7c added choose all project option at dashboard 2025-07-15 17:06:47 +05:30
999b8bfb99 added permission rights in daily task report 2025-07-15 10:34:35 +05:30
Pramod Mahajan
20c9dca759 added formatNumber at globally for reusable 2025-07-04 11:29:24 +05:30
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
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
4cda7fdcfd added approve task feature 2025-06-19 16:44:41 +05:30
Pramod Mahajan
f58aa8cb18 added new modal for create sub task 2025-06-17 20:46:46 +05:30
Pramod Mahajan
3b826342ba modified comment state for handle audit and comment form 2025-06-16 19:42:43 +05:30
Pramod Mahajan
3ed5999f29 added attachment views 2025-06-12 22:54:08 +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
d3524c40f3 Updation In Daily Progress Report filter icon. 2025-06-10 14:26:57 +00:00
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
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
26191bccfe Adding Filter Icon on Daily Progress Report and performing a filteration according to building, floor and activity. 2025-06-09 05:39:43 +00:00
101baa2b78 Todays date is not visible in Daily Progress Report. 2025-06-05 05:26:06 +00:00
50d5c69db1 Convert all date to DD-MM-YYYY accross all component. 2025-05-27 07:53:31 +00:00
Pramod Mahajan
2ebd1a074f show 'No Reports Found' message when task list is empty and loading is complete 2025-05-15 05:46:40 +00:00
f26b708564 Allowed task reporting with zero completed tasks and hid the Report button if the reported date is not null. 2025-05-10 13:38:05 +00:00
e795881c79 Implemented date-wise grouping of the Attendance Log based on the selected date range. 2025-05-07 16:04:38 +05:30
130fffcc16 remove minor error while code review 2025-05-07 13:16:02 +05:30
a60cd6b1a9 Added row background color and also changed message on report submit 2025-05-07 06:33:11 +00:00
25127659c8 Added fuctionality to Displayed Date-Wise Based on Selected Date Range 2025-05-07 06:33:11 +00:00
Pramod Mahajan
8483114f4d set selectedProject on page refresh in DailyTask.jsx
- added fallback logic to select first project if selectedProject is undefined or 1
- used initialized flag to prevent multiple dispatches
2025-05-06 11:00:13 +05:30
029254e548 Validation for reporting task so that completed tasks will not exceed total pending tasks for that activity 2025-05-05 18:20:24 +05:30
a14e5c88b4 Dynamic date range for DateRange Picker in task allocation log 2025-05-04 12:50:53 +05:30
Pramod Mahajan
4bd574772f filtering projects according to logged user at data layer 2025-05-04 12:00:10 +05:30
1bbc8fd422 Conver Int to Guid 2025-05-03 21:43:15 +05:30
Pramod Mahajan
8b9206ec74 remove accordion functionality from DailyTask component 2025-05-02 04:51:46 +00:00
Pramod Mahajan
a92a041333 Prevent multiple API calls and display correct data for selected project 2025-04-25 11:00:43 +00:00
Pramod Mahajan
461ffeb83d fixed correct projectId is used when navigating to DailyTask 2025-04-22 10:33:04 +00:00
Pramod Mahajan
28437c3a9e this component read projectId from the URL using useSearchParams. 2025-04-19 05:29:34 +00:00
Pramod Mahajan
ee2762fb4a removed console 2025-04-14 22:51:58 +05:30