| 
						
					 | 
					
						
						
						
						
							
						
						
							3d3dcb4f69
							
						
					 | 
					
						
						
							
							In the Attendance Component, dates are filtered to show logs from the last 7 days, including yesterday.
						
						
						
						
						
						
					 | 
					
						2025-05-20 12:56:05 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							8a53e2d8de
							
						
					 | 
					
						
						
							
							replace add phone & email button with icon-only element for cleaner UI
						
						
						
						
						
						
					 | 
					
						2025-05-19 16:32:09 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							35b036398f
							
						
					 | 
					
						
						
							
							chnaged checkbox color
						
						
						
						
						
						
					 | 
					
						2025-05-19 13:37:05 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b71dd7f0f5
							
						
					 | 
					
						
						
							
							Merge pull request 'pramod_Task-#239 : Display in Card View contacts List' (#121) from pramod_Task-#239 into Feature_Directory
						
						
						
						
						
						
						
						Reviewed-on: #121 
						
						
					 | 
					
						2025-05-19 07:29:19 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							99e0cd94d4
							
						
					 | 
					
						
						
							
							text-wrap for organization column value
						
						
						
						
						
						
					 | 
					
						2025-05-19 12:52:53 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							27fafb4f05
							
						
					 | 
					
						
						
							
							use ITEM_PER_PAGE constant to standardize pagination
						
						
						
						
						
						
					 | 
					
						2025-05-19 12:52:23 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0587351cdb
							
						
					 | 
					
						
						
							
							Merge pull request 'Checking all the popups and adding header on it.' (#120) from Kartik_Enhancement#308 into Issue_May_3W
						
						
						
						
						
						
						
						Reviewed-on: #120 
						
						
					 | 
					
						2025-05-19 07:15:50 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							978165d3de
							
						
					 | 
					
						
						
							
							added key for listviewdirectory
						
						
						
						
						
						
					 | 
					
						2025-05-19 12:16:15 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							b9a7d4977c
							
						
					 | 
					
						
						
							
							removed selected
						
						
						
						
						
						
					 | 
					
						2025-05-19 12:15:43 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							65aa8990a3
							
						
					 | 
					
						
						
							
							removed selected
						
						
						
						
						
						
					 | 
					
						2025-05-19 12:15:30 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							9509b0b8da
							
						
					 | 
					
						
						
							
							removed key attribute
						
						
						
						
						
						
					 | 
					
						2025-05-19 12:15:14 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e659b9bb04
							
						
					 | 
					
						
						
							
							Checking all the popups and adding header on it.
						
						
						
						
						
						
					 | 
					
						2025-05-19 11:59:34 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							7e16701b0d
							
						
					 | 
					
						
						
							
							passes props inside CardViewDirectory for open edit modal
						
						
						
						
						
						
					 | 
					
						2025-05-19 11:52:51 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							1e079a89eb
							
						
					 | 
					
						
						
							
							chanaged icons
						
						
						
						
						
						
					 | 
					
						2025-05-19 11:52:06 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							aba02f64c0
							
						
					 | 
					
						
						
							
							added  fun as props to open edit modal
						
						
						
						
						
						
					 | 
					
						2025-05-19 11:51:33 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							c43c668fb8
							
						
					 | 
					
						
						
							
							restore page scroll after modal is closed
						
						
						
						
						
						
					 | 
					
						2025-05-19 11:50:50 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							353238fd60
							
						
					 | 
					
						
						
							
							set default list view
						
						
						
						
						
						
					 | 
					
						2025-05-19 11:24:48 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							b2e1fbcf95
							
						
					 | 
					
						
						
							
							it send properly existen phone and email id if existen data
						
						
						
						
						
						
					 | 
					
						2025-05-19 11:24:27 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							b296dec542
							
						
					 | 
					
						
						
							
							removed header -  icon
						
						
						
						
						
						
					 | 
					
						2025-05-19 11:23:15 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							3efeea55e0
							
						
					 | 
					
						
						
							
							added avatar
						
						
						
						
						
						
					 | 
					
						2025-05-19 11:22:45 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							126a84b5cc
							
						
					 | 
					
						
						
							
							modified phone no validation, accept upto min 6 and max 13
						
						
						
						
						
						
					 | 
					
						2025-05-19 11:22:30 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							7613f36624
							
						
					 | 
					
						
						
							
							added avatar for name
						
						
						
						
						
						
					 | 
					
						2025-05-19 11:21:37 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							1cac05ddcb
							
						
					 | 
					
						
						
							
							updated state for reflacte immediately update in rendered UI
						
						
						
						
						
						
					 | 
					
						2025-05-19 09:47:34 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							49d38f553a
							
						
					 | 
					
						
						
							
							added category filter and search
						
						
						
						
						
						
					 | 
					
						2025-05-18 23:16:34 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							b65be72809
							
						
					 | 
					
						
						
							
							increased width of name coulmn
						
						
						
						
						
						
					 | 
					
						2025-05-18 23:16:04 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							e9903ee2f6
							
						
					 | 
					
						
						
							
							added new component for card View directory-contacts
						
						
						
						
						
						
					 | 
					
						2025-05-18 23:14:45 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b489c094b3
							
						
					 | 
					
						
						
							
							Merge pull request 'pramod_Task-#298 : Update Contact' (#119) from pramod_Task-#298 into Feature_Directory
						
						
						
						
						
						
						
						Reviewed-on: #119 
						
						
					 | 
					
						2025-05-18 12:35:54 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							28e409ff99
							
						
					 | 
					
						
						
							
							Uncommented reset logic on component unmount for cleanup
						
						
						
						
						
						
					 | 
					
						2025-05-18 17:13:58 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							b6a0fb54ac
							
						
					 | 
					
						
						
							
							Re-enabled submit and reset logic, removed console log
						
						
						
						
						
						
					 | 
					
						2025-05-18 17:13:15 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							61ce554e05
							
						
					 | 
					
						
						
							
							prevent to reset form before calling api.
						
						
						
						
						
						
					 | 
					
						2025-05-18 16:57:06 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							d956bfd3cc
							
						
					 | 
					
						
						
							
							added new method for update contact
						
						
						
						
						
						
					 | 
					
						2025-05-18 02:26:58 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							71b9a3602b
							
						
					 | 
					
						
						
							
							added update contact modal
						
						
						
						
						
						
					 | 
					
						2025-05-18 02:25:42 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							68999401e5
							
						
					 | 
					
						
						
							
							created separate contactCategory and contactTag hook for managing contacts creation and edition
						
						
						
						
						
						
					 | 
					
						2025-05-18 02:24:10 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							a837b16a7d
							
						
					 | 
					
						
						
							
							removed console
						
						
						
						
						
						
					 | 
					
						2025-05-18 02:22:21 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							d716a5ffac
							
						
					 | 
					
						
						
							
							modified  hook  prevent to recall api
						
						
						
						
						
						
					 | 
					
						2025-05-18 02:22:01 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							5f33826e61
							
						
					 | 
					
						
						
							
							created new component for update contact
						
						
						
						
						
						
					 | 
					
						2025-05-18 02:18:53 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							8e06991bd3
							
						
					 | 
					
						
						
							
							modified as per required changes.
						
						
						
						
						
						
					 | 
					
						2025-05-18 02:18:13 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							79ad15d572
							
						
					 | 
					
						
						
							
							added new props, for triggering for open modal
						
						
						
						
						
						
					 | 
					
						2025-05-18 02:16:58 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							4d6171e1ed
							
						
					 | 
					
						
						
							
							created new file for directory form schema
						
						
						
						
						
						
					 | 
					
						2025-05-18 02:15:30 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							28a4f63d10
							
						
					 | 
					
						
						
							
							modfified TagInput for prevent multiple rendering
						
						
						
						
						
						
					 | 
					
						2025-05-18 02:14:40 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							c2ead3cd0f
							
						
					 | 
					
						
						
							
							created new component SelectMultiple items
						
						
						
						
						
						
					 | 
					
						2025-05-18 02:13:38 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							b33fad1b17
							
						
					 | 
					
						
						
							
							created style file SelectMultiple component
						
						
						
						
						
						
					 | 
					
						2025-05-18 02:12:12 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pramod Mahajan
							
						 
					 | 
					
						
						
						
						
							
						
						
							5ccdf33c35
							
						
					 | 
					
						
						
							
							added style for Tag list
						
						
						
						
						
						
					 | 
					
						2025-05-18 02:11:09 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d117c0d09b
							
						
					 | 
					
						
						
							
							Merge branch 'Issue_May_3W' of https://git.marcoaiot.com/admin/marco.pms.web into Issue_May_3W
						
						
						
						
						
						
						
						# Conflicts:
#	src/components/Project/AssignRole.jsx 
						
						
					 | 
					
						2025-05-17 17:39:36 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2a5e716615
							
						
					 | 
					
						
						
							
							Merge branch 'kartik_Enhancement#222' into Issue_May_3W
						
						
						
						
						
						
					 | 
					
						2025-05-17 17:38:35 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6477c30bbc
							
						
					 | 
					
						
						
							
							All Changes in Assign Role popup from project list.
						
						
						
						
						
						
					 | 
					
						2025-05-17 17:29:48 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6753bf7287
							
						
					 | 
					
						
						
							
							Merge pull request '"In the Manage Building popup (accessed from Project > Project List, by selecting a project and navigating to Infrastructure), the error message is now correctly displayed as 'Building name is required'.  A previous issue caused the message 'Expected s…' (#115) from Kartik_bug#278 into Issue_May_3W
						
						
						
						
						
						
						
						Reviewed-on: #115 
						
						
					 | 
					
						2025-05-17 10:58:14 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9e6cfdb659
							
						
					 | 
					
						
						
							
							Changes in Attendance tab.
						
						
						
						
						
						
						
						1. Filter the view to show only "Today's" attendance.
2. Display today's date prominently above the names in that tab. 
						
						
					 | 
					
						2025-05-17 10:58:14 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6e2d640542
							
						
					 | 
					
						
						
							
							"In the Manage Building popup (accessed from Project > Project List, by selecting a project and navigating to Infrastructure), the error message is now correctly displayed as 'Building name is required'.  A previous issue caused the message 'Expected string, received null' to appear initially."
						
						
						
						
						
						
					 | 
					
						2025-05-17 10:58:14 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e252c909db
							
						
					 | 
					
						
						
							
							Merge pull request 'Modified Manage task popup from project > project list. Change name planned to completed/planned and completed to Today`s planned.' (#114) from Kartik_Enhancement#276 into Issue_May_3W
						
						
						
						
						
						
						
						Reviewed-on: #114 
						
						
					 | 
					
						2025-05-17 10:57:50 +00:00 | 
					
					
						
						
							
							
							
						
					 |