40 Commits

Author SHA1 Message Date
13d3572cf6 fixed datepicke ui 2025-10-10 16:45:43 +05:30
5e1ccc9b05 Calling api for Attendance component for Organization. 2025-09-21 18:17:47 +05:30
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
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
7ed6a7e5b9 UI Changes in Assign Employee popup, Attendance tabs, Dashboard heading will be same. 2025-09-05 16:53:48 +05:30
34654aae0a : rename component from checkoutcheckou to checkInCheckOut and useSelectedproject to useSelectedProject 2025-09-05 10:53:05 +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
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
ae973bf1a1 Enhancement implemented in the Attendance component to include search functionality. 2025-07-26 12:41:42 +05:30
cdcc9b90e4 Enhancement implemented in the Attendance component to include search functionality. 2025-07-26 12:04:16 +05:30
e96187cfa1 Enhancement implemented in the Attendance component to include search functionality. 2025-07-22 16:47:26 +05:30
d176221c13 Corrected regex to accurately detect / and dashboard 2025-07-18 11:19:29 +05:30
92568039eb sync data within regularize request and appove or reject between 2025-07-18 00:01:16 +05:30
ea6d03ef75 fiex pagination in regularization issue 2025-07-16 18:15:46 +05:30
2c0800f0e3 Unnecessary Blank Space Appears Below Employees in Regularization Tab. 2025-07-01 12:21:49 +05:30
200ef5ae0a Implemented signalR in Employee module 2025-06-18 11:57:55 +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
101baa2b78 Todays date is not visible in Daily Progress Report. 2025-06-05 05:26:06 +00:00
a896a722f1 revert 20f5dee5344e05c402e012daeebdf2404cbff39d
revert revert 77b94e89bd9297e00aa76b7c433628fee221d259

revert handled zero length of array error.
2025-05-09 11:31:14 +00:00
20f5dee534 revert 77b94e89bd9297e00aa76b7c433628fee221d259
revert handled zero length of array error.
2025-05-09 11:25:34 +00:00
Pramod Mahajan
77b94e89bd handled zero length of array error. 2025-05-09 16:48:06 +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
b963f6bad9 Fix loading error. Hide existing content and then show loading 2025-04-17 17:52:09 +05:30
1418f84976 Remove warnings 2025-04-17 17:29:18 +05:30
Pramod Mahajan
aa6ddd7fe9 remove regularization request after approve or reject. 2025-04-10 02:46:54 +05:30
Pramod Mahajan
faf68cac25 fixed attendance logs, attendanance rolename and removed import-userProfile. 2025-04-09 11:23:34 +05:30
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
2081b13d64 removed space between check and view button 2025-04-07 17:15:17 +05:30
11241696b3 Add first version in main branch 2025-03-25 17:14:14 +05:30