2591 Commits

Author SHA1 Message Date
ddfbd2dc71 Merge branch 'Issues_Oct_main_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Kartik_Bug#1499 2025-10-15 18:06:38 +05:30
3a2fcf71ee Merge pull request 'Export to PDF button not functioning' (#479) from Kartik_Bug#1434 into Issues_Oct_main_2W
Reviewed-on: #479
Merged
2025-10-15 12:33:55 +00:00
f0c6aea55d Create a seprate file for export functionality in employee. 2025-10-15 12:33:55 +00:00
278a5651fe Changes in excel import. 2025-10-15 12:33:55 +00:00
6fc3e674e5 Export to PDF button not functioning 2025-10-15 12:33:55 +00:00
9f4d82eb06 Merge pull request '“No images match the selected filters.” message should be displayed at the center of the page.' (#481) from Kartik_Bug#1497 into Issues_Oct_main_2W
Reviewed-on: #481
Merged
2025-10-15 12:26:25 +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
acf6a28191 Merge pull request 'Attendance "No record" message improvement' (#480) from Kartik_Bug#1437 into Issues_Oct_main_2W
Reviewed-on: #480
merged
2025-10-15 12:24:37 +00:00
98c90f2a9b Attendance "No record" message improvement 2025-10-15 12:24:37 +00:00
66270c1886 Changes in Attendance and Expenselist. 2025-10-15 17:21:56 +05:30
b80af5467c Changes in Infrastructure. 2025-10-14 15:07:07 +05:30
0ff12e27d8 Changes in Employee list at pagination and at mobile view then scrollbar is shown. 2025-10-14 14:51:57 +05:30
2845ad67d1 Changes in Regularization tab. 2025-10-14 14:42:33 +05:30
8b766abe46 Changes in Attendance page. 2025-10-14 14:32:45 +05:30
97aebf680f Excessive space between Organization dropdown and Search bar in Attendance menu. 2025-10-14 12:46:29 +05:30
9592108472 Removing extra margin-top on Project-details. 2025-10-13 16:35:28 +05:30
3b032b7b07 Merge pull request 'Incorrect Toggle Switch Text for Active/Inactive Employee in Project Teams' (#475) from Kartik_Bug#1455 into Issues_Oct_main_2W
Reviewed-on: #475
merged
2025-10-13 09:33:09 +00:00
b8891d403f Incorrect Toggle Switch Text for Active/Inactive Employee in Project Teams 2025-10-13 09:33:09 +00:00
01568db61c Merge pull request '“NA” Should Be Displayed When Employee Has No Email Instead of “–”' (#476) from Kartik_Bug#1451 into Issues_Oct_main_2W
Reviewed-on: #476
Merged
2025-10-13 09:32:51 +00:00
80a974e3be “NA” Should Be Displayed When Employee Has No Email Instead of “–” 2025-10-13 09:32:51 +00:00
f3e05a11d6 Merge pull request 'Adding Project and Service field in View Organization popup.' (#477) from Kartik_Task#1477 into Issues_Oct_main_2W
Reviewed-on: #477
Merged
2025-10-13 09:32:32 +00:00
222e6495a8 Adding Project and Service field in View Organization popup. 2025-10-13 09:32:32 +00:00
18a3b8a85b Merge pull request 'Filter Sidebar Should Auto-Close When Navigating to Another Page' (#478) from Kartik_Bug#1450 into Issues_Oct_main_2W
Reviewed-on: #478
merged
2025-10-13 09:32:17 +00:00
d75296ffe8 Filter Sidebar Should Auto-Close When Navigating to Another Page 2025-10-13 14:51:47 +05:30
6649cab6a2 Added cursor-not-allowed when user can delete the organization. 2025-10-13 14:16:11 +05:30
eab23389ed Correction in Projects Completion Status in this weidget data cannot be shown. 2025-10-13 12:51:42 +05:30
12b632f087 added new api for list of org 2025-10-11 18:06:51 +05:30
6ee4fb6d04 Updated TeamEmployeeList to fetch employees using useOrganizationEmployees during search. 2025-10-11 17:48:25 +05:30
67bb685d4b added new api for orgaization dropdown 2025-10-11 16:55:22 +05:30
8fd4e7f3f1 added space between first and last name 2025-10-11 16:30:27 +05:30
aca2decb00 clear fully cache after remove session 2025-10-11 16:26:04 +05:30
f7f4b68997 changed reimburse data during transaction to current date 2025-10-11 15:09:04 +05:30
f839613066 Merge pull request 'Fix: Ensure orgData can be cleared when opening Organization Modal' (#474) from HotChanges_11_10_25 into main
Reviewed-on: #474
Merged
2025-10-11 08:42:26 +00:00
b58bd33774 added requested b and requested at column inside rgularization 2025-10-11 14:08:27 +05:30
136bc94c5b removed dbugger and add new classes 2025-10-11 13:12:23 +05:30
281a956ac8 fixed directory header layout 2025-10-11 12:43:37 +05:30
31882c3d12 REMOVED UNNEEDED CARD CLASS 2025-10-11 11:13:38 +05:30
a64635cd37 Fix: Ensure orgData can be cleared when opening Organization Modal 2025-10-11 10:29:40 +05:30
9b8c8c34ab Merge pull request 'HotChanges_10_10_25' (#472) from HotChanges_10_10_25 into main
Reviewed-on: #472
Merged
2025-10-10 14:50:04 +00:00
704ba79289 prevent to select future date 2025-10-10 20:17:06 +05:30
3440467107 wapped header content into separated div 2025-10-10 18:25:19 +05:30
f4edcfd2f3 changed prod url 2025-10-10 18:18:20 +05:30
62e5c6899a profile icon should display always at end 2025-10-10 18:17:24 +05:30
00a23b3de9 changed class for table responsive 2025-10-10 18:11:43 +05:30
79161a8ede prevent to pick future date 2025-10-10 18:09:35 +05:30
860779d096 fixed service list show in Dialy Task 2025-10-10 18:08:21 +05:30
a2067e150d fixed service list show 2025-10-10 17:51:12 +05:30
edce5ef614 added newhook that return only organization employee for employee list (Active or Inactive) 2025-10-10 16:48:22 +05:30
dd944b3414 datepicker should not take future date 2025-10-10 16:46:34 +05:30
13d3572cf6 fixed datepicke ui 2025-10-10 16:45:43 +05:30