Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								a39d8297a6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'refs/heads/design_3.0_asset_inventory_module' into design_3.0_GlobalHealth
							
							
							
							
							
							
							
							# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/controllers/providers/api/all_requests_provider.dart 
							
						 | 
						
							1 week ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								ae0e08183f
								
							
								
							
						 | 
						
							
							
								
								asset group switching added.
							
							
							
							
							
						 | 
						
							2 weeks ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								174e714d38
								
							
								
							
						 | 
						
							
							
								
								nurse cannot see recall and alert.
							
							
							
							
							
						 | 
						
							3 weeks ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								4e28068eef
								
							
								
							
						 | 
						
							
							
								
								improvement.
							
							
							
							
							
						 | 
						
							3 weeks ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								ceee6d689d
								
							
								
							
						 | 
						
							
							
								
								total working hours added on task detail.
							
							
							
							
							
						 | 
						
							3 weeks ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								b17d6db327
								
							
								
							
						 | 
						
							
							
								
								po number, site, information added in asset details,
							
							
							
							
							
						 | 
						
							3 weeks ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								d3c000004e
								
							
								
							
						 | 
						
							
							
								
								code improvements
							
							
							
							
							
						 | 
						
							4 weeks ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								8578319cc3
								
							
								
							
						 | 
						
							
							
								
								asset inventory module  ready for qa
							
							
							
							
							
						 | 
						
							4 weeks ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								e5775019a4
								
							
								
							
						 | 
						
							
							
								
								asset inventory design
							
							
							
							
							
						 | 
						
							4 weeks ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								89b81391e9
								
							
								
							
						 | 
						
							
							
								
								site contact list api added.
							
							
							
							
							
						 | 
						
							1 month ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								ccef98860f
								
							
								
							
						 | 
						
							
							
								
								recall and alert type request added
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								642d1a908c
								
							
								
							
						 | 
						
							
							
								
								auto login improvement.
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								waseemabbasi22
							
						 | 
						
							
							
							
							
								
							
								6c3f36944a
								
							
								
							
						 | 
						
							
							
								
								auth and attachment fixes
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								b2d3d60152
								
							
								
							
						 | 
						
							
							
								
								logout api added.
							
							
							
							
							
						 | 
						
							3 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								4e665d1959
								
							
								
							
						 | 
						
							
							
								
								attachment fixes
							
							
							
							
							
						 | 
						
							3 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								262b3aa42f
								
							
								
							
						 | 
						
							
							
								
								local auth fail handling and improvements.
							
							
							
							
							
						 | 
						
							3 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								32627bbda1
								
							
								
							
						 | 
						
							
							
								
								form fixes
							
							
							
							
							
						 | 
						
							3 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								456432050d
								
							
								
							
						 | 
						
							
							
								
								timezone header added, update ppm error flow improvement.
							
							
							
							
							
						 | 
						
							3 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								f3f09d1eb2
								
							
								
							
						 | 
						
							
							
								
								timer improvements
							
							
							
							
							
						 | 
						
							4 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								0b0f2ba25c
								
							
								
							
						 | 
						
							
							
								
								improvements.
							
							
							
							
							
						 | 
						
							4 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								40c37f5373
								
							
								
							
						 | 
						
							
							
								
								profile contact detail update added.
							
							
							
							
							
						 | 
						
							4 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								aa11d93409
								
							
								
							
						 | 
						
							
							
								
								update user contact info bottomsheet design and statedate time initial value added
							
							
							
							
							
						 | 
						
							4 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								62dd395a73
								
							
								
							
						 | 
						
							
							
								
								timer picker added, and code improvements
							
							
							
							
							
						 | 
						
							4 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								13be4e960a
								
							
								
							
						 | 
						
							
							
								
								notification issue, otp issue fixed.
							
							
							
							
							
						 | 
						
							5 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								8ae51480f9
								
							
								
							
						 | 
						
							
							
								
								added nurse signature for device transfer request and tested on uat
							
							
							
							
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								56c70671d8
								
							
								
							
						 | 
						
							
							
								
								add contact and created by information for asset transfer and gasrefill request
							
							
							
							
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								06e8831d02
								
							
								
							
						 | 
						
							
							
								
								add label for destination site details
							
							
							
							
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								b320e3751a
								
							
								
							
						 | 
						
							
							
								
								add code for nurse edit gas refill request
							
							
							
							
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								e3531d471d
								
							
								
							
						 | 
						
							
							
								
								ATOMS-783 fixed
							
							
							
							
							
						 | 
						
							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 | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								72823e37f8
								
							
								
							
						 | 
						
							
							
								
								bug-771,804,773,769,776,794,801,796,797,799,811,814 fixed
							
							
							
							
							
						 | 
						
							6 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								3ee2b66fbf
								
							
								
							
						 | 
						
							
							
								
								code clean, unused files removed.
							
							
							
							
							
						 | 
						
							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 | 
						
					
				
					
						
							
							
								 
								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
							
						 | 
						
							
							
							
							
								
							
								e66ae78c83
								
							
								
							
						 | 
						
							
							
								
								files format
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								015b73b634
								
							
								
							
						 | 
						
							
							
								
								ponit 87 fixed.
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								2291350d6f
								
							
								
							
						 | 
						
							
							
								
								added request type for task requests
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								6795ba7f72
								
							
								
							
						 | 
						
							
							
								
								device transfer gas refill merged in ppm_newflow
							
							
							
							
							
						 | 
						
							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
							
						 | 
						
							
							
							
							
								
							
								ab91baf216
								
							
								
							
						 | 
						
							
							
								
								bug fixes mentioned on excel sheet and tested with backend
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								ec63446802
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'refs/heads/design_3.0_ppm_new_flow' into design_3.0_transfer_request_new_flow
							
							
							
							
							
							
							
							# Conflicts:
#	lib/views/pages/user/ppm/ppm_work_order/recurrent_wo/components/task_info_widget.dart 
							
						 | 
						
							8 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								be8c83cc8f
								
							
								
							
						 | 
						
							
							
								
								Asset tranfer api integrated ready to test
							
							
							
							
							
						 | 
						
							8 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								ef50f37a15
								
							
								
							
						 | 
						
							
							
								
								bug 703 fixed.
							
							
							
							
							
						 | 
						
							8 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								6bd888e06a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'design_3.0_ppm_new_flow' into design_3.0_transfer_request_new_flow
							
							
							
							
							
						 | 
						
							8 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								152a0795c6
								
							
								
							
						 | 
						
							
							
								
								add and update gas refill ui and api integrated
							
							
							
							
							
						 | 
						
							8 months ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								4a7f1eb037
								
							
								
							
						 | 
						
							
							
								
								ppm improvement, recurrent task improvement
							
							
							
							
							
						 | 
						
							8 months ago | 
						
					
				
					
						
							
							
								
								 WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								3f90630db9
								
							
								
							
						 | 
						
							
							
								
								gas refill and asset transfer  ui completed waiting for api
							
							
							
							
							
						 | 
						
							8 months ago |