1853 Commits

Author SHA1 Message Date
2425387d8e display correctly activie,incative and all employee according user action 2025-07-16 18:30:06 +05:30
ea6d03ef75 fiex pagination in regularization issue 2025-07-16 18:15:46 +05:30
1978460169 added query fetching techniq in attendances 2025-07-16 16:17:49 +05:30
d6d98c7515 configure perfect scroll bar 2025-07-16 09:50:37 +05:30
c18b3529b2 removed unsed scroll bar css 2025-07-16 09:50:11 +05:30
c704982f3c Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web 2025-07-15 18:14:46 +05:30
e9fb15697a changes employee list api 2025-07-15 18:14:41 +05:30
712001a559 Merge pull request 'Issues_July_2W: Project overview widgets' (#256) from Issues_July_2W into main
Reviewed-on: #256
2025-07-15 12:28:46 +00:00
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
99f3ec19d3 Merge pull request 'Add an "All Projects" selection option in the global project dropdown.' (#253) from Kartik_Task#734 into Issues_July_2W
Reviewed-on: #253
Merged
2025-07-15 09:41:07 +00:00
3368403188 Changes in Dashboard dropdown adding All Projects Selection. 2025-07-15 09:41:07 +00:00
6ca72c7e5c added needed closed tag 2025-07-15 09:41:07 +00:00
5f8e5d16f8 Changes in Project Selection. 2025-07-15 09:41:07 +00:00
0ef60621fb Add an "All Projects" selection option in the global project dropdown. 2025-07-15 09:41:07 +00:00
8748193069 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_2W 2025-07-15 14:45:30 +05:30
983d8d6091 Truncate long project short names to prevent overflow in project card 2025-07-15 13:13:29 +05:30
2d7c7ada96 Merge pull request 'Issues_July_2W' (#255) from Issues_July_2W into main
Reviewed-on: #255
Merged
2025-07-15 07:32:29 +00:00
f55cf309a4 added permission rights in daily task report 2025-07-15 07:32:29 +00:00
e4638139f5 added view team memeber and all employee 2025-07-15 07:32:29 +00:00
6afe1e6700 dynamically updated completed planned work at project lis and workarea when going to create new sub task 2025-07-15 07:32:29 +00:00
1c2b6eaac8 add utility to calculate and format completion percentage from planned and completed work 2025-07-15 07:32:29 +00:00
d7d759732b dynamically update planned and completed work in ProjectInfra and project list card on Task reported 2025-07-15 07:32:29 +00:00
4fc6a5c9f3 dynamically update planned and completed work in ProjectInfra and project list card on activity create/edit/delete 2025-07-15 07:32:29 +00:00
6a7eb0ee91 fixed card width in core.css 2025-07-15 07:32:29 +00:00
dce29422f4 fixed css bug 2025-07-15 07:32:29 +00:00
999b8bfb99 added permission rights in daily task report 2025-07-15 10:34:35 +05:30
5ec982778d added view team memeber and all employee 2025-07-15 10:21:17 +05:30
679d5d167f dynamically updated completed planned work at project lis and workarea when going to create new sub task 2025-07-14 23:41:51 +05:30
01ccd2e758 add utility to calculate and format completion percentage from planned and completed work 2025-07-14 20:30:53 +05:30
d2b80b4f02 dynamically update planned and completed work in ProjectInfra and project list card on Task reported 2025-07-14 20:19:25 +05:30
788f0baee4 dynamically update planned and completed work in ProjectInfra and project list card on activity create/edit/delete 2025-07-14 20:18:36 +05:30
1718638a4b fixed card width in core.css 2025-07-14 18:17:07 +05:30
19e2fe377d Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_2W 2025-07-14 17:35:46 +05:30
918300c64c fixed css bug 2025-07-14 16:59:31 +05:30
11dc196ae8 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Kartik_Task#734 2025-07-14 16:16:13 +05:30
3493445b19 Merge pull request 'Issues_July_2W' (#252) from Issues_July_2W into main
Reviewed-on: #252
2025-07-14 10:40:18 +00:00
0ccd00d3f7 error fixed during occured rebase 2025-07-14 14:30:49 +05:30
c0e9c1e2b9 Merge branch 'Issues_July_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_2W 2025-07-14 14:21:44 +05:30
39f0908fc0 fixed error during rebase 2025-07-14 14:21:36 +05:30
50585e1fbd rebase from main 2025-07-14 14:21:35 +05:30
85d10e3b17 Creating a custom hook for ImageGallery to call an API. 2025-07-14 14:21:05 +05:30
94358c7aa2 Changes in Date picker . 2025-07-14 14:21:04 +05:30
6f6e688249 In the Image Gallery, the filter drawer's date picker should default to the last 7 days (today minus 7 days). 2025-07-14 14:20:28 +05:30
b8949b3b71 In filter DatePicker should not display dates in Image Gallery. 2025-07-14 14:20:28 +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
e3d7d6005b Nevigate to "Projects" Page Should Display Only Message When No Projects Are Assigned. 2025-07-14 14:19:56 +05:30
a6f55f31f3 Navigate to "Projects" Page Should Display Only Message When No Projects Are Assigned. 2025-07-14 14:19:55 +05:30
41f9d4d39a Ensure all pages maintain a consistent size, even when there's less data to display. 2025-07-14 14:17:59 +05:30
0793dc28fb Page Height Should Be Minimized with "No Reports Found" Message in Daily Progress Report. 2025-07-14 14:17:41 +05:30