| 
						
					 | 
					
						
						
						
						
							
						
						
							7385f59bbc
							
						
					 | 
					
						
						
							
							Enhanced CreateActivity Component to Select Service and Activity Group
						
						
						
						
						
						
					 | 
					
						2025-07-01 16:20:37 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9abf869704
							
						
					 | 
					
						
						
							
							Created React Component with Form to Update Service
						
						
						
						
						
						
					 | 
					
						2025-07-01 16:20:37 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							cd9c5b7ba6
							
						
					 | 
					
						
						
							
							Created React Component with Form to Update Activity Group
						
						
						
						
						
						
					 | 
					
						2025-07-01 16:20:37 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							17a1da3198
							
						
					 | 
					
						
						
							
							Create React Component with Form to Create New Activity Group
						
						
						
						
						
						
					 | 
					
						2025-07-01 16:20:37 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							56622ce623
							
						
					 | 
					
						
						
							
							Create React Component with Form to Create New Service
						
						
						
						
						
						
					 | 
					
						2025-07-01 16:20:37 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d3500253c1
							
						
					 | 
					
						
						
							
							Added New Master Entities in Constant Master File and Fetched Lists via useMaster Hook
						
						
						
						
						
						
					 | 
					
						2025-07-01 16:20:37 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							34f8ff7200
							
						
					 | 
					
						
						
							
							Integrated all CRUD APIs for services and activity group in frontend
						
						
						
						
						
						
					 | 
					
						2025-07-01 16:20:37 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c1a31e6b3e
							
						
					 | 
					
						
						
							
							Merge pull request 'Issues_Jun_3W' (#226) from Issues_Jun_3W into main
						
						
						
						
						
						
						
						Reviewed-on: #226 
						
						
					 | 
					
						2025-07-01 10:24:37 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							73b693f826
							
						
					 | 
					
						
						
							
							Merge pull request 'Missing Error Message When Required Fields Are Not Selected in Infrastructure > Create Task' (#225) from Kartik_Bug#521 into Issues_Jun_3W
						
						
						
						
						
						
						
						Reviewed-on: #225 
						
						
					 | 
					
						2025-07-01 09:36:03 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							50f941aef6
							
						
					 | 
					
						
						
							
							Merge pull request '"OTP Sent Successfully" Message Displayed After Sending OTP' (#224) from Kartik_Bug#625 into Issues_Jun_3W
						
						
						
						
						
						
						
						Reviewed-on: #224 
						
						
					 | 
					
						2025-07-01 09:34:14 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							520a0e679e
							
						
					 | 
					
						
						
							
							Merge pull request 'Correction in Login Password text box design.' (#223) from Kartik_Bug#627 into Issues_Jun_3W
						
						
						
						
						
						
						
						Reviewed-on: #223 
						
						
					 | 
					
						2025-07-01 09:33:32 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							85d8434c5f
							
						
					 | 
					
						
						
							
							Merge pull request '401 Unauthorized Error on Attendance Menu.' (#222) from KartikBug#623 into Issues_Jun_3W
						
						
						
						
						
						
						
						Reviewed-on: #222 
						
						
					 | 
					
						2025-07-01 09:32:19 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2226d54f24
							
						
					 | 
					
						
						
							
							Missing Error Message When Required Fields Are Not Selected in Infrastructure > Create Task
						
						
						
						
						
						
					 | 
					
						2025-07-01 12:37:22 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5d99f11297
							
						
					 | 
					
						
						
							
							"OTP Sent Successfully" Message Displayed After Sending OTP
						
						
						
						
						
						
					 | 
					
						2025-07-01 12:33:57 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							390a0b2b67
							
						
					 | 
					
						
						
							
							Correction in Login Password text box design.
						
						
						
						
						
						
					 | 
					
						2025-07-01 12:29:39 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2c0800f0e3
							
						
					 | 
					
						
						
							
							Unnecessary Blank Space Appears Below Employees in Regularization Tab.
						
						
						
						
						
						
					 | 
					
						2025-07-01 12:21:49 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e09413b23a
							
						
					 | 
					
						
						
							
							401 Unauthorized Error on Attendance Menu.
						
						
						
						
						
						
					 | 
					
						2025-07-01 12:19:25 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							bb9c351189
							
						
					 | 
					
						
						
							
							Changes in Search text.
						
						
						
						
						
						
					 | 
					
						2025-06-30 18:29:03 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fb4275fb05
							
						
					 | 
					
						
						
							
							Merge branch 'Issues_Jun_3W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_Jun_3W
						
						
						
						
						
						
					 | 
					
						2025-06-30 17:12:28 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							be0577e6d8
							
						
					 | 
					
						
						
							
							Changing link of ProjectNames to Projects.
						
						
						
						
						
						
					 | 
					
						2025-06-30 17:12:05 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5861288a9d
							
						
					 | 
					
						
						
							
							Merge branch 'Issues_Jun_3W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_Jun_3W
						
						
						
						
						
						
					 | 
					
						2025-06-30 17:03:56 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7615bb9c24
							
						
					 | 
					
						
						
							
							Added line after each module
						
						
						
						
						
						
					 | 
					
						2025-06-30 17:03:52 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7dffae8957
							
						
					 | 
					
						
						
							
							Merge pull request 'Changes in the employee popup size.' (#221) from Kartik_Bug#524 into Issues_Jun_3W
						
						
						
						
						
						
						
						Reviewed-on: #221 
						
						
					 | 
					
						2025-06-30 11:16:51 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							84563812b7
							
						
					 | 
					
						
						
							
							Adding cross button in Employee popup.
						
						
						
						
						
						
					 | 
					
						2025-06-30 16:42:58 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							562a4ca46d
							
						
					 | 
					
						
						
							
							"Changes in the employee popup size."
						
						
						
						
						
						
					 | 
					
						2025-06-30 16:27:12 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9c2b2d0b0e
							
						
					 | 
					
						
						
							
							Merge pull request 'Changes in Directory in Filter, removing unnessary gaps and changing color of HideEditor.' (#220) from Kartik_Enhancement#624 into Issues_Jun_3W
						
						
						
						
						
						
						
						Reviewed-on: #220 
						
						
					 | 
					
						2025-06-30 10:49:47 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0b54e0b5f1
							
						
					 | 
					
						
						
							
							Changes in Directory Notes Filter.
						
						
						
						
						
						
					 | 
					
						2025-06-30 10:49:47 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9554caf25f
							
						
					 | 
					
						
						
							
							Changes in Directory in Filter, removing unnessary gaps and changing color of HideEditor.
						
						
						
						
						
						
					 | 
					
						2025-06-30 10:49:47 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a96d3696bb
							
						
					 | 
					
						
						
							
							Changed the Ids of view infra and manage infra
						
						
						
						
						
						
					 | 
					
						2025-06-30 13:15:30 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d86c8a2c0b
							
						
					 | 
					
						
						
							
							Merge pull request '"Pagination overlaps on '+' (Add) button in Directory – bottom right corner"' (#218) from Kartik_Bug#611 into Issues_Jun_3W
						
						
						
						
						
						
						
						Reviewed-on: #218 
						
						
					 | 
					
						2025-06-30 06:43:00 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							111325968d
							
						
					 | 
					
						
						
							
							"Adding margin-bottom to the pagination section in Directory Notes."
						
						
						
						
						
						
					 | 
					
						2025-06-30 06:41:44 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							baf6a4cf54
							
						
					 | 
					
						
						
							
							"Pagination overlaps on '+' (Add) button in Directory – bottom right corner"
						
						
						
						
						
						
					 | 
					
						2025-06-30 06:41:44 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a1b45c341a
							
						
					 | 
					
						
						
							
							Merge pull request '"Directory filter popup closes on 'Clear' button click – it should remain open"' (#219) from Kartik_Bug#613 into Issues_Jun_3W
						
						
						
						
						
						
						
						Reviewed-on: #219 
						
						
					 | 
					
						2025-06-30 06:38:51 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							da69ae6fec
							
						
					 | 
					
						
						
							
							"In the Directory Notes, applying a filter changes the Clear button's state and color."
						
						
						
						
						
						
					 | 
					
						2025-06-30 06:38:51 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							48d1592b8c
							
						
					 | 
					
						
						
							
							"Directory filter popup closes on 'Clear' button click – it should remain open"
						
						
						
						
						
						
					 | 
					
						2025-06-30 06:38:51 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4700ba38cd
							
						
					 | 
					
						
						
							
							Merge pull request '"Search field height mismatch in Directory – should match Card and List view height"' (#217) from Kartik_Bug#608 into Issues_Jun_3W
						
						
						
						
						
						
						
						Reviewed-on: #217 
						
						
					 | 
					
						2025-06-30 05:18:47 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							67b694c697
							
						
					 | 
					
						
						
							
							"Search field height mismatch in Directory – should match Card and List view height"
						
						
						
						
						
						
					 | 
					
						2025-06-28 15:06:54 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2bdaed1d83
							
						
					 | 
					
						
						
							
							Merge pull request 'Enhanced the Directory module by adding Notes and Contacts tabs, with view-specific controls, export options, and search functionality for Notes.' (#215) from Kartik_Task#513 into Issues_Jun_3W
						
						
						
						
						
						
						
						Reviewed-on: #215 
						
						
					 | 
					
						2025-06-27 11:43:30 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							af22b95316
							
						
					 | 
					
						
						
							
							Merge branch 'Kartik_Task#513' of https://git.marcoaiot.com/admin/marco.pms.web into Kartik_Task#513
						
						
						
						
						
						
					 | 
					
						2025-06-27 17:13:06 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							58c17ffe37
							
						
					 | 
					
						
						
							
							remove divider line.
						
						
						
						
						
						
					 | 
					
						2025-06-27 17:13:02 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c7cd96f509
							
						
					 | 
					
						
						
							
							upadating directory filter in design.
						
						
						
						
						
						
					 | 
					
						2025-06-27 17:13:02 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							92ad8485f6
							
						
					 | 
					
						
						
							
							Clear button is working at filter.
						
						
						
						
						
						
					 | 
					
						2025-06-27 17:13:02 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9396caea57
							
						
					 | 
					
						
						
							
							In Directory changing filter logic and adding popup.
						
						
						
						
						
						
					 | 
					
						2025-06-27 17:13:02 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d646711637
							
						
					 | 
					
						
						
							
							In Directory Inhance Filter in Notes add Clear button and space between checkbox and name.
						
						
						
						
						
						
					 | 
					
						2025-06-27 17:13:02 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a2761bdd4c
							
						
					 | 
					
						
						
							
							Chnages in Directory for fetching data.
						
						
						
						
						
						
					 | 
					
						2025-06-27 17:13:02 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2df8187ade
							
						
					 | 
					
						
						
							
							Changes in Directory.
						
						
						
						
						
						
					 | 
					
						2025-06-27 17:13:02 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							35d5310cee
							
						
					 | 
					
						
						
							
							Some Changes in Directory in Search functionality and Filter by Names.
						
						
						
						
						
						
					 | 
					
						2025-06-27 17:13:02 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							52b796700d
							
						
					 | 
					
						
						
							
							Adding filteration according to names.
						
						
						
						
						
						
					 | 
					
						2025-06-27 17:13:01 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3e0b4edf4a
							
						
					 | 
					
						
						
							
							In directory Creating a tab view and add notes view.
						
						
						
						
						
						
					 | 
					
						2025-06-27 17:12:06 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b39aa2302d
							
						
					 | 
					
						
						
							
							remove divider line.
						
						
						
						
						
						
					 | 
					
						2025-06-27 16:59:24 +05:30 | 
					
					
						
						
							
							
							
						
					 |