| 
						
					 | 
					
						
						
						
						
							
						
						
							aa550ed030
							
						
					 | 
					
						
						
							
							In Projects = > Select Project = > Teams = > Clicks on particular employee when user click on profile then it will direclty show documents instead of Attendance.
						
						
						
						
						
						
					 | 
					
						2025-07-26 12:04:18 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							774f287615
							
						
					 | 
					
						
						
							
							Changes in AboutProject.jsx file Change Status where "In Active" show like but we want "InActive"
						
						
						
						
						
						
					 | 
					
						2025-07-26 12:04:18 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1d9de3dbca
							
						
					 | 
					
						
						
							
							UI changes in Employee Profile and Project Profile.
						
						
						
						
						
						
					 | 
					
						2025-07-26 12:04:18 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							bccd8a7bdd
							
						
					 | 
					
						
						
							
							Adding Search functionality in Assigned Task popup when user search by employee name and jobroles.
						
						
						
						
						
						
					 | 
					
						2025-07-26 12:04:17 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7b0cc6cdbe
							
						
					 | 
					
						
						
							
							Adding Search functionality in Assign Task popup when user can search employee by its name and jobroles.
						
						
						
						
						
						
					 | 
					
						2025-07-26 12:04:17 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							464c32c3ba
							
						
					 | 
					
						
						
							
							revert f6d3c6b2abf3324205113d83d1c4bd9dcdda4820
						
						
						
						
						
						
						
						revert When user is Assign to single project then dropdown and All Projects is not seen. 
						
						
					 | 
					
						2025-07-26 12:04:17 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							18fb3a0f09
							
						
					 | 
					
						
						
							
							When user is Assign to single project then dropdown and All Projects is not seen.
						
						
						
						
						
						
					 | 
					
						2025-07-26 12:04:17 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2bc0939d64
							
						
					 | 
					
						
						
							
							Chnages in Header.js wihile user is assigned to single project.
						
						
						
						
						
						
					 | 
					
						2025-07-26 12:04:17 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a23220fb66
							
						
					 | 
					
						
						
							
							Removing Console.log.
						
						
						
						
						
						
					 | 
					
						2025-07-26 12:04:17 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6ce2860457
							
						
					 | 
					
						
						
							
							Project dropdown should only include active ,On Hold and In Progress Projects only show in Projects page.
						
						
						
						
						
						
					 | 
					
						2025-07-26 12:04:17 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3bd2a17c97
							
						
					 | 
					
						
						
							
							Adding In-built scrollbar in Select Teams dropdown and Employees.
						
						
						
						
						
						
					 | 
					
						2025-07-26 12:04:17 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							cdcc9b90e4
							
						
					 | 
					
						
						
							
							Enhancement implemented in the Attendance component to include search functionality.
						
						
						
						
						
						
					 | 
					
						2025-07-26 12:04:16 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d8f892e9f4
							
						
					 | 
					
						
						
							
							Added new field in contact create and update form
						
						
						
						
						
						
					 | 
					
						2025-07-26 12:03:38 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							587029a766
							
						
					 | 
					
						
						
							
							Changes in Employee list and Update and Create pupup of employee change "Role" to "Official designation".
						
						
						
						
						
						
					 | 
					
						2025-07-26 12:03:38 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2d1cddb2e0
							
						
					 | 
					
						
						
							
							At the time of Regularize status code 400 were shown now solved we add error message in popup "Checkout time must be later than check-in time".
						
						
						
						
						
						
					 | 
					
						2025-07-26 12:03:38 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a02c72859f
							
						
					 | 
					
						
						
							
							Blue Highlight Under “Contacts” Tab Disappears When Switching View now its appear.
						
						
						
						
						
						
					 | 
					
						2025-07-26 12:02:32 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d3f21f33b6
							
						
					 | 
					
						
						
							
							added background color property for table row - 'tr-group'-  that grouping entities
						
						
						
						
						
						
					 | 
					
						2025-07-25 18:17:18 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f209b7cb86
							
						
					 | 
					
						
						
							
							Merge pull request 'Search input works for both name and job role filtering. Dropdown correctly shows checkboxes and supports multi-selection. Updated icon appears, and filtering updates the employee list as expected.' (#291) from Kartik_Task#808 into Issues_July_4W
						
						
						
						
						
						
						
						Reviewed-on: #291 
						
						
					 | 
					
						2025-07-25 09:45:43 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c2fe727bec
							
						
					 | 
					
						
						
							
							Merge pull request 'Attendance Log Page Resets to First Page After Performing Action on Other Pages.' (#288) from Kartik_Bug#757 into Issues_July_4W
						
						
						
						
						
						
						
						Reviewed-on: #288 
						
						
					 | 
					
						2025-07-25 09:39:48 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0cb661687a
							
						
					 | 
					
						
						
							
							Search input works for both name and job role filtering. Dropdown correctly shows checkboxes and supports multi-selection. Updated icon appears, and filtering updates the employee list as expected.
						
						
						
						
						
						
					 | 
					
						2025-07-25 11:52:30 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							85bdc270ac
							
						
					 | 
					
						
						
							
							Attendance page search functionality and Attendance Log Page Resets to First Page After Performing Action on Other Pages.
						
						
						
						
						
						
					 | 
					
						2025-07-24 17:40:03 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							678e6bccf6
							
						
					 | 
					
						
						
							
							Merge branch 'Kartik_Bug#757' of https://git.marcoaiot.com/admin/marco.pms.web into Kartik_Bug#757
						
						
						
						
						
						
					 | 
					
						2025-07-24 17:10:25 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4f64a23089
							
						
					 | 
					
						
						
							
							Attendance Log Page Resets to First Page After Performing Action on Other Pages.
						
						
						
						
						
						
					 | 
					
						2025-07-24 17:10:22 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							da434ff649
							
						
					 | 
					
						
						
							
							Merge pull request 'In Projects = > Select Project = > Teams = > Clicks on particular employee when user click on profile then it will direclty show documents instead of Attendance.' (#287) from Kartik_Bug#542 into Issues_July_4W
						
						
						
						
						
						
						
						Reviewed-on: #287 
						
						
					 | 
					
						2025-07-24 10:41:55 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3de7ce30c4
							
						
					 | 
					
						
						
							
							Merge pull request 'Kartik_Bug#787 UI correction in Project Profile and Employee profile page.' (#285) from Kartik_Bug#787 into Issues_July_4W
						
						
						
						
						
						
						
						Reviewed-on: #285 
						
						
					 | 
					
						2025-07-24 10:38:48 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1e509501da
							
						
					 | 
					
						
						
							
							Merge branch 'Kartik_Bug#799' into Issues_July_4W
						
						
						
						
						
						
						
						# Conflicts:
#	src/components/Project/AssignTask.jsx 
						
						
					 | 
					
						2025-07-24 16:04:30 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ba1864a9ff
							
						
					 | 
					
						
						
							
							Merge pull request 'Project dropdown should only include active ,On Hold and In Progress Projects only show in Projects page.' (#281) from Kartik_Bug#792 into Issues_July_4W
						
						
						
						
						
						
						
						Reviewed-on: #281 
						
						
					 | 
					
						2025-07-24 10:29:29 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							95dde88d7a
							
						
					 | 
					
						
						
							
							Merge pull request 'Adding In-built scrollbar in Select Teams dropdown and Employees.' (#278) from Kartik_Bug795 into Issues_July_4W
						
						
						
						
						
						
						
						Reviewed-on: #278 
						
						
					 | 
					
						2025-07-24 10:14:09 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2c3c4087c8
							
						
					 | 
					
						
						
							
							Merge pull request 'Enhancement implemented in the Attendance component to include search functionality.' (#277) from Kartik_Enhancement#759 into Issues_July_4W
						
						
						
						
						
						
						
						Reviewed-on: #277 
						
						
					 | 
					
						2025-07-24 10:10:56 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							bc18cf9cc3
							
						
					 | 
					
						
						
							
							Merge pull request 'Added new field in contact create and update form' (#263) from Ashutosh_Enhancement_#632 into Issues_July_4W
						
						
						
						
						
						
						
						Reviewed-on: #263 
						
						
					 | 
					
						2025-07-24 10:05:41 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d42bb413e8
							
						
					 | 
					
						
						
							
							Merge pull request 'react-query-v2 : react-query intergrated inside attendance and gallery module' (#270) from react-query-v2 into main
						
						
						
						
						
						
						
						Reviewed-on: #270 
						
						
					 | 
					
						2025-07-24 09:41:19 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a6f5c131a3
							
						
					 | 
					
						
						
							
							Attendance Log Page Resets to First Page After Performing Action on Other Pages.
						
						
						
						
						
						
					 | 
					
						2025-07-24 12:03:38 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0a890bf88a
							
						
					 | 
					
						
						
							
							In Projects = > Select Project = > Teams = > Clicks on particular employee when user click on profile then it will direclty show documents instead of Attendance.
						
						
						
						
						
						
					 | 
					
						2025-07-24 10:59:13 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							89674dd771
							
						
					 | 
					
						
						
							
							Changes in AboutProject.jsx file Change Status where "In Active" show like but we want "InActive"
						
						
						
						
						
						
					 | 
					
						2025-07-23 18:22:13 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d4c4454eb1
							
						
					 | 
					
						
						
							
							UI changes in Employee Profile and Project Profile.
						
						
						
						
						
						
					 | 
					
						2025-07-23 17:08:50 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8fd8f395c9
							
						
					 | 
					
						
						
							
							Adding Search functionality in Assigned Task popup when user search by employee name and jobroles.
						
						
						
						
						
						
					 | 
					
						2025-07-23 15:47:41 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e485066bd1
							
						
					 | 
					
						
						
							
							Adding Search functionality in Assign Task popup when user can search employee by its name and jobroles.
						
						
						
						
						
						
					 | 
					
						2025-07-23 15:45:02 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d3822c3590
							
						
					 | 
					
						
						
							
							revert f6d3c6b2abf3324205113d83d1c4bd9dcdda4820
						
						
						
						
						
						
						
						revert When user is Assign to single project then dropdown and All Projects is not seen. 
						
						
					 | 
					
						2025-07-23 06:21:27 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f6d3c6b2ab
							
						
					 | 
					
						
						
							
							When user is Assign to single project then dropdown and All Projects is not seen.
						
						
						
						
						
						
					 | 
					
						2025-07-23 11:47:11 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							df15367397
							
						
					 | 
					
						
						
							
							Chnages in Header.js wihile user is assigned to single project.
						
						
						
						
						
						
					 | 
					
						2025-07-23 11:10:34 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2f2acb7df3
							
						
					 | 
					
						
						
							
							Removing Console.log.
						
						
						
						
						
						
					 | 
					
						2025-07-23 10:55:30 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9dbec1e137
							
						
					 | 
					
						
						
							
							Project dropdown should only include active ,On Hold and In Progress Projects only show in Projects page.
						
						
						
						
						
						
					 | 
					
						2025-07-23 10:52:30 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a021a7b7b2
							
						
					 | 
					
						
						
							
							Adding In-built scrollbar in Select Teams dropdown and Employees.
						
						
						
						
						
						
					 | 
					
						2025-07-22 17:13:45 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e96187cfa1
							
						
					 | 
					
						
						
							
							Enhancement implemented in the Attendance component to include search functionality.
						
						
						
						
						
						
					 | 
					
						2025-07-22 16:47:26 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							820f80562f
							
						
					 | 
					
						
						
							
							Merge pull request 'Kartik_Bug#785' (#274) from Kartik_Bug#785 into Issues_July_4W
						
						
						
						
						
						
						
						Reviewed-on: #274
Merged 
						
						
					 | 
					
						2025-07-22 09:29:12 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b5cf52ba49
							
						
					 | 
					
						
						
							
							Changes in Employee list and Update and Create pupup of employee change "Role" to "Official designation".
						
						
						
						
						
						
					 | 
					
						2025-07-22 09:29:12 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							633e60d141
							
						
					 | 
					
						
						
							
							At the time of Regularize status code 400 were shown now solved we add error message in popup "Checkout time must be later than check-in time".
						
						
						
						
						
						
					 | 
					
						2025-07-22 09:29:12 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							59c36d099b
							
						
					 | 
					
						
						
							
							Merge pull request 'Blue Highlight Under “Contacts” Tab Disappears When Switching View now its appear.' (#275) from Kartik_Bug#789 into Issues_July_4W
						
						
						
						
						
						
						
						Reviewed-on: #275
Merged 
						
						
					 | 
					
						2025-07-22 09:27:01 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e207310f0e
							
						
					 | 
					
						
						
							
							Blue Highlight Under “Contacts” Tab Disappears When Switching View now its appear.
						
						
						
						
						
						
					 | 
					
						2025-07-22 12:53:54 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							43e173d0ef
							
						
					 | 
					
						
						
							
							Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into react-query-v2
						
						
						
						
						
						
					 | 
					
						2025-07-21 09:47:09 +05:30 | 
					
					
						
						
							
							
							
						
					 |