| 
						
					 | 
					
						
						
						
						
							
						
						
							d25cc3531e
							
						
					 | 
					
						
						
							
							added Tenant Profile
						
						
						
						
						
						
					 | 
					
						2025-08-11 20:24:04 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2d7adbac14
							
						
					 | 
					
						
						
							
							initial setup for tenant profile
						
						
						
						
						
						
					 | 
					
						2025-08-09 17:36:14 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							25f5ff27b1
							
						
					 | 
					
						
						
							
							added skeleton and refresh button
						
						
						
						
						
						
					 | 
					
						2025-08-09 13:01:32 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4bff065153
							
						
					 | 
					
						
						
							
							added pagination and partially added filter
						
						
						
						
						
						
					 | 
					
						2025-08-09 10:30:06 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fb3b55c694
							
						
					 | 
					
						
						
							
							added spinkit loader and integrated inside projectDeatils and InfraPlanning
						
						
						
						
						
						
					 | 
					
						2025-08-08 14:11:22 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							412c2118c9
							
						
					 | 
					
						
						
							
							Merge branch 'Tenant_Manag' of https://git.marcoaiot.com/admin/marco.pms.web into Tenant_Manag
						
						
						
						
						
						
					 | 
					
						2025-08-08 11:27:20 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4ff01d0e60
							
						
					 | 
					
						
						
							
							success fully created tenant with subscription
						
						
						
						
						
						
					 | 
					
						2025-08-08 11:26:17 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fbc53e9ea1
							
						
					 | 
					
						
						
							
							integrated tenant creation and addsubscription
						
						
						
						
						
						
					 | 
					
						2025-08-08 11:26:16 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							34b429c28c
							
						
					 | 
					
						
						
							
							tenant and subscript form full setup
						
						
						
						
						
						
					 | 
					
						2025-08-08 11:25:18 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1dc038c965
							
						
					 | 
					
						
						
							
							tenant creating layout setup properly
						
						
						
						
						
						
					 | 
					
						2025-08-08 11:21:46 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							12cbf576e1
							
						
					 | 
					
						
						
							
							create new tenant app
						
						
						
						
						
						
					 | 
					
						2025-08-08 11:21:46 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5e28f9e372
							
						
					 | 
					
						
						
							
							initially setup tenant manag. setup wizard-form and properly manage data. handle two sperate form with on wizard
						
						
						
						
						
						
					 | 
					
						2025-08-08 11:21:46 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f093b5f532
							
						
					 | 
					
						
						
							
							fixed column size base dvice size
						
						
						
						
						
						
					 | 
					
						2025-08-08 10:40:09 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							edf1bb9601
							
						
					 | 
					
						
						
							
							handle error due to data loading
						
						
						
						
						
						
					 | 
					
						2025-08-08 10:39:00 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f9e9e2b326
							
						
					 | 
					
						
						
							
							Merge pull request 'Expense_Manangement_Feature' (#328) from Expense_Manangement_Feature into main
						
						
						
						
						
						
						
						Reviewed-on: #328 
						
						
					 | 
					
						2025-08-07 12:31:37 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6113bc66c6
							
						
					 | 
					
						
						
							
							Merge branch 'Expense_Manangement_Feature' of https://git.marcoaiot.com/admin/marco.pms.web into Expense_Manangement_Feature
						
						
						
						
						
						
					 | 
					
						2025-08-07 17:57:55 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							acfa254718
							
						
					 | 
					
						
						
							
							correct date picker
						
						
						
						
						
						
					 | 
					
						2025-08-07 17:57:46 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6a3f9e57d9
							
						
					 | 
					
						
						
							
							added proper date
						
						
						
						
						
						
					 | 
					
						2025-08-07 17:57:22 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							952dfefddc
							
						
					 | 
					
						
						
							
							resolved taking incorrect date range
						
						
						
						
						
						
					 | 
					
						2025-08-07 17:57:22 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7333869c2c
							
						
					 | 
					
						
						
							
							Merge branch 'Expense_Manangement_Feature' of https://git.marcoaiot.com/admin/marco.pms.web into Expense_Manangement_Feature
						
						
						
						
						
						
					 | 
					
						2025-08-07 17:47:57 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4167fd0a4d
							
						
					 | 
					
						
						
							
							added margin for reimburment sectin
						
						
						
						
						
						
					 | 
					
						2025-08-07 17:47:45 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							11ef1932b4
							
						
					 | 
					
						
						
							
							view expense  if have any one permission of - viewself, upload, viewALl
						
						
						
						
						
						
					 | 
					
						2025-08-07 17:47:45 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							bbe9c829f3
							
						
					 | 
					
						
						
							
							correct date picker
						
						
						
						
						
						
					 | 
					
						2025-08-07 17:47:44 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1a77c26d6b
							
						
					 | 
					
						
						
							
							added proper date
						
						
						
						
						
						
					 | 
					
						2025-08-07 17:47:44 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							597baede57
							
						
					 | 
					
						
						
							
							resolved taking incorrect date range
						
						
						
						
						
						
					 | 
					
						2025-08-07 17:47:44 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							27bbdae433
							
						
					 | 
					
						
						
							
							added margin for reimburment sectin
						
						
						
						
						
						
					 | 
					
						2025-08-07 17:38:01 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							248254ba3b
							
						
					 | 
					
						
						
							
							view expense  if have any one permission of - viewself, upload, viewALl
						
						
						
						
						
						
					 | 
					
						2025-08-07 17:36:25 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							cb38f9bf98
							
						
					 | 
					
						
						
							
							Merge branch 'Expense_Manangement_Feature' of https://git.marcoaiot.com/admin/marco.pms.web into Expense_Manangement_Feature
						
						
						
						
						
						
					 | 
					
						2025-08-07 17:18:41 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4e059e13c7
							
						
					 | 
					
						
						
							
							correct date picker
						
						
						
						
						
						
					 | 
					
						2025-08-07 17:18:15 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							afd147c7e3
							
						
					 | 
					
						
						
							
							handle expense view permission
						
						
						
						
						
						
					 | 
					
						2025-08-07 17:18:15 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							da12099ba1
							
						
					 | 
					
						
						
							
							added proper date
						
						
						
						
						
						
					 | 
					
						2025-08-07 17:18:15 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7d7549e902
							
						
					 | 
					
						
						
							
							resolved taking incorrect date range
						
						
						
						
						
						
					 | 
					
						2025-08-07 17:18:15 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5188db2c8f
							
						
					 | 
					
						
						
							
							handle condition if project haven't selected
						
						
						
						
						
						
					 | 
					
						2025-08-07 17:18:15 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							69f3516656
							
						
					 | 
					
						
						
							
							handler run time error
						
						
						
						
						
						
					 | 
					
						2025-08-07 17:18:15 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							eb17ec208c
							
						
					 | 
					
						
						
							
							mis out remove expense id from action function
						
						
						
						
						
						
					 | 
					
						2025-08-07 17:18:14 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a0762c3f0f
							
						
					 | 
					
						
						
							
							correct date picker
						
						
						
						
						
						
					 | 
					
						2025-08-07 16:55:52 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							11b1cf22b5
							
						
					 | 
					
						
						
							
							handle expense view permission
						
						
						
						
						
						
					 | 
					
						2025-08-07 16:09:47 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f3e60bf8bc
							
						
					 | 
					
						
						
							
							added proper date
						
						
						
						
						
						
					 | 
					
						2025-08-07 15:50:33 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6963e8ca8c
							
						
					 | 
					
						
						
							
							resolved taking incorrect date range
						
						
						
						
						
						
					 | 
					
						2025-08-07 15:24:13 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							466f362221
							
						
					 | 
					
						
						
							
							handle condition if project haven't selected
						
						
						
						
						
						
					 | 
					
						2025-08-07 14:39:55 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							bd5c2206dd
							
						
					 | 
					
						
						
							
							handler run time error
						
						
						
						
						
						
					 | 
					
						2025-08-07 14:27:19 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							eab4dd94e9
							
						
					 | 
					
						
						
							
							display employee tasks in emp profile
						
						
						
						
						
						
					 | 
					
						2025-08-07 12:57:22 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ed5ff3be4b
							
						
					 | 
					
						
						
							
							success fully created tenant with subscription
						
						
						
						
						
						
					 | 
					
						2025-08-07 11:26:23 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							04580a3f28
							
						
					 | 
					
						
						
							
							integrated tenant creation and addsubscription
						
						
						
						
						
						
					 | 
					
						2025-08-07 01:10:59 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6f2ddacfd1
							
						
					 | 
					
						
						
							
							tenant and subscript form full setup
						
						
						
						
						
						
					 | 
					
						2025-08-06 19:42:40 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6883d87bdc
							
						
					 | 
					
						
						
							
							- Add date format hook
						
						
						
						
						
						
						
						- add Ui for Activities 
						
						
					 | 
					
						2025-08-06 18:32:43 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b85b812981
							
						
					 | 
					
						
						
							
							Handle null variable
						
						
						
						
						
						
					 | 
					
						2025-08-06 17:07:22 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							eb735f443d
							
						
					 | 
					
						
						
							
							Add api to fetch employee project allocation
						
						
						
						
						
						
					 | 
					
						2025-08-06 17:01:40 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9112f9f673
							
						
					 | 
					
						
						
							
							mis out remove expense id from action function
						
						
						
						
						
						
					 | 
					
						2025-08-06 16:56:45 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							199d7ab8ff
							
						
					 | 
					
						
						
							
							Merge pull request 'Highlight Separator Line Between Expense Details and History Section adding border-2 for the thikness of the line.' (#326) from Expense_Bugs into Expense_Manangement_Feature
						
						
						
						
						
						
						
						Reviewed-on: #326
merged 
						
						
					 | 
					
						2025-08-06 09:41:42 +00:00 | 
					
					
						
						
							
							
							
						
					 |