WaseemAbbasi22
							
						 | 
						
							
							
							
							
								
							
								8ae51480f9
								
							
								
							
						 | 
						
							
							
								
								added nurse signature for device transfer request and tested on uat
							
							
							
							
							
						 | 
						
							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 | 
						
					
				
					
						
							
							
								
								 zaid_daoud
							
						 | 
						
							
							
							
							
								
							
								c7d6b68fd2
								
							
								
							
						 | 
						
							
							
								
								Change Asset & Asset Transfer models
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 zaid_daoud
							
						 | 
						
							
							
							
							
								
							
								9dca070121
								
							
								
							
						 | 
						
							
							
								
								add asset id to spare parts API
							
							
							
							
							
							
							
							add attachments and signature to the sender & receiver info 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 zaid_daoud
							
						 | 
						
							
							
							
							
								
							
								3e314447c6
								
							
								
							
						 | 
						
							
							
								
								Fix building, floor, room issue when edit sender or receiver
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 zaid_daoud
							
						 | 
						
							
							
							
							
								
							
								fe1885b367
								
							
								
							
						 | 
						
							
							
								
								Fix asset destination issue
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 zaid_daoud
							
						 | 
						
							
							
							
							
								
							
								fd439a4f46
								
							
								
							
						 | 
						
							
							
								
								Track Asset Transfer [Most Recent]
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 zaid_daoud
							
						 | 
						
							
							
							
							
								
							
								e32de37209
								
							
								
							
						 | 
						
							
							
								
								Improve most recent filter
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 zaid_daoud
							
						 | 
						
							
							
							
							
								
							
								614426853b
								
							
								
							
						 | 
						
							
							
								
								[API doesn't support the required parameters] add search dialog to track asset transfer
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 zaid_daoud
							
						 | 
						
							
							
							
							
								
							
								b16ca9ce77
								
							
								
							
						 | 
						
							
							
								
								Improvements
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 zaid_daoud
							
						 | 
						
							
							
							
							
								
							
								af1874600a
								
							
								
							
						 | 
						
							
							
								
								Improvements
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 zaid_daoud
							
						 | 
						
							
							
							
							
								
							
								8184632ce7
								
							
								
							
						 | 
						
							
							
								
								Improvements
							
							
							
							
							
						 | 
						
							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 | 
						
					
				
					
						
							
							
								
								 zaid_daoud
							
						 | 
						
							
							
							
							
								
							
								11f95b9578
								
							
								
							
						 | 
						
							
							
								
								Search in service request, preventive maintenance, gas refill, and transfer to arrange the requests from most recent to earliestt
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								b8051a40fe
								
							
								
							
						 | 
						
							
							
								
								signature fixes
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 zaid_daoud
							
						 | 
						
							
							
							
							
								
							
								45b66e6b2a
								
							
								
							
						 | 
						
							
							
								
								Convert (Start Date & End Date) to Timer
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								ffacf3949e
								
							
								
							
						 | 
						
							
							
								
								startdate, end date & working hours fixed.
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								nextwo
							
						 | 
						
							
							
							
							
								
							
								1b7c1a3692
								
							
								
							
						 | 
						
							
							
								
								editing in working hours in update transfer device
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								nextwo
							
						 | 
						
							
							
							
							
								
							
								8c0ef0acf0
								
							
								
							
						 | 
						
							
							
								
								transfer device + track transfer device
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								333c684670
								
							
								
							
						 | 
						
							
							
								
								improvements
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								nextwo
							
						 | 
						
							
							
							
							
								
							
								756e2a1881
								
							
								
							
						 | 
						
							
							
								
								implement searchWorkOrders api and edit on ui
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								nextwo
							
						 | 
						
							
							
							
							
								
							
								dad222f8fb
								
							
								
							
						 | 
						
							
							
								
								fix track device transfer issue
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 majd alattari
							
						 | 
						
							
							
							
							
								
							
								ca5e0fa9b4
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'main_latest_merged' into 'majd_development_new'
							
							
							
							
							
							
							
							# Conflicts:
#   lib/controllers/providers/api/device_transfer_provider.dart
#   lib/views/pages/user/land_page.dart
#   lib/views/widgets/status/single_status_menu.dart 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								nextwo
							
						 | 
						
							
							
							
							
								
							
								2c09cdb7e4
								
							
								
							
						 | 
						
							
							
								
								FIX BUGS
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 zaid_daoud
							
						 | 
						
							
							
							
							
								
							
								1bf9d612ad
								
							
								
							
						 | 
						
							
							
								
								Fixing bugs
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								nextwo
							
						 | 
						
							
							
							
							
								
							
								7b49f9f40e
								
							
								
							
						 | 
						
							
							
								
								FIX BUGS
							
							
							
							
							
						 | 
						
							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
							
						 | 
						
							
							
							
							
								
							
								4af0c3c9b0
								
							
								
							
						 | 
						
							
							
								
								import optimization
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								MaximusAshraf
							
						 | 
						
							
							
							
							
								
							
								72ff36020c
								
							
								
							
						 | 
						
							
							
								
								remove prints and optimize imports
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								MaximusAshraf
							
						 | 
						
							
							
							
							
								
							
								2d2e22fa11
								
							
								
							
						 | 
						
							
							
								
								Initial commit
							
							
							
							
							
						 | 
						
							3 years ago |