204 Commits

Author SHA1 Message Date
2e3e3aa6ca Merge pull request 'Adding Filter Icon in Attendance tab and add functionality in all Attendance component.' (#416) from Kartik_Task_AttFilter#1235 into Organization_Management
Reviewed-on: #416
2025-09-20 06:45:11 +00:00
90b96864be Changes in Attendance filter 2025-09-20 12:13:49 +05:30
9bdcc74486 Adding Filter Icon in Attendance tab and add functionality in all Attendance component. 2025-09-20 10:28:18 +05:30
9223f7a176 Adding Card in Daily Progress Report. 2025-09-19 20:03:36 +05:30
18698a67e3 removed unused files 2025-09-18 15:18:04 +05:30
9311f41f56 fixed high level changes 2025-09-18 12:38:39 +05:30
7ed6a7e5b9 UI Changes in Assign Employee popup, Attendance tabs, Dashboard heading will be same. 2025-09-05 16:53:48 +05:30
8f8cbf27ef Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into UI_Changes_PMS 2025-09-05 11:44:27 +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
f3913c2824 Change the UI of all components and add stars for all mandatory fields. 2025-09-03 17:19:29 +05:30
f433e55a96 Changes in date format in Attendance logs and attendance. 2025-09-01 09:19:03 +00:00
833a54e57a Attendance Record Popup Shows Wrong Date Format 2025-09-01 09:19:03 +00:00
f847e5f07f Remove hardcoded 20 and add ITEMS_PER_PAGE 2025-09-01 12:11:55 +05:30
8c465db8d4 Pagination Displayed Even When Records Are greater Than 20 2025-09-01 10:49:40 +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
a01e2deee7 Changes in Regularizationaction. 2025-08-23 13:19:41 +05:30
57eb2ab405 Changes in projectId for attendance, employee.
Dropdown of project has been hide in expense.
2025-08-23 12:55:35 +05:30
9f9bfbe922 Selected Project Resets to "All Projects" After Page Refresh in Daily Task Planning 2025-08-23 04:36:31 +00:00
9272783388 Implementing a search functionality within the Attendance component to enable search across all tabs. 2025-08-23 04:35:39 +00:00
fb3b55c694 added spinkit loader and integrated inside projectDeatils and InfraPlanning 2025-08-08 14:11:22 +05:30
03fb762f24 prevent to select checkout before check in time 2025-08-02 17:12:22 +05:30
543b1bf94b revert changes fo July_4W 2025-08-02 17:01:17 +05:30
8b2aef8a52 All the changes of Search functionality in Attendance page. 2025-07-28 11:21:37 +05:30
254aaf1977 Merge branch 'Issues_July_4W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_4W 2025-07-26 16:55:11 +05:30
32434da93f Attendance page search functionality and Attendance Log Page Resets to First Page After Performing Action on Other Pages. 2025-07-26 16:42:26 +05:30
276a2ca9f4 Attendance Log Page Resets to First Page After Performing Action on Other Pages. 2025-07-26 16:39:42 +05:30
3709346d42 Enhancement implemented in the Attendance component to include search functionality. 2025-07-26 16:35:43 +05:30
699c349ba5 Changes in during a merge 2025-07-26 13:28:47 +05:30
7e5f5807f6 Merge branch 'Issues_July_4W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_4W 2025-07-26 12:56:54 +05:30
1f3438e3a9 Attendance page search functionality and Attendance Log Page Resets to First Page After Performing Action on Other Pages. 2025-07-26 12:55:14 +05:30
30b567d020 Attendance Log Page Resets to First Page After Performing Action on Other Pages. 2025-07-26 12:54:09 +05:30
ae973bf1a1 Enhancement implemented in the Attendance component to include search functionality. 2025-07-26 12:41:42 +05:30
5956e64492 Merge branch 'Issues_July_4W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_4W 2025-07-26 12:05:42 +05:30
1e8c836e4d Attendance page search functionality and Attendance Log Page Resets to First Page After Performing Action on Other Pages. 2025-07-26 12:04:18 +05:30
9afee2934a Attendance Log Page Resets to First Page After Performing Action on Other Pages. 2025-07-26 12:04:18 +05:30
cdcc9b90e4 Enhancement implemented in the Attendance component to include search functionality. 2025-07-26 12:04:16 +05:30
2d1cddb2e0 At the time of Regularize status code 400 were shown now solved we add error message in popup "Checkout time must be later than check-in time". 2025-07-26 12:03:38 +05:30
85bdc270ac Attendance page search functionality and Attendance Log Page Resets to First Page After Performing Action on Other Pages. 2025-07-24 17:40:03 +05:30
4f64a23089 Attendance Log Page Resets to First Page After Performing Action on Other Pages. 2025-07-24 17:10:22 +05:30
e96187cfa1 Enhancement implemented in the Attendance component to include search functionality. 2025-07-22 16:47:26 +05:30
633e60d141 At the time of Regularize status code 400 were shown now solved we add error message in popup "Checkout time must be later than check-in time". 2025-07-22 09:29:12 +00:00
43e173d0ef Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into react-query-v2 2025-07-21 09:47:09 +05:30
f0e007fe89 FixedInfra Planning issue 2025-07-19 11:18:21 +05:30
0ad8c72aa9 fixed singlar 2025-07-18 11:32:32 +05:30
d176221c13 Corrected regex to accurately detect / and dashboard 2025-07-18 11:19:29 +05:30
1c68e3a3d5 fixed signalr issue due to occured integrated query 2025-07-18 10:54:44 +05:30
92568039eb sync data within regularize request and appove or reject between 2025-07-18 00:01:16 +05:30
07885d3ed4 intergrated react-query 2025-07-17 20:41:57 +05:30