165 Commits

Author SHA1 Message Date
92b1531b75 daily task planning filtering according to service 2025-09-25 14:11:04 +05:30
c609387924 Changes in Organization popup 2025-09-22 16:00:24 +05:30
71dd35adc2 Changes in Services Dropdown. 2025-09-22 12:40:00 +05:30
693cabf63d Merge pull request 'Calling api for Attendance component for Organization.' (#420) from Kartik_Task_Att#1236 into Organization_Management
Reviewed-on: #420
2025-09-22 04:07:09 +00:00
4afe43d116 handle one tenant have , directly move to dashboard once logged 2025-09-22 00:09:34 +05:30
5e1ccc9b05 Calling api for Attendance component for Organization. 2025-09-21 18:17:47 +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
5a048f7066 Merge pull request 'Adding Dropdown and API call in Daily Progress Report.' (#413) from Kartik_Task_DailyProgress#1232 into Organization_Management
Reviewed-on: #413
2025-09-20 06:22:43 +00:00
731d2dbed7 Changes in Infrastructure. 2025-09-20 11:51:32 +05:30
58b5da1793 Changes in Daily Task planning 2025-09-20 11:39:14 +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
27b62c858d Change the position of Datepicker and Dropdown box. 2025-09-19 19:50:50 +05:30
e9d8b6daea Adding Dropdown and API call in Daily Progress Report. 2025-09-19 16:43:44 +05:30
9b37288901 Adding Dropdown in Daily Task Planning and call api. 2025-09-19 16:32:34 +05:30
a86c815ca2 Asthetic Changes
- Margin on all sides for grid
- Margin for card content
2025-09-16 18:33:48 +05:30
daa1a29e8a added option chain for handle error 2025-09-16 18:11:47 +05:30
b934527cf5 added manually changed 2025-09-10 10:41:26 +05:30
7ed6a7e5b9 UI Changes in Assign Employee popup, Attendance tabs, Dashboard heading will be same. 2025-09-05 16:53:48 +05:30
cabb1b01c9 don't changed project when move to one page to another page 2025-09-05 11:14:02 +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
fc5f47536f Filter Applied Without Clicking on "Apply" Button in Daily Progress Report 2025-09-01 08:56:20 +00:00
2377a1b869 removed unused code 2025-08-24 16:10:25 +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
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
9720206150 Inconsistent Filter Icon in Daily Progress Report section. 2025-08-18 12:07:05 +05:30
4bff065153 added pagination and partially added filter 2025-08-09 10:30:06 +05:30
5188db2c8f handle condition if project haven't selected 2025-08-07 17:18:15 +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
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
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
1c68e3a3d5 fixed signalr issue due to occured integrated query 2025-07-18 10:54:44 +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
1978460169 added query fetching techniq in attendances 2025-07-16 16:17:49 +05:30
0126d38b57 removed scrollbar on dashbord graph 2025-07-15 17:52:56 +05:30
47e458fe7c added choose all project option at dashboard 2025-07-15 17:06:47 +05:30
999b8bfb99 added permission rights in daily task report 2025-07-15 10:34:35 +05:30
f8abcc8aa8 In ProjectNav.jsx and AttendancePage.jsx, remove inline CSS font-size styles and replace them with Bootstrap classes. 2025-07-14 14:19:56 +05:30
a381b58851 Increase the size of Tabs text in Attendance and Projects. 2025-07-14 14:14:13 +05:30
26d2e82116 In ProjectNav.jsx and AttendancePage.jsx, remove inline CSS font-size styles and replace them with Bootstrap classes. 2025-07-14 13:24:54 +05:30