From 39ba2cfde72a51ec2b8a10b45ba8a20f41c702a9 Mon Sep 17 00:00:00 2001 From: Fatimah Alshammari Date: Tue, 10 Aug 2021 11:30:13 +0300 Subject: [PATCH 1/5] fixed issues. --- lib/widgets/mobile-no/mobile_no.dart | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/widgets/mobile-no/mobile_no.dart b/lib/widgets/mobile-no/mobile_no.dart index 6e89f529..44162743 100644 --- a/lib/widgets/mobile-no/mobile_no.dart +++ b/lib/widgets/mobile-no/mobile_no.dart @@ -2,6 +2,7 @@ import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/models/mobile_number.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:provider/provider.dart'; import '../../Constants.dart'; @@ -127,7 +128,9 @@ class _MobileNo extends State { controller: widget.controller, keyboardType: TextInputType.number, maxLength: 10, - + inputFormatters: [ + FilteringTextInputFormatter.allow(RegExp("[0-9]")), + ], // maxLengthEnforced: true, // onChanged: (value) { // widget.controller.text = countryCode; From 0d3f6237ce1fae5f64b060c62ee079b862e1224b Mon Sep 17 00:00:00 2001 From: Fatimah Alshammari Date: Wed, 11 Aug 2021 16:41:21 +0300 Subject: [PATCH 2/5] fixed issues --- lib/pages/pharmacies/product_detail.dart | 81 +++---- .../screens/recommended-product-page.dart | 225 +++++------------- 2 files changed, 87 insertions(+), 219 deletions(-) diff --git a/lib/pages/pharmacies/product_detail.dart b/lib/pages/pharmacies/product_detail.dart index 0abc38ef..72c2bd2d 100644 --- a/lib/pages/pharmacies/product_detail.dart +++ b/lib/pages/pharmacies/product_detail.dart @@ -22,6 +22,8 @@ int price = 0; var languageID; bool isOverQuantity = false; bool isInWishlit = false; +//int isSelected = 1; +bool isSelected= true; String itemID; var customerId; CompareList compareItems = new CompareList(); @@ -642,14 +644,12 @@ class __ProductDetailPageState extends State { padding: EdgeInsets.only(bottom: 5), // margin: EdgeInsets.symmetric(horizontal: 6, vertical: 4), child: BaseView( - onModelReady: (model) => - model.getRecommendedProducts( - widget.product.id.toString()), + + onModelReady: (model) => model.getRecommendedProducts(widget.product.id.toString()), builder: (_, model, wi) => Container( child: // Text(model.recommendedProductList[0].id), - model.recommendedProductList.length != - null + model.recommendedProductList.length != null ? Expanded( child: ListView.builder( scrollDirection: @@ -657,11 +657,8 @@ class __ProductDetailPageState extends State { shrinkWrap: true, physics: ScrollPhysics(), // physics: NeverScrollableScrollPhysics(), - itemCount: model - .recommendedProductList - .length, - itemBuilder: - (context, index) { + itemCount: model.recommendedProductList.length, + itemBuilder: (context, index) { return InkWell( onTap: () { Navigator.push( @@ -674,42 +671,22 @@ class __ProductDetailPageState extends State { elevation: 2, shape: RoundedRectangleBorder( side: BorderSide( - color: Colors - .grey[ - 300], + color: Colors.grey[300], width: 2), - borderRadius: - BorderRadius - .circular( - 10)), - margin: EdgeInsets - .symmetric( + borderRadius: BorderRadius.circular(10)), + margin: EdgeInsets.symmetric( horizontal: 8, vertical: 0, ), child: Container( - decoration: - BoxDecoration( - borderRadius: - BorderRadius - .all( - Radius.circular( - 15), + decoration: BoxDecoration( + borderRadius: BorderRadius.all(Radius.circular(15), ), ), - padding: EdgeInsets - .symmetric( - horizontal: - 4), - width: MediaQuery.of( - context) - .size - .width / - 3, + padding: EdgeInsets.symmetric(horizontal: 4), + width: MediaQuery.of(context).size.width / 3, child: Column( - crossAxisAlignment: - CrossAxisAlignment - .start, + crossAxisAlignment: CrossAxisAlignment.start, children: [ Stack( children: [ @@ -717,11 +694,10 @@ class __ProductDetailPageState extends State { child: Align( alignment: Alignment.topRight, child: IconButton( - icon: Icon(!isInWishlit - ? Icons.favorite_border - : Icons.favorite), + icon: Icon(!isInWishlit ? Icons.favorite_border : Icons.favorite), color: !isInWishlit ? Colors.grey : Colors.red, onPressed: () async { + if (customerId != null) { if (!isInWishlit) { await addToWishlistFunction(model.recommendedProductList[index].id); @@ -734,29 +710,36 @@ class __ProductDetailPageState extends State { setState(() {}); }, )), -// itemID.contains(model.recommendedProductList[index].id) + +// child: Align( +// alignment: Alignment.topRight, +// child:itemID.contains(model.recommendedProductList[index].id) // // !isInWishlist // ? IconButton( // icon: Icon(Icons.favorite_border), -// color: Colors.red, +// color: Colors.grey, // iconSize: 30, // onPressed: () { // setState(() { -// deleteFromWishlistFunction(itemID); -// }); +// if (customerId != null && isInWishlit ) { +// deleteFromWishlistFunction( +// model.recommendedProductList[index].id); +// } }); // }, // ) // : IconButton( // icon: Icon(Icons.favorite), -// color: Colors.grey, +// color: Colors.red, // iconSize: 30, // onPressed: () { // setState(() { -// addToWishlistFunction(itemID); -// }); +// if (customerId != null && !isInWishlit ) { +// addToWishlistFunction( +// model.recommendedProductList[index].id); +// } }); // }, // ) -// +// ), ), Container( diff --git a/lib/pages/pharmacies/screens/recommended-product-page.dart b/lib/pages/pharmacies/screens/recommended-product-page.dart index 28e3cce3..28abf661 100644 --- a/lib/pages/pharmacies/screens/recommended-product-page.dart +++ b/lib/pages/pharmacies/screens/recommended-product-page.dart @@ -231,37 +231,21 @@ class _RecommendedProductPageState extends State Stack(children: [ Container( child: Align( - alignment: - Alignment - .topRight, - child: - itemID.contains(e.id) + alignment: Alignment.topRight, + child: itemID.contains(e.id) // !isInWishlist - ? IconButton( - icon: - Icon(Icons.favorite_border), - color: - Colors.grey, - iconSize: - 30, + ? IconButton(icon: Icon(Icons.favorite_border), + color: Colors.grey, iconSize: 30, onPressed: () { - setState(() { - addToWishlistFunction(itemID); + setState(() {addToWishlistFunction(itemID); }); }, ) - : - IconButton( - icon: - Icon(Icons.favorite), - color: - Colors.red, - iconSize: - 30, + : IconButton(icon: Icon(Icons.favorite), + color: Colors.red, iconSize: 30, onPressed: - () { - setState(() { + () {setState(() { deleteFromWishlistFunction(itemID); }); }, @@ -269,149 +253,74 @@ class _RecommendedProductPageState extends State // ), ), - Container( - margin: EdgeInsets - .fromLTRB(0, 16, - 10, 16), - alignment: - Alignment.center, + Container(margin: EdgeInsets.fromLTRB(0, 16, 10, 16), + alignment: Alignment.center, // padding: EdgeInsets.only(left: 25, bottom: 20), - child: (e.images != - null && - e.images.length > - 0) - ? Image.network( - e.images[0] - .src - .toString(), + child: (e.images != null && e.images.length > 0) + ? Image.network(e.images[0].src.toString(), // item.images[0].src, - fit: BoxFit - .cover, - height: 60, - ) - : Image.asset( - "assets/images/no_image.png", - fit: BoxFit - .cover, - height: 60, + fit: BoxFit.cover, height: 60,) + : Image.asset("assets/images/no_image.png", fit: BoxFit.cover, height: 60, ), ), - Container( - width: e.rxMessage != - null - ? MediaQuery.of( - context) - .size - .width / - 5 - : 0, - padding: - EdgeInsets.all(4), - decoration: - BoxDecoration( - color: Color( - 0xffb23838), - borderRadius: - BorderRadius.only( - topLeft: Radius - .circular( - 6)), + Container(width: e.rxMessage != null ? MediaQuery.of(context) + .size.width / 5 : 0, + padding: EdgeInsets.all(4), + decoration: BoxDecoration( + color: Color(0xffb23838), + borderRadius: BorderRadius.only(topLeft: Radius.circular(6)), ), - child: Texts( - e.rxMessage != null - ? e.rxMessage - : "", + child: Texts(e.rxMessage != null ? e.rxMessage : "", color: Colors.white, regular: true, fontSize: 10, - fontWeight: - FontWeight.w400, + fontWeight: FontWeight.w400, ), ), ]), Container( margin: EdgeInsets - .symmetric( - horizontal: 6, - vertical: 0, + .symmetric(horizontal: 6, vertical: 0, ), child: Column( - crossAxisAlignment: - CrossAxisAlignment - .start, + crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - languageID == "ar" - ? e.namen - : e.name, + languageID == "ar" ? e.namen : e.name, style: TextStyle( - color: Colors - .black, - fontSize: 13.0, + color: Colors.black, fontSize: 13.0, // fontWeight: FontWeight.bold, ), ), Padding( // padding: const EdgeInsets.only(top: 15, bottom: 10), - padding: - const EdgeInsets - .only( - top: 10, - bottom: - 5), - child: Texts( - "SAR ${e.price}", - bold: true, - fontSize: 14, + padding: const EdgeInsets.only(top: 10, bottom: 5), + child: Texts("SAR ${e.price}", + bold: true, fontSize: 14, ), ), ], ), ), Row( - crossAxisAlignment: - CrossAxisAlignment - .start, + crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( - padding: EdgeInsets - .only( - right: - 10), + padding: EdgeInsets.only(right: 10), // margin: EdgeInsets.only(left: 5), - child: Align( - alignment: - Alignment - .topLeft, - child: RatingBar - .readOnly( - initialRating: e - .approvedRatingSum - .toDouble(), + child: Align(alignment: Alignment.topLeft, + child: RatingBar.readOnly(initialRating: e.approvedRatingSum.toDouble(), // initialRating: productRate, - size: 13.0, - filledColor: - Colors.yellow[ - 700], - emptyColor: - Colors.grey[ - 500], - isHalfAllowed: - true, - halfFilledIcon: - Icons - .star_half, - filledIcon: - Icons - .star, - emptyIcon: - Icons - .star, + size: 13.0, filledColor: Colors.yellow[700], + emptyColor: Colors.grey[500], + isHalfAllowed: true, + halfFilledIcon: Icons.star_half, + filledIcon: Icons.star, + emptyIcon: Icons.star, ), ), ), - Texts( - "(${e.approvedTotalReviews.toString()})", + Texts("(${e.approvedTotalReviews.toString()})", // bold: true, fontSize: 12, ), @@ -664,8 +573,7 @@ class _RecommendedProductPageState extends State return Card( elevation: 2, shape: RoundedRectangleBorder( - side: - BorderSide(color: Colors.grey[300], width: 2), + side: BorderSide(color: Colors.grey[300], width: 2), borderRadius: BorderRadius.circular(10)), // margin: EdgeInsets.symmetric( @@ -692,14 +600,12 @@ class _RecommendedProductPageState extends State //wishlistVar[index].id.contains(model.recommendedProductList[index].id) !isInWishlist ? IconButton( - icon: Icon( - Icons.favorite_border), + icon: Icon(Icons.favorite_border), color: Colors.grey, iconSize: 30, onPressed: () { setState(() { - addToWishlistFunction( - itemID); + addToWishlistFunction(itemID); }); }, ) @@ -709,8 +615,7 @@ class _RecommendedProductPageState extends State iconSize: 30, onPressed: () { setState(() { - deleteFromWishlistFunction( - itemID); + deleteFromWishlistFunction(itemID); }); }, ) @@ -721,30 +626,20 @@ class _RecommendedProductPageState extends State margin: EdgeInsets.fromLTRB(0, 16, 10, 16), alignment: Alignment.center, // padding: EdgeInsets.only(left: 25, bottom: 20), - child: (model.recommendedProductList[index] - .images != - null && - model.recommendedProductList[index] - .images.length > - 0) - ? Image.network( - model.recommendedProductList[index] - .images[0].src - .toString(), + child: (model.recommendedProductList[index].images != null && + model.recommendedProductList[index].images.length > 0) + ? Image.network(model.recommendedProductList[index].images[0].src.toString(), // item.images[0].src, fit: BoxFit.cover, height: 60, ) - : Image.asset( - "assets/images/no_image.png", + : Image.asset("assets/images/no_image.png", fit: BoxFit.cover, height: 60, ), ), Container( - width: model.recommendedProductList[index] - .rxMessage != - null + width: model.recommendedProductList[index].rxMessage != null ? MediaQuery.of(context).size.width / 5 : 0, padding: EdgeInsets.all(4), @@ -754,11 +649,8 @@ class _RecommendedProductPageState extends State topLeft: Radius.circular(6)), ), child: Texts( - model.recommendedProductList[index] - .rxMessage != - null - ? model.recommendedProductList[index] - .rxMessage + model.recommendedProductList[index].rxMessage != null + ? model.recommendedProductList[index].rxMessage : "", color: Colors.white, regular: true, @@ -773,12 +665,9 @@ class _RecommendedProductPageState extends State vertical: 2, ), child: Column( - crossAxisAlignment: - CrossAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, children: [ - Text( - model - .recommendedProductList[index].name, + Text(model.recommendedProductList[index].name, style: TextStyle( color: Colors.black, fontSize: 13.0, @@ -799,8 +688,7 @@ class _RecommendedProductPageState extends State ), ), Row( - crossAxisAlignment: - CrossAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( padding: EdgeInsets.only( @@ -809,10 +697,7 @@ class _RecommendedProductPageState extends State child: Align( alignment: Alignment.topLeft, child: RatingBar.readOnly( - initialRating: model - .recommendedProductList[index] - .approvedRatingSum - .toDouble(), + initialRating: model.recommendedProductList[index].approvedRatingSum.toDouble(), // initialRating: productRate, size: 13.0, filledColor: Colors.yellow[700], From 352cda4c703d1f54436025aeb81a1c015c0b524a Mon Sep 17 00:00:00 2001 From: hussam al-habibeh Date: Sun, 15 Aug 2021 13:29:07 +0300 Subject: [PATCH 3/5] hide Covid19-driveThrow for patient out of KSA --- lib/pages/landing/home_page.dart | 414 ++++++++++++------------------- 1 file changed, 156 insertions(+), 258 deletions(-) diff --git a/lib/pages/landing/home_page.dart b/lib/pages/landing/home_page.dart index 8793452a..b64d2330 100644 --- a/lib/pages/landing/home_page.dart +++ b/lib/pages/landing/home_page.dart @@ -40,8 +40,7 @@ class HomePage extends StatefulWidget { } class _HomePageState extends State { - PharmacyModuleViewModel pharmacyModuleViewModel = - locator(); + PharmacyModuleViewModel pharmacyModuleViewModel = locator(); @override Widget build(BuildContext context) { @@ -66,9 +65,7 @@ class _HomePageState extends State { height: 210, decoration: BoxDecoration( image: DecorationImage( - image: ExactAssetImage( - 'assets/images/dashboard_top_bg.png'), - fit: BoxFit.cover), + image: ExactAssetImage('assets/images/dashboard_top_bg.png'), fit: BoxFit.cover), ), child: Stack( children: [ @@ -77,131 +74,112 @@ class _HomePageState extends State { left: 5, right: 5, child: Container( - width: - MediaQuery.of(context).size.width * 0.8, + width: MediaQuery.of(context).size.width * 0.8, child: Row( children: [ Expanded( child: Container( - height: 125, - padding: EdgeInsets.all(5), - margin: EdgeInsets.all(5), - decoration: BoxDecoration( - image: DecorationImage( - image: AssetImage( - "assets/images/new-design/covid_bg_transparent.png"), - fit: BoxFit.fill, - ), - color: - Colors.white.withOpacity(0.3), - borderRadius: BorderRadius.all( - Radius.circular(5))), - child: Container( - child: Column( - children: [ - Texts( - TranslationBase.of(context) - .covidTest, - color: Colors.white, - fontWeight: FontWeight.w700, + height: 125, + padding: EdgeInsets.all(5), + margin: EdgeInsets.all(5), + decoration: BoxDecoration( + image: DecorationImage( + image: + AssetImage("assets/images/new-design/covid_bg_transparent.png"), + fit: BoxFit.fill, ), - Row( - mainAxisAlignment: - MainAxisAlignment - .spaceAround, - children: [ - Container( - margin: EdgeInsets.only( - top: 15.0, - ), - child: SvgPicture.asset( - 'assets/images/new-design/covid-19-car.svg', - width: 45.0, - height: 45.0), + color: Colors.white.withOpacity(0.3), + borderRadius: BorderRadius.all(Radius.circular(5))), + child: (model.user != null && model.user.outSA == 1) + ? Container( + width: double.infinity, + height: double.infinity, + color: Colors.grey.shade500.withOpacity(0.3), + child: Icon( + Icons.lock_outline, + size: 40, ), - Container( - margin: EdgeInsets.only( - top: 5.0), - child: Column( - children: [ - Texts( - TranslationBase.of( - context) - .driveThru, - fontWeight: - FontWeight.w700, - color: Colors.white, - ), - ButtonTheme( - shape: - RoundedRectangleBorder( - borderRadius: - BorderRadius - .circular( - 5.0), + ) + : Container( + child: Column( + children: [ + Texts( + TranslationBase.of(context).covidTest, + color: Colors.white, + fontWeight: FontWeight.w700, + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceAround, + children: [ + Container( + margin: EdgeInsets.only( + top: 15.0, + ), + child: SvgPicture.asset( + 'assets/images/new-design/covid-19-car.svg', + width: 45.0, + height: 45.0), ), - minWidth: MediaQuery.of( - context) - .size - .width * - 0.15, - height: 25.0, - child: RaisedButton( - color: Colors - .red[800], - textColor: - Colors.white, - disabledTextColor: - Colors.white, - disabledColor: - new Color( - 0xFFbcc2c4), - onPressed: () { - navigateToCovidDriveThru(); - }, - child: Center( - child: Center( - child: Center( - child: - Center( - child: - Texts( - TranslationBase.of(context) - .bookNow, - fontWeight: - FontWeight.w700, - color: Colors - .white, + Container( + margin: EdgeInsets.only(top: 5.0), + child: Column( + children: [ + Texts( + TranslationBase.of(context).driveThru, + fontWeight: FontWeight.w700, + color: Colors.white, + ), + ButtonTheme( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(5.0), + ), + minWidth: MediaQuery.of(context).size.width * 0.15, + height: 25.0, + child: RaisedButton( + color: Colors.red[800], + textColor: Colors.white, + disabledTextColor: Colors.white, + disabledColor: new Color(0xFFbcc2c4), + onPressed: + (model.user != null && model.user.outSA == 1) + ? () {} + : () { + navigateToCovidDriveThru(); + }, + child: Center( + child: Center( + child: Center( + child: Center( + child: Texts( + TranslationBase.of(context).bookNow, + fontWeight: FontWeight.w700, + color: Colors.white, + ), + ), + ), + ), ), ), ), - ), + ], ), ), - ), - ], - ), + ], + ), + ], ), - ], - ), - ], - ), - ), - ), + )), ), Expanded( child: InkWell( - onTap: () => Navigator.push(context, - FadePage(page: LiveCareHome())), + onTap: () => Navigator.push(context, FadePage(page: LiveCareHome())), child: Container( height: 125, padding: EdgeInsets.all(15), margin: EdgeInsets.all(5), decoration: BoxDecoration( - color: Colors.white - .withOpacity(0.3), - borderRadius: BorderRadius.all( - Radius.circular(5))), + color: Colors.white.withOpacity(0.3), + borderRadius: BorderRadius.all(Radius.circular(5))), child: SvgPicture.asset( projectViewModel.isArabic ? 'assets/images/new-design/livecare_arabic_logo.svg' @@ -217,23 +195,15 @@ class _HomePageState extends State { ], ), ), - Container( - width: double.infinity, - height: projectViewModel.isArabic ? 110 : 80) + Container(width: double.infinity, height: projectViewModel.isArabic ? 110 : 80) ], ), Positioned( top: 155, left: MediaQuery.of(context).size.width * - (MediaQuery.of(context).orientation == - Orientation.landscape - ? 0.02 - : 0.03), + (MediaQuery.of(context).orientation == Orientation.landscape ? 0.02 : 0.03), right: MediaQuery.of(context).size.width * - (MediaQuery.of(context).orientation == - Orientation.landscape - ? 0.02 - : 0.03), + (MediaQuery.of(context).orientation == Orientation.landscape ? 0.02 : 0.03), child: (!model.isLogin) ? Container( width: double.infinity, @@ -241,14 +211,10 @@ class _HomePageState extends State { decoration: BoxDecoration( color: HexColor('#A59E9E'), shape: BoxShape.rectangle, - border: Border.all( - color: Colors.transparent, width: 0.5), - borderRadius: - BorderRadius.all(Radius.circular(9)), + border: Border.all(color: Colors.transparent, width: 0.5), + borderRadius: BorderRadius.all(Radius.circular(9)), image: DecorationImage( - image: ExactAssetImage( - 'assets/images/bg_graphic.png'), - fit: BoxFit.cover)), + image: ExactAssetImage('assets/images/bg_graphic.png'), fit: BoxFit.cover)), child: Container( margin: EdgeInsets.all(5), child: Column( @@ -264,37 +230,30 @@ class _HomePageState extends State { fontSize: 23, ), Texts( - TranslationBase.of(context) - .myMedicalFileSubTitle, + TranslationBase.of(context).myMedicalFileSubTitle, color: Colors.black, fontSize: 16, ), Align( - alignment: projectViewModel.isArabic - ? Alignment.bottomLeft - : Alignment.bottomRight, + alignment: + projectViewModel.isArabic ? Alignment.bottomLeft : Alignment.bottomRight, child: InkWell( onTap: () { widget.goToMyProfile(); }, child: Container( - margin: EdgeInsets.only( - left: 15, right: 15), + margin: EdgeInsets.only(left: 15, right: 15), width: 90, height: 30, decoration: BoxDecoration( color: HexColor('#D81A2E'), shape: BoxShape.rectangle, - border: Border.all( - color: Colors.transparent, - width: 0.5), - borderRadius: BorderRadius.all( - Radius.circular(0)), + border: Border.all(color: Colors.transparent, width: 0.5), + borderRadius: BorderRadius.all(Radius.circular(0)), ), child: Center( child: Texts( - TranslationBase.of(context) - .viewMore, + TranslationBase.of(context).viewMore, color: Colors.white, fontWeight: FontWeight.w700, fontSize: 12, @@ -313,14 +272,10 @@ class _HomePageState extends State { decoration: BoxDecoration( color: HexColor('#A59E9E'), shape: BoxShape.rectangle, - border: Border.all( - color: Colors.transparent, width: 0.5), - borderRadius: - BorderRadius.all(Radius.circular(9)), + border: Border.all(color: Colors.transparent, width: 0.5), + borderRadius: BorderRadius.all(Radius.circular(9)), image: DecorationImage( - image: ExactAssetImage( - 'assets/images/bg_graphic.png'), - fit: BoxFit.cover), + image: ExactAssetImage('assets/images/bg_graphic.png'), fit: BoxFit.cover), ), child: Container( margin: EdgeInsets.all(5), @@ -328,81 +283,51 @@ class _HomePageState extends State { children: [ Row( children: [ - if (projectViewModel.user != null && - model.isLogin) + if (projectViewModel.user != null && model.isLogin) Expanded( child: Column( - crossAxisAlignment: - CrossAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, children: [ SizedBox( height: 8, ), - model.user.cRSVerificationStatus == - 2 + model.user.cRSVerificationStatus == 2 ? Row( children: [ Texts( - model.user - .firstName + - " " + - model.user - .lastName, - color: Colors - .grey[100], + model.user.firstName + " " + model.user.lastName, + color: Colors.grey[100], bold: true, fontSize: 15, ), Container( - margin: EdgeInsets - .fromLTRB( - 8.0, - 0.0, - 8.0, - 0.0), + margin: EdgeInsets.fromLTRB(8.0, 0.0, 8.0, 0.0), child: SvgPicture.asset( "assets/images/new-design/verification_check.svg"), ), ], ) - : model.user.cRSVerificationStatus == - 3 + : model.user.cRSVerificationStatus == 3 ? Row( children: [ Texts( - model.user - .firstName + - " " + - model.user - .lastName, - color: Colors - .grey[100], + model.user.firstName + " " + model.user.lastName, + color: Colors.grey[100], bold: true, fontSize: 15, ), Container( - margin: EdgeInsets - .fromLTRB( - 8.0, - 0.0, - 8.0, - 0.0), - child: SvgPicture - .asset( - "assets/images/new-design/pending.svg"), + margin: EdgeInsets.fromLTRB(8.0, 0.0, 8.0, 0.0), + child: SvgPicture.asset( + "assets/images/new-design/pending.svg"), ), ], ) : Row( children: [ Texts( - model.user - .firstName + - " " + - model.user - .lastName, - color: Colors - .grey[100], + model.user.firstName + " " + model.user.lastName, + color: Colors.grey[100], bold: true, fontSize: 15, ), @@ -436,17 +361,14 @@ class _HomePageState extends State { decoration: BoxDecoration( color: HexColor('#D81A2E'), shape: BoxShape.rectangle, - border: Border.all( - color: Colors.transparent, - width: 0.5), + border: Border.all(color: Colors.transparent, width: 0.5), borderRadius: BorderRadius.all( Radius.circular(5), ), ), child: Center( child: Texts( - TranslationBase.of(context) - .myMedicalFile, + TranslationBase.of(context).myMedicalFile, color: Colors.white, fontSize: 12, textAlign: TextAlign.center, @@ -485,10 +407,8 @@ class _HomePageState extends State { width: 25, height: 40, ), - Texts( - '${model.weightKg} ${TranslationBase.of(context).kg}', - color: Colors.white, - fontSize: 17) + Texts('${model.weightKg} ${TranslationBase.of(context).kg}', + color: Colors.white, fontSize: 17) ], ), ), @@ -503,9 +423,7 @@ class _HomePageState extends State { width: 35, height: 40, ), - Texts('${model.booldType}', - color: Colors.white, - fontSize: 17) + Texts('${model.booldType}', color: Colors.white, fontSize: 17) ], ), ), @@ -519,12 +437,10 @@ class _HomePageState extends State { ], ), Padding( - padding: - const EdgeInsets.only(bottom: 15, right: 15, left: 15), + padding: const EdgeInsets.only(bottom: 15, right: 15, left: 15), child: InkWell( onTap: () { - Navigator.of(context).push(MaterialPageRoute( - builder: (context) => PackagesHomePage())); + Navigator.of(context).push(MaterialPageRoute(builder: (context) => PackagesHomePage())); }, child: Container( decoration: BoxDecoration( @@ -571,13 +487,14 @@ class _HomePageState extends State { }, child: Center( child: Padding( - padding: const EdgeInsets.all(15.0), - child: (model.user != null && - model.user.outSA == 1) + padding: (model.user != null && model.user.outSA == 1) + ? const EdgeInsets.all(0.0) + : const EdgeInsets.all(15.0), + child: (model.user != null && model.user.outSA == 1) ? Container( width: double.infinity, height: double.infinity, - color: Colors.grey.withOpacity(0.7), + color: Colors.grey.shade500.withOpacity(0.3), child: Icon( Icons.lock_outline, size: 40, @@ -594,14 +511,11 @@ class _HomePageState extends State { height: 10, ), Texts( - TranslationBase.of(context) - .homeHealthCare, + TranslationBase.of(context).homeHealthCare, textAlign: TextAlign.center, color: Colors.white, fontWeight: FontWeight.w700, - fontSize: - SizeConfig.textMultiplier * - 1.55, + fontSize: SizeConfig.textMultiplier * 1.55, ) ], )), @@ -613,18 +527,17 @@ class _HomePageState extends State { if (projectViewModel.havePrivilege(65)) DashboardItem( onTap: () => - (model.user != null && model.user.outSA == 1) - ? () {} - : getPharmacyToken(model), + (model.user != null && model.user.outSA == 1) ? () {} : getPharmacyToken(model), child: Center( child: Padding( - padding: const EdgeInsets.all(15.0), - child: (model.user != null && - model.user.outSA == 1) + padding: (model.user != null && model.user.outSA == 1) + ? const EdgeInsets.all(0.0) + : const EdgeInsets.all(15.0), + child: (model.user != null && model.user.outSA == 1) ? Container( width: double.infinity, height: double.infinity, - color: Colors.grey.withOpacity(0.7), + color: Colors.grey.shade500.withOpacity(0.3), child: Icon( Icons.lock_outline, size: 40, @@ -647,14 +560,11 @@ class _HomePageState extends State { height: 20, ), Texts( - TranslationBase.of(context) - .onlinePharmacy, + TranslationBase.of(context).onlinePharmacy, textAlign: TextAlign.center, color: Colors.white, fontWeight: FontWeight.w700, - fontSize: - SizeConfig.textMultiplier * - 1.55, + fontSize: SizeConfig.textMultiplier * 1.55, ) ], ), @@ -677,13 +587,14 @@ class _HomePageState extends State { }, child: Center( child: Padding( - padding: const EdgeInsets.all(15.0), - child: (model.user != null && - model.user.outSA == 1) + padding: (model.user != null && model.user.outSA == 1) + ? const EdgeInsets.all(0.0) + : const EdgeInsets.all(15.0), + child: (model.user != null && model.user.outSA == 1) ? Container( width: double.infinity, height: double.infinity, - color: Colors.grey.withOpacity(0.7), + color: Colors.grey.shade500.withOpacity(0.3), child: Icon( Icons.lock_outline, size: 40, @@ -700,14 +611,11 @@ class _HomePageState extends State { height: 10, ), Texts( - TranslationBase.of(context) - .cmcHeading, + TranslationBase.of(context).cmcHeading, textAlign: TextAlign.center, color: Colors.white, fontWeight: FontWeight.w700, - fontSize: - SizeConfig.textMultiplier * - 1.55, + fontSize: SizeConfig.textMultiplier * 1.55, ) ], )), @@ -723,8 +631,7 @@ class _HomePageState extends State { height: 8, ), InkWell( - onTap: () => - Navigator.push(context, FadePage(page: PaymentService())), + onTap: () => Navigator.push(context, FadePage(page: PaymentService())), child: Container( margin: EdgeInsets.only(left: 15, right: 15), child: Row( @@ -745,8 +652,7 @@ class _HomePageState extends State { height: 5, ), Texts( - TranslationBase.of(context) - .onlinePaymentService, + TranslationBase.of(context).onlinePaymentService, textAlign: TextAlign.center, color: Colors.black87, bold: false, @@ -777,8 +683,7 @@ class _HomePageState extends State { height: 10, ), Texts( - TranslationBase.of(context) - .offersAndPackages, + TranslationBase.of(context).offersAndPackages, textAlign: TextAlign.center, color: Colors.black87, bold: false, @@ -818,13 +723,11 @@ class _HomePageState extends State { height: 10, ), Texts( - TranslationBase.of(context) - .emergencyServices, + TranslationBase.of(context).emergencyServices, textAlign: TextAlign.center, color: Colors.black87, bold: false, - fontSize: - SizeConfig.textMultiplier * 1.7, + fontSize: SizeConfig.textMultiplier * 1.7, ) ], ), @@ -862,8 +765,7 @@ class _HomePageState extends State { fontWeight: FontWeight.normal, ), Texts( - TranslationBase.of(context) - .viewAllHabibMedicalService, + TranslationBase.of(context).viewAllHabibMedicalService, color: Colors.white, fontWeight: FontWeight.normal, fontSize: 10, @@ -884,15 +786,13 @@ class _HomePageState extends State { opacity: 0.5, color: Colors.grey[700], width: MediaQuery.of(context).size.width * 0.45, - onTap: () => Navigator.push( - context, FadePage(page: AllHabibMedicalService())), + onTap: () => Navigator.push(context, FadePage(page: AllHabibMedicalService())), ), DashboardItem( onTap: () { // Navigator.push( // context, FadePage(page: FeedbackHomePage())); - Navigator.push( - context, FadePage(page: ContactUsPage())); + Navigator.push(context, FadePage(page: ContactUsPage())); }, child: Container( width: double.infinity, @@ -1014,10 +914,8 @@ class DashboardItem extends StatelessWidget { ? DecorationImage( image: ExactAssetImage('assets/images/$imageName'), fit: BoxFit.cover, - colorFilter: hasColorFilter - ? new ColorFilter.mode( - Colors.black.withOpacity(0.2), BlendMode.dstIn) - : null, + colorFilter: + hasColorFilter ? new ColorFilter.mode(Colors.black.withOpacity(0.2), BlendMode.dstIn) : null, ) : null, ), From 1568698b980e5200440c5c3e33c684c6ef7eef3d Mon Sep 17 00:00:00 2001 From: Elham Rababh Date: Sun, 15 Aug 2021 16:56:28 +0300 Subject: [PATCH 4/5] fix issues related to wight and sugar blood --- lib/config/config.dart | 4 +- .../my_trackers/Weight/WeightMonthlyPage.dart | 26 +++------- .../my_trackers/Weight/WeightWeeklyPage.dart | 50 ++++++++++--------- .../my_trackers/Weight/WeightYeaPage.dart | 27 ++++------ .../my_trackers/blood_suger/BloodMonthly.dart | 2 +- .../my_trackers/blood_suger/BloodYeaPage.dart | 2 +- .../blood_suger/blood_sugar_weekly_page.dart | 2 +- 7 files changed, 48 insertions(+), 65 deletions(-) diff --git a/lib/config/config.dart b/lib/config/config.dart index a9f06a53..723030a7 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -13,8 +13,8 @@ const PACKAGES_CUSTOMER = '/api/customers'; const PACKAGES_SHOPPING_CART = '/api/shopping_cart_items'; const PACKAGES_ORDERS = '/api/orders'; -//const BASE_URL = 'https://uat.hmgwebservices.com/'; -const BASE_URL = 'https://hmgwebservices.com/'; +const BASE_URL = 'https://uat.hmgwebservices.com/'; +// const BASE_URL = 'https://hmgwebservices.com/'; // Pharmacy UAT URLs //const BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/'; diff --git a/lib/pages/medical/my_trackers/Weight/WeightMonthlyPage.dart b/lib/pages/medical/my_trackers/Weight/WeightMonthlyPage.dart index e3aa9755..5b391a62 100644 --- a/lib/pages/medical/my_trackers/Weight/WeightMonthlyPage.dart +++ b/lib/pages/medical/my_trackers/Weight/WeightMonthlyPage.dart @@ -8,6 +8,7 @@ import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/pages/medical/my_trackers/widget/MonthLineChartCurved.dart'; import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; +import 'package:diplomaticquarterapp/widgets/charts/app_time_series_chart.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:flutter/cupertino.dart'; @@ -29,22 +30,7 @@ class WeightMonthlyPage extends StatelessWidget { ProjectViewModel projectViewModel = Provider.of(context); return AppScaffold( isShowDecPage: false, - body: model.weighMonthTimeSeriesData.isEmpty - ? Container( - child: Center( - child: Container( - child: Center( - child: MonthLineChartCurved( - horizontalInterval: 1.0, - title: TranslationBase.of(context).weight, - timeSeries: model.weighMonthTimeSeriesData, - indexes: model.weighMonthTimeSeriesData.length ~/ 5.5 ?? 0, - ), - ), - ), - ), - ) - : ListView( + body: ListView( children: [ Container( width: double.maxFinite, @@ -52,7 +38,7 @@ class WeightMonthlyPage extends StatelessWidget { child: MonthLineChartCurved( horizontalInterval: 1.0, title: TranslationBase.of(context).weight, - timeSeries: model.weighMonthTimeSeriesData, + timeSeries: model.weighMonthTimeSeriesData.isEmpty?[TimeSeriesSales3(0, 0.0)]:model.weighMonthTimeSeriesData, indexes: model.weighMonthTimeSeriesData.length ~/ 5.5, )), SizedBox( @@ -68,7 +54,11 @@ class WeightMonthlyPage extends StatelessWidget { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Table( + model.weighMonthTimeSeriesData.isEmpty? Container( + child: Center( + child: Texts(TranslationBase.of(context).noDataAvailable), + ), + ):Table( border: TableBorder.symmetric( inside: BorderSide(width: 2.0, color: Colors.grey[300]), ), diff --git a/lib/pages/medical/my_trackers/Weight/WeightWeeklyPage.dart b/lib/pages/medical/my_trackers/Weight/WeightWeeklyPage.dart index d0c92da1..5895eee1 100644 --- a/lib/pages/medical/my_trackers/Weight/WeightWeeklyPage.dart +++ b/lib/pages/medical/my_trackers/Weight/WeightWeeklyPage.dart @@ -3,6 +3,7 @@ import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/pages/medical/my_trackers/widget/LineChartCurved.dart'; import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; +import 'package:diplomaticquarterapp/widgets/charts/app_time_series_chart.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; @@ -25,22 +26,7 @@ class WeightWeeklyPage extends StatelessWidget { return AppScaffold( isShowDecPage: false, - body: model.weightWeekTimeSeriesData.isEmpty - ? Container( - child: Center( - child: Container( - child: Center( - child: LineChartCurved( - horizontalInterval: 1.0, - title: TranslationBase.of(context).weight, - timeSeries: model.weightWeekTimeSeriesData, - indexes: model.weightWeekTimeSeriesData.length ~/ 5.5 ?? 0, - ), - ), - ), - ), - ) - : ListView( + body: ListView( children: [ Container( margin: EdgeInsets.only(top: 12, left: 8, right: 8), @@ -48,7 +34,9 @@ class WeightWeeklyPage extends StatelessWidget { child: LineChartCurved( horizontalInterval: 1.0, title: TranslationBase.of(context).weight, - timeSeries: model.weightWeekTimeSeriesData, + timeSeries: model.weightWeekTimeSeriesData.isEmpty + ? [TimeSeriesSales2(DateTime.now(), 0.0)] + : model.weightWeekTimeSeriesData, indexes: model.weightWeekTimeSeriesData.length ~/ 5.5 ?? 0, ), ), @@ -65,9 +53,14 @@ class WeightWeeklyPage extends StatelessWidget { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Table( + model.weightWeekTimeSeriesData.isEmpty? Container( + child: Center( + child: Texts(TranslationBase.of(context).noDataAvailable), + ), + ):Table( border: TableBorder.symmetric( - inside: BorderSide(width: 2.0, color: Colors.grey[300]), + inside: + BorderSide(width: 2.0, color: Colors.grey[300]), ), children: fullData(context, projectViewModel, model), ), @@ -79,7 +72,8 @@ class WeightWeeklyPage extends StatelessWidget { ); } - List fullData(BuildContext context, ProjectViewModel projectViewModel, WeightPressureViewModel model) { + List fullData(BuildContext context, + ProjectViewModel projectViewModel, WeightPressureViewModel model) { List tableRow = []; tableRow.add( TableRow( @@ -88,8 +82,12 @@ class WeightWeeklyPage extends StatelessWidget { decoration: BoxDecoration( color: Theme.of(context).primaryColor, borderRadius: BorderRadius.only( - topLeft: projectViewModel.isArabic ? Radius.circular(0.0) : Radius.circular(10.0), - topRight: projectViewModel.isArabic ? Radius.circular(10.0) : Radius.circular(0.0), + topLeft: projectViewModel.isArabic + ? Radius.circular(0.0) + : Radius.circular(10.0), + topRight: projectViewModel.isArabic + ? Radius.circular(10.0) + : Radius.circular(0.0), ), ), child: Center( @@ -129,8 +127,12 @@ class WeightWeeklyPage extends StatelessWidget { decoration: BoxDecoration( color: Theme.of(context).primaryColor, borderRadius: BorderRadius.only( - topLeft: projectViewModel.isArabic ? Radius.circular(10.0) : Radius.circular(0.0), - topRight: projectViewModel.isArabic ? Radius.circular(0.0) : Radius.circular(10.0), + topLeft: projectViewModel.isArabic + ? Radius.circular(10.0) + : Radius.circular(0.0), + topRight: projectViewModel.isArabic + ? Radius.circular(0.0) + : Radius.circular(10.0), ), ), child: Center( diff --git a/lib/pages/medical/my_trackers/Weight/WeightYeaPage.dart b/lib/pages/medical/my_trackers/Weight/WeightYeaPage.dart index f8fc4dc4..ed50458e 100644 --- a/lib/pages/medical/my_trackers/Weight/WeightYeaPage.dart +++ b/lib/pages/medical/my_trackers/Weight/WeightYeaPage.dart @@ -7,6 +7,7 @@ import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/pages/medical/my_trackers/widget/LineChartCurved.dart'; import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; +import 'package:diplomaticquarterapp/widgets/charts/app_time_series_chart.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:flutter/cupertino.dart'; @@ -28,22 +29,8 @@ class WeightYearPage extends StatelessWidget { ProjectViewModel projectViewModel = Provider.of(context); return AppScaffold( isShowDecPage: false, - body: model.weightYearTimeSeriesData.isEmpty - ? Container( - child: Center( - child: Container( - child: Center( - child: LineChartCurved( - horizontalInterval: 1.0, - title: TranslationBase.of(context).weight, - timeSeries: model.weightYearTimeSeriesData, - indexes: model.weightWeekTimeSeriesData.length ~/ 5.5 ?? 0, - ), - ), - ), - ), - ) - : ListView( + body: + ListView( children: [ Container( width: double.maxFinite, @@ -51,7 +38,7 @@ class WeightYearPage extends StatelessWidget { child: LineChartCurved( horizontalInterval: 2.0, title: TranslationBase.of(context).weight, - timeSeries: model.weightYearTimeSeriesData, + timeSeries: model.weightYearTimeSeriesData.isEmpty?[TimeSeriesSales2(DateTime.now(),0.0)]:model.weightYearTimeSeriesData, indexes: model.weightYearTimeSeriesData.length ~/ 5.5 ?? "", )), SizedBox( @@ -67,7 +54,11 @@ class WeightYearPage extends StatelessWidget { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Table( + model.weightYearTimeSeriesData.isEmpty? Container( + child: Center( + child: Texts(TranslationBase.of(context).noDataAvailable), + ), + ):Table( border: TableBorder.symmetric( inside: BorderSide(width: 2.0, color: Colors.grey[300]), ), diff --git a/lib/pages/medical/my_trackers/blood_suger/BloodMonthly.dart b/lib/pages/medical/my_trackers/blood_suger/BloodMonthly.dart index a0f37c83..f94053e3 100644 --- a/lib/pages/medical/my_trackers/blood_suger/BloodMonthly.dart +++ b/lib/pages/medical/my_trackers/blood_suger/BloodMonthly.dart @@ -30,7 +30,7 @@ class BloodMonthlyPage extends StatelessWidget { Widget build(BuildContext context) { ProjectViewModel projectViewModel = Provider.of(context); return AppScaffold( - baseViewModel: bloodSugarViewMode, + // baseViewModel: bloodSugarViewMode, body: ListView( children: [ Container( diff --git a/lib/pages/medical/my_trackers/blood_suger/BloodYeaPage.dart b/lib/pages/medical/my_trackers/blood_suger/BloodYeaPage.dart index a11b3b14..0b6bf607 100644 --- a/lib/pages/medical/my_trackers/blood_suger/BloodYeaPage.dart +++ b/lib/pages/medical/my_trackers/blood_suger/BloodYeaPage.dart @@ -25,7 +25,7 @@ class BloodYearPage extends StatelessWidget { Widget build(BuildContext context) { ProjectViewModel projectViewModel = Provider.of(context); return AppScaffold( - baseViewModel: bloodSugarViewMode, + // baseViewModel: bloodSugarViewMode, body: ListView( children: [ Container( diff --git a/lib/pages/medical/my_trackers/blood_suger/blood_sugar_weekly_page.dart b/lib/pages/medical/my_trackers/blood_suger/blood_sugar_weekly_page.dart index 6e1ff71b..8bc6788c 100644 --- a/lib/pages/medical/my_trackers/blood_suger/blood_sugar_weekly_page.dart +++ b/lib/pages/medical/my_trackers/blood_suger/blood_sugar_weekly_page.dart @@ -31,7 +31,7 @@ class BloodSugarWeeklyPage extends StatelessWidget { Widget build(BuildContext context) { ProjectViewModel projectViewModel = Provider.of(context); return AppScaffold( - baseViewModel: bloodSugarViewMode, + // baseViewModel: bloodSugarViewMode, body: ListView( children: [ Container( From 8629b62fcb3a8a9ef1bd166f62909e04e09a3f6d Mon Sep 17 00:00:00 2001 From: Elham Rababh Date: Sun, 15 Aug 2021 17:41:53 +0300 Subject: [PATCH 5/5] fix issue --- .../my_trackers/blood_pressure/AddBloodPressurePage.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart b/lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart index 1b8f70e3..733fa9cb 100644 --- a/lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart +++ b/lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart @@ -144,7 +144,7 @@ class _AddBloodPressurePageState extends State { ), InkWell( onTap: () { - confirmSelectMeasureTimeDialog(projectViewModel.isArabic ? measureTimeEnList : measureTimeArList); + confirmSelectMeasureTimeDialog(projectViewModel.isArabic ? measureTimeArList : measureTimeEnList); }, child: Container( padding: EdgeInsets.all(12),