Merge branch 'bug_fix_mirza' into 'development'

Check-In NFC

See merge request Cloud_Solution/diplomatic-quarter!326

lib/config/config.dart

@@ -313,6 +313,9 @@ const UPDATE_HEALTH_TERMS =
 const GET_PATIENT_HEALTH_STATS =
     'Services/Patients.svc/REST/Med_GetTransactionsSts';
 
+const SEND_CHECK_IN_NFC_REQUEST =
+    'Services/Patients.svc/REST/Patient_CheckAppointmentValidation_ForNFC';
+
 //URL to get medicine and pharmacies list
 const CHANNEL = 3;
 const GENERAL_ID = 'Cs2020@2016\$2958';

lib/config/localized_values.dart

@@ -466,6 +466,14 @@ const Map localizedValues = {
     "ar":
         " خدمة المواقف، تتيح هذه الخدمة للمستخدم معلومات عن موقف السيارة ليسهل عليه العودة لها لاحقاً ، 1- بالضغط على زر(قراءة الكود) تستطيع حفظ البيانات الخاصة بالموقف. 2-بالضغط على زر(عرض موقف سيارتي) يعرض لك موقع السيارة في خرائط قوقل. 3- لإعادة قراءة موقف آخرعن طريق الضغط على زر(مسح بيانات الموقف). "
   },
+  "parkingDescription": {
+
+    "en": "Parking service is for you to scan the car location so you can find it easy on you way out. click on (scan parking) button to save the parking location, then (show my park) button will appear to show you the way for the parking. if you want to rescan parking QR just click on (Clear My Data).",
+
+    "ar": "خدمة المواقف، تتيح هذه الخدمة للمستخدم معلومات عن موقف السيارة ليسهل عليه العودة لها لاحقاً ، 1- بالضغط على زر(قراءة الكود) تستطيع حفظ البيانات الخاصة بالموقف. 2-بالضغط على زر(عرض موقف سيارتي) يعرض لك موقع السيارة في خرائط قوقل. 3- لإعادة قراءة موقف آخرعن طريق الضغط على زر(مسح بيانات الموقف)."
+
+  },
+  "checkinOption": {"en": "Check-In Options", "ar": "تحقق في الخيارات"},
   "readBarcode": {"en": "Read Barcode", "ar": "قراءة الكود"},
   "showMyPark": {"en": "Show My Park", "ar": "عرض بارك"},
   "clearMyData": {"en": "clear My Data", "ar": "امسح البيانات"},

lib/pages/AlHabibMedicalService/parking_page.dart

@@ -8,7 +8,7 @@ import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:maps_launcher/maps_launcher.dart';
-
+import 'package:diplomaticquarterapp/core/model/ImagesInfo.dart';
 import '../../d_q_icons_icons.dart';
 
 class ParkingPage extends StatelessWidget {
@@ -19,6 +19,13 @@ class ParkingPage extends StatelessWidget {
       builder: (_, model, widget) => AppScaffold(
         isShowAppBar: true,
         appBarTitle: TranslationBase.of(context).parking,
+        description: TranslationBase.of(context).parkingDescription,
+        imagesInfo: [
+          ImagesInfo(
+              imageAr: 'assets/images/bc_parking.png',
+              imageEn: 'assets/images/bc_parking.png',
+              isAsset: true)
+        ],
         body: SingleChildScrollView(
           padding: EdgeInsets.all(12),
           child: !model.isSavePark

lib/pages/BookAppointment/QRCode.dart

@@ -13,8 +13,10 @@ import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
 import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
 import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
 import 'package:diplomaticquarterapp/widgets/dialogs/confirm_dialog.dart';
+import 'package:diplomaticquarterapp/widgets/nfc/nfc_reader_sheet.dart';
 import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
 import 'package:flutter/material.dart';
+import 'package:nfc_in_flutter/nfc_in_flutter.dart';
 
 class QRCode extends StatefulWidget {
   PatientShareResponse patientShareResponse;
@@ -30,17 +32,27 @@ class QRCode extends StatefulWidget {
 
 class _QRCodeState extends State<QRCode> {
   Uint8List _bytes;
+  bool _supportsNFC = false;
+  BuildContext _context;
 
   @override
   void initState() {
     // TODO: implement initState
+
     _bytes = base64.decode(widget.appoQR.split(',').last);
     widget.authUser = new AuthenticatedUser();
+    NFC.isNDEFSupported.then((supported) {
+      setState(() {
+        print("nfc supprted");
+        _supportsNFC = true;
+      });
+    });
     super.initState();
   }
 
   @override
   Widget build(BuildContext context) {
+    _context = context;
     return AppScaffold(
       appBarTitle: TranslationBase.of(context).attendRegisterCode,
       isShowAppBar: true,
@@ -51,9 +63,56 @@ class _QRCodeState extends State<QRCode> {
             mainAxisSize: MainAxisSize.max,
             children: <Widget>[
               Container(
-                margin: EdgeInsets.only(top: 30.0),
+                width: double.infinity,
-                alignment: Alignment.center,
+                height: MediaQuery.of(context).size.width / 3,
-                child: Image.memory(_bytes, scale: 0.5),
+                child: Row(
+                  children: [
+                    _supportsNFC
+                        ? Expanded(
+                            flex: 1,
+                            child: Row(
+                              crossAxisAlignment: CrossAxisAlignment.center,
+                              mainAxisAlignment: MainAxisAlignment.center,
+                              children: [
+                                InkWell(
+                                  child: Container(
+                                    margin: EdgeInsets.only(top: 30.0),
+                                    alignment: Alignment.center,
+                                    padding: EdgeInsets.all(8),
+                                    decoration: BoxDecoration(
+                                      border: Border.all(color: Colors.black),
+                                      borderRadius: BorderRadius.circular(10),
+                                    ),
+                                    child: Image.asset(
+                                        "assets/images/nfc/ic_nfc.png"),
+                                  ),
+                                  onTap: () {
+                                    showNfcReader(context,
+                                        onNcfScan: (String nfcId) {
+                                      Future.delayed(
+                                          const Duration(milliseconds: 100),
+                                          () {
+                                        sendNfcCheckInRequest(nfcId);
+                                      });
+                                    });
+                                  },
+                                ),
+                              ],
+                            ),
+                          )
+                        : Container(),
+                    Expanded(
+                      flex: 1,
+                      child: Container(
+                        margin: EdgeInsets.only(top: 30.0),
+                        alignment: Alignment.center,
+                        child: Image.memory(
+                          _bytes,
+                        ),
+                      ),
+                    ),
+                  ],
+                ),
               ),
               Container(
                 margin: EdgeInsets.only(top: 20.0, left: 20.0, right: 20.0),
@@ -70,18 +129,20 @@ class _QRCodeState extends State<QRCode> {
                           EdgeInsets.only(top: 10.0, left: 40.0, bottom: 10.0),
                       child: Image.asset(
                           "assets/images/new-design/device_icon.png",
-                          width: 120.0,
+                          width: MediaQuery.of(context).size.width / 3.4,
-                          height: 120.0),
+                          height: MediaQuery.of(context).size.width / 3.4),
                     ),
-                    Container(
+                    Expanded(
-                      width: MediaQuery.of(context).size.width * 0.5,
+                      child: Container(
-                      margin: EdgeInsets.only(
+                        width: double.infinity,
-                          top: 15.0, bottom: 10.0, left: 20.0, right: 20.0),
+                        margin: EdgeInsets.only(
-                      child: Text(TranslationBase.of(context).scanQRHospital,
+                            top: 15.0, bottom: 10.0, left: 20.0, right: 20.0),
-                          style: TextStyle(
+                        child: Text(TranslationBase.of(context).scanQRHospital,
-                              color: Colors.red[700],
+                            style: TextStyle(
-                              fontSize: 20.0,
+                                color: Colors.red[700],
-                              fontWeight: FontWeight.bold)),
+                                fontSize: 18.0,
+                                fontWeight: FontWeight.bold)),
+                      ),
                     ),
                   ],
                 ),
@@ -300,4 +361,51 @@ class _QRCodeState extends State<QRCode> {
     }
     return docSpeciality;
   }
+
+  sendNfcCheckInRequest(String nfcId) {
+    GifLoaderDialogUtils.showMyDialog(context);
+
+    DoctorsListService service = new DoctorsListService();
+
+    service
+        .sendCheckinNfcRequest(widget.patientShareResponse.appointmentNo, nfcId,
+            widget.patientShareResponse.projectID, context)
+        .then((res) {
+      print(res);
+
+      GifLoaderDialogUtils.hideDialog(context);
+      _showMyDialog(res["SuccessMsg"], this.context);
+    }).catchError((err) {
+      GifLoaderDialogUtils.hideDialog(context);
+      print(err);
+      _showMyDialog(err, this.context);
+    });
+  }
+
+  Future<void> _showMyDialog(String message, BuildContext context) async {
+    return showDialog<void>(
+      context: context,
+      barrierDismissible: true, // user must tap button!
+      builder: (BuildContext context) {
+        return AlertDialog(
+          title: const Text('Alert'),
+          content: SingleChildScrollView(
+            child: ListBody(
+              children: <Widget>[
+                Text(message),
+              ],
+            ),
+          ),
+          actions: <Widget>[
+            TextButton(
+              child: const Text('OK'),
+              onPressed: () {
+                Navigator.of(context).pop();
+              },
+            ),
+          ],
+        );
+      },
+    );
+  }
 }

lib/pages/ToDoList/ToDo.dart

@@ -92,6 +92,12 @@ class _ToDoState extends State<ToDo> {
                 padding: EdgeInsets.all(0.0),
                 itemCount: widget.appoList.length,
                 itemBuilder: (context, index) {
+                  print("ttt "+getNextActionImage(widget
+                      .appoList[index]
+                      .nextAction));
+                  print("ttt "+widget
+                      .appoList[index]
+                      .nextAction.toString());
                   return Container(
                     margin: EdgeInsets.all(10.0),
                     child: Column(
@@ -459,6 +465,10 @@ class _ToDoState extends State<ToDo> {
         return "assets/images/new-design/waiting_for_doctor.png";
         break;
 
+      case 90:
+        return "assets/images/new-design/check-in.png";
+        break;
+
       default:
         return "";
     }
@@ -480,6 +490,9 @@ class _ToDoState extends State<ToDo> {
         break;
       case 60:
         break;
+      case 90:
+        getAppoQR(context, appo);
+        break;
     }
   }
 
@@ -516,6 +529,10 @@ class _ToDoState extends State<ToDo> {
         return TranslationBase.of(context).waitingForDoctor;
         break;
 
+      case 90:
+        return TranslationBase.of(context).checkinOptions;
+        break;
+
       default:
         return "";
     }

lib/services/appointment_services/GetDoctorsList.dart

@@ -1445,4 +1445,24 @@ class DoctorsListService extends BaseService {
     }, body: request);
     return Future.value(localRes);
   }
+
+  Future<Map> sendCheckinNfcRequest(
+      int appointmentNo, String nfcCode,int projectId, BuildContext context) async {
+    Map<String, dynamic> request;
+
+    Request req = appGlobal.getPublicRequest();
+    request = {
+      "AppointmentNo":appointmentNo,
+      "NFC_Code": nfcCode,
+      "ProjectID": projectId,
+    };
+    dynamic localRes;
+    await baseAppClient.post(SEND_CHECK_IN_NFC_REQUEST,
+        onSuccess: (response, statusCode) async {
+          localRes = response;
+        }, onFailure: (String error, int statusCode) {
+          throw error;
+        }, body: request);
+    return Future.value(localRes);
+  }
 }

lib/uitl/translations_delegate_base.dart

@@ -471,6 +471,8 @@ class TranslationBase {
   String get medicalProfile =>
       localizedValues['medicalProfile'][locale.languageCode];
   String get parking => localizedValues['parking'][locale.languageCode];
+  String get parkingDescription => localizedValues['parkingDescription'][locale.languageCode];
+  String get checkinOptions => localizedValues['checkinOption'][locale.languageCode];
   String get alhabiServices =>
       localizedValues['alhabiServices'][locale.languageCode];
   String get parkingTitle =>

lib/widgets/in_app_browser/InAppBrowser.dart

@@ -21,17 +21,17 @@ var _InAppBrowserOptions = InAppBrowserClassOptions(
 
 class MyInAppBrowser extends InAppBrowser {
   _PAYMENT_TYPE paymentType;
-  // static String SERVICE_URL =
-  //     'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; // Payfort Payment Gateway URL UAT
-
   static String SERVICE_URL =
-      'https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL LIVE
+      'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; // Payfort Payment Gateway URL UAT
 
-  // static String PREAUTH_SERVICE_URL =
+  // static String SERVICE_URL =
-  //     'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; // Payfort PreAuth Payment Gateway URL UAT
+  //     'https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL LIVE
 
   static String PREAUTH_SERVICE_URL =
-      'https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx'; //Payfort PreAuth Payment Gateway URL Live Store
+      'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; // Payfort PreAuth Payment Gateway URL UAT
+
+  // static String PREAUTH_SERVICE_URL =
+  //     'https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx'; //Payfort PreAuth Payment Gateway URL Live Store
 
   // static String PRESCRIPTION_PAYMENT_WITH_ORDERID =
   //     'https://uat.hmgwebservices.com/epharmacy/checkout/OpcCompleteRedirectionPaymentClientbyOrder?orderID=';

lib/widgets/nfc/nfc_reader_sheet.dart

@@ -0,0 +1,196 @@
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:nfc_in_flutter/nfc_in_flutter.dart';
+
+void showNfcReader(BuildContext context, {Function onNcfScan}) {
+  showModalBottomSheet(
+      context: context,
+      enableDrag: false,
+      isDismissible: false,
+      shape: RoundedRectangleBorder(
+        borderRadius: BorderRadius.only(
+            topLeft: Radius.circular(12), topRight: Radius.circular(12)),
+      ),
+      backgroundColor: Colors.white,
+      builder: (context) {
+        return NfcLayout(
+          onNcfScan: onNcfScan,
+        );
+      });
+}
+
+class NfcLayout extends StatefulWidget {
+  Function onNcfScan;
+
+  NfcLayout({this.onNcfScan});
+
+  @override
+  _NfcLayoutState createState() => _NfcLayoutState();
+}
+
+class _NfcLayoutState extends State<NfcLayout> {
+  StreamSubscription<NDEFMessage> _stream;
+  bool _reading = false;
+  Widget mainWidget;
+  String nfcId;
+
+  @override
+  void initState() {
+    super.initState();
+
+    setState(() {
+      // _reading = true;
+      // Start reading using NFC.readNDEF()
+      _stream = NFC
+          .readNDEF(
+              once: false,
+              throwOnUserCancel: false,
+              readerMode: NFCDispatchReaderMode())
+          .listen((NDEFMessage message) {
+        setState(() {
+          _reading = true;
+          mainWidget = doneNfc();
+        });
+        Future.delayed(const Duration(milliseconds: 500), () {
+          _stream?.cancel();
+          widget.onNcfScan(nfcId);
+          Navigator.pop(context);
+        });
+        print("read NDEF id: ${message.id}");
+        //  widget.onNcfScan(message.id);
+        nfcId = message.id;
+      }, onError: (e) {
+        // Check error handling guide below
+      });
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    (mainWidget == null && !_reading)
+        ? mainWidget = scanNfc()
+        : mainWidget = doneNfc();
+    return AnimatedSwitcher(
+        duration: Duration(milliseconds: 500), child: mainWidget);
+  }
+
+  Widget scanNfc() {
+    return Container(
+      key: ValueKey(1),
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: <Widget>[
+          SizedBox(
+            height: 30,
+          ),
+          Text(
+            "Ready To Scan",
+            style: TextStyle(
+              fontWeight: FontWeight.bold,
+              fontSize: 24,
+            ),
+          ),
+          SizedBox(
+            height: 30,
+          ),
+          Image.asset(
+            "assets/images/nfc/ic_nfc.png",
+            height: MediaQuery.of(context).size.width / 3,
+          ),
+          SizedBox(
+            height: 30,
+          ),
+          Text(
+            "Approach an NFC Tag",
+            style: TextStyle(
+              fontSize: 18,
+            ),
+          ),
+          SizedBox(
+            height: 30,
+          ),
+          ButtonTheme(
+            minWidth: MediaQuery.of(context).size.width / 1.2,
+            height: 45.0,
+            buttonColor: Colors.grey[300],
+            shape: RoundedRectangleBorder(
+              borderRadius: BorderRadius.circular(6),
+            ),
+            child: RaisedButton(
+              onPressed: () {
+                _stream?.cancel();
+                Navigator.pop(context);
+              },
+              child: Text("CANCEL"),
+            ),
+          ),
+          SizedBox(
+            height: 30,
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget doneNfc() {
+    return Container(
+      key: ValueKey(2),
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: <Widget>[
+          SizedBox(
+            height: 30,
+          ),
+          Text(
+            "Successfully Scanned",
+            style: TextStyle(
+              fontWeight: FontWeight.bold,
+              fontSize: 24,
+            ),
+          ),
+          SizedBox(
+            height: 30,
+          ),
+          Image.asset(
+            "assets/images/nfc/ic_done.png",
+            height: MediaQuery.of(context).size.width / 3,
+          ),
+          SizedBox(
+            height: 30,
+          ),
+          Text(
+            "Approach an NFC Tag",
+            style: TextStyle(
+              fontSize: 18,
+            ),
+          ),
+          SizedBox(
+            height: 30,
+          ),
+          ButtonTheme(
+            minWidth: MediaQuery.of(context).size.width / 1.2,
+            height: 45.0,
+            buttonColor: Colors.grey[300],
+            shape: RoundedRectangleBorder(
+              borderRadius: BorderRadius.circular(6),
+            ),
+            child: RaisedButton(
+              // onPressed: () {
+              //   _stream?.cancel();
+              //   widget.onNcfScan(nfcId);
+              //   Navigator.pop(context);
+              // },
+              onPressed: null,
+
+              child: Text("DONE"),
+            ),
+          ),
+          SizedBox(
+            height: 30,
+          ),
+        ],
+      ),
+    );
+  }
+}

pubspec.yaml

@@ -171,6 +171,7 @@ dependencies:
 
   wifi: ^0.1.5
   vibration: ^1.7.3
+  nfc_in_flutter: ^2.0.5
 
   speech_to_text:
     path: speech_to_text
@@ -220,6 +221,7 @@ flutter:
     - assets/images/gif/
     - assets/images/pharmacy_module/payment/
     - assets/images/pharmacy_module/lakum/
+    - assets/images/nfc/
 
 
   fonts: