Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							8ba025ca43
							
						
					 | 
					
						
						
							
							added confrim modal, it will take permission first.
						
						
						
						
						
						
					 | 
					
						2025-05-09 11:53:40 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							c78200f80f
							
						
					 | 
					
						
						
							
							removed console
						
						
						
						
						
						
					 | 
					
						2025-05-09 11:53:40 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							71a47f320c
							
						
					 | 
					
						
						
							
							added data props in confrima modal
						
						
						
						
						
						
					 | 
					
						2025-05-09 11:53:40 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							1d9bf0a4dd
							
						
					 | 
					
						
						
							
							added confirmation modal inside team, wherevener delete employee confirm modal appear.
						
						
						
						
						
						
					 | 
					
						2025-05-09 11:53:40 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							21e4af4e33
							
						
					 | 
					
						
						
							
							Changed header alignment to left-aligned in Project list view, employee list view and master view
						
						
						
						
						
						
					 | 
					
						2025-05-09 11:53:22 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							11adad64d5
							
						
					 | 
					
						
						
							
							Updated inline styles to conditionally set 'display' and 'backgroundColor' based on showModal2 state.
						
						
						
						
						
						
						
						Ensures modal appears with a dark overlay when active and is hidden otherwise. 
						
						
					 | 
					
						2025-05-09 11:52:57 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a896a722f1
							
						
					 | 
					
						
						
							
							revert 20f5dee5344e05c402e012daeebdf2404cbff39d
						
						
						
						
						
						
						
						revert revert 77b94e89bd9297e00aa76b7c433628fee221d259
revert handled zero length of array error. 
						
						
					 | 
					
						2025-05-09 11:31:14 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							20f5dee534
							
						
					 | 
					
						
						
							
							revert 77b94e89bd9297e00aa76b7c433628fee221d259
						
						
						
						
						
						
						
						revert handled zero length of array error. 
						
						
					 | 
					
						2025-05-09 11:25:34 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							77b94e89bd
							
						
					 | 
					
						
						
							
							handled zero length of array error.
						
						
						
						
						
						
					 | 
					
						2025-05-09 16:48:06 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							8dddb38278
							
						
					 | 
					
						
						
							
							mismatch approved and reject icons. replaced them
						
						
						
						
						
						
					 | 
					
						2025-05-09 16:47:16 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							2182e764bf
							
						
					 | 
					
						
						
							
							added  "request " entry in filterwise
						
						
						
						
						
						
					 | 
					
						2025-05-09 16:46:31 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8af759bb45
							
						
					 | 
					
						
						
							
							Deleted unnecessary components to clean up and optimize the codebase.
						
						
						
						
						
						
					 | 
					
						2025-05-09 06:36:26 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1887ccf2c0
							
						
					 | 
					
						
						
							
							Employee data is now sent as JSON instead of multipart/form-data during creation and update, with the form shown in a popup and Aadhar/PAN fields removed.
						
						
						
						
						
						
					 | 
					
						2025-05-09 06:36:26 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8251d875e3
							
						
					 | 
					
						
						
							
							Added proper success messages upon creation and update of building, floor, and work area for improved user feedback.
						
						
						
						
						
						
					 | 
					
						2025-05-09 06:34:57 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							6e600e899c
							
						
					 | 
					
						
						
							
							Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issue_May_2W
						
						
						
						
						
						
					 | 
					
						2025-05-09 10:52:40 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a90aa77cf6
							
						
					 | 
					
						
						
							
							Provided proper parameter to employee list api for ont to include inactive employees
						
						
						
						
						
						
					 | 
					
						2025-05-09 10:20:54 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							ff7f61b338
							
						
					 | 
					
						
						
							
							added one more property in avoid column
						
						
						
						
						
						
					 | 
					
						2025-05-09 10:04:50 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							0ac2dc36ff
							
						
					 | 
					
						
						
							
							Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issue_May_2W
						
						
						
						
						
						
					 | 
					
						2025-05-08 18:27:53 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							9f2dfadcfd
							
						
					 | 
					
						
						
							
							added delete repository for Job Role, Activity and Application Role
						
						
						
						
						
						
					 | 
					
						2025-05-08 18:27:43 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							a9cd2097d6
							
						
					 | 
					
						
						
							
							added isSystem property in hiddenColumns because this field will broken table.
						
						
						
						
						
						
					 | 
					
						2025-05-08 18:25:18 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							6c5b62eb40
							
						
					 | 
					
						
						
							
							added delete functionality for each master
						
						
						
						
						
						
					 | 
					
						2025-05-08 18:23:27 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							f76b524ded
							
						
					 | 
					
						
						
							
							changed padding of modal-body and and button postion
						
						
						
						
						
						
					 | 
					
						2025-05-08 18:22:03 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0fc43bb55b
							
						
					 | 
					
						
						
							
							minor gui changes
						
						
						
						
						
						
					 | 
					
						2025-05-08 16:45:33 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ba763f986d
							
						
					 | 
					
						
						
							
							Added logic to the employee list to hide the 'Manage Role' and 'Suspend' buttons for system-defined employees
						
						
						
						
						
						
					 | 
					
						2025-05-08 10:15:33 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							9ac15d3cf7
							
						
					 | 
					
						
						
							
							restrict employee search to first and last name fields only
						
						
						
						
						
						
					 | 
					
						2025-05-08 10:15:07 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							3161288871
							
						
					 | 
					
						
						
							
							handled server negative response, in user readable format
						
						
						
						
						
						
					 | 
					
						2025-05-08 10:14:54 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							7fa502f44c
							
						
					 | 
					
						
						
							
							project list or card will display 10 per page.
						
						
						
						
						
						
					 | 
					
						2025-05-08 10:14:02 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							4175fb67c6
							
						
					 | 
					
						
						
							
							showing custom delete confirmation modal in master module until API is ready
						
						
						
						
						
						
					 | 
					
						2025-05-08 10:13:49 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							865cc7a366
							
						
					 | 
					
						
						
							
							Reset Select Activity field and remove used activity after task submission
						
						
						
						
						
						
					 | 
					
						2025-05-08 10:13:19 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							b004fe8c15
							
						
					 | 
					
						
						
							
							added va;idation for contact person. it will accept only alphabetical character
						
						
						
						
						
						
					 | 
					
						2025-05-08 10:12:23 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							6c4c6db0d7
							
						
					 | 
					
						
						
							
							added form submission logic with loading state management
						
						
						
						
						
						
					 | 
					
						2025-05-08 05:39:24 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							6c9fd4d20a
							
						
					 | 
					
						
						
							
							status filter dropdown available for both view card and list
						
						
						
						
						
						
					 | 
					
						2025-05-08 05:38:44 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a3867dfb2f
							
						
					 | 
					
						
						
							
							Added a toggle switch in the Employee List module to view active and inactive employees separately.
						
						
						
						
						
						
					 | 
					
						2025-05-08 05:38:27 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							4f9d2f091a
							
						
					 | 
					
						
						
							
							dcrease table row size
						
						
						
						
						
						
					 | 
					
						2025-05-08 05:37:33 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							8a1cbebced
							
						
					 | 
					
						
						
							
							hide relase date coumen when active employee and modified  column name of role to project role
						
						
						
						
						
						
					 | 
					
						2025-05-07 18:54:53 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ef2fdf899c
							
						
					 | 
					
						
						
							
							Merge branch 'pramod_Task#186DeleteActivity' into Issue_May_2W
						
						
						
						
						
						
						
						# Conflicts:
#	src/data/menuData.json 
						
						
					 | 
					
						2025-05-07 17:31:50 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e61ba5b53a
							
						
					 | 
					
						
						
							
							remove unused menus
						
						
						
						
						
						
					 | 
					
						2025-05-07 17:29:58 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							1598842436
							
						
					 | 
					
						
						
							
							modified delete modal msg
						
						
						
						
						
						
					 | 
					
						2025-05-07 17:19:41 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							71bb1c25dd
							
						
					 | 
					
						
						
							
							changed position of header
						
						
						
						
						
						
					 | 
					
						2025-05-07 17:18:57 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							00c56788ed
							
						
					 | 
					
						
						
							
							removed directory menu
						
						
						
						
						
						
					 | 
					
						2025-05-07 17:14:30 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							5427fda41e
							
						
					 | 
					
						
						
							
							Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task#186DeleteActivity
						
						
						
						
						
						
					 | 
					
						2025-05-07 17:01:31 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							620bf064c9
							
						
					 | 
					
						
						
							
							changed class to className
						
						
						
						
						
						
					 | 
					
						2025-05-07 16:58:54 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							16a9cab12a
							
						
					 | 
					
						
						
							
							Handled wrong implementation on attendance log popup to show Attendance By Employee name
						
						
						
						
						
						
					 | 
					
						2025-05-07 16:56:56 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							18125f7c6a
							
						
					 | 
					
						
						
							
							Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issue_May_2W
						
						
						
						
						
						
					 | 
					
						2025-05-07 16:43:50 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3607bdc77d
							
						
					 | 
					
						
						
							
							increase page size
						
						
						
						
						
						
					 | 
					
						2025-05-07 16:43:21 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							7c7b5a9be7
							
						
					 | 
					
						
						
							
							changed class to className
						
						
						
						
						
						
					 | 
					
						2025-05-07 16:42:19 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							144f8a0595
							
						
					 | 
					
						
						
							
							Added validation to the Completed Work field to prevent negative values.
						
						
						
						
						
						
					 | 
					
						2025-05-07 11:11:26 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							f3bedf5826
							
						
					 | 
					
						
						
							
							handled console error
						
						
						
						
						
						
					 | 
					
						2025-05-07 16:41:25 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							e0994c6f43
							
						
					 | 
					
						
						
							
							deleted this component. no more used
						
						
						
						
						
						
					 | 
					
						2025-05-07 16:40:04 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							e5f6ac23ef
							
						
					 | 
					
						
						
							
							removed console and unused code
						
						
						
						
						
						
					 | 
					
						2025-05-07 16:38:01 +05:30 | 
					
					
						
						
							
							
							
						
					 |