fix bugs pharmacy home

merge-update-with-lab-changes
mosazaid 5 years ago
parent fdb61c78c5
commit f47d59c43f

@ -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/Prescriptions.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/recommendedProduct_model.dart'; import 'package:diplomaticquarterapp/core/model/pharmacies/recommendedProduct_model.dart';
import 'package:diplomaticquarterapp/core/service/medical/prescriptions_service.dart'; import 'package:diplomaticquarterapp/core/service/medical/prescriptions_service.dart';
//import 'package:diplomaticquarterapp/core/model/prescriptions/perscription_pharmacy.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/parmacy_module_service.dart';
import 'package:diplomaticquarterapp/core/service/parmacyModule/prescription_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/gif_loader_dialog_utils.dart';
import 'package:diplomaticquarterapp/uitl/navigation_service.dart'; import 'package:diplomaticquarterapp/uitl/navigation_service.dart';
import '../../../locator.dart'; import '../../../locator.dart';
class PharmacyModuleViewModel extends BaseViewModel { class PharmacyModuleViewModel extends BaseViewModel {
PharmacyModuleService _pharmacyService = locator<PharmacyModuleService>(); PharmacyModuleService _pharmacyService = locator<PharmacyModuleService>();
RecommendedProductService _recommendedProductService = locator<RecommendedProductService>(); RecommendedProductService _recommendedProductService =
locator<RecommendedProductService>();
List<PharmacyImageObject> get bannerList => _pharmacyService.bannerItems; List<PharmacyImageObject> get bannerList => _pharmacyService.bannerItems;
List <RecommendedProductModel> get recommendedProductList => List<RecommendedProductModel> get recommendedProductList =>
_recommendedProductService.recommendedList; _recommendedProductService.recommendedList;
Future getBannerList() async { Future getBannerList() async {
_pharmacyService.bannerItems.clear(); _pharmacyService.bannerItems.clear();
// setState(ViewState.BusyLocal); // setState(ViewState.BusyLocal);
@ -37,17 +36,15 @@ class PharmacyModuleViewModel extends BaseViewModel {
await _pharmacyService.getBannerListList(); await _pharmacyService.getBannerListList();
GifLoaderDialogUtils.hideDialog( GifLoaderDialogUtils.hideDialog(
locator<NavigationService>().navigatorKey.currentContext); locator<NavigationService>().navigatorKey.currentContext);
// if (_pharmacyService.hasError) if (_pharmacyService.hasError) {
// { error = _pharmacyService.error;
// error = _pharmacyService.error; setState(ViewState.Error);
// setState(ViewState.Error); } else
// } else setState(ViewState.Idle);
// setState(ViewState.Idle);
} }
Future getPharmacyHomeData() async { Future getPharmacyHomeData() async {
if(authenticatedUserObject.isLogin) if (authenticatedUserObject.isLogin) await generatePharmacyToken();
await generatePharmacyToken();
var data = await sharedPref.getObject(USER_PROFILE); var data = await sharedPref.getObject(USER_PROFILE);
var customerId = await sharedPref.getString(PHARMACY_CUSTOMER_ID); var customerId = await sharedPref.getString(PHARMACY_CUSTOMER_ID);
@ -72,6 +69,7 @@ class PharmacyModuleViewModel extends BaseViewModel {
setState(ViewState.Idle); setState(ViewState.Idle);
} }
} }
Future generatePharmacyToken() async { Future generatePharmacyToken() async {
setState(ViewState.Busy); setState(ViewState.Busy);
await _pharmacyService.generatePharmacyToken(); await _pharmacyService.generatePharmacyToken();
@ -83,7 +81,6 @@ class PharmacyModuleViewModel extends BaseViewModel {
} }
} }
List<String> getBannerImagesUrl() { List<String> getBannerImagesUrl() {
List<String> images = List(); List<String> images = List();
images.add('assets/images/pharmacy_module/pharmacy_logo_green.png'); images.add('assets/images/pharmacy_module/pharmacy_logo_green.png');
@ -94,8 +91,8 @@ class PharmacyModuleViewModel extends BaseViewModel {
return images; return images;
} }
getRecommendedProducts(productId) async { getRecommendedProducts(productId) async {
setState(ViewState.Busy); setState(ViewState.Busy);
await _recommendedProductService.getRecommendedProducts(productId); await _recommendedProductService.getRecommendedProducts(productId);
if (_recommendedProductService.hasError) { if (_recommendedProductService.hasError) {
error = _recommendedProductService.error; error = _recommendedProductService.error;
@ -118,5 +115,4 @@ class PharmacyModuleViewModel extends BaseViewModel {
return false; return false;
} }
} }
} }

@ -52,7 +52,7 @@ class _PharmacyPageState extends State<PharmacyPage> {
isShowDecPage: false, isShowDecPage: false,
baseViewModel: model, baseViewModel: model,
backgroundColor: Colors.white, backgroundColor: Colors.white,
body: model.state != ViewState.BusyLocal ? Container( body: Container(
width: double.infinity, width: double.infinity,
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(
@ -67,9 +67,6 @@ class _PharmacyPageState extends State<PharmacyPage> {
], ],
), ),
), ),
) : Container(
height: 200,
color: Colors.red,
), ),
), ),
); );

Loading…
Cancel
Save