From b0a207008e9c5115cff336e704e63be9b2e6bba8 Mon Sep 17 00:00:00 2001 From: Elham Rababah Date: Mon, 24 Aug 2020 15:39:09 +0300 Subject: [PATCH 1/3] first step qr reader --- lib/config/config.dart | 15 +++++-- .../model/scan_qr/scan_qr_request_model.dart | 44 +++++++++++++++++++ lib/core/service/client/base_app_client.dart | 15 ++++++- lib/core/service/pending_orders_service.dart | 26 +++++++++++ .../viewModels/pending_orders_view_model.dart | 11 +++++ lib/pages/dashboard/dashboard_screen.dart | 32 ++++++++++++-- 6 files changed, 133 insertions(+), 10 deletions(-) create mode 100644 lib/core/model/scan_qr/scan_qr_request_model.dart 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..e53f646 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,17 @@ 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['MobileNo'] = doctorProfile?.mobileNumber; + } + + body['Channel'] = CHANNEL; print("URL : $url"); print("Body : ${json.encode(body)}"); diff --git a/lib/core/service/pending_orders_service.dart b/lib/core/service/pending_orders_service.dart index f4024a3..eb08d8f 100644 --- a/lib/core/service/pending_orders_service.dart +++ b/lib/core/service/pending_orders_service.dart @@ -1,10 +1,12 @@ 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 PendingOrdersService extends BaseService { List _orders = List(); List get orders => _orders; + bool isOrderInserted; PendingOrders _requestGetPendingOrders = PendingOrders( driverID: 1111, @@ -14,9 +16,11 @@ class PendingOrdersService extends BaseService { tokenID: "@dm!n", userID: "1111", mobileNo: "0541710575", + firstName: "dfdfdf" ); Future getPendingOrders() async { + hasError = false; await baseAppClient.post(GET_ALL_ORDERS, onSuccess: (dynamic response, int statusCode) { _orders.clear(); @@ -28,4 +32,26 @@ class PendingOrdersService extends BaseService { super.error = error; }, body: _requestGetPendingOrders.toJson()); } + + + Future insertOrder() async { + ScanQrRequestModel _scanQrRequestModel = ScanQrRequestModel(deliveryOrderID: 129, 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/viewModels/pending_orders_view_model.dart b/lib/core/viewModels/pending_orders_view_model.dart index 0f66bba..903ede5 100644 --- a/lib/core/viewModels/pending_orders_view_model.dart +++ b/lib/core/viewModels/pending_orders_view_model.dart @@ -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/pages/dashboard/dashboard_screen.dart b/lib/pages/dashboard/dashboard_screen.dart index 94ff6ae..a9e8bef 100644 --- a/lib/pages/dashboard/dashboard_screen.dart +++ b/lib/pages/dashboard/dashboard_screen.dart @@ -1,5 +1,8 @@ +import 'package:barcode_scan/platform_wrapper.dart'; import 'package:driverapp/config/size_config.dart'; +import 'package:driverapp/core/enum/viewstate.dart'; import 'package:driverapp/core/viewModels/pending_orders_view_model.dart'; +import 'package:driverapp/uitl/utils.dart'; import 'package:flutter/material.dart'; import '../base/base_view.dart'; import 'package:flutter/cupertino.dart'; @@ -238,10 +241,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), @@ -392,4 +400,20 @@ class _DashboardScreenState extends State { ), ); } + + _scanQrAndGetPatient(BuildContext context,PendingOrdersViewModel 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); + } + + } + } From bf79a6427e47e576cd842f716924a95d71936639 Mon Sep 17 00:00:00 2001 From: Elham Rababah Date: Mon, 24 Aug 2020 15:49:32 +0300 Subject: [PATCH 2/3] refactor orders Concept --- ...rders_service.dart => orders_service.dart} | 26 ++++++++++++------- ...view_model.dart => orders_view_model.dart} | 6 ++--- lib/locator.dart | 8 +++--- lib/pages/dashboard/dashboard_screen.dart | 11 +++++--- lib/pages/orders/pending_orders_page.dart | 6 ++--- 5 files changed, 33 insertions(+), 24 deletions(-) rename lib/core/service/{pending_orders_service.dart => orders_service.dart} (68%) rename lib/core/viewModels/{pending_orders_view_model.dart => orders_view_model.dart} (80%) diff --git a/lib/core/service/pending_orders_service.dart b/lib/core/service/orders_service.dart similarity index 68% rename from lib/core/service/pending_orders_service.dart rename to lib/core/service/orders_service.dart index eb08d8f..a6e8541 100644 --- a/lib/core/service/pending_orders_service.dart +++ b/lib/core/service/orders_service.dart @@ -3,7 +3,7 @@ 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 PendingOrdersService extends BaseService { +class OrdersService extends BaseService { List _orders = List(); List get orders => _orders; bool isOrderInserted; @@ -21,21 +21,27 @@ class PendingOrdersService extends BaseService { Future getPendingOrders() async { hasError = false; - 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) { + 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; - }, body: _requestGetPendingOrders.toJson()); + throw e; + } } Future insertOrder() async { - ScanQrRequestModel _scanQrRequestModel = ScanQrRequestModel(deliveryOrderID: 129, groupID: 0); + ScanQrRequestModel _scanQrRequestModel = ScanQrRequestModel(deliveryOrderID: 1200, groupID: 0); hasError = false; try { await baseAppClient.post(SCAN_QR, diff --git a/lib/core/viewModels/pending_orders_view_model.dart b/lib/core/viewModels/orders_view_model.dart similarity index 80% rename from lib/core/viewModels/pending_orders_view_model.dart rename to lib/core/viewModels/orders_view_model.dart index 903ede5..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; 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/dashboard/dashboard_screen.dart b/lib/pages/dashboard/dashboard_screen.dart index a9e8bef..a6d2b5f 100644 --- a/lib/pages/dashboard/dashboard_screen.dart +++ b/lib/pages/dashboard/dashboard_screen.dart @@ -1,7 +1,8 @@ import 'package:barcode_scan/platform_wrapper.dart'; import 'package:driverapp/config/size_config.dart'; import 'package:driverapp/core/enum/viewstate.dart'; -import 'package:driverapp/core/viewModels/pending_orders_view_model.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'; @@ -18,10 +19,10 @@ 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( @@ -401,7 +402,7 @@ class _DashboardScreenState extends State { ); } - _scanQrAndGetPatient(BuildContext context,PendingOrdersViewModel model) async { + _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 @@ -412,6 +413,8 @@ class _DashboardScreenState extends State { 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..aa353f8 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, From 2dfe4ca1dd5ad63dc85ed9740df4c3c7c8b934f8 Mon Sep 17 00:00:00 2001 From: Elham Rababah Date: Mon, 24 Aug 2020 16:02:32 +0300 Subject: [PATCH 3/3] fix bug --- lib/core/service/orders_service.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/core/service/orders_service.dart b/lib/core/service/orders_service.dart index a6e8541..90bb8a7 100644 --- a/lib/core/service/orders_service.dart +++ b/lib/core/service/orders_service.dart @@ -16,7 +16,6 @@ class OrdersService extends BaseService { tokenID: "@dm!n", userID: "1111", mobileNo: "0541710575", - firstName: "dfdfdf" ); Future getPendingOrders() async {