fix issue

merge-update-with-lab-changes
Fatimah Alshammari 4 years ago
parent f5de786745
commit d1e0b6ccd9

@ -60,6 +60,7 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectProvider = Provider.of(context);
ProjectViewModel projectViewModel = Provider.of(context); ProjectViewModel projectViewModel = Provider.of(context);
return BaseView<PharmacyCategoriseViewModel>( return BaseView<PharmacyCategoriseViewModel>(
onModelReady: (model) { onModelReady: (model) {
@ -228,7 +229,7 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
), ),
child: model.finalProducts[index].rxMessage != null child: model.finalProducts[index].rxMessage != null
? Texts( ? Texts(
languageID == 'ar' ? model.finalProducts[index].rxMessagen : model.finalProducts[index].rxMessage, projectProvider.isArabic ? model.finalProducts[index].rxMessagen : model.finalProducts[index].rxMessage,
color: Colors.white, color: Colors.white,
regular: true, regular: true,
fontSize: 10, fontSize: 10,
@ -390,13 +391,22 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
color: Color(0xffb23838), color: Color(0xffb23838),
borderRadius: BorderRadius.only(topLeft: Radius.circular(6)), borderRadius: BorderRadius.only(topLeft: Radius.circular(6)),
), ),
child: Texts( child:model.finalProducts[index].rxMessage != null
model.finalProducts[index].rxMessage != null ? model.finalProducts[index].rxMessage : "", ? Texts(
projectProvider.isArabic ? model.finalProducts[index].rxMessagen : model.finalProducts[index].rxMessage,
color: Colors.white, color: Colors.white,
regular: true, regular: true,
fontSize: 10, fontSize: 10,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
), )
: Texts(""),
// Texts(
// model.finalProducts[index].rxMessage != null ? model.finalProducts[index].rxMessage : "",
// color: Colors.white,
// regular: true,
// fontSize: 10,
// fontWeight: FontWeight.w600,
// ),
), ),
], ],
), ),

@ -275,7 +275,7 @@ class _OffersCategorisePageState extends State<OffersCategorisePage> {
bottom: 5.0, bottom: 5.0,
), ),
child: Texts( child: Texts(
'offer' TranslationBase.of(context).offers
.toUpperCase(), .toUpperCase(),
color: Colors color: Colors
.red, .red,
@ -338,25 +338,28 @@ class _OffersCategorisePageState extends State<OffersCategorisePage> {
.circular( .circular(
6)), 6)),
), ),
child: Texts( child: model.products[index].rxMessage != null
model ? Texts(
.products[ projectProvider.isArabic
index] ? model.products[index].rxMessagen
.rxMessage != : model.products[index].rxMessage,
null color: Colors.white,
? model
.products[
index]
.rxMessage
: "",
color:
Colors.white,
regular: true, regular: true,
fontSize: 10, fontSize: 10,
fontWeight: fontWeight: FontWeight.w400,
FontWeight ): Texts("")
.w400, // Texts(
), // model.products[index].rxMessage != null ?
// model.products[index].rxMessage
// : "",
// color:
// Colors.white,
// regular: true,
// fontSize: 10,
// fontWeight:
// FontWeight
// .w400,
// ),
), ),
], ],
), ),
@ -508,7 +511,7 @@ class _OffersCategorisePageState extends State<OffersCategorisePage> {
child: Center( child: Center(
child: child:
Texts( Texts(
'offer' TranslationBase.of(context).offers
.toUpperCase(), .toUpperCase(),
color: Colors color: Colors
.red, .red,
@ -576,25 +579,28 @@ class _OffersCategorisePageState extends State<OffersCategorisePage> {
.circular( .circular(
6)), 6)),
), ),
child: Texts( child: model.products[index].rxMessage != null
model ? Texts(
.products[ projectProvider.isArabic
index] ? model.products[index].rxMessagen
.rxMessage != : model.products[index].rxMessage,
null color: Colors.white,
? model
.products[
index]
.rxMessage
: "",
color:
Colors.white,
regular: true, regular: true,
fontSize: 10, fontSize: 10,
fontWeight: fontWeight: FontWeight.w400,
FontWeight ): Texts("")
.w400, // Texts(
), // model.products[index].rxMessage != null
// ? model.products[index].rxMessage
// : "",
// color:
// Colors.white,
// regular: true,
// fontSize: 10,
// fontWeight:
// FontWeight
// .w400,
// ),
), ),
], ],
), ),

@ -1,5 +1,6 @@
import 'package:diplomaticquarterapp/config/size_config.dart'; import 'package:diplomaticquarterapp/config/size_config.dart';
import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/brand_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/brand_view_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
@ -9,6 +10,7 @@ import 'package:diplomaticquarterapp/widgets/input/text_field.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_pharmacy_widget.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_pharmacy_widget.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:provider/provider.dart';
class SearchBrandsPage extends StatefulWidget { class SearchBrandsPage extends StatefulWidget {
@override @override
@ -22,6 +24,7 @@ class _SearchBrandsPageState extends State<SearchBrandsPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectProvider = Provider.of(context);
return BaseView<BrandsViewModel>( return BaseView<BrandsViewModel>(
onModelReady: (model) => model.searchProducts(), onModelReady: (model) => model.searchProducts(),
builder: (BuildContext context, model, Widget child) => builder: (BuildContext context, model, Widget child) =>
@ -60,7 +63,7 @@ class _SearchBrandsPageState extends State<SearchBrandsPage> {
RegExp regExp = RegExp(r'([A-Za-z0-9 a space])'); RegExp regExp = RegExp(r'([A-Za-z0-9 a space])');
if (value.isEmpty) { if (value.isEmpty) {
TranslationBase.of(context).pleaseEnterProductName; TranslationBase.of(context).pleaseEnterProductName;
}else if (regExp.hasMatch(value)){ }else if (!regExp.hasMatch(value)){
AppToast.showErrorToast(message: TranslationBase.of(context).noArabicLetters); AppToast.showErrorToast(message: TranslationBase.of(context).noArabicLetters);
} }
return null; return null;
@ -112,7 +115,7 @@ class _SearchBrandsPageState extends State<SearchBrandsPage> {
model.searchList.length == 0 model.searchList.length == 0
? Container( ? Container(
child: Text( child: Text(
'no data' + model.searchList.length.toString()), TranslationBase.of(context).noData + model.searchList.length.toString()),
) )
: Expanded( : Expanded(
child: Container( child: Container(
@ -128,8 +131,9 @@ class _SearchBrandsPageState extends State<SearchBrandsPage> {
Padding( Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Container( child: Container(
child: Text( child: Text( projectProvider.isArabic
model.searchList[index].name, ? model.searchList[index].namen
:model.searchList[index].name,
style: TextStyle(fontSize: 20), style: TextStyle(fontSize: 20),
), ),
), ),

@ -1,5 +1,6 @@
import 'package:diplomaticquarterapp/config/size_config.dart'; import 'package:diplomaticquarterapp/config/size_config.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/pages/pharmacies/screens/product-details/product-detail.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/screens/product-details/product-detail.dart';
// import 'package:diplomaticquarterapp/pages/pharmacies/product_detail.dart'; // import 'package:diplomaticquarterapp/pages/pharmacies/product_detail.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart';
@ -13,6 +14,7 @@ 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:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:provider/provider.dart';
import 'base/base_view.dart'; import 'base/base_view.dart';
@ -28,6 +30,7 @@ class _SearchProductsPageState extends State<SearchProductsPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectProvider = Provider.of(context);
return BaseView<PharmacyCategoriseViewModel>( return BaseView<PharmacyCategoriseViewModel>(
onModelReady: (model) => model.clearSearchList(), onModelReady: (model) => model.clearSearchList(),
builder: (BuildContext context, PharmacyCategoriseViewModel model, builder: (BuildContext context, PharmacyCategoriseViewModel model,
@ -67,7 +70,7 @@ class _SearchProductsPageState extends State<SearchProductsPage> {
if (value.isEmpty) { if (value.isEmpty) {
TranslationBase.of(context) TranslationBase.of(context)
.pleaseEnterProductName; .pleaseEnterProductName;
} else if (regExp.hasMatch(value)) { } else if (!regExp.hasMatch(value)) {
AppToast.showErrorToast( AppToast.showErrorToast(
message: TranslationBase.of(context) message: TranslationBase.of(context)
.noArabicLetters); .noArabicLetters);
@ -220,19 +223,29 @@ class _SearchProductsPageState extends State<SearchProductsPage> {
Radius.circular( Radius.circular(
6)), 6)),
), ),
child: Texts( child: model.searchList[index].rxMessage != null
model.searchList[index] ? Texts(
.rxMessage != projectProvider.isArabic
null ? model.searchList[index].rxMessagen
? model : model.searchList[index].rxMessage,
.searchList[index]
.rxMessage
: "",
color: Colors.white, color: Colors.white,
regular: true, regular: true,
fontSize: 10, fontSize: 10,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
), ): Texts(""),
// Texts(
// model.searchList[index]
// .rxMessage !=
// null
// ? model
// .searchList[index]
// .rxMessage
// : "",
// color: Colors.white,
// regular: true,
// fontSize: 10,
// fontWeight: FontWeight.w400,
// ),
), ),
], ],
), ),
@ -245,9 +258,11 @@ class _SearchProductsPageState extends State<SearchProductsPage> {
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: [ children: [
Texts( Texts(projectProvider.isArabic
model ? model.searchList[index].namen
.searchList[index].name, :model.searchList[index].name,
// model.searchList[index].name,
regular: true, regular: true,
fontSize: 12, fontSize: 12,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,

@ -884,7 +884,7 @@ class _SubCategorisePageState extends State<SubCategorisePage> {
Padding( Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Text( child: Text(
'There is no data', TranslationBase.of(context).noData,
style: TextStyle(fontSize: 30), style: TextStyle(fontSize: 30),
), ),
) )

Loading…
Cancel
Save