From f47d59c43fa81b7843a921fd1c5c0107b2df9b24 Mon Sep 17 00:00:00 2001 From: mosazaid Date: Tue, 5 Oct 2021 10:13:11 +0300 Subject: [PATCH] fix bugs pharmacy home --- .../pharmacy_module_view_model.dart | 30 ++++++++----------- .../screens/pharmacy_module_page.dart | 5 +--- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/lib/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart b/lib/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart index 7bcb8f91..b07585a8 100644 --- a/lib/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart +++ b/lib/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart @@ -6,6 +6,7 @@ import 'package:diplomaticquarterapp/core/model/pharmacies/PharmacyProduct.dart' import 'package:diplomaticquarterapp/core/model/pharmacies/Prescriptions.dart'; import 'package:diplomaticquarterapp/core/model/pharmacies/recommendedProduct_model.dart'; import 'package:diplomaticquarterapp/core/service/medical/prescriptions_service.dart'; + //import 'package:diplomaticquarterapp/core/model/prescriptions/perscription_pharmacy.dart'; import 'package:diplomaticquarterapp/core/service/parmacyModule/parmacy_module_service.dart'; import 'package:diplomaticquarterapp/core/service/parmacyModule/prescription_service.dart'; @@ -14,21 +15,19 @@ import 'package:diplomaticquarterapp/services/pharmacy_services/recommendedProdu import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart'; import 'package:diplomaticquarterapp/uitl/navigation_service.dart'; - import '../../../locator.dart'; class PharmacyModuleViewModel extends BaseViewModel { - PharmacyModuleService _pharmacyService = locator(); - RecommendedProductService _recommendedProductService = locator(); + RecommendedProductService _recommendedProductService = + locator(); List get bannerList => _pharmacyService.bannerItems; - List get recommendedProductList => + List get recommendedProductList => _recommendedProductService.recommendedList; - Future getBannerList() async { _pharmacyService.bannerItems.clear(); // setState(ViewState.BusyLocal); @@ -37,17 +36,15 @@ class PharmacyModuleViewModel extends BaseViewModel { await _pharmacyService.getBannerListList(); GifLoaderDialogUtils.hideDialog( locator().navigatorKey.currentContext); - // if (_pharmacyService.hasError) - // { - // error = _pharmacyService.error; - // setState(ViewState.Error); - // } else - // setState(ViewState.Idle); + if (_pharmacyService.hasError) { + error = _pharmacyService.error; + setState(ViewState.Error); + } else + setState(ViewState.Idle); } Future getPharmacyHomeData() async { - if(authenticatedUserObject.isLogin) - await generatePharmacyToken(); + if (authenticatedUserObject.isLogin) await generatePharmacyToken(); var data = await sharedPref.getObject(USER_PROFILE); var customerId = await sharedPref.getString(PHARMACY_CUSTOMER_ID); @@ -72,6 +69,7 @@ class PharmacyModuleViewModel extends BaseViewModel { setState(ViewState.Idle); } } + Future generatePharmacyToken() async { setState(ViewState.Busy); await _pharmacyService.generatePharmacyToken(); @@ -83,7 +81,6 @@ class PharmacyModuleViewModel extends BaseViewModel { } } - List getBannerImagesUrl() { List images = List(); images.add('assets/images/pharmacy_module/pharmacy_logo_green.png'); @@ -94,8 +91,8 @@ class PharmacyModuleViewModel extends BaseViewModel { return images; } - getRecommendedProducts(productId) async { - setState(ViewState.Busy); + getRecommendedProducts(productId) async { + setState(ViewState.Busy); await _recommendedProductService.getRecommendedProducts(productId); if (_recommendedProductService.hasError) { error = _recommendedProductService.error; @@ -118,5 +115,4 @@ class PharmacyModuleViewModel extends BaseViewModel { return false; } } - } diff --git a/lib/pages/pharmacies/screens/pharmacy_module_page.dart b/lib/pages/pharmacies/screens/pharmacy_module_page.dart index 3ec3143d..2136f589 100644 --- a/lib/pages/pharmacies/screens/pharmacy_module_page.dart +++ b/lib/pages/pharmacies/screens/pharmacy_module_page.dart @@ -52,7 +52,7 @@ class _PharmacyPageState extends State { isShowDecPage: false, baseViewModel: model, backgroundColor: Colors.white, - body: model.state != ViewState.BusyLocal ? Container( + body: Container( width: double.infinity, child: SingleChildScrollView( child: Column( @@ -67,9 +67,6 @@ class _PharmacyPageState extends State { ], ), ), - ) : Container( - height: 200, - color: Colors.red, ), ), );