1517 Commits

Author SHA1 Message Date
f5c6382952 Changes in Date picker . 2025-07-11 07:13:52 +00:00
b36986d1c2 In the Image Gallery, the filter drawer's date picker should default to the last 7 days (today minus 7 days). 2025-07-11 07:13:52 +00:00
788a096f00 In filter DatePicker should not display dates in Image Gallery. 2025-07-11 07:13:52 +00:00
0a0f0046cc Merge pull request 'In ProjectNav.jsx and AttendancePage.jsx, remove inline CSS font-size styles and replace them with Bootstrap classes.' (#247) from Kartik_Bug#725 into Issues_July_2W
Reviewed-on: #247
Merged
2025-07-11 05:36:37 +00:00
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
200888ff99 Merge pull request 'Navigate to "Projects" Page Should Display Only Message When No Projects Are Assigned.' (#237) from Kartik_Bug#650 into Issues_July_2W
Reviewed-on: #237
2025-07-10 05:22:26 +00:00
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
fc8f6375c1 Merge pull request 'UI Misaligned on Toggling 'Show Inactive Contact' When No Inactive Contacts Exist in Directory at projects.' (#236) from Kartik_bug#649 into Issues_July_2W
Reviewed-on: #236
2025-07-10 05:18:09 +00:00
bae48be2b5 Increase the size of table in Projects Directory and show text in center and add 200 px height. 2025-07-09 16:06:30 +05:30
588104a9dd Nevigate to "Projects" Page Should Display Only Message When No Projects Are Assigned. 2025-07-09 15:15:53 +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
f53b88f946 Merge pull request 'On Change Password popup cross button is now working on click on it.' (#243) from Kartik_Bug#713 into Issues_July_2W
Reviewed-on: #243
2025-07-09 07:32:11 +00:00
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
3f43f56020 Merge pull request 'There's an issue: Today's Attendance, when I went to page 2 and then changed the project, all the data was lost."' (#241) from Kartik_Bug#681 into Issues_July_2W
Reviewed-on: #241
2025-07-09 07:27:48 +00:00
cbfaf3cf35 Merge pull request 'Assigned Task Should Be Visible to Normal User Without Showing Assign Button.' (#240) from Kartik_Bug#648 into Issues_July_2W
Reviewed-on: #240
2025-07-09 07:18:15 +00:00
2e66372f54 Merge pull request 'Saved Username and Password Not Visible on Login Page Load' (#239) from Kartik_Bug#678 into Issues_July_2W
Reviewed-on: #239
2025-07-09 07:16:12 +00:00
235106b9db Merge pull request 'Adding pagination 20 in Profile Attendance page and adding condtion to show more then 20 records to show paging.' (#235) from kartik_Bug#540 into Issues_July_2W
Reviewed-on: #235
2025-07-09 07:08:57 +00:00
31e5b48a4b Merge pull request 'Image Popup Expands Page Width when add lengthy comment on Click in Image Gallery.' (#233) from Kartik_Bug#667 into Issues_July_2W
Reviewed-on: #233
2025-07-09 07:06:18 +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
0d5ac23df9 On Change Password popup cross button is now working on click on it. 2025-07-09 11:39:29 +05:30
cefd4e7319 Increase the size of Tabs text in Attendance and Projects. 2025-07-09 11:24:46 +05:30
ce011c4f14 There's an issue: Today's Attendance, when I went to page 2 and then changed the project, all the data was lost." 2025-07-09 10:45:46 +05:30
e3417287d3 Sizing for the projects directory has been corrected. 2025-07-09 10:20:32 +05:30
b2376bbad4 Assigned Task Should Be Visible to Normal User Without Showing Assign Button. 2025-07-08 15:23:56 +05:30
012c8faca8 Saved Username and Password Not Visible on Login Page Load 2025-07-08 13:34:30 +05:30
e1e4ba2b54 Navigate to "Projects" Page Should Display Only Message When No Projects Are Assigned. 2025-07-08 12:45:48 +05:30
3d8247a27b UI Misaligned on Toggling 'Show Inactive Contact' When No Inactive Contacts Exist in Directory at projects. 2025-07-08 12:38:08 +05:30
9b63b2000e Adding pagination 20 in Profile Attendance page and adding condtion to show more then 20 records to show paging. 2025-07-08 12:35:02 +05:30
c4fd04dbac Merge pull request 'Images_gallery_filter' (#234) from Images_gallery_filter into main
Reviewed-on: #234

deployed feature to production
2025-07-08 06:47:12 +00:00
Pramod Mahajan
1226006afd added local time zone util fun 2025-07-08 10:18:50 +05:30
Pramod Mahajan
4e1891efdb added projectrepository and toast that was missing. 2025-07-08 09:53:08 +05:30
Pramod Mahajan
61b41c3aa4 added utils method that convert UTC TO Local 2025-07-07 15:25:13 +05:30
ad1db0f366 Image Popup Expands Page Width when add lengthy comment on Click in Image Gallery. 2025-07-07 15:07:43 +05:30
Pramod Mahajan
76aa9200f7 added Breadcrumb for image gallary 2025-07-07 13:25:44 +05:30
Pramod Mahajan
287d116609 added cosmetic changes 2025-07-07 12:52:43 +05:30
Pramod Mahajan
4f45a805e1 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Images_gallery_filter 2025-07-07 12:43:24 +05:30
Pramod Mahajan
04ffa0f645 fixed filter button of image galllary 2025-07-07 12:42:19 +05:30
c88af2441f Added condition to check if number of images uploaded is greater than 0 2025-07-07 11:25:41 +05:30
e97031c0e1 Merge pull request 'Changes in Image gallery and integrating singnalR.' (#231) from Kartik_Task#661 into Images_gallery_filter
Reviewed-on: #231
2025-07-07 04:35:50 +00:00
9eb8418330 Change the design of Filter drower. 2025-07-06 13:37:42 +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
4adfbc8e8e Adding next and previous button hide and correction in filter logic. 2025-07-05 21:59:18 +05:30
aebae577df Changes in Image gallery and integrating singnalR. 2025-07-05 18:09:06 +05:30
eb1f048059 Merge pull request 'Project Not Visible When Created with "In Progress" Status Selected from Filter' (#230) from Kartik_Bug#641 into Issues_July_1W
Reviewed-on: #230
2025-07-05 11:15:39 +00:00
0af211a218 Merge pull request 'Image_Gallery' (#229) from Image_Gallery into main
Reviewed-on: #229
2025-07-05 11:14:41 +00:00
6914b1cd90 Merge pull request 'Reduce the checkbox size and remove unnecessary spacing within the Directory Notes and Contact filters.' (#228) from Kartik_Bug#612 into Issues_July_1W
Reviewed-on: #228
2025-07-05 11:13:57 +00:00
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
1f9dcbbc82 Merge branch 'Issues_July_1W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_1W
# Conflicts:
#	src/pages/authentication/ChangePassword.jsx
2025-07-04 14:14:37 +05:30