Commit Graph

31 Commits (6f3978c439d9cebb84e940d0ebc5db45344ec31a)

Author SHA1 Message Date
nextwo 204305f705 dark / ligth dark 2 years ago
zaid_daoud 9ce5ca2f09 Improvements 2 years ago
nextwo 9c43eab5db device transfer 2 years ago
nextwo 57abce1b75 device transfer 2 years ago
nextwo 62f6f135bb device transfer 2 years ago
Sikander Saleem 1ee58eeed9 merge conflict resolved. 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 1e1ac215ea Rename asset to be device as it was before 2 years ago
zaid_daoud c7d6b68fd2 Change Asset & Asset Transfer models 2 years ago
zaid_daoud 3e314447c6 Fix building, floor, room issue when edit sender or receiver 2 years ago
Sikander Saleem 300bc0a1a6 improvements 2 years ago
zaid_daoud 13d4b71128 sender & receiver issue 2 years ago
zaid_daoud 6caab58171 Merge With Majd [part #2] 2 years ago
zaid_daoud 984f46913a Merge remote-tracking branch 'origin/majd_development_new' into zaid_development_new
# Conflicts:
#	lib/models/visits/visits_search.dart
#	lib/views/pages/device_transfer/device_transfer_details.dart
#	lib/views/pages/user/gas_refill/request_gas_refill.dart
#	lib/views/widgets/device_trancfer/device_transfer_info_section.dart
#	lib/views/widgets/search/service_request_search_bar.dart
#	lib/views/widgets/search/visits_search_bar.dart
2 years ago
zaid_daoud 60a2e372a3 Change To Powered By Cloud Solutions, and remove engineer name from the track device transfer info, in addition to merge with majd's branch 2 years ago
zaid_daoud 460c3138fd Merge remote-tracking branch 'origin/majd_development_new' into zaid_development_new
# Conflicts:
#	lib/models/visits/visits_search.dart
#	lib/views/pages/device_transfer/device_transfer_details.dart
#	lib/views/pages/user/visits/visit_details.dart
#	lib/views/widgets/search/service_request_search_bar.dart
#	lib/views/widgets/search/visits_search_bar.dart
2 years ago
nextwo c393f29829 some changes 2 years ago
zaid_daoud ca114f5cf8 the receiver engineer can edit information for both sender and receiver 2 years ago
zaid_daoud 96c9515e87 Status for both sender and receiver is synchronized. 2 years ago
Sikander Saleem 8ada0dd0af fixes-1 2 years ago
zaid_daoud 5890835f7b Simple Changes 2 years ago
Sikander Saleem be6a418bb6 sender & receiver transfer edit login update & fixes 2 years ago
zaid_daoud b97d6e4283 - on deivce transfer list screen, add asset number.
- on deivce transfer details screen, add asset name on 2nd position.
- on deivce transfer details screen, add asset serial number.
- on deivce transfer details screen, rename title to transfer id.
- on deivce transfer details screen, name unit to department.
2 years ago
nextwo 8c0ef0acf0 transfer device + track transfer device 2 years ago
nextwo b51ee155c0 track transfer complete 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
MaximusAshraf 75fedf395e new server edits 3 years ago
MaximusAshraf 72ff36020c remove prints and optimize imports 3 years ago
MaximusAshraf 2d2e22fa11 Initial commit 3 years ago