Commit Graph

186 Commits (174e714d38b43cbcdf3ec1a79034e4b6a5ae7708)

Author SHA1 Message Date
Sikander Saleem f50ede8321 Merge remote-tracking branch 'origin/demo_branch' into demo_branch
# Conflicts:
#	lib/views/pages/user/gas_refill/gas_refill_form.dart
9 months ago
WaseemAbbasi22 71ee34c658 gas refill attachment and device transfer assistant employee issue fixes 9 months ago
Sikander Saleem b34014e24f sender and receiver comment fixed 9 months ago
WaseemAbbasi22 5963a27213 Merge remote-tracking branch 'origin/demo_branch' into demo_branch 9 months ago
WaseemAbbasi22 43820f01d3 asset transfer attachment issue fixed 9 months ago
Sikander Saleem b0d5e03d5c Merge remote-tracking branch 'origin/demo_branch' into demo_branch 9 months ago
Sikander Saleem c4c68fbe8b asset fixes 9 months ago
WaseemAbbasi22 b592e114bc gas refill attachment issue fixed 9 months ago
WaseemAbbasi22 be8c83cc8f Asset tranfer api integrated ready to test 10 months ago
WaseemAbbasi22 289d06ff68 Asset transfer nurse side ui completed 11 months ago
WaseemAbbasi22 3f90630db9 gas refill and asset transfer ui completed waiting for api 11 months ago
WaseemAbbasi22 c15cec364d Gas refill and Asset Transfer attributes addition done 12 months ago
Sikander Saleem 58f5f6103a app red screen, on drawer & asset filter fixed. 1 year ago
Sikander Saleem 0d333fa688 dashboard screen & service detail screen, flow changed. 1 year ago
Sikander Saleem e6e35ab1d0 null safety conversion complete. 1 year ago
Sikander Saleem be4c8d7653 null safety conversation complete 1 year ago
Sikander Saleem fe8ac14e46 sdk upgrade changes-1. 1 year ago
Sikander Saleem 7d0a2eb65c sdk upgrade changes. 1 year ago
Sikander Saleem ed256dac7c improvements. 2 years ago
nextwo c1c0bcd646 fix show assets 2 years ago
Sikander Saleem 865a2197ad Merge remote-tracking branch 'origin/main_design2.1' into main_design2.1 2 years ago
Sikander Saleem a9042a834c text to speech, call comments & voice record added. 2 years ago
nextwo 49a6ac8996 add oracle code parameter 2 years ago
nextwo e65d2a44ed search asset ui 2 years ago
nextwo 9a1303fc5e search asset ui 2 years ago
nextwo b792585810 add timer list in asset transfer for sender and receiver 2 years ago
nextwo 67854d2e8c add timer list in asset transfer for sender and receiver 2 years ago
Sikander Saleem cfcb5e24ca Selected Nurse made not required 2 years ago
Sikander Saleem 96701730c0 eng can edit device transfer even status is completed. 2 years ago
Sikander Saleem 60639620c6 snag issues resolve 2 years ago
Sikander Saleem caa1f975ab ppm timer & receiver name fixed. 2 years ago
Sikander Saleem 668333dd15 timer issue fix on receiver engineer. 2 years ago
Sikander Saleem 26b82fbda0 attachment added on transfer request. 2 years ago
Sikander Saleem cda5b5cbe5 ppm request no & report status changed 2 years ago
Sikander Saleem 7db4bca3b2 receiver name added on transfer detail 2 years ago
Sikander Saleem a6dd802321 receiver name added on new transfer request & improvements 2 years ago
Sikander Saleem c25862b98d improvement 2 years ago
Sikander Saleem 4d0b18b5a8 room model & gas refill request number added. 2 years ago
Sikander Saleem 2932796068 asset transfer room model & comment added 2 years ago
Sikander Saleem 162ebd38be gas & transfer request status on open improvement. 2 years ago
Sikander Saleem 88108686d0 sender & receiver transfer fix. 2 years ago
Sikander Saleem 6bb2b81ac3 improvements & fixes 2 years ago
Sikander Saleem a7f5fcb911 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
Sikander Saleem 8079646728 timer on device transfer, 2 years ago
nextwo 6b740549a5 my requests pagination + Sender only close sender request Sender,
Receiver can do both jobs, sender & receiver.
2 years ago
zaid_daoud 23700d0adf Enhancements on Asset Details Screen (SHOW MODEL NAME & FIX DATES FORMAT) 2 years ago
zaid_daoud 9e2baae2e2 Change Chart Design && Update dark theme colors 2 years ago
zaid_daoud 04da316440 Fix Asset Filter Pagination Issue 2 years ago
zaid_daoud 9971416f6f Enhancements 2 years ago
zaid_daoud 5b9a33c519 Enhancements on Assets Filter 2 years ago
zaid_daoud 2a2142adb3 Enhancements on Assets Filter 2 years ago
zaid_daoud 5eb1ab2755 Enhancements 2 years ago
zaid_daoud 82720bf831 Enhancements 2 years ago
zaid_daoud cb658f0e60 Enhancements on search and filter reset button 2 years ago
zaid_daoud 51ef873770 Reformatting code 2 years ago
nextwo 81afa14ffc When we have filters, add reset button. 2 years ago
nextwo 7966378016 When we have filters, add reset button. 2 years ago
zaid_daoud a403fb0028 Device Transfer Issued Fixed For Sender & Receiver 2 years ago
Sikander Saleem 09f24edb35 eSignature fixed, 2 years ago
nextwo 0a699fe33b Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
zaid_daoud 884471009a Sub work order screen under testing 2 years ago
nextwo b295256d66 When log out, it keeps loading ,
On asset transfer, on complete & close , dont show edit button,
Signature issue on update asset.
On calendar weekly swipe data calling issue.
Also on monthly
2 years ago
Sikander Saleem ab83963c65 improvements 2 years ago
nextwo 4757c73737 dark / ligth dark 2 years ago
nextwo 204305f705 dark / ligth dark 2 years ago
zaid_daoud 9ce5ca2f09 Improvements 2 years ago
zaid_daoud a2e2d9ac12 Timer For Working Hours 2 years ago
nextwo 9c43eab5db device transfer 2 years ago
nextwo 57abce1b75 device transfer 2 years ago
nextwo 62f6f135bb device transfer 2 years ago
zaid_daoud 32e54d6853 add [pm date range] & [equipment status] to asset filter 2 years ago
zaid_daoud 6258035a88 add room field to asset transfer 2 years ago
zaid_daoud fb3f442ed5 asset search done & filter assets need to be discussed 2 years ago
zaid_daoud 5cf84e6988 Change device class name to asset 2 years ago
zaid_daoud 3959068858 Asset Transfer Done + Multiple Image Picker + Enhancements 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
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 3 years ago
zaid_daoud ca114f5cf8 the receiver engineer can edit information for both sender and receiver 3 years ago
zaid_daoud 96c9515e87 Status for both sender and receiver is synchronized. 3 years ago