228 Commits

Author SHA1 Message Date
8522f0ca82 Correction in Date format in Attendance logs, and adding spinnerloade at attendance tab. 2025-10-31 15:37:26 +05:30
1c64fac499 Adding Spinners in all files. 2025-10-31 15:06:11 +05:30
6a78eddd2b Changes in UI of Attendance Tabs 2025-10-31 05:21:20 +00:00
565ce3f757 UI changes in View popup at attendance logs 2025-10-30 12:16:25 +05:30
798ea24088 Merge branch 'Issues_Oct_main_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Expense_Weidget_main 2025-10-16 10:03:02 +05:30
c8273070ac Changes in Attendance and Expenselist. 2025-10-15 12:37:16 +00:00
20b508bebc Changes in Regularization tab. 2025-10-15 12:37:16 +00:00
05c01d1d34 Changes in Attendance page. 2025-10-15 12:37:16 +00:00
4ba0c823c0 “No images match the selected filters.” message should be displayed at the center of the page. 2025-10-15 12:26:25 +00:00
98c90f2a9b Attendance "No record" message improvement 2025-10-15 12:24:37 +00:00
dec15278fa Changes in Emp Attendance and DateRange picker. 2025-10-15 11:00:18 +05:30
b8891d403f Incorrect Toggle Switch Text for Active/Inactive Employee in Project Teams 2025-10-13 09:33:09 +00:00
b58bd33774 added requested b and requested at column inside rgularization 2025-10-11 14:08:27 +05:30
281a956ac8 fixed directory header layout 2025-10-11 12:43:37 +05:30
13d3572cf6 fixed datepicke ui 2025-10-10 16:45:43 +05:30
8bcfcc5718 fixed attendance - check In -out and persisted date range from Redux store for attendance logs 2025-10-07 07:12:49 +00:00
a28a7fb444 checked-Out Time should be greather than or equal to checked In time 2025-10-06 16:07:31 +05:30
cfd3986479 fixed small changed like heading, font change 2025-09-30 11:59:16 +05:30
02dcd8611f user could not create subtask completed equal to approve task and fixd error imported subTask component 2025-09-29 17:29:11 +05:30
fb08e48edd added iniial state of daly progress filte panel 2025-09-25 19:30:55 +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
72dbdb0fe0 Changes in Attendance 2025-09-21 16:40:23 +05:30
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
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
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