Merge branch 'pharmacy_fix_bugs' into 'development'

fix bugs pharmacy home

See merge request Cloud_Solution/diplomatic-quarter!412
merge-update-with-lab-changes
Mohammad Aljammal 4 years ago
commit 6339e30369

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 867 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

@ -13,14 +13,14 @@ class BestSellerViewModel extends BaseViewModel {
_pharmacyService.bestSellerProducts; _pharmacyService.bestSellerProducts;
getBestSellerProducts() async { getBestSellerProducts() async {
setState(ViewState.Busy); setState(ViewState.BusyLocal);
await _pharmacyService.getBestSellerProducts(); await _pharmacyService.getBestSellerProducts();
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);
} // }
} }
} }

@ -11,14 +11,14 @@ class BrandViewModel extends BaseViewModel {
List<Manufacturer> get manufacturerList => _pharmacyService.manufacturerList; List<Manufacturer> get manufacturerList => _pharmacyService.manufacturerList;
Future getTopManufacturerList() async { Future getTopManufacturerList() async {
setState(ViewState.Busy); setState(ViewState.BusyLocal);
await _pharmacyService.getTopManufacturerList(); await _pharmacyService.getTopManufacturerList();
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);
} // }
} }
@override @override

@ -15,11 +15,11 @@ class LastVisitedViewModel extends BaseViewModel {
getLastVisitedProducts() async { getLastVisitedProducts() async {
setState(ViewState.BusyLocal); setState(ViewState.BusyLocal);
await _pharmacyService.getLastVisitedProducts(); await _pharmacyService.getLastVisitedProducts();
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);
} // }
} }
} }

@ -40,7 +40,7 @@ class PharmacyModuleViewModel extends BaseViewModel {
} }
Future verifyCustomer() async { Future verifyCustomer() async {
if (authenticatedUserObject.isLogin) await generatePharmacyToken(); // if (authenticatedUserObject.isLogin) 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);

@ -825,6 +825,7 @@ class _HomePageState extends State<HomePage> {
} else { } else {
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
await pharmacyModuleViewModel.generatePharmacyToken().then((value) async { await pharmacyModuleViewModel.generatePharmacyToken().then((value) async {
await pharmacyModuleViewModel.verifyCustomer().then((value) { await pharmacyModuleViewModel.verifyCustomer().then((value) {
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);
Navigator.push(context, FadePage(page: LandingPagePharmacy())); Navigator.push(context, FadePage(page: LandingPagePharmacy()));

@ -59,7 +59,7 @@ class _BannerPagerState extends State<BannerPager> {
) )
: CachedNetworkImage( : CachedNetworkImage(
imageUrl: item, imageUrl: item,
fit: BoxFit.cover, fit: BoxFit.fitWidth,
errorWidget: (context, url, error) => errorWidget: (context, url, error) =>
SizedBox()), SizedBox()),
), ),

@ -1,3 +1,4 @@
import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/BestSellerViewModel.dart'; import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/BestSellerViewModel.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
@ -26,6 +27,7 @@ class BestSellerWidget extends StatelessWidget {
id: "", id: "",
productType: 20, productType: 20,
)), )),
if (model.state != ViewState.BusyLocal)
Container( Container(
height: MediaQuery.of(context).size.height / 4 + 20, height: MediaQuery.of(context).size.height / 4 + 20,
child: ListView.builder( child: ListView.builder(
@ -34,7 +36,18 @@ class BestSellerWidget extends StatelessWidget {
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,
itemCount: model.bestSellerProduct.length, itemCount: model.bestSellerProduct.length,
), ),
), ) else
Container(
height: 80,
child: Center(
child: CircularProgressIndicator(
backgroundColor: Colors.white,
valueColor: AlwaysStoppedAnimation<Color>(
Colors.grey[500],
),
),
),
),
], ],
), ),
), ),

@ -29,10 +29,15 @@ class GridViewCard extends StatelessWidget {
flex: 2, flex: 2,
child: Padding( child: Padding(
padding: const EdgeInsets.all(6), padding: const EdgeInsets.all(6),
child: Texts( child: Column(
text, children: [
color: Colors.white, Texts(
fontSize: SizeConfig.textMultiplier * 1.5, text,
color: Colors.white,
bold: true,
fontSize: SizeConfig.textMultiplier * 1.5,
),
],
), ),
), ),
), ),

@ -18,7 +18,7 @@ class RecentlyViewedWidget extends StatelessWidget {
builder: (_, model, wi) => NetworkBaseView( builder: (_, model, wi) => NetworkBaseView(
isLocalLoader: true, isLocalLoader: true,
baseViewModel: model, baseViewModel: model,
child: Container( child: model.lastVisitedProducts.isNotEmpty ? Container(
child: Column( child: Column(
children: [ children: [
ViewAllHomeWidget( ViewAllHomeWidget(
@ -53,7 +53,7 @@ class RecentlyViewedWidget extends StatelessWidget {
), ),
], ],
), ),
), ) : Container(),
)); ));
} }
} }

@ -1,3 +1,4 @@
import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/BrandViewModel.dart'; import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/BrandViewModel.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
@ -15,26 +16,38 @@ class ShopByBrandWidget extends StatelessWidget {
onModelReady: (model) => model.getTopManufacturerList(), onModelReady: (model) => model.getTopManufacturerList(),
allowAny: true, allowAny: true,
builder: (_, model, wi) => NetworkBaseView( builder: (_, model, wi) => NetworkBaseView(
isLocalLoader: true, isLocalLoader: true,
baseViewModel: model, baseViewModel: model,
child: Container( child: Container(
child: Column( child: Column(
children: [ children: [
ViewAllHomeWidget( ViewAllHomeWidget(TranslationBase.of(context).shopByBrands,
TranslationBase.of(context).shopByBrands, ProductBrandsPage()),
ProductBrandsPage()), if (model.state != ViewState.BusyLocal)
Container( Container(
height: 100, height: 100,
child: ListView.builder( child: ListView.builder(
itemBuilder: (ctx, i) => itemBuilder: (ctx, i) =>
ManufacturerItem(model.manufacturerList[i]), ManufacturerItem(model.manufacturerList[i]),
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,
itemCount: model.manufacturerList.length, itemCount: model.manufacturerList.length,
), ),
)
else
Container(
height: 80,
child: Center(
child: CircularProgressIndicator(
backgroundColor: Colors.white,
valueColor: AlwaysStoppedAnimation<Color>(
Colors.grey[500],
),
),
),
),
],
), ),
], ),
), ));
),
));
} }
} }

@ -21,14 +21,16 @@ class ViewAllHomeWidget extends StatelessWidget {
Texts( Texts(
title, title,
bold: true, bold: true,
fontSize: 16,
), ),
BorderedButton( BorderedButton(
TranslationBase.of(context).viewAll, TranslationBase.of(context).viewAll,
hasBorder: true, hasBorder: true,
borderColor: Colors.green, borderColor: Colors.green,
textColor: Colors.green, textColor: Colors.green,
fontWeight: FontWeight.bold,
vPadding: 6, vPadding: 6,
hPadding: 8, hPadding: 14,
handler: () { handler: () {
Navigator.push( Navigator.push(
context, context,

Loading…
Cancel
Save