Commit Graph

61 Commits (84c9efda5ac224cb9c2bedf2646ff7dfca5bdcaa)

Author SHA1 Message Date
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
Sikander Saleem 5fc2aceecf ppm disable edit on closed, gaz refill site fix, & print statements remove. 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
Sikander Saleem 300bc0a1a6 improvements 2 years ago
zaid_daoud f1bb4117e2 Add asset floor and room to create asset transfer screen 2 years ago
Sikander Saleem 1eaf9a21fa asset transfer status fixed. 2 years ago
Sikander Saleem 07c8acf3a3 improvement 2 years ago
zaid_daoud 90fe4e76b7 Asset Transfer Search Dialog Done 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 13d4b71128 sender & receiver issue 2 years ago
zaid_daoud af1874600a Improvements 2 years ago
Sikander Saleem c14aaceb5e rename device with asset 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
nextwo be636bb18b some changes 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
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
zaid_daoud 4d548e1048 In Asset Transfer request add Destination label under pick asset 2 years ago
zaid_daoud ff9cb5102c Solution #2 : View the site and department of picked asset 2 years ago
zaid_daoud fc52f7ec30 View the site and department of picked asset 2 years ago
zaid_daoud 5941a421e2 Not Required Solution 2 years ago
zaid_daoud 8df2edd55f Rename Transfer Device to Transfer Asset 3 years ago
zaid_daoud 4997e1e3df Timer Fixed 3 years ago
Sikander Saleem b8051a40fe signature fixes 3 years ago
Sikander Saleem 8ada0dd0af fixes-1 3 years ago
zaid_daoud 5890835f7b Simple Changes 3 years ago
Sikander Saleem be6a418bb6 sender & receiver transfer edit login update & fixes 3 years ago
nextwo 44654e1e38 some edits 3 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.
3 years ago
zaid_daoud 45b66e6b2a Convert (Start Date & End Date) to Timer 3 years ago
Sikander Saleem da911ea7ae fixes 3 years ago
Sikander Saleem ffacf3949e startdate, end date & working hours fixed. 3 years ago
nextwo 1b7c1a3692 editing in working hours in update transfer device 3 years ago
nextwo 8c0ef0acf0 transfer device + track transfer device 3 years ago
nextwo b51ee155c0 track transfer complete 3 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
3 years ago
nextwo 756e2a1881 implement searchWorkOrders api and edit on ui 3 years ago
zaid daoud 51c5bcc3a0 Merge branch 'main_latest_merged' into 'zaid_development_new'
# Conflicts:
#   lib/views/widgets/equipment/single_device_picker.dart
3 years ago
zaid_daoud d0f083ce22 - Update Login API
- Adding Get Service Request By ID API
3 years ago
nextwo dad222f8fb fix track device transfer issue 3 years ago
nextwo 12764a647c pagintion + FIX BUGS 3 years ago