Commit Graph

66 Commits (d7c8d9f3cf97e985071dce9ede3ec1d44bc5ecc2)

Author SHA1 Message Date
Sikander Saleem 8d45b02614 Merge branch 'refs/heads/main_production_ai_enhancement' into ui_ux_rollout_merge
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/modules/cm_module/views/components/service_request_detail_view.dart
#	lib/views/widgets/dialogs/loading_dialog.dart
#	lib/views/widgets/equipment/asset_detail_page.dart
#	lib/views/widgets/equipment/asset_item_gridview.dart
#	lib/views/widgets/equipment/asset_item_listview.dart
#	lib/views/widgets/equipment/single_device_picker.dart
#	pubspec.yaml
3 months ago
Sikander Saleem fbc14318e5 asset images upload functionality added for ai training. 3 months ago
Sikander Saleem f356d5efcd improvements. 5 months ago
Sikander Saleem 141d8c001f icon added & improvements 5 months ago
Sikander Saleem 252a03b219 ui changes 5 months ago
Sikander Saleem 3429dcff60 ui changes 5 months ago
WaseemAbbasi22 77f5d41757 export feature added for asset and my request 5 months ago
Sikander Saleem 16a2fa2b26 files refactoring 11 months ago
Sikander Saleem c1b1f37eec asset search loading ui fixed. 1 year ago
WaseemAbbasi22 72823e37f8 bug-771,804,773,769,776,794,801,796,797,799,811,814 fixed 1 year ago
Sikander Saleem 58f5f6103a app red screen, on drawer & asset filter fixed. 2 years ago
Sikander Saleem 0d333fa688 dashboard screen & service detail screen, flow changed. 2 years ago
Sikander Saleem e6e35ab1d0 null safety conversion complete. 2 years ago
Sikander Saleem be4c8d7653 null safety conversation complete 2 years ago
Sikander Saleem fe8ac14e46 sdk upgrade changes-1. 2 years ago
nextwo e65d2a44ed search asset ui 2 years ago
nextwo 9a1303fc5e search asset ui 2 years ago
nextwo 3cc7176c63 scan asset ui 2 years ago
Sikander Saleem 60639620c6 snag issues resolve 3 years ago
zaid_daoud 9e2baae2e2 Change Chart Design && Update dark theme colors 3 years ago
zaid_daoud 7418e8d937 Fix Asset Filter Pagination Issue 3 years ago
zaid_daoud 04da316440 Fix Asset Filter Pagination Issue 3 years ago
zaid_daoud 03748d4fb4 Fixing asset picker and asset details issue 3 years ago
Sikander Saleem 593cecbe55 improvements 3 years ago
zaid_daoud 51ef873770 Reformatting code 3 years ago
Sikander Saleem 29e414a703 user profile change added & improvements. 3 years ago
Sikander Saleem ecacd2ec8f request list added on my requests. 3 years ago
Sikander Saleem ab83963c65 improvements 3 years ago
zaid_daoud e29946e280 Search All Requests Done 3 years ago
Sikander Saleem 34bae463b6 improvements. 3 years ago
Sikander Saleem f519841c04 improvements. 3 years ago
nextwo 204305f705 dark / ligth dark 3 years ago
nextwo 4ec0b27afa loclization 3 years ago
Sikander Saleem fd18e5d39c dashboard cont 3 years ago
zaid_daoud fb3f442ed5 asset search done & filter assets need to be discussed 3 years ago
zaid_daoud 5cf84e6988 Change device class name to asset 3 years ago
Sikander Saleem 487b04514a Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
#	lib/views/widgets/equipment/single_device_picker.dart
3 years ago
Sikander Saleem 4ffe899ff9 asset list & detail screens, models, added. 3 years ago
zaid_daoud 5b1e067a93 Pick asset screen design 3 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
3 years ago
Sikander Saleem 7e17bd2558 localization i18 implementation 3 years ago
zaid_daoud 1e1ac215ea Rename asset to be device as it was before 3 years ago
zaid_daoud c7d6b68fd2 Change Asset & Asset Transfer models 3 years ago
Sikander Saleem 5fc2aceecf ppm disable edit on closed, gaz refill site fix, & print statements remove. 3 years ago
zaid_daoud 05d1976969 Make QR code searches for a specific elements which are equal to asset no. 3 years ago
zaid_daoud 6caab58171 Merge With Majd [part #2] 3 years ago
nextwo be636bb18b some changes 3 years ago
zaid_daoud 4d548e1048 In Asset Transfer request add Destination label under pick asset 3 years ago
nextwo f583151345 show images in the app + search list issue 3 years ago
nextwo 44654e1e38 some edits 3 years ago