Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'

Fatima new design

See merge request Cloud_Solution/diplomatic-quarter!489
merge-update-with-lab-changes
haroon amjad 4 years ago
commit efe8dea9a9

@ -1037,6 +1037,7 @@ const Map localizedValues = {
"no-data": {"en": "No data found", "ar": "لاتوجد بيانات"}, "no-data": {"en": "No data found", "ar": "لاتوجد بيانات"},
"insurance-details": {"en": "Insurance Details", "ar": "تفاصيل التأمين"}, "insurance-details": {"en": "Insurance Details", "ar": "تفاصيل التأمين"},
"nearest-hospital": {"en": "Nearest Hospital", "ar": "أقرب مستشفى"}, "nearest-hospital": {"en": "Nearest Hospital", "ar": "أقرب مستشفى"},
"submitReview": {"en": "Your review has been Submitted successfully", "ar": "تم إرسال التقييم بنجاح"},
"request-sent": {"en": "Request sent successfully", "ar": "تم إرسال الطلب بنجاح"}, "request-sent": {"en": "Request sent successfully", "ar": "تم إرسال الطلب بنجاح"},
"message-sent": {"en": "Message sent successfully", "ar": "تم إرسال الرسالة بنجاح"}, "message-sent": {"en": "Message sent successfully", "ar": "تم إرسال الرسالة بنجاح"},
"sent-on": {"en": "Sent on", "ar": "أرسلت في"}, "sent-on": {"en": "Sent on", "ar": "أرسلت في"},

@ -11,6 +11,7 @@ import 'package:diplomaticquarterapp/services/pharmacy_services/cancelOrder_serv
import 'package:diplomaticquarterapp/services/pharmacy_services/orderDetails_service.dart'; import 'package:diplomaticquarterapp/services/pharmacy_services/orderDetails_service.dart';
import 'package:diplomaticquarterapp/services/pharmacy_services/order_service.dart'; import 'package:diplomaticquarterapp/services/pharmacy_services/order_service.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import '../../../locator.dart'; import '../../../locator.dart';
import '../base_view_model.dart'; import '../base_view_model.dart';
@ -77,7 +78,8 @@ class OrderModelViewModel extends BaseViewModel {
dynamic res; dynamic res;
await _cancelOrderService.getCanceledOrder(order).then((value) { await _cancelOrderService.getCanceledOrder(order).then((value) {
res = value['success']['SuccessEndUserMsg']; res = value['success']['SuccessEndUserMsg'];
AppToast.showSuccessToast(message: "Request Sent Successfully"); // AppToast.showSuccessToast(message: "Request Sent Successfully");
AppToast.showSuccessToast(message: TranslationBase.of(context).requestSent);
// Navigator.pop(context); // Navigator.pop(context);
}); });
if (_cancelOrderService.hasError) { if (_cancelOrderService.hasError) {
@ -95,7 +97,7 @@ class OrderModelViewModel extends BaseViewModel {
return res; return res;
} }
Future makeReview(PharmacyProduct product, double rating, String reviewText) async { Future makeReview(PharmacyProduct product, double rating, String reviewText, context) async {
setState(ViewState.Busy); setState(ViewState.Busy);
await _orderDetailsService.makeReview(product, rating, reviewText); await _orderDetailsService.makeReview(product, rating, reviewText);
if (_orderDetailsService.hasError) { if (_orderDetailsService.hasError) {
@ -104,8 +106,9 @@ class OrderModelViewModel extends BaseViewModel {
AppToast.showErrorToast(message: error); AppToast.showErrorToast(message: error);
} else { } else {
setState(ViewState.Idle); setState(ViewState.Idle);
AppToast.showSuccessToast( AppToast.showSuccessToast(message: TranslationBase.of(context).submitReview);
message: "Your review has been Submitted successfully"); // AppToast.showSuccessToast(
// message: "Your review has been Submitted successfully");
} }
} }

@ -15,6 +15,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:rating_bar/rating_bar.dart';
import 'base/base_view.dart'; import 'base/base_view.dart';
@ -274,11 +275,21 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
), ),
Row( Row(
children: [ children: [
StarRating( // StarRating(
totalAverage: model.finalProducts[index].approvedRatingSum > 0 // totalAverage: model.finalProducts[index].approvedRatingSum > 0
? (model.finalProducts[index].approvedRatingSum.toDouble() / model.finalProducts[index].approvedRatingSum.toDouble()).toDouble() // ? (model.finalProducts[index].approvedRatingSum.toDouble() / model.finalProducts[index].approvedRatingSum.toDouble()).toDouble()
: 0, // : 0,
forceStars: true), // forceStars: true),
RatingBar.readOnly(
initialRating: model.finalProducts[index].approvedRatingSum.toDouble(),
size: 15.0,
filledColor: Colors.yellow[700],
emptyColor: Colors.grey[500],
isHalfAllowed: true,
halfFilledIcon: Icons.star_half,
filledIcon: Icons.star,
emptyIcon: Icons.star,
),
Texts( Texts(
"(${model.finalProducts[index].approvedTotalReviews})", "(${model.finalProducts[index].approvedTotalReviews})",
regular: true, regular: true,
@ -424,11 +435,21 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
), ),
Row( Row(
children: [ children: [
StarRating( // StarRating(
totalAverage: model.finalProducts[index].approvedRatingSum > 0 // totalAverage: model.finalProducts[index].approvedRatingSum > 0
? (model.finalProducts[index].approvedRatingSum.toDouble() / model.finalProducts[index].approvedRatingSum.toDouble()).toDouble() // ? (model.finalProducts[index].approvedRatingSum.toDouble() / model.finalProducts[index].approvedRatingSum.toDouble()).toDouble()
: 0, // : 0,
forceStars: true), // forceStars: true),
RatingBar.readOnly(
initialRating: model.finalProducts[index].approvedRatingSum.toDouble(),
size: 15.0,
filledColor: Colors.yellow[700],
emptyColor: Colors.grey[500],
isHalfAllowed: true,
halfFilledIcon: Icons.star_half,
filledIcon: Icons.star,
emptyIcon: Icons.star,
),
Texts( Texts(
"(${model.finalProducts[index].approvedTotalReviews})", "(${model.finalProducts[index].approvedTotalReviews})",
regular: true, regular: true,

@ -7,6 +7,7 @@ import 'package:diplomaticquarterapp/widgets/others/app_scaffold_pharmacy_widget
import 'package:diplomaticquarterapp/widgets/others/network_base_view.dart'; import 'package:diplomaticquarterapp/widgets/others/network_base_view.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';
import 'base/base_view.dart'; import 'base/base_view.dart';
@ -428,14 +429,24 @@ class _OffersCategorisePageState extends State<OffersCategorisePage> {
), ),
Row( Row(
children: [ children: [
StarRating( // StarRating(
totalAverage: model.products[index].approvedRatingSum > // totalAverage: model.products[index].approvedRatingSum >
0 // 0
? (model.products[index].approvedRatingSum.toDouble() / model.products[index].approvedRatingSum.toDouble()) // ? (model.products[index].approvedRatingSum.toDouble() / model.products[index].approvedRatingSum.toDouble())
.toDouble() // .toDouble()
: 0, // : 0,
forceStars: // forceStars:
true), // true),
RatingBar.readOnly(
initialRating: model.products[index].approvedRatingSum.toDouble(),
size: 15.0,
filledColor: Colors.yellow[700],
emptyColor: Colors.grey[500],
isHalfAllowed: true,
halfFilledIcon: Icons.star_half,
filledIcon: Icons.star,
emptyIcon: Icons.star,
),
Texts( Texts(
"(${model.products[index].approvedTotalReviews})", "(${model.products[index].approvedTotalReviews})",
regular: true, regular: true,
@ -663,19 +674,29 @@ class _OffersCategorisePageState extends State<OffersCategorisePage> {
), ),
Row( Row(
children: [ children: [
StarRating( // StarRating(
totalAverage: model // totalAverage: model
.products[ // .products[
index] // index]
.approvedRatingSum > // .approvedRatingSum >
0 // 0
? (model.products[index].approvedRatingSum.toDouble() / // ? (model.products[index].approvedRatingSum.toDouble() /
model.products[index].approvedRatingSum // model.products[index].approvedRatingSum
.toDouble()) // .toDouble())
.toDouble() // .toDouble()
: 0, // : 0,
forceStars: // forceStars:
true), // true),
RatingBar.readOnly(
initialRating: model.products[index].approvedRatingSum.toDouble(),
size: 15.0,
filledColor: Colors.yellow[700],
emptyColor: Colors.grey[500],
isHalfAllowed: true,
halfFilledIcon: Icons.star_half,
filledIcon: Icons.star,
emptyIcon: Icons.star,
),
Texts( Texts(
"(${model.products[index].approvedTotalReviews})", "(${model.products[index].approvedTotalReviews})",
regular: true, regular: true,

@ -22,6 +22,7 @@ import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.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';
import 'base/base_view.dart'; import 'base/base_view.dart';
@ -714,11 +715,21 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
), ),
Row( Row(
children: [ children: [
StarRating( // StarRating(
totalAverage: model.parentProducts[index].approvedRatingSum > 0 // totalAverage: model.parentProducts[index].approvedRatingSum > 0
? (model.parentProducts[index].approvedRatingSum.toDouble() / model.parentProducts[index].approvedRatingSum.toDouble()).toDouble() // ? (model.parentProducts[index].approvedRatingSum.toDouble() / model.parentProducts[index].approvedRatingSum.toDouble()).toDouble()
: 0, // : 0,
forceStars: true), // forceStars: true),
RatingBar.readOnly(
initialRating: model.parentProducts[index].approvedRatingSum.toDouble(),
size: 15.0,
filledColor: Colors.yellow[700],
emptyColor: Colors.grey[500],
isHalfAllowed: true,
halfFilledIcon: Icons.star_half,
filledIcon: Icons.star,
emptyIcon: Icons.star,
),
Texts( Texts(
"(${model.parentProducts[index].approvedTotalReviews})", "(${model.parentProducts[index].approvedTotalReviews})",
regular: true, regular: true,
@ -838,11 +849,21 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
), ),
Row( Row(
children: [ children: [
StarRating( // StarRating(
totalAverage: model.parentProducts[index].approvedRatingSum > 0 // totalAverage: model.parentProducts[index].approvedRatingSum > 0
? (model.parentProducts[index].approvedRatingSum.toDouble() / model.parentProducts[index].approvedRatingSum.toDouble()).toDouble() // ? (model.parentProducts[index].approvedRatingSum.toDouble() / model.parentProducts[index].approvedRatingSum.toDouble()).toDouble()
: 0, // : 0,
forceStars: true), // forceStars: true),
RatingBar.readOnly(
initialRating: model.parentProducts[index].approvedRatingSum.toDouble(),
size: 15.0,
filledColor: Colors.yellow[700],
emptyColor: Colors.grey[500],
isHalfAllowed: true,
halfFilledIcon: Icons.star_half,
filledIcon: Icons.star,
emptyIcon: Icons.star,
),
Texts( Texts(
"(${model.parentProducts[index].approvedTotalReviews})", "(${model.parentProducts[index].approvedTotalReviews})",
regular: true, regular: true,

@ -201,7 +201,7 @@ class _ProductReviewPageState extends State<ProductReviewPage> {
? () { ? () {
model model
.makeReview( .makeReview(
widget.product, ratingValue, reviewText) widget.product, ratingValue, reviewText, context)
.then((value) { .then((value) {
setState(() { setState(() {
finishReview = true; finishReview = true;

@ -17,6 +17,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:rating_bar/rating_bar.dart';
import 'base/base_view.dart'; import 'base/base_view.dart';
import 'final_products_page.dart'; import 'final_products_page.dart';
@ -641,11 +642,21 @@ class _SubCategorisePageState extends State<SubCategorisePage> {
), ),
Row( Row(
children: [ children: [
StarRating( // StarRating(
totalAverage: model.subProducts[index].approvedRatingSum > 0 // totalAverage: model.subProducts[index].approvedRatingSum > 0
? (model.subProducts[index].approvedRatingSum.toDouble() / model.subProducts[index].approvedRatingSum.toDouble()).toDouble() // ? (model.subProducts[index].approvedRatingSum.toDouble() / model.subProducts[index].approvedRatingSum.toDouble()).toDouble()
: 0, // : 0,
forceStars: true), // forceStars: true),
RatingBar.readOnly(
initialRating: model.subProducts[index].approvedRatingSum.toDouble(),
size: 15.0,
filledColor: Colors.yellow[700],
emptyColor: Colors.grey[500],
isHalfAllowed: true,
halfFilledIcon: Icons.star_half,
filledIcon: Icons.star,
emptyIcon: Icons.star,
),
Texts( Texts(
"(${model.subProducts[index].approvedTotalReviews})", "(${model.subProducts[index].approvedTotalReviews})",
regular: true, regular: true,
@ -766,11 +777,21 @@ class _SubCategorisePageState extends State<SubCategorisePage> {
), ),
Row( Row(
children: [ children: [
StarRating( // StarRating(
totalAverage: model.subProducts[index].approvedRatingSum > 0 // totalAverage: model.subProducts[index].approvedRatingSum > 0
? (model.subProducts[index].approvedRatingSum.toDouble() / model.subProducts[index].approvedRatingSum.toDouble()).toDouble() // ? (model.subProducts[index].approvedRatingSum.toDouble() / model.subProducts[index].approvedRatingSum.toDouble()).toDouble()
: 0, // : 0,
forceStars: true), // forceStars: true),
RatingBar.readOnly(
initialRating: model.subProducts[index].approvedRatingSum.toDouble(),
size: 15.0,
filledColor: Colors.yellow[700],
emptyColor: Colors.grey[500],
isHalfAllowed: true,
halfFilledIcon: Icons.star_half,
filledIcon: Icons.star,
emptyIcon: Icons.star,
),
Texts( Texts(
"(${model.subProducts[index].approvedTotalReviews})", "(${model.subProducts[index].approvedTotalReviews})",
regular: true, regular: true,

@ -1770,6 +1770,8 @@ class TranslationBase {
String get requestSent => localizedValues['request-sent'][locale.languageCode]; String get requestSent => localizedValues['request-sent'][locale.languageCode];
String get submitReview => localizedValues['submitReview'][locale.languageCode];
String get attachInsuraceImage => localizedValues['attach-insurace-image'][locale.languageCode]; String get attachInsuraceImage => localizedValues['attach-insurace-image'][locale.languageCode];
String get infoInsurCards => localizedValues['info-insur-cards'][locale.languageCode]; String get infoInsurCards => localizedValues['info-insur-cards'][locale.languageCode];

Loading…
Cancel
Save