diff --git a/lib/config/config.dart b/lib/config/config.dart index 2a6f133..679ef20 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -1,15 +1,22 @@ import 'package:flutter/cupertino.dart'; -const MAX_SMALL_SCREEN = 660; - +/// End points const BASE_URL = 'https://uat.hmgwebservices.com/Services'; - const GET_PROJECT = '/Lists.svc/REST/GetProject'; const LOGIN = "/Authentication.svc/REST/CheckDriverAuthentication"; +const GET_ALL_ORDERS = '/Patients.svc/REST/PatientER_Delivery_GetAllOrder'; +const SCAN_QR = '/Patients.svc/REST/PatientER_Delivery_OrderInsert'; +/// Body Constant +const CHANNEL = 9; + + +/// design constant +const MAX_SMALL_SCREEN = 660; -const GET_ALL_ORDERS = '/Patients.svc/REST/PatientER_Delivery_GetAllOrder'; class AppGlobal { static BuildContext context; } + + diff --git a/lib/core/model/scan_qr/scan_qr_request_model.dart b/lib/core/model/scan_qr/scan_qr_request_model.dart new file mode 100644 index 0000000..53c0284 --- /dev/null +++ b/lib/core/model/scan_qr/scan_qr_request_model.dart @@ -0,0 +1,44 @@ +class ScanQrRequestModel { + int deliveryOrderID; + int driverID; + int createdBy; + int channel; + int groupID; + String tokenID; + String userID; + String mobileNo; + + ScanQrRequestModel( + {this.deliveryOrderID, + this.driverID, + this.createdBy, + this.channel, + this.groupID, + this.tokenID, + this.userID, + this.mobileNo}); + + ScanQrRequestModel.fromJson(Map json) { + deliveryOrderID = json['DeliveryOrderID']; + driverID = json['DriverID']; + createdBy = json['CreatedBy']; + channel = json['Channel']; + groupID = json['GroupID']; + tokenID = json['TokenID']; + userID = json['UserID']; + mobileNo = json['MobileNo']; + } + + Map toJson() { + final Map data = new Map(); + data['DeliveryOrderID'] = this.deliveryOrderID; + data['DriverID'] = this.driverID; + data['CreatedBy'] = this.createdBy; + data['Channel'] = this.channel; + data['GroupID'] = this.groupID; + data['TokenID'] = this.tokenID; + data['UserID'] = this.userID; + data['MobileNo'] = this.mobileNo; + return data; + } +} diff --git a/lib/core/service/client/base_app_client.dart b/lib/core/service/client/base_app_client.dart index 5008fe5..50835f1 100644 --- a/lib/core/service/client/base_app_client.dart +++ b/lib/core/service/client/base_app_client.dart @@ -1,6 +1,8 @@ import 'dart:convert'; import 'package:driverapp/config/config.dart'; +import 'package:driverapp/config/shared_pref_kay.dart'; +import 'package:driverapp/core/model/authentication/authenticated_user.dart'; import 'package:driverapp/uitl/app_shared_preferences.dart'; import 'package:driverapp/uitl/utils.dart'; import 'package:http/http.dart' as http; @@ -23,8 +25,18 @@ class BaseAppClient { String url = BASE_URL + endPoint; try { - //Map profile = await sharedPref.getObj(DOCTOR_PROFILE); - // String token = await sharedPref.getString(TOKEN); + Map profile = await sharedPref.getObject(USER_PROFILE); + String token = await sharedPref.getString(TOKEN); + if (profile != null) { + AuthenticatedUser doctorProfile = AuthenticatedUser.fromJson(profile); + body['DriverID'] = doctorProfile?.userID; + body['CreatedBy'] = doctorProfile?.userID; + body['UserID'] = '${doctorProfile?.userID}'; + body['TokenID'] = token; + body['MobileNo'] = doctorProfile?.mobileNumber; + } + + body['Channel'] = CHANNEL; print("URL : $url"); print("Body : ${json.encode(body)}"); diff --git a/lib/core/service/orders_service.dart b/lib/core/service/orders_service.dart new file mode 100644 index 0000000..90bb8a7 --- /dev/null +++ b/lib/core/service/orders_service.dart @@ -0,0 +1,62 @@ +import 'package:driverapp/config/config.dart'; +import 'package:driverapp/core/model/pending_orders/pending_orders_model.dart'; +import 'package:driverapp/core/model/scan_qr/scan_qr_request_model.dart'; +import 'package:driverapp/core/service/base_service.dart'; + +class OrdersService extends BaseService { + List _orders = List(); + List get orders => _orders; + bool isOrderInserted; + + PendingOrders _requestGetPendingOrders = PendingOrders( + driverID: 1111, + searchKey: "", + pageSize: 0, + pageIndex: 0, + tokenID: "@dm!n", + userID: "1111", + mobileNo: "0541710575", + ); + + Future getPendingOrders() async { + hasError = false; + try { + await baseAppClient.post(GET_ALL_ORDERS, + onSuccess: (dynamic response, int statusCode) { + _orders.clear(); + response['PatientER_Delivery_GetAllOrderList'].forEach((order) { + _orders.add(PendingOrders.fromJson(order)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: _requestGetPendingOrders.toJson()); + } catch (e) { + hasError = true; + super.error = error; + throw e; + } + } + + + Future insertOrder() async { + ScanQrRequestModel _scanQrRequestModel = ScanQrRequestModel(deliveryOrderID: 1200, groupID: 0); + hasError = false; + try { + await baseAppClient.post(SCAN_QR, + onSuccess: (dynamic response, int statusCode) { + isOrderInserted = response["PatientER_Delivery_IsOrderInserted"]; + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: _scanQrRequestModel.toJson()); + } catch (e) { + + hasError = true; + super.error = error; + throw e; + } + } + + +} diff --git a/lib/core/service/pending_orders_service.dart b/lib/core/service/pending_orders_service.dart deleted file mode 100644 index f4024a3..0000000 --- a/lib/core/service/pending_orders_service.dart +++ /dev/null @@ -1,31 +0,0 @@ -import 'package:driverapp/config/config.dart'; -import 'package:driverapp/core/model/pending_orders/pending_orders_model.dart'; -import 'package:driverapp/core/service/base_service.dart'; - -class PendingOrdersService extends BaseService { - List _orders = List(); - List get orders => _orders; - - PendingOrders _requestGetPendingOrders = PendingOrders( - driverID: 1111, - searchKey: "", - pageSize: 0, - pageIndex: 0, - tokenID: "@dm!n", - userID: "1111", - mobileNo: "0541710575", - ); - - Future getPendingOrders() async { - await baseAppClient.post(GET_ALL_ORDERS, - onSuccess: (dynamic response, int statusCode) { - _orders.clear(); - response['PatientER_Delivery_GetAllOrderList'].forEach((order) { - _orders.add(PendingOrders.fromJson(order)); - }); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: _requestGetPendingOrders.toJson()); - } -} diff --git a/lib/core/viewModels/pending_orders_view_model.dart b/lib/core/viewModels/orders_view_model.dart similarity index 54% rename from lib/core/viewModels/pending_orders_view_model.dart rename to lib/core/viewModels/orders_view_model.dart index 0f66bba..8ce412b 100644 --- a/lib/core/viewModels/pending_orders_view_model.dart +++ b/lib/core/viewModels/orders_view_model.dart @@ -1,11 +1,11 @@ import 'package:driverapp/core/enum/viewstate.dart'; -import 'package:driverapp/core/service/pending_orders_service.dart'; +import 'package:driverapp/core/service/orders_service.dart'; import 'package:driverapp/core/model/pending_orders/pending_orders_model.dart'; import '../../locator.dart'; import 'base_view_model.dart'; -class PendingOrdersViewModel extends BaseViewModel { - PendingOrdersService _pendingOrdersService = locator(); +class OrdersViewModel extends BaseViewModel { + OrdersService _pendingOrdersService = locator(); List get orders => _pendingOrdersService.orders; @@ -18,4 +18,15 @@ class PendingOrdersViewModel extends BaseViewModel { } else setState(ViewState.Idle); } + + + Future insertOrder() async { + setState(ViewState.ErrorLocal); + await _pendingOrdersService.insertOrder(); + if (_pendingOrdersService.hasError) { + error = _pendingOrdersService.error; + setState(ViewState.ErrorLocal); + } else + setState(ViewState.Idle); + } } diff --git a/lib/locator.dart b/lib/locator.dart index e12abbf..a10e30e 100644 --- a/lib/locator.dart +++ b/lib/locator.dart @@ -2,9 +2,9 @@ import 'package:get_it/get_it.dart'; import 'core/service/authentication_service.dart'; import 'core/service/hospital_service.dart'; -import 'core/service/pending_orders_service.dart'; +import 'core/service/orders_service.dart'; import 'core/viewModels/authentication_view_model.dart'; -import 'core/viewModels/pending_orders_view_model.dart'; +import 'core/viewModels/orders_view_model.dart'; import 'core/viewModels/hospital_view_model.dart'; GetIt locator = GetIt.instance; @@ -14,10 +14,10 @@ void setupLocator() { /// Services locator.registerLazySingleton(() => HospitalService()); locator.registerLazySingleton(() => AuthenticationService()); - locator.registerLazySingleton(() => PendingOrdersService()); + locator.registerLazySingleton(() => OrdersService()); /// View Model locator.registerFactory(() => HospitalViewModel()); locator.registerFactory(() => AuthenticationViewModel()); - locator.registerFactory(() => PendingOrdersViewModel()); + locator.registerFactory(() => OrdersViewModel()); } diff --git a/lib/pages/authentication/login_page.dart b/lib/pages/authentication/login_page.dart index 9d37032..b43dfbb 100644 --- a/lib/pages/authentication/login_page.dart +++ b/lib/pages/authentication/login_page.dart @@ -11,6 +11,7 @@ import 'package:driverapp/uitl/utils.dart'; import 'package:driverapp/widgets/buttons/secondary_button.dart'; import 'package:driverapp/widgets/data_display/circle-container.dart'; import 'package:driverapp/widgets/input/text_field.dart'; +import 'package:driverapp/widgets/others/app_scaffold_widget.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; @@ -28,7 +29,8 @@ class LoginPage extends StatelessWidget { return AnimatedSwitcher( duration: Duration(microseconds: 350), child: BaseView( - builder: (_, model, widget) => Scaffold( + builder: (_, model, widget) => AppScaffold( + isShowAppBar: false, body: SingleChildScrollView( child: Center( child: Column( diff --git a/lib/pages/dashboard/dashboard_screen.dart b/lib/pages/dashboard/dashboard_screen.dart index 94ff6ae..ed986ee 100644 --- a/lib/pages/dashboard/dashboard_screen.dart +++ b/lib/pages/dashboard/dashboard_screen.dart @@ -1,5 +1,9 @@ +import 'package:barcode_scan/platform_wrapper.dart'; import 'package:driverapp/config/size_config.dart'; -import 'package:driverapp/core/viewModels/pending_orders_view_model.dart'; +import 'package:driverapp/core/enum/viewstate.dart'; +import 'package:driverapp/core/viewModels/orders_view_model.dart'; +import 'package:driverapp/uitl/app_toast.dart'; +import 'package:driverapp/uitl/utils.dart'; import 'package:flutter/material.dart'; import '../base/base_view.dart'; import 'package:flutter/cupertino.dart'; @@ -15,13 +19,15 @@ class DashboardScreen extends StatefulWidget { class _DashboardScreenState extends State { @override Widget build(BuildContext context) { - return BaseView( + return BaseView( onModelReady: (model) => model.getPendingOrders(), builder: - (BuildContext context, PendingOrdersViewModel model, Widget child) => + (BuildContext context, OrdersViewModel model, Widget child) => Scaffold( backgroundColor: Color(0xffF4F9FA), body: Column( + // mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, children: [ Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, @@ -30,152 +36,171 @@ class _DashboardScreenState extends State { padding: EdgeInsets.all(16.0), child: Column( children: [ - Column( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - 'Have a great day ,', - style: TextStyle(fontSize: 12.5), - ), - Padding( - padding: EdgeInsets.only(top: 4.5), - child: Text( - 'Driver Name', - style: TextStyle( - fontWeight: FontWeight.w400, fontSize: 25.0), + SafeArea( + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + 'Have a great day ,', + style: TextStyle(fontSize: 12.5), ), - ), - ], + Padding( + padding: EdgeInsets.only(top: 4.5), + child: Text( + 'Driver Name', + style: TextStyle( + fontWeight: FontWeight.w400, + fontSize: 25.0), + ), + ), + ], + ), ), ], ), ), Padding( padding: EdgeInsets.all(16.0), - child: Column( - children: [ - CircleAvatar( - radius: 25.5, - backgroundColor: Color(0xff30B7B9), - child: CircleAvatar( + child: SafeArea( + child: Column( + children: [ + CircleAvatar( + radius: 25.5, backgroundColor: Color(0xff30B7B9), - maxRadius: 26.0, - child: Image.asset( - 'assets/images/driver.png', - fit: BoxFit.contain, + child: CircleAvatar( + backgroundColor: Color(0xff30B7B9), + maxRadius: 26.0, + child: Image.asset( + 'assets/images/driver.png', + fit: BoxFit.contain, + ), ), ), - ), - ], + ], + ), ), ), ], ), Row( children: [ - Column( - children: [ - Padding( - padding: EdgeInsets.symmetric(horizontal: 12.0), - child: Container( - height: MediaQuery.of(context).size.height * 0.15, - width: MediaQuery.of(context).size.width * 0.43, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(12.0), - gradient: LinearGradient( - colors: [Color(0xff17AFB8), Color(0xff49C1BC)]), - ), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Padding( - padding: EdgeInsets.all(12.0), - child: Column( - mainAxisAlignment: - MainAxisAlignment.spaceEvenly, - children: [ - Text( - 'You Have', - style: TextStyle( - color: Colors.white, fontSize: 10.0), - ), - Text( - '5', - style: TextStyle( - color: Colors.white, fontSize: 25.0), - ), - Text( - 'Undelivered \n Packages', - style: TextStyle( - color: Colors.white, fontSize: 10.0), - ) - ], + Expanded( + child: Column( + children: [ + Padding( + padding: EdgeInsets.symmetric(horizontal: 10.0), + child: Container( + height: MediaQuery.of(context).size.height * 0.15, + width: MediaQuery.of(context).size.width * 0.44, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(15.0), + gradient: LinearGradient( + colors: [Color(0xff17AFB8), Color(0xff49C1BC)]), + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Padding( + padding: EdgeInsets.all(10.0), + child: Column( + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + children: [ + Text( + 'You Have', + style: TextStyle( + color: Colors.white, fontSize: 10.0), + ), + Text( + '5', + style: TextStyle( + color: Colors.white, fontSize: 25.0), + ), + Expanded( + child: Text( + 'Undelivered \n Packages', + style: TextStyle( + color: Colors.white, + fontSize: 10.0), + ), + ) + ], + ), ), - ), - Padding( - padding: EdgeInsets.all(4.0), - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Padding( - padding: EdgeInsets.only(right: 9.5), - child: Image.asset( - 'assets/images/closed_box.png', - height: - MediaQuery.of(context).size.height * + Expanded( + child: Padding( + padding: EdgeInsets.all(4.0), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Padding( + padding: EdgeInsets.only(right: 9.5), + child: Image.asset( + 'assets/images/closed_box.png', + height: MediaQuery.of(context) + .size + .height * 0.09, - width: - MediaQuery.of(context).size.width * + width: MediaQuery.of(context) + .size + .width * 0.20, - //fit: BoxFit.cover, - )), - ], - ), - ) - ], + //fit: BoxFit.cover, + )), + ], + ), + ), + ) + ], + ), ), - ), - ) - ], + ) + ], + ), ), Column( children: [ Padding( - padding: EdgeInsets.symmetric(horizontal: 12.0), + padding: EdgeInsets.symmetric(horizontal: 10.0), child: Container( height: MediaQuery.of(context).size.height * 0.15, - width: MediaQuery.of(context).size.width * 0.43, + width: MediaQuery.of(context).size.width * 0.44, decoration: BoxDecoration( - borderRadius: BorderRadius.circular(12.0), + borderRadius: BorderRadius.circular(15.0), gradient: LinearGradient( colors: [Color(0xff17AFB8), Color(0xff49C1BC)]), ), child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Padding( - padding: EdgeInsets.all(12.0), - child: Column( - mainAxisAlignment: - MainAxisAlignment.spaceEvenly, - children: [ - Text( - 'You Have', - style: TextStyle( - color: Colors.white, fontSize: 10.0), - ), - Text( - '25', - style: TextStyle( - color: Colors.white, fontSize: 25.0), - ), - Text( - 'unWanted\n Packge', - style: TextStyle( - color: Colors.white, fontSize: 10.0), - ) - ], + Expanded( + child: Padding( + padding: EdgeInsets.all(12.0), + child: Column( + mainAxisAlignment: + MainAxisAlignment.spaceEvenly, + children: [ + Text( + 'You Have', + style: TextStyle( + color: Colors.white, fontSize: 10.0), + ), + Text( + '25', + style: TextStyle( + color: Colors.white, fontSize: 25.0), + ), + Expanded( + child: Text( + 'unWanted\n Packge', + style: TextStyle( + color: Colors.white, + fontSize: 10.0), + ), + ) + ], + ), ), ), Padding( @@ -186,9 +211,9 @@ class _DashboardScreenState extends State { Image.asset( 'assets/images/open_box.png', height: MediaQuery.of(context).size.height * - 0.11, + 0.10, width: MediaQuery.of(context).size.width * - 0.24, + 0.20, scale: 0.9, fit: BoxFit.cover, ), @@ -204,16 +229,16 @@ class _DashboardScreenState extends State { ], ), Padding( - padding: EdgeInsets.symmetric(vertical: 16.0, horizontal: 12.0), + padding: EdgeInsets.symmetric(vertical: 16.0, horizontal: 15.0), child: Row( children: [ Expanded( child: InkWell( child: Container( - height: 140, - width: 350, + height: MediaQuery.of(context).size.height * 0.16, + width: MediaQuery.of(context).size.width * 0.50, decoration: BoxDecoration( - borderRadius: BorderRadius.circular(12.0), + borderRadius: BorderRadius.circular(15.0), gradient: LinearGradient(colors: [ Color(0xff48C0BC), Color(0xff17AFB8) @@ -230,7 +255,7 @@ class _DashboardScreenState extends State { MediaQuery.of(context).size.width * 0.25, height: MediaQuery.of(context).size.height * 0.14, - fit: BoxFit.fitHeight, + fit: BoxFit.cover, ) ], ), @@ -238,10 +263,15 @@ class _DashboardScreenState extends State { mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.start, children: [ - Text( - 'SCAN', - style: TextStyle( - fontSize: 35.0, color: Colors.white), + InkWell( + onTap:(){ + _scanQrAndGetPatient(context,model); + }, + child: Text( + 'SCAN', + style: TextStyle( + fontSize: 35.0, color: Colors.white), + ), ), Padding( padding: EdgeInsets.only(top: 6.0), @@ -266,7 +296,7 @@ class _DashboardScreenState extends State { ), ), Padding( - padding: EdgeInsets.symmetric(horizontal: 12.0, vertical: 10.0), + padding: EdgeInsets.symmetric(horizontal: 12.0, vertical: 1.0), child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ @@ -313,73 +343,86 @@ class _DashboardScreenState extends State { shrinkWrap: true, scrollDirection: Axis.vertical, itemCount: //model.orders == null ? 0 : model.orders.length, - 2, + 3, itemBuilder: (BuildContext context, int index) { return Padding( - padding: EdgeInsets.symmetric(horizontal: 12.0), + padding: EdgeInsets.symmetric(horizontal: 12.2), child: RoundedContainer( - height: SizeConfig.heightMultiplier * 10.5, + height: MediaQuery.of(context).size.height * 0.108, child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Padding( - padding: EdgeInsets.only(left: 22.0), - child: Image.asset( - 'assets/images/location.png'), - ) - ], - ), - if (model.orders.length != 0) - Column( - crossAxisAlignment: CrossAxisAlignment.start, + Expanded( + flex: 1, + child: Column( + mainAxisAlignment: MainAxisAlignment.center, children: [ - Text( - model.orders[index].firstName + - ' ' + - model.orders[index].lastName, - style: TextStyle(fontSize: 20.0), - ), - Text( - model.orders[index].mobileNumber, - style: TextStyle( - color: Color(0xff30B7B9), - fontWeight: FontWeight.w600, - fontSize: 15.0), - ), - Text( - 'Olaya ST, Behind kfc next to king-\ndom tower 2nd floor n.o 247', - style: TextStyle(color: Colors.black45), + Padding( + padding: EdgeInsets.only(left: 22.0), + child: Image.asset( + 'assets/images/location.png'), ) ], ), + ), + if (model.orders.length != 0) + Expanded( + flex: 3, + child: Column( + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + Text( + model.orders[index].firstName + + ' ' + + model.orders[index].lastName, + style: TextStyle(fontSize: 18.0), + ), + Text( + model.orders[index].mobileNumber, + style: TextStyle( + color: Color(0xff30B7B9), + fontWeight: FontWeight.w600, + fontSize: 15.0), + ), + Expanded( + child: Text( + 'Olaya ST, Behind kfc next to king ', + style: + TextStyle(color: Colors.black45), + ), + ) + ], + ), + ), Padding( padding: EdgeInsets.all(10.0), child: Column( mainAxisAlignment: MainAxisAlignment.center, children: [ - CircleAvatar( - backgroundColor: Colors.black45, - radius: 30.0, + Expanded( child: CircleAvatar( - backgroundColor: Colors.white, - maxRadius: 28.9, - child: Padding( - padding: const EdgeInsets.all(8.0), - child: Text( - '3 K.m \n away', - style: TextStyle( - color: Color(0xff30B7B9), - fontSize: 14.0), + backgroundColor: Colors.black45, + radius: 28.0, + child: CircleAvatar( + backgroundColor: Colors.white, + maxRadius: 25.1, + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Text( + '3 K.m \n away', + style: TextStyle( + color: Color(0xff30B7B9), + fontSize: 12.5, + fontWeight: FontWeight.w600), + ), ), ), ), ) ], ), - ) + ), ], ), ), @@ -392,4 +435,22 @@ class _DashboardScreenState extends State { ), ); } + + _scanQrAndGetPatient(BuildContext context,OrdersViewModel model) async { + /// When give qr we will change this method to get data + /// var result = await BarcodeScanner.scan(); + /// int patientID = get from qr result + var result = await BarcodeScanner.scan(); + // if (result.rawContent == "") { + List listOfParams = result.rawContent.split(','); + String patientType = "1"; + await model.insertOrder(); + if (model.state == ViewState.ErrorLocal) { + Utils.showErrorToast(model.error); + }else{ + AppToast.showSuccessToast(message: "Order Added"); + } + + } + } diff --git a/lib/pages/orders/pending_orders_page.dart b/lib/pages/orders/pending_orders_page.dart index f7caff9..624fb18 100644 --- a/lib/pages/orders/pending_orders_page.dart +++ b/lib/pages/orders/pending_orders_page.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:driverapp/config/size_config.dart'; -import 'package:driverapp/core/viewModels/pending_orders_view_model.dart'; +import 'package:driverapp/core/viewModels/orders_view_model.dart'; import '../base/base_view.dart'; import 'package:flutter/cupertino.dart'; import 'package:driverapp/widgets/others/rounded_container.dart'; @@ -13,10 +13,10 @@ class OrdersListScreen extends StatefulWidget { class _OrdersListScreenState extends State { @override Widget build(BuildContext context) { - return BaseView( + return BaseView( onModelReady: (model) => model.getPendingOrders(), builder: - (BuildContext context, PendingOrdersViewModel model, Widget child) => + (BuildContext context, OrdersViewModel model, Widget child) => Scaffold( appBar: AppBar( centerTitle: true, @@ -25,6 +25,100 @@ class _OrdersListScreenState extends State { 'Your Delivery Que', ), ), + body: Column( + children: [ + Text( + 'Nearest', + style: TextStyle(color: Color(0xff30B7B9), fontSize: 18.0), + ), + ListView.builder( + itemCount: model.orders == null ? 0 : model.orders.length, + scrollDirection: Axis.vertical, + shrinkWrap: true, + itemBuilder: (BuildContext context, int index) { + return Padding( + padding: EdgeInsets.symmetric(horizontal: 12.2), + child: RoundedContainer( + height: MediaQuery.of(context).size.height * 0.11, + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Expanded( + flex: 1, + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Padding( + padding: EdgeInsets.only(left: 22.0), + child: + Image.asset('assets/images/location.png'), + ) + ], + ), + ), + if (model.orders.length != 0) + Expanded( + flex: 3, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + model.orders[index].firstName + + ' ' + + model.orders[index].lastName, + style: TextStyle(fontSize: 18.0), + ), + Text( + model.orders[index].mobileNumber, + style: TextStyle( + color: Color(0xff30B7B9), + fontWeight: FontWeight.w600, + fontSize: 15.0), + ), + Expanded( + child: Text( + 'Olaya ST, Behind kfc next to king ', + style: TextStyle(color: Colors.black45), + ), + ) + ], + ), + ), + Padding( + padding: EdgeInsets.all(10.0), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Expanded( + child: CircleAvatar( + backgroundColor: Colors.black45, + radius: 28.0, + child: CircleAvatar( + backgroundColor: Colors.white, + maxRadius: 25.1, + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Text( + '3 K.m \n away', + style: TextStyle( + color: Color(0xff30B7B9), + fontSize: 12.5, + fontWeight: FontWeight.w600), + ), + ), + ), + ), + ) + ], + ), + ), + ], + ), + ), + ); + }), + ], + ), ), ); }