From 207a87a5f05a835f4fe35a0f7e83bde3cd65c7e7 Mon Sep 17 00:00:00 2001 From: Hamza Aleghwairyeen Date: Mon, 8 Apr 2024 23:28:51 +0300 Subject: [PATCH] 4/7/11 --- lib/controller/home/captin/home_captain_controller.dart | 7 ++++++- lib/controller/home/captin/map_driver_controller.dart | 8 ++++++++ lib/controller/home/map_passenger_controller.dart | 4 +++- .../home/Captin/orderCaptin/order_request_page.dart | 9 ++++++++- .../home/Captin/orderCaptin/order_speed_request.dart | 8 +++++++- 5 files changed, 32 insertions(+), 4 deletions(-) diff --git a/lib/controller/home/captin/home_captain_controller.dart b/lib/controller/home/captin/home_captain_controller.dart index 68b1daa..db91d0d 100644 --- a/lib/controller/home/captin/home_captain_controller.dart +++ b/lib/controller/home/captin/home_captain_controller.dart @@ -28,7 +28,11 @@ class HomeCaptainController extends GetxController { late double kazan; double latePrice = 0; double heavyPrice = 0; - double comfortPrice = 0, speedPrice = 0, deliveryPrice = 0, mashwariPrice = 0; + double comfortPrice = 0, + speedPrice = 0, + deliveryPrice = 0, + mashwariPrice = 0, + fuelPrice = 0; double naturePrice = 0; bool isCallOn = false; String totalMoneyToday = '0'; @@ -256,6 +260,7 @@ class HomeCaptainController extends GetxController { deliveryPrice = double.parse(jsonDecode(res)['message'][0]['deliveryPrice']); mashwariPrice = double.parse(jsonDecode(res)['message'][0]['freePrice']); + fuelPrice = double.parse(jsonDecode(res)['message'][0]['fuelPrice']); } } diff --git a/lib/controller/home/captin/map_driver_controller.dart b/lib/controller/home/captin/map_driver_controller.dart index 3c2c8df..db0e754 100644 --- a/lib/controller/home/captin/map_driver_controller.dart +++ b/lib/controller/home/captin/map_driver_controller.dart @@ -836,6 +836,13 @@ class MapDriverController extends GetxController { update(); } + double mpg = 0; + calculateConsumptionFuel() { + mpg = Get.find().fuelPrice / + 12; //todo in register car add mpg in box + update(); + } + late Duration durationToAdd; int hours = 0; int minutes = 0; @@ -910,6 +917,7 @@ class MapDriverController extends GetxController { durationToAdd = Duration(seconds: int.parse(duration)); hours = durationToAdd.inHours; minutes = (durationToAdd.inMinutes % 60).round(); + calculateConsumptionFuel(); // cancelCheckRidefromPassenger(); // checkIsDriverNearPassenger(); super.onInit(); diff --git a/lib/controller/home/map_passenger_controller.dart b/lib/controller/home/map_passenger_controller.dart index 880c9d8..ee4dd85 100644 --- a/lib/controller/home/map_passenger_controller.dart +++ b/lib/controller/home/map_passenger_controller.dart @@ -2458,7 +2458,9 @@ class MapPassengerController extends GetxController { link: AppLink.getPassengerRate, payload: {'passenger_id': box.read(BoxName.passengerID)}); if (res != 'failure') { - passengerRate = jsonDecode(res)['message']['rating'].toDouble(); + passengerRate = jsonDecode(res)['message']['rating'] == null + ? 5 + : jsonDecode(res)['message']['rating'].toDouble(); } } diff --git a/lib/views/home/Captin/orderCaptin/order_request_page.dart b/lib/views/home/Captin/orderCaptin/order_request_page.dart index c094a16..f6e6dad 100644 --- a/lib/views/home/Captin/orderCaptin/order_request_page.dart +++ b/lib/views/home/Captin/orderCaptin/order_request_page.dart @@ -79,7 +79,13 @@ class OrderRequestPage extends StatelessWidget { endIcon = value; }); // } + double mpg = 0; + calculateConsumptionFuel() { + mpg = Get.find().fuelPrice / + 12; //todo in register car add mpg in box + } + calculateConsumptionFuel(); return MyScafolld( title: 'Order Details'.tr, body: [ @@ -278,7 +284,8 @@ class OrderRequestPage extends StatelessWidget { style: AppStyle.title, children: [ TextSpan( - text: double.parse(myList[26]).toStringAsFixed(2), + text: (mpg * double.parse(myList[5])) + .toStringAsFixed(2), style: AppStyle.headTitle2), ], ), diff --git a/lib/views/home/Captin/orderCaptin/order_speed_request.dart b/lib/views/home/Captin/orderCaptin/order_speed_request.dart index a0e0136..f21f34b 100644 --- a/lib/views/home/Captin/orderCaptin/order_speed_request.dart +++ b/lib/views/home/Captin/orderCaptin/order_speed_request.dart @@ -81,6 +81,11 @@ class OrderSpeedRequest extends StatelessWidget { endIcon = value; }); // } + double mpg = 0; + calculateConsumptionFuel() { + mpg = Get.find().fuelPrice / + 12; //todo in register car add mpg in box + } return MyScafolld( title: 'Order Details'.tr, @@ -287,7 +292,8 @@ class OrderSpeedRequest extends StatelessWidget { style: AppStyle.title, children: [ TextSpan( - text: double.parse(myList[26]).toStringAsFixed(2), + text: (mpg * double.parse(myList[5])) + .toStringAsFixed(2), style: AppStyle.headTitle2), ], ),