186 Commits

Author SHA1 Message Date
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
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
6e5e206bc8 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into react-query-v2 2025-07-17 17:30:16 +05:30
59196b3cf0 added query hook for fetching and posting data 2025-07-17 09:52:14 +05:30
ea6d03ef75 fiex pagination in regularization issue 2025-07-16 18:15:46 +05:30
6afe1e6700 dynamically updated completed planned work at project lis and workarea when going to create new sub task 2025-07-15 07:32:29 +00:00
d7d759732b dynamically update planned and completed work in ProjectInfra and project list card on Task reported 2025-07-15 07:32:29 +00:00
0ccd00d3f7 error fixed during occured rebase 2025-07-14 14:30:49 +05:30
c0566f8281 Merge branch 'Issues_July_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_2W 2025-07-14 12:58:48 +05:30
b1c0773c33 Ensure all pages maintain a consistent size, even when there's less data to display. 2025-07-14 12:57:12 +05:30
770c8e3e91 Page Height Should Be Minimized with "No Reports Found" Message in Daily Progress Report. 2025-07-14 12:56:59 +05:30
42bceef654 Merge branch 'Issues_July_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_2W 2025-07-14 12:52:19 +05:30
73b07904d2 Ensure all pages maintain a consistent size, even when there's less data to display. 2025-07-14 12:48:48 +05:30
ded2f73cc0 Page Height Should Be Minimized with "No Reports Found" Message in Daily Progress Report. 2025-07-14 12:47:14 +05:30
e26fafeba3 Ensure all pages maintain a consistent size, even when there's less data to display. 2025-07-14 12:29:27 +05:30
e2eaced0ea Page Height Should Be Minimized with "No Reports Found" Message in Daily Progress Report. 2025-07-14 12:29:27 +05:30
bb32c3925d Assigned Task Should Be Visible to Normal User Without Showing Assign Button. 2025-07-14 12:28:21 +05:30
c12efe3061 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_2W 2025-07-11 17:47:19 +05:30
ab75fcf20c Merge pull request 'Page Height Should Be Minimized with "No Reports Found" Message in Daily Progress Report.' (#244) from Kartik_Bug#640 into Issues_July_2W
Reviewed-on: #244
2025-07-10 05:20:53 +00:00
7bab8b7551 Ensure all pages maintain a consistent size, even when there's less data to display. 2025-07-09 13:32:12 +05:30