zaid_daoud 
							
						 
						
							 
							
							
							
								
							
								e407b00630 
								
							
								 
							
						 
						
							
							
								
								New Work Order [In Progress]  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								
								zaid_daoud 
							
						 
						
							 
							
							
							
								
							
								402f7513bd 
								
							
								 
							
						 
						
							
							
								
								First Action Bottom Sheet Done  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								
								zaid_daoud 
							
						 
						
							 
							
							
							
								
							
								ee16e35485 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								
								zaid_daoud 
							
						 
						
							 
							
							
							
								
							
								fb3f442ed5 
								
							
								 
							
						 
						
							
							
								
								asset search done & filter assets need to be discussed  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								nextwo
							
						 
						
							 
							
							
							
								
							
								e21bde0153 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	lib/l10n/app_ar.arb
#	lib/l10n/app_en.arb
#	lib/new_views/common_widgets/single_item_drop_down_menu.dart 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								nextwo
							
						 
						
							 
							
							
							
								
							
								4cc12691ac 
								
							
								 
							
						 
						
							
							
								
								gas refill  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								
								zaid_daoud 
							
						 
						
							 
							
							
							
								
							
								957e3d9e6f 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	lib/l10n/app_en.arb 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								
								zaid_daoud 
							
						 
						
							 
							
							
							
								
							
								3959068858 
								
							
								 
							
						 
						
							
							
								
								Asset Transfer Done + Multiple Image Picker + Enhancements  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Sikander Saleem
							
						 
						
							 
							
							
							
								
							
								4ffe899ff9 
								
							
								 
							
						 
						
							
							
								
								asset list & detail screens, models, added.  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								
								zaid_daoud 
							
						 
						
							 
							
							
							
								
							
								e419b17bd1 
								
							
								 
							
						 
						
							
							
								
								Service request design done  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Sikander Saleem
							
						 
						
							 
							
							
							
								
							
								2d553b56e0 
								
							
								 
							
						 
						
							
							
								
								service request detail ui changed.  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Sikander Saleem
							
						 
						
							 
							
							
							
								
							
								47b863c479 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	lib/main.dart
#	lib/new_views/common_widgets/app_floating_action_button.dart
#	lib/new_views/common_widgets/app_text_form_field.dart
#	lib/new_views/pages/new_gas_refill_request_page.dart
#	lib/new_views/pages/new_service_request_page.dart
#	lib/views/pages/device_transfer/device_transfer_details.dart
#	lib/views/pages/device_transfer/update_device_transfer.dart
#	lib/views/pages/user/requests/create_request.dart
#	lib/views/pages/user/requests/request_details.dart
#	lib/views/widgets/device_trancfer/device_transfer_info_section.dart
#	lib/views/widgets/device_trancfer/device_transfer_item.dart
#	lib/views/widgets/device_trancfer/device_transfer_list.dart
#	lib/views/widgets/equipment/auto_complete_devices_field.dart
#	lib/views/widgets/equipment/auto_complete_models_field.dart
#	lib/views/widgets/equipment/device_button.dart
#	lib/views/widgets/equipment/device_item.dart
#	lib/views/widgets/equipment/single_device_picker.dart
#	lib/views/widgets/pentry/auto_complete_fields/auto_complete_devices_field.dart
#	lib/views/widgets/requests/service_request_item.dart
#	lib/views/widgets/search/asset_transfer_search_dialog.dart 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Sikander Saleem
							
						 
						
							 
							
							
							
								
							
								7e17bd2558 
								
							
								 
							
						 
						
							
							
								
								localization i18 implementation  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								
								zaid_daoud 
							
						 
						
							 
							
							
							
								
							
								c7d6b68fd2 
								
							
								 
							
						 
						
							
							
								
								Change Asset & Asset Transfer models  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Sikander Saleem
							
						 
						
							 
							
							
							
								
							
								df4a9a4887 
								
							
								 
							
						 
						
							
							
								
								revert code for existing functionality  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								
								zaid_daoud 
							
						 
						
							 
							
							
							
								
							
								b77a36ac50 
								
							
								 
							
						 
						
							
							
								
								Gas refill screen  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								
								zaid_daoud 
							
						 
						
							 
							
							
							
								
							
								b1e93abf4d 
								
							
								 
							
						 
						
							
							
								
								Gas refill design without submit button  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								
								zaid_daoud 
							
						 
						
							 
							
							
							
								
							
								ed759f5dcf 
								
							
								 
							
						 
						
							
							
								
								Still working on gas refill request  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								
								zaid_daoud 
							
						 
						
							 
							
							
							
								
							
								bb1a516f0a 
								
							
								 
							
						 
						
							
							
								
								add the old route  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								
								zaid_daoud 
							
						 
						
							 
							
							
							
								
							
								1db543710e 
								
							
								 
							
						 
						
							
							
								
								Working on gas request screen  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								
								zaid_daoud 
							
						 
						
							 
							
							
							
								
							
								3bdae42769 
								
							
								 
							
						 
						
							
							
								
								1- change text form field code  
							
							 
							
							... 
							
							
							
							2- app bar design
3- working on request gas refill screen 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								
								zaid_daoud 
							
						 
						
							 
							
							
							
								
							
								8e315d54d0 
								
							
								 
							
						 
						
							
							
								
								Default App Bar  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								
								zaid_daoud 
							
						 
						
							 
							
							
							
								
							
								42deeeb104 
								
							
								 
							
						 
						
							
							
								
								new service request page  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								
								zaid_daoud 
							
						 
						
							 
							
							
							
								
							
								0513fe1bc0 
								
							
								 
							
						 
						
							
							
								
								Fix Home App Bar  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								
								zaid_daoud 
							
						 
						
							 
							
							
							
								
							
								dd524bcbd1 
								
							
								 
							
						 
						
							
							
								
								Merged with Majd  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								nextwo
							
						 
						
							 
							
							
							
								
							
								e20f3b5433 
								
							
								 
							
						 
						
							
							
								
								app bar  
							
							 
							
							... 
							
							
							
							nav bar 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								
								zaid_daoud 
							
						 
						
							 
							
							
							
								
							
								05398a9f76 
								
							
								 
							
						 
						
							
							
								
								Enhancement  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								
								zaid_daoud 
							
						 
						
							 
							
							
							
								
							
								a8a7b5a613 
								
							
								 
							
						 
						
							
							
								
								Activate light and dark theme  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								
								zaid_daoud 
							
						 
						
							 
							
							
							
								
							
								ca673787f1 
								
							
								 
							
						 
						
							
							
								
								1 -> New Way of Localizations  
							
							 
							
							... 
							
							
							
							2 -> Implementing Login Page
3 -> New way to achieve responsive design 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								
								zaid_daoud 
							
						 
						
							 
							
							
							
								
							
								3b3de831f0 
								
							
								 
							
						 
						
							
							
								
								Preparing new style (theme & colors)  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Sikander Saleem
							
						 
						
							 
							
							
							
								
							
								1eaf9a21fa 
								
							
								 
							
						 
						
							
							
								
								asset transfer status fixed.  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								
								zaid_daoud 
							
						 
						
							 
							
							
							
								
							
								5aedb12004 
								
							
								 
							
						 
						
							
							
								
								Vendor Fields Have Been Added  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								
								zaid_daoud 
							
						 
						
							 
							
							
							
								
							
								ffaa340d9d 
								
							
								 
							
						 
						
							
							
								
								Enhancements  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								
								zaid_daoud 
							
						 
						
							 
							
							
							
								
							
								d13bfa5f60 
								
							
								 
							
						 
						
							
							
								
								Wo Details Bottom Sheet & Spare Parts Bottom Sheet Design Done  
							
							 
							
							... 
							
							
							
							[without activating update buttons] 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								
								zaid_daoud 
							
						 
						
							 
							
							
							
								
							
								27d3a74d3b 
								
							
								 
							
						 
						
							
							
								
								Search Sub Work Order Screen DONE  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								
									
								
								Sikander Saleem 
							
						 
						
							 
							
							
							
								
							
								13c5b3891a 
								
							
								 
							
						 
						
							
							
								
								equipment status added.  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								
								zaid_daoud 
							
						 
						
							 
							
							
							
								
							
								655f96049c 
								
							
								 
							
						 
						
							
							
								
								Fault Description Became a Dropdown Menu  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								
								zaid_daoud 
							
						 
						
							 
							
							
							
								
							
								5945756e60 
								
							
								 
							
						 
						
							
							
								
								New Work Order Done (Unable to upload Engineer Signature)  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								
								zaid_daoud 
							
						 
						
							 
							
							
							
								
							
								a219d81ccc 
								
							
								 
							
						 
						
							
							
								
								Update Service Request Done  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								
									
								
								Sikander Saleem 
							
						 
						
							 
							
							
							
								
							
								c5c96a4fce 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'atoms_main/main' into main_latest_merged  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/controllers/providers/api/departments_provider.dart
#	lib/controllers/providers/api/device_transfer_provider.dart
#	lib/controllers/providers/api/devices_provider.dart
#	lib/controllers/providers/api/gas_refill_provider.dart
#	lib/controllers/providers/api/hospitals_provider.dart
#	lib/controllers/providers/api/parts_provider.dart
#	lib/controllers/providers/api/regular_visits_provider.dart
#	lib/controllers/providers/api/service_requests_provider.dart
#	lib/controllers/providers/api/status_drop_down/employee/assigned_to_provider.dart
#	lib/controllers/providers/api/status_drop_down/gas_refill/gas_cylinder_size_provider.dart
#	lib/controllers/providers/api/status_drop_down/gas_refill/gas_status_provider.dart
#	lib/controllers/providers/api/status_drop_down/gas_refill/gas_types_provider.dart
#	lib/controllers/providers/api/status_drop_down/pentry/pentry_status_provider.dart
#	lib/controllers/providers/api/status_drop_down/pentry/pentry_task_status_provider.dart
#	lib/controllers/providers/api/status_drop_down/pentry/pentry_visit_status_provider.dart
#	lib/controllers/providers/api/status_drop_down/report/service_report_defect_types_provider.dart
#	lib/controllers/providers/api/status_drop_down/report/service_report_last_calls_provider.dart
#	lib/controllers/providers/api/status_drop_down/report/service_report_priority_provider.dart
#	lib/controllers/providers/api/status_drop_down/report/service_report_reasons_provider.dart
#	lib/controllers/providers/api/status_drop_down/report/service_report_status_provider.dart
#	lib/controllers/providers/api/status_drop_down/report/service_report_types_provider.dart
#	lib/controllers/providers/api/status_drop_down/report/service_types_provider.dart
#	lib/main.dart
#	lib/models/device/device.dart
#	lib/models/device/device_transfer.dart
#	lib/models/device/device_transfer_info.dart
#	lib/models/gas_refill/gas_refill_details.dart
#	lib/models/gas_refill/gas_refill_model.dart
#	lib/models/lookup.dart
#	lib/models/pantry/calibration_tools.dart
#	lib/models/pantry/lookups/contact_person.dart
#	lib/models/pantry/lookups/contact_title.dart
#	lib/models/pantry/pentry.dart
#	lib/models/pantry/pm_kit.dart
#	lib/models/pantry/ppm_check_list.dart
#	lib/models/service_report.dart
#	lib/models/service_request/service_request.dart
#	lib/models/user.dart
#	lib/models/visits/visit.dart
#	lib/models/visits/visits_group.dart
#	lib/views/app_style/colors.dart
#	lib/views/pages/login.dart
#	lib/views/pages/register.dart
#	lib/views/pages/splash_screen.dart
#	lib/views/pages/user/land_page.dart
#	lib/views/pages/user/requests/create_request.dart
#	lib/views/pages/user/requests/report/create_service_report.dart
#	lib/views/pages/user/requests/report/edit_service_report.dart
#	lib/views/pages/user/requests/request_details.dart
#	lib/views/pages/user/visits/pantry/edit_pentry.dart
#	lib/views/pages/user/visits/preventive_maintenance_visits_page.dart
#	lib/views/pages/user/visits/regular_visits_page.dart
#	lib/views/pages/user/visits/update_visits_group_sheet.dart
#	lib/views/pages/user/visits/visit_details.dart
#	lib/views/widgets/app_text_form_field.dart
#	lib/views/widgets/buttons/app_back_button.dart
#	lib/views/widgets/departments/department_button.dart
#	lib/views/widgets/drawer/drawer_item.dart
#	lib/views/widgets/equipment/auto_complete_devices_field.dart
#	lib/views/widgets/equipment/device_button.dart
#	lib/views/widgets/equipment/single_device_picker.dart
#	lib/views/widgets/hospitals/hospital_auto_complete_field.dart
#	lib/views/widgets/hospitals/hospital_button.dart
#	lib/views/widgets/images/multi_image_picker.dart
#	lib/views/widgets/loaders/loading_manager.dart
#	lib/views/widgets/parts/auto_complete_parts_field.dart
#	lib/views/widgets/pentry/auto_complete_fields/auto_complete_devices_field.dart
#	lib/views/widgets/pentry/pentry_calibration_tool_form.dart
#	lib/views/widgets/pentry/pentry_info_form.dart
#	lib/views/widgets/pentry/pentry_pm_kit_form.dart
#	lib/views/widgets/requests/service_request_update_dialog.dart
#	lib/views/widgets/search/service_request_search_bar.dart
#	lib/views/widgets/search/visits_search_bar.dart
#	lib/views/widgets/sound/record_sound.dart
#	lib/views/widgets/sound/sound_player.dart
#	lib/views/widgets/speech_to_text/speech_to_text.dart
#	lib/views/widgets/status/employee/assigned_to_mune.dart
#	lib/views/widgets/status/multi_status_menu.dart
#	lib/views/widgets/status/report/service_status.dart
#	lib/views/widgets/status/single_status_menu.dart
#	lib/views/widgets/timer/app_timer.dart
#	lib/views/widgets/visits/visit_item.dart
#	pubspec.yaml 
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								MaximusAshraf
							
						 
						
							 
							
							
							
								
							
								910e01324f 
								
							
								 
							
						 
						
							
							
								
								bug fixing  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								MaximusAshraf
							
						 
						
							 
							
							
							
								
							
								75fedf395e 
								
							
								 
							
						 
						
							
							
								
								new server edits  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								
									
								
								Sikander Saleem 
							
						 
						
							 
							
							
							
								
							
								4af0c3c9b0 
								
							
								 
							
						 
						
							
							
								
								import optimization  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								
									
								
								Sikander Saleem 
							
						 
						
							 
							
							
							
								
							
								14eceb7ae5 
								
							
								 
							
						 
						
							
							
								
								pentry added.  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								MaximusAshraf
							
						 
						
							 
							
							
							
								
							
								bba0b3d7d7 
								
							
								 
							
						 
						
							
							
								
								version 0.7.4 - update pentry  
							
							 
							
							... 
							
							
							
							add update pentry
add Defect Type and priority for service request
rename and remove unused fields
add search with asset number and view it in service request and ppm visit 
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								Sikander Saleem
							
						 
						
							 
							
							
							
								
							
								df36b3405e 
								
							
								 
							
						 
						
							
							
								
								IOS and Android release configurations  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								
									
								
								Sikander Saleem 
							
						 
						
							 
							
							
							
								
							
								9ce90c745f 
								
							
								 
							
						 
						
							
							
								
								Changes for Phase-1  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								 
								MaximusAshraf
							
						 
						
							 
							
							
							
								
							
								2d2e22fa11 
								
							
								 
							
						 
						
							
							
								
								Initial commit  
							
							 
							
							
							
						 
						
							3 years ago