71 Commits

Author SHA1 Message Date
cf78d17cf5 Merge pull request 'Add an Organization column in the Attendance grid across all tabs.' (#414) from Kartik_Task_OrgCol_att#1238 into Organization_Management
Reviewed-on: #414
2025-09-21 11:11:21 +00:00
72dbdb0fe0 Changes in Attendance 2025-09-21 16:40:23 +05:30
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
164b82e1c7 Add an Organization column in the Attendance grid across all tabs. 2025-09-19 17:00:02 +05:30
18698a67e3 removed unused files 2025-09-18 15:18:04 +05:30
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
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
57eb2ab405 Changes in projectId for attendance, employee.
Dropdown of project has been hide in expense.
2025-08-23 12:55:35 +05:30
9272783388 Implementing a search functionality within the Attendance component to enable search across all tabs. 2025-08-23 04:35:39 +00:00
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
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
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
59196b3cf0 added query hook for fetching and posting data 2025-07-17 09:52:14 +05:30
41f9d4d39a Ensure all pages maintain a consistent size, even when there's less data to display. 2025-07-14 14:17:59 +05:30
0793dc28fb Page Height Should Be Minimized with "No Reports Found" Message in Daily Progress Report. 2025-07-14 14:17:41 +05:30
cefc475c0a Ensure all pages maintain a consistent size, even when there's less data to display. 2025-07-14 13:24:13 +05:30
10cf207677 Page Height Should Be Minimized with "No Reports Found" Message in Daily Progress Report. 2025-07-14 13:24:13 +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
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
e09413b23a 401 Unauthorized Error on Attendance Menu. 2025-07-01 12:19:25 +05:30
200ef5ae0a Implemented signalR in Employee module 2025-06-18 11:57:55 +05:30
a0e4b1c5ed Changed some functionallity in attendance 2025-06-17 17:07:53 +05:30
90a77d357f Implemented attendance funcationality in attendance module 2025-06-17 17:07:53 +05:30
Pramod Mahajan
7c9607cb78 resolved localCompare error 2025-06-13 18:06:09 +05:30