Commit Graph

24 Commits (1daf9b4437f855d86c2b164ce4d778c4adb6a883)

Author SHA1 Message Date
nextwo 62f6f135bb device transfer 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 9dca070121 add asset id to spare parts API
add attachments and signature to the sender & receiver info
2 years ago
Sikander Saleem 1eaf9a21fa asset transfer status fixed. 2 years ago
Sikander Saleem 07c8acf3a3 improvement 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 4997e1e3df Timer Fixed 2 years ago
Sikander Saleem b8051a40fe signature fixes 2 years ago
nextwo d4ea2d4c58 show images in the app + search list issue 2 years ago
nextwo f583151345 show images in the app + search list issue 2 years ago
zaid_daoud 45b66e6b2a Convert (Start Date & End Date) to Timer 2 years ago
Sikander Saleem da911ea7ae fixes 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
zaid_daoud 1bf9d612ad Fixing bugs 3 years ago
MaximusAshraf 910e01324f bug fixing 3 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