51ac6cf65f 
							
						 
					 
					
						
						
							
							Merge branch 'vikas_78_infra_ui_enhancement' into Feature_Task_Management  
						
						
						
						
					 
					
						2025-04-16 16:11:55 +05:30 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							d1011fd5ec 
							
						 
					 
					
						
						
							
							Merge pull request 'Vaibhav_Task#77' ( #16 ) from Vaibhav_Task#77 into Feature_Task_Management  
						
						... 
						
						
						
						Reviewed-on: #16  
						
						
					 
					
						2025-04-16 10:35:47 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							dcc6b80f12 
							
						 
					 
					
						
						
							
							refactor: clean up Header component for improved readability  
						
						
						
						
					 
					
						2025-04-16 10:35:47 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							6bf8fcf9a2 
							
						 
					 
					
						
						
							
							refactor: optimize Avatar component for better performance and readability  
						
						
						
						
					 
					
						2025-04-16 10:35:47 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							37620c78a1 
							
						 
					 
					
						
						
							
							refactor: update EmployeeProfile component layout and add employee details table  
						
						
						
						
					 
					
						2025-04-16 10:35:47 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							49e3e0735e 
							
						 
					 
					
						
						
							
							refactor(EmployeeProfile): integrate Avatar component for user display and enhance contact information layout  
						
						
						
						
					 
					
						2025-04-16 10:35:47 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							9306c12296 
							
						 
					 
					
						
						
							
							refactor(EmployeeNav): update class names for nav links and correct label for account  
						
						
						
						
					 
					
						2025-04-16 10:35:47 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							e93c39f22f 
							
						 
					 
					
						
						
							
							remove redundant type attribute from button in Dashboard component  
						
						
						
						
					 
					
						2025-04-16 10:35:47 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							64904c3cee 
							
						 
					 
					
						
						
							
							- Change Loader style on Project Details page. Earlier, it was showing multiple glowing circles of various colors. Now only two will be displayed  
						
						... 
						
						
						
						- Changed Navigation Style for project modules. Earlier, we were using pills; now, tabs are used for better visualization
- Changed Navigation Style for Employee Details Page 
						
						
					 
					
						2025-04-16 16:00:48 +05:30 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							88a60a7c48 
							
						 
					 
					
						
						
							
							- Modify Font sizes to suit the theme  
						
						... 
						
						
						
						- Change gay color of grid to match the theme
- realign floor and workarea lebel for visual clearity
- remove background color with the message "No floor added to the building, please add new floor to start working' 
						
						
					 
					
						2025-04-16 15:31:38 +05:30 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							6f19196265 
							
						 
					 
					
						
						
							
							Merge pull request 'pramod_Enhancement#76_ImproveEmpl_ListView' ( #15 ) from pramod_Enhancement#76_ImproveEmpl_ListView into Feature_Task_Management  
						
						... 
						
						
						
						Reviewed-on: #15  
						
						
					 
					
						2025-04-16 09:34:40 +00:00 
						 
				 
			
				
					
						
							
							
								Pramod Mahajan 
							
						 
					 
					
						
						
						
						
							
						
						
							093e38096c 
							
						 
					 
					
						
						
							
							changed export dropdown option and add new model for suspend employee  
						
						
						
						
					 
					
						2025-04-16 09:34:40 +00:00 
						 
				 
			
				
					
						
							
							
								Pramod Mahajan 
							
						 
					 
					
						
						
						
						
							
						
						
							9708a9184c 
							
						 
					 
					
						
						
							
							added new suspend model inside employee list  
						
						
						
						
					 
					
						2025-04-16 09:34:40 +00:00 
						 
				 
			
				
					
						
							
							
								Pramod Mahajan 
							
						 
					 
					
						
						
						
						
							
						
						
							ff0595b021 
							
						 
					 
					
						
						
							
							customize avatar size  
						
						
						
						
					 
					
						2025-04-16 09:34:40 +00:00 
						 
				 
			
				
					
						
							
							
								Pramod Mahajan 
							
						 
					 
					
						
						
						
						
							
						
						
							e3032d2a05 
							
						 
					 
					
						
						
							
							changed export dropdown option and add new model for suspend employee  
						
						
						
						
					 
					
						2025-04-16 11:04:48 +05:30 
						 
				 
			
				
					
						
							
							
								Pramod Mahajan 
							
						 
					 
					
						
						
						
						
							
						
						
							22a8fe580a 
							
						 
					 
					
						
						
							
							added new suspend model inside employee list  
						
						
						
						
					 
					
						2025-04-16 11:01:56 +05:30 
						 
				 
			
				
					
						
							
							
								Pramod Mahajan 
							
						 
					 
					
						
						
						
						
							
						
						
							86b58a7e41 
							
						 
					 
					
						
						
							
							customize avatar size  
						
						
						
						
					 
					
						2025-04-16 11:01:02 +05:30 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							2f5e91aa11 
							
						 
					 
					
						
						
							
							Merge pull request 'individual affect eye icon on pass' ( #13 ) from pramod_Bug#65_EyeIconAffectBoth into Feature_Task_Management  
						
						... 
						
						
						
						Reviewed-on: #13  
						
						
					 
					
						2025-04-16 04:50:10 +00:00 
						 
				 
			
				
					
						
							
							
								Pramod Mahajan 
							
						 
					 
					
						
						
						
						
							
						
						
							f4baa83b6d 
							
						 
					 
					
						
						
							
							individual affect eye icon on pass  
						
						
						
						
					 
					
						2025-04-16 09:36:36 +05:30 
						 
				 
			
				
					
						
							
							
								Pramod Mahajan 
							
						 
					 
					
						
						
						
						
							
						
						
							bcb273d663 
							
						 
					 
					
						
						
							
							Merge branch 'Feature_Task_Management' of  https://git.marcoaiot.com/admin/marco.pms.web  into Feature_Task_Management  
						
						
						
						
					 
					
						2025-04-16 00:19:30 +05:30 
						 
				 
			
				
					
						
							
							
								Pramod Mahajan 
							
						 
					 
					
						
						
						
						
							
						
						
							b73a7fc5ab 
							
						 
					 
					
						
						
							
							added validation for end Date, end date should be greater than start date  
						
						
						
						
					 
					
						2025-04-16 00:16:53 +05:30 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							85cae0a786 
							
						 
					 
					
						
						
							
							Merge pull request 'Vaibhav_Project_Details_Task-#73' ( #11 ) from Vaibhav_Project_Details_Task-#73 into Feature_Task_Management  
						
						... 
						
						
						
						Reviewed-on: #11  
						
						
					 
					
						2025-04-15 12:51:52 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							8b8a518b12 
							
						 
					 
					
						
						
							
							replased nav naming and removed duplicate data  
						
						
						
						
					 
					
						2025-04-15 18:10:17 +05:30 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							47bbb38683 
							
						 
					 
					
						
						
							
							refactor: clean up AboutProject component by removing unused contact fields  
						
						
						
						
					 
					
						2025-04-15 18:07:47 +05:30 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							82e52e1937 
							
						 
					 
					
						
						
							
							Merge pull request 'update icon for Activities and rename User Management to Administration; add Inventory menu item' ( #10 ) from Vaibhav_Sidebar_Task-#70 into Feature_Task_Management  
						
						... 
						
						
						
						Reviewed-on: #10  
						
						
					 
					
						2025-04-15 12:12:13 +00:00 
						 
				 
			
				
					
						
							
							
								Pramod Mahajan 
							
						 
					 
					
						
						
						
						
							
						
						
							7ebd8dcc00 
							
						 
					 
					
						
						
							
							after assigned employee and submit, model will close  
						
						
						
						
					 
					
						2025-04-15 17:26:16 +05:30 
						 
				 
			
				
					
						
							
							
								Pramod Mahajan 
							
						 
					 
					
						
						
						
						
							
						
						
							ab1754aa49 
							
						 
					 
					
						
						
							
							project list display status wise  
						
						
						
						
					 
					
						2025-04-15 17:23:33 +05:30 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							b526e64a65 
							
						 
					 
					
						
						
							
							remove: delete Inventory menu item from Projects submenu  
						
						
						
						
					 
					
						2025-04-15 17:23:19 +05:30 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							89df1fd9c0 
							
						 
					 
					
						
						
							
							update icon for Activities and rename User Management to Administration; add Inventory menu item  
						
						
						
						
					 
					
						2025-04-15 17:20:39 +05:30 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							af7001f563 
							
						 
					 
					
						
						
							
							Merge pull request 'Vaibhav_Dashboard_Enhancement' ( #9 ) from Vaibhav_Dashboard_Enhancement into Feature_Task_Management  
						
						... 
						
						
						
						Reviewed-on: #9  
						
						
					 
					
						2025-04-15 11:42:45 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							4e654444a8 
							
						 
					 
					
						
						
							
							add: enable legend display with reduced font size in HorizontalBarChart  
						
						
						
						
					 
					
						2025-04-15 16:49:05 +05:30 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							c05f3aa0a1 
							
						 
					 
					
						
						
							
							fix: update card subtitle to better reflect project completion status  
						
						
						
						
					 
					
						2025-04-15 16:43:45 +05:30 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							dd697b47b5 
							
						 
					 
					
						
						
							
							add line chart date formatting based on sorted dashboard data  
						
						
						
						
					 
					
						2025-04-15 16:38:26 +05:30 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							9a5bf23712 
							
						 
					 
					
						
						
							
							refactor: remove unnecessary class from time range buttons in Dashboard  
						
						
						
						
					 
					
						2025-04-15 16:29:22 +05:30 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							b57b46440d 
							
						 
					 
					
						
						
							
							add font size adjustment for chart labels in HorizontalBarChart  
						
						
						
						
					 
					
						2025-04-15 16:29:11 +05:30 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							19df5a55ff 
							
						 
					 
					
						
						
							
							dynamically adjust chart height and bar height based on data points in HorizontalBarChart  
						
						
						
						
					 
					
						2025-04-15 15:36:52 +05:30 
						 
				 
			
				
					
						
							
							
								Pramod Mahajan 
							
						 
					 
					
						
						
						
						
							
						
						
							30a9908499 
							
						 
					 
					
						
						
							
							changed Task Report UI  
						
						
						
						
					 
					
						2025-04-15 02:58:01 +05:30 
						 
				 
			
				
					
						
							
							
								Pramod Mahajan 
							
						 
					 
					
						
						
						
						
							
						
						
							d1c36dfd97 
							
						 
					 
					
						
						
							
							Changed 'Role' to 'Application Role'  
						
						
						
						
					 
					
						2025-04-15 01:08:59 +05:30 
						 
				 
			
				
					
						
							
							
								Pramod Mahajan 
							
						 
					 
					
						
						
						
						
							
						
						
							57272eb894 
							
						 
					 
					
						
						
							
							chanaged activityName validation msg  
						
						
						
						
					 
					
						2025-04-15 01:02:15 +05:30 
						 
				 
			
				
					
						
							
							
								Pramod Mahajan 
							
						 
					 
					
						
						
						
						
							
						
						
							5f094aa2e6 
							
						 
					 
					
						
						
							
							added CreateActivity and EditActivity components.  
						
						
						
						
					 
					
						2025-04-15 00:36:20 +05:30 
						 
				 
			
				
					
						
							
							
								Pramod Mahajan 
							
						 
					 
					
						
						
						
						
							
						
						
							6df20de749 
							
						 
					 
					
						
						
							
							it will take default range date, initially whenever component mount  
						
						
						
						
					 
					
						2025-04-14 22:53:38 +05:30 
						 
				 
			
				
					
						
							
							
								Pramod Mahajan 
							
						 
					 
					
						
						
						
						
							
						
						
							ee2762fb4a 
							
						 
					 
					
						
						
							
							removed console  
						
						
						
						
					 
					
						2025-04-14 22:51:58 +05:30 
						 
				 
			
				
					
						
							
							
								Pramod Mahajan 
							
						 
					 
					
						
						
						
						
							
						
						
							97606dfef0 
							
						 
					 
					
						
						
							
							added 'checkLists' array  inside hiddenColumn  
						
						
						
						
					 
					
						2025-04-14 20:15:39 +05:30 
						 
				 
			
				
					
						
							
							
								Pramod Mahajan 
							
						 
					 
					
						
						
						
						
							
						
						
							23223661f0 
							
						 
					 
					
						
						
							
							removed console  
						
						
						
						
					 
					
						2025-04-14 20:14:25 +05:30 
						 
				 
			
				
					
						
							
							
								Pramod Mahajan 
							
						 
					 
					
						
						
						
						
							
						
						
							2d57ab23da 
							
						 
					 
					
						
						
							
							removed console and  unnecessary hook  
						
						
						
						
					 
					
						2025-04-14 20:10:30 +05:30 
						 
				 
			
				
					
						
							
							
								Pramod Mahajan 
							
						 
					 
					
						
						
						
						
							
						
						
							409c80471a 
							
						 
					 
					
						
						
							
							removed href-#  
						
						
						
						
					 
					
						2025-04-14 20:07:59 +05:30 
						 
				 
			
				
					
						
							
							
								Pramod Mahajan 
							
						 
					 
					
						
						
						
						
							
						
						
							a100194508 
							
						 
					 
					
						
						
							
							Merge branch 'Feature_Task_Management' of  https://git.marcoaiot.com/admin/marco.pms.web  into Feature_Task_Management  
						
						
						
						
					 
					
						2025-04-14 20:05:40 +05:30 
						 
				 
			
				
					
						
							
							
								Pramod Mahajan 
							
						 
					 
					
						
						
						
						
							
						
						
							d421355451 
							
						 
					 
					
						
						
							
							added to tooltip in projectCard view more button  
						
						
						
						
					 
					
						2025-04-14 20:05:16 +05:30 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							a39002ccf3 
							
						 
					 
					
						
						
							
							Merge branch 'Feature_Task_Management' of  https://git.marcoaiot.com/admin/marco.pms.web  into Feature_Task_Management  
						
						
						
						
					 
					
						2025-04-14 18:00:02 +05:30 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							87c110a6af 
							
						 
					 
					
						
						
							
							Add UI changes for dashboard.  
						
						... 
						
						
						
						- Reduce dropdown font
- sort project list 
						
						
					 
					
						2025-04-14 17:59:43 +05:30