1103 Commits

Author SHA1 Message Date
c0566f8281 Merge branch 'Issues_July_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_2W 2025-07-14 12:58:48 +05:30
1d32632be7 In ProjectNav.jsx and AttendancePage.jsx, remove inline CSS font-size styles and replace them with Bootstrap classes. 2025-07-14 12:58:00 +05:30
b1c0773c33 Ensure all pages maintain a consistent size, even when there's less data to display. 2025-07-14 12:57:12 +05:30
770c8e3e91 Page Height Should Be Minimized with "No Reports Found" Message in Daily Progress Report. 2025-07-14 12:56:59 +05:30
a1f232d65b Increase the size of Tabs text in Attendance and Projects. 2025-07-14 12:56:16 +05:30
42bceef654 Merge branch 'Issues_July_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_2W 2025-07-14 12:52:19 +05:30
17271f1900 In ProjectNav.jsx and AttendancePage.jsx, remove inline CSS font-size styles and replace them with Bootstrap classes. 2025-07-14 12:50:36 +05:30
73b07904d2 Ensure all pages maintain a consistent size, even when there's less data to display. 2025-07-14 12:48:48 +05:30
ded2f73cc0 Page Height Should Be Minimized with "No Reports Found" Message in Daily Progress Report. 2025-07-14 12:47:14 +05:30
db8ecec49e Increase the size of Tabs text in Attendance and Projects. 2025-07-14 12:45:46 +05:30
6125d48119 In the Date Range Picker, users should not be able to select any date in the future; future dates must be disabled. 2025-07-14 12:29:59 +05:30
a3f24af524 In ProjectNav.jsx and AttendancePage.jsx, remove inline CSS font-size styles and replace them with Bootstrap classes. 2025-07-14 12:29:58 +05:30
e26fafeba3 Ensure all pages maintain a consistent size, even when there's less data to display. 2025-07-14 12:29:27 +05:30
e2eaced0ea Page Height Should Be Minimized with "No Reports Found" Message in Daily Progress Report. 2025-07-14 12:29:27 +05:30
f0ab6efb36 Increase the size of Tabs text in Attendance and Projects. 2025-07-14 12:28:21 +05:30
bb32c3925d Assigned Task Should Be Visible to Normal User Without Showing Assign Button. 2025-07-14 12:28:21 +05:30
c12efe3061 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_2W 2025-07-11 17:47:19 +05:30
a73ac284bd In the Date Range Picker, users should not be able to select any date in the future; future dates must be disabled. 2025-07-11 16:25:03 +05:30
Pramod Mahajan
5f54f5e29a added project status label that was missing, during changed structure of project details 2025-07-10 18:12:45 +05:30
722b85752a In ProjectNav.jsx and AttendancePage.jsx, remove inline CSS font-size styles and replace them with Bootstrap classes. 2025-07-10 16:58:25 +05:30
ab75fcf20c Merge pull request 'Page Height Should Be Minimized with "No Reports Found" Message in Daily Progress Report.' (#244) from Kartik_Bug#640 into Issues_July_2W
Reviewed-on: #244
2025-07-10 05:20:53 +00:00
Pramod Mahajan
fe4426af9e fixed project updation in project about 2025-07-09 16:59:36 +05:30
Pramod Mahajan
bba4315a8e clear button class changed primary to secondary in manage employee form 2025-07-09 16:28:14 +05:30
7bab8b7551 Ensure all pages maintain a consistent size, even when there's less data to display. 2025-07-09 13:32:12 +05:30
9b99be6c0d Merge pull request 'Increase the size of Tabs text in Attendance and Projects.' (#242) from Kartik_Bug#712 into Issues_July_2W
Reviewed-on: #242
2025-07-09 07:32:02 +00:00
f8192ae1ca Page Height Should Be Minimized with "No Reports Found" Message in Daily Progress Report. 2025-07-09 12:18:41 +05:30
Pramod Mahajan
d818ea9265 vissible data after updated inside projecr details page 2025-07-09 11:48:42 +05:30
cefd4e7319 Increase the size of Tabs text in Attendance and Projects. 2025-07-09 11:24:46 +05:30
Pramod Mahajan
87edce4c3d added signalr events 2025-07-09 10:42:04 +05:30
Pramod Mahajan
cb7df469c2 added aspect ratio for image view in task comment 2025-07-08 15:24:18 +05:30
b2376bbad4 Assigned Task Should Be Visible to Normal User Without Showing Assign Button. 2025-07-08 15:23:56 +05:30
Pramod Mahajan
3968a47d98 fixed : project updation issue 2025-07-08 15:11:03 +05:30
Pramod Mahajan
ae07e9629b reset default correct activity for edit Task 2025-07-08 13:33:43 +05:30
Pramod Mahajan
16c7e971b1 updateed payload for createdTask fun , for getting workAreaId 2025-07-08 13:32:37 +05:30
Pramod Mahajan
4e1891efdb added projectrepository and toast that was missing. 2025-07-08 09:53:08 +05:30
Pramod Mahajan
5192ce2fc6 rename class to className 2025-07-07 17:02:02 +05:30
Pramod Mahajan
f24b66ae1c set default activity initially 2025-07-07 17:01:02 +05:30
Pramod Mahajan
287d116609 added cosmetic changes 2025-07-07 12:52:43 +05:30
Pramod Mahajan
58187db80a added default active status at create new project 2025-07-07 11:09:18 +05:30
Pramod Mahajan
9447178985 added format number 2025-07-07 10:59:51 +05:30
Pramod Mahajan
035ef6c099 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into react-query 2025-07-06 22:18:54 +05:30
Pramod Mahajan
10ee3796d3 Optimized to avoid unnecessary API calls 2025-07-06 22:10:13 +05:30
Pramod Mahajan
b5b1f9d31f added completedWork , plannedWork for progrss line with formatnumber util 2025-07-06 13:11:15 +05:30
Pramod Mahajan
485c7f2347 format number 2025-07-06 12:39:39 +05:30
52eeede904 Merge branch 'Issues_July_1W' 2025-07-06 11:21:24 +05:30
3be9f7aadb Change brand log and remove some demo css 2025-07-06 11:15:25 +05:30
981a7b121e Project Not Visible When Created with "In Progress" Status Selected from Filter 2025-07-05 11:45:13 +05:30
87a7b49948 Changes in Image Gallery creating changing the filter icon adding box at the time of Work Category. 2025-07-04 15:21:18 +05:30
Pramod Mahajan
28c226904e closed modal after update activity and format number of plannedwork and completed work at project overview 2025-07-04 12:39:10 +05:30
Pramod Mahajan
eb1c4fc765 show denied msg on Daily Task planning page if don't have manage infra and assign task 2025-07-04 12:37:55 +05:30