Sikander Saleem
							
						 
						
							 
							
							
							
								
							
								fd18e5d39c 
								
							
								 
							
						 
						
							
							
								
								dashboard cont  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Sikander Saleem
							
						 
						
							 
							
							
							
								
							
								8347afec6d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'main_latest_merged' into main_design2.0  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/controllers/providers/api/status_drop_down/report/service_report_assistants_employee_provider.dart
#	lib/views/pages/sub_workorder/work_order_details_bottom_sheet.dart
#	lib/views/widgets/status/report/service_report_assistant_employee_menu.dart 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Sikander Saleem
							
						 
						
							 
							
							
							
								
							
								98c68bfbf0 
								
							
								 
							
						 
						
							
							
								
								search work order by assigned employee fixed.  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Sikander Saleem
							
						 
						
							 
							
							
							
								
							
								c9f903fac8 
								
							
								 
							
						 
						
							
							
								
								urgent improvements.  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Sikander Saleem
							
						 
						
							 
							
							
							
								
							
								4ffe899ff9 
								
							
								 
							
						 
						
							
							
								
								asset list & detail screens, models, added.  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								
								zaid_daoud 
							
						 
						
							 
							
							
							
								
							
								7d2afa23cc 
								
							
								 
							
						 
						
							
							
								
								add record player to the recorder  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Sikander Saleem
							
						 
						
							 
							
							
							
								
							
								050c710bf8 
								
							
								 
							
						 
						
							
							
								
								android 1.0.4 released.  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								
								zaid_daoud 
							
						 
						
							 
							
							
							
								
							
								b77a36ac50 
								
							
								 
							
						 
						
							
							
								
								Gas refill screen  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								
								zaid_daoud 
							
						 
						
							 
							
							
							
								
							
								ed759f5dcf 
								
							
								 
							
						 
						
							
							
								
								Still working on gas refill request  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								
									
								
								Sikander Saleem 
							
						 
						
							 
							
							
							
								
							
								f0c605b07d 
								
							
								 
							
						 
						
							
							
								
								improvements  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								
								zaid_daoud 
							
						 
						
							 
							
							
							
								
							
								2d0c72b138 
								
							
								 
							
						 
						
							
							
								
								1- prevent the user from creating a new gas refill request if the department isn't selected.  
							
							 
							
							... 
							
							
							
							2- working on host: https://atomsmdev.hmg.com  
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								
								zaid_daoud 
							
						 
						
							 
							
							
							
								
							
								0f9d4127b4 
								
							
								 
							
						 
						
							
							
								
								[SubWorkOrder]: Auto Filled Fields Depending on ParentId  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								
								zaid_daoud 
							
						 
						
							 
							
							
							
								
							
								60f6cbf1b8 
								
							
								 
							
						 
						
							
							
								
								Voice Note Issue Fixed  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Sikander Saleem
							
						 
						
							 
							
							
							
								
							
								1eaf9a21fa 
								
							
								 
							
						 
						
							
							
								
								asset transfer status fixed.  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								nextwo
							
						 
						
							 
							
							
							
								
							
								798faf51a4 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'zaid_development_new' into majd_development_new  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								nextwo
							
						 
						
							 
							
							
							
								
							
								b3c577d03e 
								
							
								 
							
						 
						
							
							
								
								fix bugs  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								
								zaid_daoud 
							
						 
						
							 
							
							
							
								
							
								5aedb12004 
								
							
								 
							
						 
						
							
							
								
								Vendor Fields Have Been Added  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								
								zaid_daoud 
							
						 
						
							 
							
							
							
								
							
								bd299e2a6d 
								
							
								 
							
						 
						
							
							
								
								Some changes on work orders model attributes & change File Base Url (Still under testing)  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								
								zaid_daoud 
							
						 
						
							 
							
							
							
								
							
								66100c36a4 
								
							
								 
							
						 
						
							
							
								
								Enhancements  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								
								zaid_daoud 
							
						 
						
							 
							
							
							
								
							
								6caab58171 
								
							
								 
							
						 
						
							
							
								
								Merge With Majd [part  #2 ]  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								nextwo
							
						 
						
							 
							
							
							
								
							
								be636bb18b 
								
							
								 
							
						 
						
							
							
								
								some changes  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								
								zaid_daoud 
							
						 
						
							 
							
							
							
								
							
								96c9515e87 
								
							
								 
							
						 
						
							
							
								
								Status for both sender and receiver is synchronized.  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Sikander Saleem
							
						 
						
							 
							
							
							
								
							
								b8051a40fe 
								
							
								 
							
						 
						
							
							
								
								signature fixes  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								
								zaid_daoud 
							
						 
						
							 
							
							
							
								
							
								27d3a74d3b 
								
							
								 
							
						 
						
							
							
								
								Search Sub Work Order Screen DONE  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								
									
								
								Sikander Saleem 
							
						 
						
							 
							
							
							
								
							
								8e2b21bd9d 
								
							
								 
							
						 
						
							
							
								
								gas refill cont.  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								
									
								
								Sikander Saleem 
							
						 
						
							 
							
							
							
								
							
								b4aac2a8b8 
								
							
								 
							
						 
						
							
							
								
								new work order, service type, fault description fixes  
							
							 
							
							
							
						 
						
							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  
						
					 
				
					
						
							
							
								 
								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  
						
					 
				
					
						
							
							
								
								zaid_daoud 
							
						 
						
							 
							
							
							
								
							
								5f7bc0cf6e 
								
							
								 
							
						 
						
							
							
								
								Change service last calls API  
							
							 
							
							
							
						 
						
							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
							
						 
						
							 
							
							
							
								
							
								d869f82020 
								
							
								 
							
						 
						
							
							
								
								implement searchWorkOrders api and edit on ui  
							
							 
							
							
							
						 
						
							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 
							
						 
						
							 
							
							
							
								
							
								048774bd8c 
								
							
								 
							
						 
						
							
							
								
								Enhancements  
							
							 
							
							
							
						 
						
							3 years ago  
						
					 
				
					
						
							
							
								
									
								
								Sikander Saleem 
							
						 
						
							 
							
							
							
								
							
								4f37bb9476 
								
							
								 
							
						 
						
							
							
								
								improvements.  
							
							 
							
							
							
						 
						
							3 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 
							
						 
						
							 
							
							
							
								
							
								079a11ad98 
								
							
								 
							
						 
						
							
							
								
								uat url added.  
							
							 
							
							
							
						 
						
							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  
						
					 
				
					
						
							
							
								 
								MaximusAshraf
							
						 
						
							 
							
							
							
								
							
								2d2e22fa11 
								
							
								 
							
						 
						
							
							
								
								Initial commit  
							
							 
							
							
							
						 
						
							3 years ago