| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							c018ffa455
							
						
					 | 
					
						
						
							
							if assigned employee to project, that employees  should display instantly inside Assigned task view and employee list
						
						
						
						
						
						
					 | 
					
						2025-07-10 13:18:04 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							fe4426af9e
							
						
					 | 
					
						
						
							
							fixed project updation in project about
						
						
						
						
						
						
					 | 
					
						2025-07-09 16:59:36 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							01591c429e
							
						
					 | 
					
						
						
							
							added generic modal for edit profile
						
						
						
						
						
						
					 | 
					
						2025-07-09 16:37:09 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							bba4315a8e
							
						
					 | 
					
						
						
							
							clear button class changed primary to secondary in manage employee form
						
						
						
						
						
						
					 | 
					
						2025-07-09 16:28:14 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							2d33eede45
							
						
					 | 
					
						
						
							
							changed class to clasName
						
						
						
						
						
						
					 | 
					
						2025-07-09 16:26:40 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							710af87db1
							
						
					 | 
					
						
						
							
							removed custome hook for loading state, becuase react-hook provide own state
						
						
						
						
						
						
					 | 
					
						2025-07-09 16:04:39 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							588104a9dd
							
						
					 | 
					
						
						
							
							Nevigate to "Projects" Page Should Display Only Message When No Projects Are Assigned.
						
						
						
						
						
						
					 | 
					
						2025-07-09 15:15:53 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							fca3f03a44
							
						
					 | 
					
						
						
							
							fixed searching for employee
						
						
						
						
						
						
					 | 
					
						2025-07-09 14:33:21 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							d818ea9265
							
						
					 | 
					
						
						
							
							vissible data after updated inside projecr details page
						
						
						
						
						
						
					 | 
					
						2025-07-09 11:48:42 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							87edce4c3d
							
						
					 | 
					
						
						
							
							added signalr events
						
						
						
						
						
						
					 | 
					
						2025-07-09 10:42:04 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e3417287d3
							
						
					 | 
					
						
						
							
							Sizing for the projects directory has been corrected.
						
						
						
						
						
						
					 | 
					
						2025-07-09 10:20:32 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							012c8faca8
							
						
					 | 
					
						
						
							
							Saved Username and Password Not Visible on Login Page Load
						
						
						
						
						
						
					 | 
					
						2025-07-08 13:34:30 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							f7f9c4044b
							
						
					 | 
					
						
						
							
							cache invalidation for calling fro workItem after assign task for today planne
						
						
						
						
						
						
					 | 
					
						2025-07-08 13:31:21 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							2c4ad2ba4a
							
						
					 | 
					
						
						
							
							optimized to prevented for maximum deep rendering
						
						
						
						
						
						
					 | 
					
						2025-07-08 13:30:11 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							ce37d5f447
							
						
					 | 
					
						
						
							
							added date util fun for UTC to Local zone
						
						
						
						
						
						
					 | 
					
						2025-07-08 13:29:09 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							a146d4d15e
							
						
					 | 
					
						
						
							
							Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into react-query
						
						
						
						
						
						
					 | 
					
						2025-07-08 12:28:52 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							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
							
						 
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 |