fixed issues

merge-update-with-lab-changes
Fatimah Alshammari 5 years ago
parent 9563998fc3
commit 62d904aa68

@ -2,6 +2,7 @@ import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart'; import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart';
import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/product_detail_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/product_detail_view_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/pharmacy_categorise_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/pharmacy_categorise_view_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/locator.dart'; import 'package:diplomaticquarterapp/locator.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/cart-page/cart-order-page.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/screens/cart-page/cart-order-page.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/product-details/product-detail.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/screens/product-details/product-detail.dart';
@ -15,6 +16,7 @@ import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/others/network_base_view.dart'; import 'package:diplomaticquarterapp/widgets/others/network_base_view.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:rating_bar/rating_bar.dart'; import 'package:rating_bar/rating_bar.dart';
import 'base/base_view.dart'; import 'base/base_view.dart';
@ -58,6 +60,7 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context);
return BaseView<PharmacyCategoriseViewModel>( return BaseView<PharmacyCategoriseViewModel>(
onModelReady: (model) { onModelReady: (model) {
if (widget.productType == 1) { if (widget.productType == 1) {
@ -259,8 +262,8 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
), ),
), ),
), ),
Texts( Texts(projectViewModel.isArabic ? model.finalProducts[index].namen : model.finalProducts[index].name,
model.finalProducts[index].name, // model.finalProducts[index].name,
regular: true, regular: true,
fontSize: 12, fontSize: 12,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
@ -414,8 +417,8 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
), ),
Container( Container(
width: MediaQuery.of(context).size.width * 0.64, width: MediaQuery.of(context).size.width * 0.64,
child: Texts( child: Texts(projectViewModel.isArabic ? model.finalProducts[index].namen : model.finalProducts[index].name,
model.finalProducts[index].name, // model.finalProducts[index].name,
regular: true, regular: true,
fontSize: 13.2, fontSize: 13.2,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,

@ -28,6 +28,7 @@ class _OffersCategorisePageState extends State<OffersCategorisePage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context);
ProjectViewModel projectProvider = Provider.of(context); ProjectViewModel projectProvider = Provider.of(context);
return BaseView<OffersCategoriseViewModel>( return BaseView<OffersCategoriseViewModel>(
onModelReady: (model) => model.getOffersCategorise(), onModelReady: (model) => model.getOffersCategorise(),
@ -99,9 +100,8 @@ class _OffersCategorisePageState extends State<OffersCategorisePage> {
.height * .height *
0.09, 0.09,
child: Center( child: Center(
child: Texts( child: Texts(projectViewModel.isArabic ? model.categorise[index].namen : model.categorise[index].name,
model.categorise[index] // model.categorise[index].name,
.name,
fontWeight: fontWeight:
FontWeight.w600, FontWeight.w600,
fontSize: 13.8, fontSize: 13.8,
@ -117,8 +117,8 @@ class _OffersCategorisePageState extends State<OffersCategorisePage> {
String ids = String ids =
model.categorise[index].id; model.categorise[index].id;
categoriseName = model categoriseName = projectViewModel.isArabic ? model.categorise[index].namen : model.categorise[index].name;
.categorise[index].name; //model.categorise[index].name;
}), }),
], ],
), ),
@ -403,11 +403,8 @@ class _OffersCategorisePageState extends State<OffersCategorisePage> {
), ),
), ),
), ),
Texts( Texts( projectViewModel.isArabic ? model.products[index].namen : model.products[index].name,
model // model.products[index].name,
.products[
index]
.name,
regular: true, regular: true,
fontSize: 12.58, fontSize: 12.58,
fontWeight: fontWeight:
@ -649,9 +646,8 @@ class _OffersCategorisePageState extends State<OffersCategorisePage> {
SizedBox( SizedBox(
height: 4.0, height: 4.0,
), ),
Texts( Texts( projectViewModel.isArabic ? model.products[index].namen : model.products[index].name,
model.products[index] // model.products[index].name,
.name,
regular: true, regular: true,
fontSize: 14.0, fontSize: 14.0,
fontWeight: fontWeight:

@ -116,12 +116,12 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Row( InkWell(
mainAxisAlignment: MainAxisAlignment.spaceBetween, child: Row(
children: [ mainAxisAlignment: MainAxisAlignment.spaceBetween,
Padding( children: [
padding: EdgeInsets.all(10.0), Padding(
child: InkWell( padding: EdgeInsets.all(10.0),
child: Container( child: Container(
child: Texts( child: Texts(
TranslationBase.of(context).viewCategorise, TranslationBase.of(context).viewCategorise,
@ -129,70 +129,19 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
fontWeight: FontWeight.w300, fontWeight: FontWeight.w300,
), ),
), ),
onTap: () {
Navigator.push(
context,
FadePage(
page: SubCategoriseModalsheet(
// id: model.categorise[0].id,
// titleName: model.categorise[0].name,
)),
);
// showModalBottomSheet<void>(
// isScrollControlled: true,
// context: context,
// builder: (BuildContext context) {
// return Container(
// // height: MediaQuery.of(context)
// // .size
// // .height *
// // 0.89,
// color: Colors.white,
// child: Center(
// child: ListView.builder(
// scrollDirection: Axis.vertical,
// itemCount: model.categoriseParent.length,
// itemBuilder: (BuildContext context, int index) {
// return Container(
// child: Padding(
// padding: EdgeInsets.all(4.0),
// child: InkWell(
// child: Column(
// crossAxisAlignment: CrossAxisAlignment.start,
// children: [
// Texts(projectViewModel.isArabic
// ? model.categoriseParent[index].namen
// : model.categoriseParent[index].name),
// Divider(
// thickness: 0.6,
// color: Colors.black12,
// )
// ],
// ),
// onTap: () {
// Navigator.push(
// context,
// FadePage(
// page: SubCategorisePage(
// title: model.categoriseParent[index].name,
// id: model.categoriseParent[index].id,
// parentId: id,
// )),
// );
// },
// ),
// ),
// );
// }),
// ),
// );
// },
// );
},
), ),
),
Icon(Icons.arrow_forward) Icon(Icons.arrow_forward)
], ],
),
onTap: () {
Navigator.push(
context,
FadePage(
page: SubCategoriseModalsheet(
// id: model.categorise[0].id,
// titleName: model.categorise[0].name,
)),
);}
), ),
Divider( Divider(
thickness: 1.0, thickness: 1.0,
@ -256,7 +205,8 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
context, context,
FadePage( FadePage(
page: SubCategorisePage( page: SubCategorisePage(
title: model.categoriseParent[index].name, title: projectViewModel.isArabic ? model.categoriseParent[index].namen : model.categoriseParent[index].name,
// title: model.categoriseParent[index].name,
id: model.categoriseParent[index].id, id: model.categoriseParent[index].id,
parentId: id, parentId: id,
)), )),
@ -289,7 +239,7 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
width: 10.0, width: 10.0,
), ),
Texts( Texts(
'Refine', TranslationBase.of(context).refine,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
), ),
], ],

@ -8,6 +8,7 @@ import 'package:diplomaticquarterapp/widgets/others/StarRating.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:rating_bar/rating_bar.dart';
class ProductTileItem extends StatelessWidget { class ProductTileItem extends StatelessWidget {
final AppSharedPreferences sharedPref = AppSharedPreferences(); final AppSharedPreferences sharedPref = AppSharedPreferences();
@ -178,15 +179,31 @@ class ProductTileItem extends StatelessWidget {
), ),
Row( Row(
children: [ children: [
Expanded( // Expanded(
child: StarRating( RatingBar.readOnly(
totalAverage: item.approvedTotalReviews > 0 initialRating: item.approvedRatingSum.toDouble(),
? (item.approvedRatingSum.toDouble() / size: 15.0,
item.approvedTotalReviews.toDouble()) filledColor: Colors.yellow[700],
.toDouble() emptyColor: Colors.grey[500],
: 0, isHalfAllowed: true,
forceStars: true), halfFilledIcon: Icons.star_half,
), filledIcon: Icons.star,
emptyIcon: Icons.star,
),
Texts(
"(${item.approvedTotalReviews})",
regular: true,
fontSize: 10,
fontWeight: FontWeight.w400,
)
// StarRating(
// totalAverage: item.approvedTotalReviews > 0
// ? (item.approvedRatingSum.toDouble() /
// item.approvedTotalReviews.toDouble())
// .toDouble()
// : 0,
// forceStars: true),
// ),
], ],
), ),
], ],

@ -36,7 +36,7 @@ class PrescriptionsWidget extends StatelessWidget {
ViewAllHomeWidget(TranslationBase.of(context).myPrescription, HomePrescriptionsPage()), ViewAllHomeWidget(TranslationBase.of(context).myPrescription, HomePrescriptionsPage()),
Container( Container(
margin: EdgeInsets.only(right: 10.0, left: 10.0), margin: EdgeInsets.only(right: 10.0, left: 10.0),
height: MediaQuery.of(context).size.height * 0.19, height: MediaQuery.of(context).size.height * 0.30,
child: ListView.builder( child: ListView.builder(
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,
shrinkWrap: true, shrinkWrap: true,

@ -80,7 +80,8 @@ class _PharmacyCategorisePageState extends State<PharmacyCategorisePage> {
page: model.categorise[index].id != '12' page: model.categorise[index].id != '12'
? ParentCategorisePage( ? ParentCategorisePage(
id: model.categorise[index].id, id: model.categorise[index].id,
titleName: model.categorise[index].name, titleName: projectViewModel.isArabic ? model.categorise[index].namen : model.categorise[index].name,
// titleName: model.categorise[index].name,
) )
: FinalProductsPage( : FinalProductsPage(
id: model.categorise[index].id, id: model.categorise[index].id,

@ -2,6 +2,7 @@ import 'package:diplomaticquarterapp/core/model/pharmacy/categorise_parent_model
import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart'; import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart';
import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/product_detail_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/product_detail_view_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/pharmacy_categorise_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/pharmacy_categorise_view_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/locator.dart'; import 'package:diplomaticquarterapp/locator.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/cart-page/cart-order-page.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/screens/cart-page/cart-order-page.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/product-details/product-detail.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/screens/product-details/product-detail.dart';
@ -17,6 +18,7 @@ import 'package:diplomaticquarterapp/widgets/others/entity_checkbox_list.dart';
import 'package:diplomaticquarterapp/widgets/others/network_base_view.dart'; import 'package:diplomaticquarterapp/widgets/others/network_base_view.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:rating_bar/rating_bar.dart'; import 'package:rating_bar/rating_bar.dart';
import 'base/base_view.dart'; import 'base/base_view.dart';
@ -59,6 +61,7 @@ class _SubCategorisePageState extends State<SubCategorisePage> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
TextEditingController minField = TextEditingController(); TextEditingController minField = TextEditingController();
TextEditingController maxField = TextEditingController(); TextEditingController maxField = TextEditingController();
ProjectViewModel projectViewModel = Provider.of(context);
return BaseView<PharmacyCategoriseViewModel>( return BaseView<PharmacyCategoriseViewModel>(
onModelReady: (model) => model.getSubCategorise(i: id), onModelReady: (model) => model.getSubCategorise(i: id),
builder: (BuildContext context, PharmacyCategoriseViewModel model, Widget child) => PharmacyAppScaffold( builder: (BuildContext context, PharmacyCategoriseViewModel model, Widget child) => PharmacyAppScaffold(
@ -136,7 +139,9 @@ class _SubCategorisePageState extends State<SubCategorisePage> {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Texts(model.subCategorise[index].name), Texts(projectViewModel.isArabic ? model.subCategorise[index].namen : model.subCategorise[index].name,
// model.subCategorise[index].name
),
Divider( Divider(
thickness: 0.6, thickness: 0.6,
color: Colors.black12, color: Colors.black12,
@ -208,7 +213,8 @@ class _SubCategorisePageState extends State<SubCategorisePage> {
height: MediaQuery.of(context).size.height * 0.10, height: MediaQuery.of(context).size.height * 0.10,
child: Center( child: Center(
child: Texts( child: Texts(
model.subCategorise[index].name, //projectViewModel.isArabic ? model.subCategorise[index].namen : model.subCategorise[index].name,
model.subCategorise[index].name,
fontSize: 14, fontSize: 14,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
maxLines: 2, maxLines: 2,
@ -627,7 +633,8 @@ class _SubCategorisePageState extends State<SubCategorisePage> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Texts( Texts(
model.subProducts[index].name, projectViewModel.isArabic ? model.subProducts[index].namen : model.subProducts[index].name,
// model.subProducts[index].name,
regular: true, regular: true,
fontSize: 12, fontSize: 12,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
@ -757,7 +764,8 @@ class _SubCategorisePageState extends State<SubCategorisePage> {
Container( Container(
width: MediaQuery.of(context).size.width * 0.65, width: MediaQuery.of(context).size.width * 0.65,
child: Texts( child: Texts(
model.subProducts[index].name, projectViewModel.isArabic ? model.subProducts[index].namen : model.subProducts[index].name,
// model.subProducts[index].name,
regular: true, regular: true,
fontSize: 13.2, fontSize: 13.2,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,

Loading…
Cancel
Save