fixed arrow issue order page

merge-update-with-lab-changes
Fatimah Alshammari 4 years ago
parent 3bfca80ab9
commit 54ff9931cb

@ -1,6 +1,7 @@
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/orders_model.dart'; import 'package:diplomaticquarterapp/core/model/pharmacies/orders_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/order_model_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/order_model_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/pages/pharmacy/order/OrderDetails.dart'; import 'package:diplomaticquarterapp/pages/pharmacy/order/OrderDetails.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
@ -8,6 +9,7 @@ import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.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_svg/flutter_svg.dart'; import 'package:flutter_svg/flutter_svg.dart';
import 'package:provider/provider.dart';
dynamic languageID; dynamic languageID;
@ -107,6 +109,7 @@ class _OrderPageState extends State<OrderPage>
} }
Widget getDeliveredOrder(OrderModelViewModel model) { Widget getDeliveredOrder(OrderModelViewModel model) {
ProjectViewModel projectViewModel = Provider.of(context);
for (int i = 0; i < model.orders.length; i++) { for (int i = 0; i < model.orders.length; i++) {
if (model.orders[i].orderStatusId == 30 || if (model.orders[i].orderStatusId == 30 ||
model.orders[i].orderStatusId == 997 || model.orders[i].orderStatusId == 997 ||
@ -210,7 +213,7 @@ class _OrderPageState extends State<OrderPage>
Container( Container(
margin: EdgeInsets.all(8.0), margin: EdgeInsets.all(8.0),
child: SvgPicture.asset( child: SvgPicture.asset(
languageID == "ar" projectViewModel.isArabic
? 'assets/images/pharmacy/arrow_left.svg' ? 'assets/images/pharmacy/arrow_left.svg'
: 'assets/images/pharmacy/arrow_right.svg', : 'assets/images/pharmacy/arrow_right.svg',
height: 20, height: 20,
@ -373,6 +376,7 @@ class _OrderPageState extends State<OrderPage>
} }
Widget getProcessingOrder(OrderModelViewModel model) { Widget getProcessingOrder(OrderModelViewModel model) {
ProjectViewModel projectViewModel = Provider.of(context);
for (int i = 0; i < model.orders.length; i++) { for (int i = 0; i < model.orders.length; i++) {
if (model.orders[i].orderStatusId == 20 || if (model.orders[i].orderStatusId == 20 ||
model.orders[i].orderStatusId == 995 || model.orders[i].orderStatusId == 995 ||
@ -477,7 +481,7 @@ class _OrderPageState extends State<OrderPage>
Container( Container(
margin: EdgeInsets.all(8.0), margin: EdgeInsets.all(8.0),
child: SvgPicture.asset( child: SvgPicture.asset(
languageID == "ar" projectViewModel.isArabic
? 'assets/images/pharmacy/arrow_left.svg' ? 'assets/images/pharmacy/arrow_left.svg'
: 'assets/images/pharmacy/arrow_right.svg', : 'assets/images/pharmacy/arrow_right.svg',
height: 20, height: 20,
@ -820,6 +824,7 @@ class _OrderPageState extends State<OrderPage>
} }
Widget getPendingOrder(OrderModelViewModel model) { Widget getPendingOrder(OrderModelViewModel model) {
ProjectViewModel projectViewModel = Provider.of(context);
for (int i = 0; i < model.orders.length; i++) { for (int i = 0; i < model.orders.length; i++) {
if (model.orders[i].orderStatusId == 10) { if (model.orders[i].orderStatusId == 10) {
pendingOrderList.add(model.orders[i]); pendingOrderList.add(model.orders[i]);
@ -922,7 +927,7 @@ class _OrderPageState extends State<OrderPage>
Container( Container(
margin: EdgeInsets.all(8.0), margin: EdgeInsets.all(8.0),
child: SvgPicture.asset( child: SvgPicture.asset(
languageID == "ar" projectViewModel.isArabic
? 'assets/images/pharmacy/arrow_left.svg' ? 'assets/images/pharmacy/arrow_left.svg'
: 'assets/images/pharmacy/arrow_right.svg', : 'assets/images/pharmacy/arrow_right.svg',
height: 20, height: 20,
@ -1087,6 +1092,7 @@ class _OrderPageState extends State<OrderPage>
} }
Widget getCancelledOrder(OrderModelViewModel model) { Widget getCancelledOrder(OrderModelViewModel model) {
ProjectViewModel projectViewModel = Provider.of(context);
for (int i = 0; i < model.orders.length; i++) { for (int i = 0; i < model.orders.length; i++) {
if (model.orders[i].orderStatusId == 40 || if (model.orders[i].orderStatusId == 40 ||
model.orders[i].orderStatus == 996 || model.orders[i].orderStatus == 996 ||
@ -1191,7 +1197,7 @@ class _OrderPageState extends State<OrderPage>
Container( Container(
margin: EdgeInsets.all(8.0), margin: EdgeInsets.all(8.0),
child: SvgPicture.asset( child: SvgPicture.asset(
languageID == "ar" projectViewModel.isArabic
? 'assets/images/pharmacy/arrow_left.svg' ? 'assets/images/pharmacy/arrow_left.svg'
: 'assets/images/pharmacy/arrow_right.svg', : 'assets/images/pharmacy/arrow_right.svg',
height: 20, height: 20,

Loading…
Cancel
Save