WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								0996801f66
								
							
								
							
						 | 
						
							
							
								
								notification testing done for all type of request on dev env.
							
							
							
							
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								06acdb184f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes
							
							
							
							
							
							
							
							# Conflicts:
#	lib/views/pages/device_transfer/update_device_transfer.dart 
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								b320e3751a
								
							
								
							
						 | 
						
							
							
								
								add code for nurse edit gas refill request
							
							
							
							
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								5169894dc4
								
							
								
							
						 | 
						
							
							
								
								code restructured and improvements.
							
							
							
							
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								0b97ffe296
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes
							
							
							
							
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								36657cd5ca
								
							
								
							
						 | 
						
							
							
								
								cost added & refactor.
							
							
							
							
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								c1c595b135
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes
							
							
							
							
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								4698a3325e
								
							
								
							
						 | 
						
							
							
								
								add validation for assistant employee start and end date
							
							
							
							
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								a54370005f
								
							
								
							
						 | 
						
							
							
								
								bug 902 fixed.
							
							
							
							
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								7251ba0e93
								
							
								
							
						 | 
						
							
							
								
								ATOMS-893 fixed
							
							
							
							
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								6004ed1a27
								
							
								
							
						 | 
						
							
							
								
								ATOMS-820 fixed
							
							
							
							
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								bd2155ea21
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes
							
							
							
							
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								f780049e87
								
							
								
							
						 | 
						
							
							
								
								ATOMS-881 fixed
							
							
							
							
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								225aa697bd
								
							
								
							
						 | 
						
							
							
								
								Bug 878 fixed
							
							
							
							
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								e16233e642
								
							
								
							
						 | 
						
							
							
								
								Bug 877,fixed
							
							
							
							
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								4e1ff56c65
								
							
								
							
						 | 
						
							
							
								
								type of alert added.
							
							
							
							
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								c41d43d890
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes
							
							
							
							
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								facbb9002d
								
							
								
							
						 | 
						
							
							
								
								ATOMS-811 fixed
							
							
							
							
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								eeafda869a
								
							
								
							
						 | 
						
							
							
								
								ATOMS-857 fixed
							
							
							
							
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								91fb195d4f
								
							
								
							
						 | 
						
							
							
								
								bug 860 fixed.
							
							
							
							
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								02ccdd1f6a
								
							
								
							
						 | 
						
							
							
								
								ATOMS-856 fixed
							
							
							
							
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								e3531d471d
								
							
								
							
						 | 
						
							
							
								
								ATOMS-783 fixed
							
							
							
							
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								b577343353
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes
							
							
							
							
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								824f46b0e3
								
							
								
							
						 | 
						
							
							
								
								ATOMS-823, ATOMS-825, ATOMS-782, ATOMS-784, ATOMS-807, issues fixed
							
							
							
							
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								50fb07b504
								
							
								
							
						 | 
						
							
							
								
								on back confirmation dialog added on gas refill, task and asset transfer
							
							
							
							
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								5b3d746b14
								
							
								
							
						 | 
						
							
							
								
								ui improvements & task details added on details screen
							
							
							
							
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								68ee5d9da7
								
							
								
							
						 | 
						
							
							
								
								Bug 770 fixed.
							
							
							
							
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								5e9ba71be6
								
							
								
							
						 | 
						
							
							
								
								ATOMS-771, ATOMS-804, ATOMS-773, ATOMS-769, ATOMS-776, ATOMS-794, ATOMS-801, ATOMS-796, ATOMS-790, ATOMS-797, ATOMS-799, ATOMS-811, ATOMS-811, ATOMS-817, ATOMS-814, ATOMS-820, ATOMS-829, issues fixed
							
							
							
							
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								99249b4839
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes
							
							
							
							
							
							
							
							# Conflicts:
#	lib/views/pages/device_transfer/device_transfer_details.dart 
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								a42466b578
								
							
								
							
						 | 
						
							
							
								
								ATOMS-771, ATOMS-804, ATOMS-773, ATOMS-769, ATOMS-776, ATOMS-794, ATOMS-801, ATOMS-796, ATOMS-790, ATOMS-797, ATOMS-799, ATOMS-811, ATOMS-811, ATOMS-817, ATOMS-814, ATOMS-820, ATOMS-829, issues fixed
							
							
							
							
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								14c2decd75
								
							
								
							
						 | 
						
							
							
								
								Bug 789 fixed.
							
							
							
							
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								72823e37f8
								
							
								
							
						 | 
						
							
							
								
								bug-771,804,773,769,776,794,801,796,797,799,811,814 fixed
							
							
							
							
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								aca081aee5
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'design_3.0_TM_Module' into design_3.0_TM_Module_bug_fixes
							
							
							
							
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								cf30e72926
								
							
								
							
						 | 
						
							
							
								
								added missing information on task detail page and also added value for task on dashboard list
							
							
							
							
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								93c7fb553d
								
							
								
							
						 | 
						
							
							
								
								task detail page improvement
							
							
							
							
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								71a0ead92c
								
							
								
							
						 | 
						
							
							
								
								loading dialog fix on save and continue button.
							
							
							
							
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								3ee2b66fbf
								
							
								
							
						 | 
						
							
							
								
								code clean, unused files removed.
							
							
							
							
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								98234dc2c7
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'refs/heads/design_3.0_task_flow' into design_3.0_tm_module_task_flow_merged
							
							
							
							
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								b836170ae8
								
							
								
							
						 | 
						
							
							
								
								task detail page improvement
							
							
							
							
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								2abe98726e
								
							
								
							
						 | 
						
							
							
								
								code improvements.
							
							
							
							
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								33dea07449
								
							
								
							
						 | 
						
							
							
								
								merge conflict resolved and file format.
							
							
							
							
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								e0902eddf7
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'refs/heads/demo_branch' into design_3.0_tm_module_task_flow
							
							
							
							
							
							
							
							# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/extensions/widget_extensions.dart
#	lib/l10n/app_ar.arb
#	lib/l10n/app_en.arb
#	lib/new_views/pages/land_page/create_request-type_bottomsheet.dart
#	lib/new_views/pages/new_gas_refill_request_page.dart
#	lib/views/pages/user/gas_refill/request_gas_refill.dart
#	lib/views/widgets/equipment/asset_picker.dart 
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								9edaca4326
								
							
								
							
						 | 
						
							
							
								
								task request module flow completed and tested with backend
							
							
							
							
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								042760e1c9
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/design_3.0_task_flow' into design_3.0_task_flow
							
							
							
							
							
							
							
							# Conflicts:
#	lib/views/pages/user/tasks_request/create_task_view.dart 
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								14e55c63e7
								
							
								
							
						 | 
						
							
							
								
								create task flow completed
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								b75c0b321d
								
							
								
							
						 | 
						
							
							
								
								multiple asset picker added.
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								0fdbe8722e
								
							
								
							
						 | 
						
							
							
								
								task request item view api integrated
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								f50ede8321
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/demo_branch' into demo_branch
							
							
							
							
							
							
							
							# Conflicts:
#	lib/views/pages/user/gas_refill/gas_refill_form.dart 
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								71ee34c658
								
							
								
							
						 | 
						
							
							
								
								gas refill attachment and device transfer assistant employee issue fixes
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								b34014e24f
								
							
								
							
						 | 
						
							
							
								
								sender and receiver comment fixed
							
							
							
							
							
						 | 
						
							7 months ago |