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
							
						 | 
						
							
							
							
							
								
							
								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 | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								e66ae78c83
								
							
								
							
						 | 
						
							
							
								
								files format
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								015b73b634
								
							
								
							
						 | 
						
							
							
								
								ponit 87 fixed.
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								5963a27213
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/demo_branch' into demo_branch
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								43820f01d3
								
							
								
							
						 | 
						
							
							
								
								asset transfer  attachment issue fixed
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								b0d5e03d5c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/demo_branch' into demo_branch
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								c4c68fbe8b
								
							
								
							
						 | 
						
							
							
								
								asset fixes
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								b592e114bc
								
							
								
							
						 | 
						
							
							
								
								gas refill attachment issue fixed
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								2291350d6f
								
							
								
							
						 | 
						
							
							
								
								added request type for task requests
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								b506616f48
								
							
								
							
						 | 
						
							
							
								
								bug  fixes for recurrent task and service request added missing details mentioned in bugs sheet
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								ef6c14ba55
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'design_3.0_transfer_request_new_flow' into demo_branch
							
							
							
							
							
							
							
							# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/l10n/app_ar.arb
#	lib/l10n/app_en.arb
#	lib/models/new_models/gas_refill_model.dart
#	lib/new_views/common_widgets/default_app_bar.dart
#	lib/views/pages/user/gas_refill/gas_refill_details.dart
#	lib/views/pages/user/ppm/update_ppm/ppm_pm_kits_form.dart 
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								5031c3cbb8
								
							
								
							
						 | 
						
							
							
								
								gas refill fixes
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								045c890a27
								
							
								
							
						 | 
						
							
							
								
								bug fixes
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								ab91baf216
								
							
								
							
						 | 
						
							
							
								
								bug fixes mentioned on excel sheet and tested with backend
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								e4dd92c4a9
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/design_3.0_ppm_new_flow' into design_3.0_ppm_new_flow
							
							
							
							
							
							
							
							# Conflicts:
#	lib/views/pages/user/ppm/update_ppm/wo_info_form.dart 
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								a66215ef8b
								
							
								
							
						 | 
						
							
							
								
								bug fixes
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								e13a7c9634
								
							
								
							
						 | 
						
							
							
								
								rename text
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								5825464ed5
								
							
								
							
						 | 
						
							
							
								
								ppm wo inspection back button added.
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								99ef704913
								
							
								
							
						 | 
						
							
							
								
								rename points done
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								5302858097
								
							
								
							
						 | 
						
							
							
								
								confirmation dialog added on ppm & recurrent
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								15e62bb004
								
							
								
							
						 | 
						
							
							
								
								Task Request Design complete
							
							
							
							
							
						 | 
						
							8 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								6b51805827
								
							
								
							
						 | 
						
							
							
								
								improvement
							
							
							
							
							
						 | 
						
							8 months ago |