zaid_daoud
							
						 | 
						
							
							
							
							
								
							
								ee4498a55e
								
							
								
							
						 | 
						
							
							
								
								Date Time Fields (Gas Refill)
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								nextwo
							
						 | 
						
							
							
							
							
								
							
								b51ee155c0
								
							
								
							
						 | 
						
							
							
								
								track transfer complete
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								8e2b21bd9d
								
							
								
							
						 | 
						
							
							
								
								gas refill cont.
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								f118bb4276
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'zaid_development_new' into 'main_latest_merged'
							
							
							
							
							
							
							
							Zaid development new
See merge request haroon6138/cloudsolutions-atoms!31 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								333c684670
								
							
								
							
						 | 
						
							
							
								
								improvements
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								13c5b3891a
								
							
								
							
						 | 
						
							
							
								
								equipment status added.
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								79d987d49e
								
							
								
							
						 | 
						
							
							
								
								improvement
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								b4aac2a8b8
								
							
								
							
						 | 
						
							
							
								
								new work order, service type, fault description fixes
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 zaid_daoud
							
						 | 
						
							
							
							
							
								
							
								f72d2cc41a
								
							
								
							
						 | 
						
							
							
								
								Minor Bug Fixed
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								dd7c866e39
								
							
								
							
						 | 
						
							
							
								
								improvements.
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 zaid_daoud
							
						 | 
						
							
							
							
							
								
							
								c8f498db6a
								
							
								
							
						 | 
						
							
							
								
								Merged with main_latest
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 zaid_daoud
							
						 | 
						
							
							
							
							
								
							
								47b1a0ff36
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'main_latest_merged' into zaid_development_new
							
							
							
							
							
							
							
							# Conflicts:
#	lib/controllers/providers/api/service_requests_provider.dart
#	lib/models/service_report.dart
#	lib/views/pages/user/requests/report/create_service_report.dart 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 zaid_daoud
							
						 | 
						
							
							
							
							
								
							
								655f96049c
								
							
								
							
						 | 
						
							
							
								
								Fault Description Became a Dropdown Menu
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 zaid_daoud
							
						 | 
						
							
							
							
							
								
							
								29466092b0
								
							
								
							
						 | 
						
							
							
								
								Service Type Became Read Only
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 zaid_daoud
							
						 | 
						
							
							
							
							
								
							
								6d6c6c700c
								
							
								
							
						 | 
						
							
							
								
								Enhancements
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 zaid_daoud
							
						 | 
						
							
							
							
							
								
							
								a19bd39516
								
							
								
							
						 | 
						
							
							
								
								Enhancements on Add Work Order Screen
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 zaid_daoud
							
						 | 
						
							
							
							
							
								
							
								c0f801c1c1
								
							
								
							
						 | 
						
							
							
								
								Review Comment in Add Work Order Screen
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 zaid_daoud
							
						 | 
						
							
							
							
							
								
							
								19edc321f5
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'main_latest_merged' into zaid_development_new
							
							
							
							
							
							
							
							# Conflicts:
#	lib/views/pages/user/requests/create_request.dart 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								74b7fc4130
								
							
								
							
						 | 
						
							
							
								
								add work order improvements.
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 zaid_daoud
							
						 | 
						
							
							
							
							
								
							
								4c75debbd5
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/zaid_development_new' into zaid_development_new
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 zaid_daoud
							
						 | 
						
							
							
							
							
								
							
								59ca4277a9
								
							
								
							
						 | 
						
							
							
								
								Enhancements
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								5d4da1961f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/main_latest_merged' into main_latest_merged
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								c24353c9ea
								
							
								
							
						 | 
						
							
							
								
								work order fixes.
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								e20e99bebe
								
							
								
							
						 | 
						
							
							
								
								through fix.
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								f9e9f63348
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'zaid_development_new' into 'main_latest_merged'
							
							
							
							
							
							
							
							Zaid development new
See merge request haroon6138/cloudsolutions-atoms!30 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								ecb8d1e1a7
								
							
								
							
						 | 
						
							
							
								
								improvements
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								29181aa965
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'main_latest_merged' into zaid_development_new
							
							
							
							
							
							
							
							# Conflicts:
#	assets/subtitles/en_subtitle.json
#	lib/controllers/providers/api/status_drop_down/report/service_report_last_calls_provider.dart
#	lib/models/subtitle.dart
#	lib/views/pages/user/requests/report/create_service_report.dart
#	lib/views/pages/user/requests/report/edit_service_report.dart
#	lib/views/widgets/status/report/service_report_status.dart 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								49147eab3d
								
							
								
							
						 | 
						
							
							
								
								improvement.
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 zaid_daoud
							
						 | 
						
							
							
							
							
								
							
								9346990626
								
							
								
							
						 | 
						
							
							
								
								Enhancemnets
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 zaid_daoud
							
						 | 
						
							
							
							
							
								
							
								64cb524917
								
							
								
							
						 | 
						
							
							
								
								Change service last calls API
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								37df63c866
								
							
								
							
						 | 
						
							
							
								
								user role parsing fix.
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 zaid_daoud
							
						 | 
						
							
							
							
							
								
							
								5f7bc0cf6e
								
							
								
							
						 | 
						
							
							
								
								Change service last calls API
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								a69e048388
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'majd_development_new' into 'main_latest_merged'
							
							
							
							
							
							
							
							Majd development new
See merge request haroon6138/cloudsolutions-atoms!29 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								nextwo
							
						 | 
						
							
							
							
							
								
							
								4e89566d1f
								
							
								
							
						 | 
						
							
							
								
								implement searchWorkOrders api and edit on ui
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								nextwo
							
						 | 
						
							
							
							
							
								
							
								8b7b40b0af
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'main_latest_merged' into majd_development_new
							
							
							
							
							
							
							
							# Conflicts:
#	assets/subtitles/ar_subtitle.json
#	assets/subtitles/en_subtitle.json
#	lib/main.dart
#	lib/models/service_request/service_request.dart
#	lib/views/pages/splash_screen.dart
#	lib/views/pages/user/notifications/notifications_page.dart
#	lib/views/pages/user/profile_page.dart
#	lib/views/pages/user/requests/create_request.dart
#	lib/views/pages/user/requests/request_details.dart
#	lib/views/pages/user/requests/requests_page.dart
#	lib/views/widgets/equipment/auto_complete_devices_field.dart
#	lib/views/widgets/equipment/single_device_picker.dart 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 zaid_daoud
							
						 | 
						
							
							
							
							
								
							
								5945756e60
								
							
								
							
						 | 
						
							
							
								
								New Work Order Done (Unable to upload Engineer Signature)
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								nextwo
							
						 | 
						
							
							
							
							
								
							
								2a5a8f411f
								
							
								
							
						 | 
						
							
							
								
								implement searchWorkOrders api and edit on ui
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								nextwo
							
						 | 
						
							
							
							
							
								
							
								756e2a1881
								
							
								
							
						 | 
						
							
							
								
								implement searchWorkOrders api and edit on ui
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								cb8d13a939
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'zaid_development_new' into 'main_latest_merged'
							
							
							
							
							
							
							
							version 0.7.4 - update pentry
See merge request haroon6138/cloudsolutions-atoms!27 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								f39b6f5d8e
								
							
								
							
						 | 
						
							
							
								
								work order improvement.
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								nextwo
							
						 | 
						
							
							
							
							
								
							
								d869f82020
								
							
								
							
						 | 
						
							
							
								
								implement searchWorkOrders api and edit on ui
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 zaid_daoud
							
						 | 
						
							
							
							
							
								
							
								31c7c7376f
								
							
								
							
						 | 
						
							
							
								
								Enhancements
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 zaid_daoud
							
						 | 
						
							
							
							
							
								
							
								62dcae610d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/zaid_development_new' into zaid_development_new
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 zaid_daoud
							
						 | 
						
							
							
							
							
								
							
								7044cc8ff0
								
							
								
							
						 | 
						
							
							
								
								Enhancements
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 zaid daoud
							
						 | 
						
							
							
							
							
								
							
								51c5bcc3a0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'main_latest_merged' into 'zaid_development_new'
							
							
							
							
							
							
							
							# Conflicts:
#   lib/views/widgets/equipment/single_device_picker.dart 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 zaid_daoud
							
						 | 
						
							
							
							
							
								
							
								d0f083ce22
								
							
								
							
						 | 
						
							
							
								
								- Update Login API
							
							
							
							
							
							
							
							- Adding Get Service Request By ID API 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 zaid_daoud
							
						 | 
						
							
							
							
							
								
							
								a219d81ccc
								
							
								
							
						 | 
						
							
							
								
								Update Service Request Done
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 zaid_daoud
							
						 | 
						
							
							
							
							
								
							
								a499889603
								
							
								
							
						 | 
						
							
							
								
								Add New Service Body Changed
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 zaid_daoud
							
						 | 
						
							
							
							
							
								
							
								bdfa26411b
								
							
								
							
						 | 
						
							
							
								
								Add New Service Body Changed
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 zaid_daoud
							
						 | 
						
							
							
							
							
								
							
								93f2378ec5
								
							
								
							
						 | 
						
							
							
								
								Update Service Request Date Still Has Issue
							
							
							
							
							
						 | 
						
							2 years ago |