32 Commits

Author SHA1 Message Date
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
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
f433e55a96 Changes in date format in Attendance logs and attendance. 2025-09-01 09:19:03 +00:00
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
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
882e3dd414 Project Address Text Overflow. 2025-06-20 15:55:16 +05:30
Pramod Mahajan
cbf376d5b6 added pending filter for attendaces using toggle buttons 2025-06-13 17:52:22 +05:30
Pramod Mahajan
117ac31d12 Merge branch 'Feature_Directory' of https://git.marcoaiot.com/admin/marco.pms.web into newFeature_Directory 2025-06-10 09:47:56 +05:30
Pramod Mahajan
a9a5206062 use ITEM_PER_PAGE constant to standardize pagination 2025-06-09 13:12:56 +05:30
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
b6330502cb Hide Page Number on Website Until Data Exceeds Records Limit. 2025-06-09 05:46:12 +00:00
101baa2b78 Todays date is not visible in Daily Progress Report. 2025-06-05 05:26:06 +00:00
115b49ac44 Modified assign task popup from Daily task planning component. 2025-05-16 16:53:51 +05:30
3607bdc77d increase page size 2025-05-07 16:43:21 +05:30
2fb08a0044 added sorting group by name, checkIn , checkOut, regularize, approved and reject 2025-05-04 12:30:35 +05:30
920692d5aa Modify UX and font size, menu vertical spacing with new sneat css v3.0.1 2025-04-18 11:38:57 +00:00
Pramod Mahajan
d56ba89a4a fixed regularization bugs- past employee is not able to regularized beacuse, id not sending to server 2025-04-08 18:21:59 +05:30
Pramod Mahajan
10d6f96ea7 added taskreport, commentTask feature 2025-04-06 18:03:10 +05:30
Pramod Mahajan
ddfbed1020 updated project infra components and added assigntask 2025-04-05 13:10:24 +05:30
Pramod Mahajan
f4af7ccf1c added ascending order list , user-rights, 2025-04-02 17:24:43 +05:30
ba302898b8 Add UserRights branch from github changeset: 10a346901a9018735d9fd70a1a79a737595177ab 2025-03-25 17:22:23 +05:30
11241696b3 Add first version in main branch 2025-03-25 17:14:14 +05:30