updates & fixes

4 years ago · 9d046fd971
parent 75de755ccd
commit 9d046fd971
4 changed files with 125 additions and 40 deletions
--- a/lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
+++ b/lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
@ -179,20 +179,20 @@ class _AllHabibMedicalServiceState extends State<AllHabibMedicalService> {
                      'assets/images/al-habib_online_payment_service_icon.png',
                  title: TranslationBase.of(context).onlinePaymentService,
                ),
-                ServicesContainer(
-                  onTap: () {
-                    Navigator.push(
-                      context,
-                      FadePage(
-                        page: ErOptions(
-                          isAppbar: true,
-                        ),
-                      ),
-                    );
-                  },
-                  imageLocation: 'assets/images/emergency_service_image.png',
-                  title: TranslationBase.of(context).emergencyService,
-                ),
+                // ServicesContainer(
+                //   onTap: () {
+                //     Navigator.push(
+                //       context,
+                //       FadePage(
+                //         page: ErOptions(
+                //           isAppbar: true,
+                //         ),
+                //       ),
+                //     );
+                //   },
+                //   imageLocation: 'assets/images/emergency_service_image.png',
+                //   title: TranslationBase.of(context).emergencyService,
+                // ),
                ServicesContainer(
                  onTap: () => Navigator.push(
                    context,
@ -233,22 +233,22 @@ class _AllHabibMedicalServiceState extends State<AllHabibMedicalService> {
                      'assets/images/new-design/virtual_tour_icon.png',
                  title: TranslationBase.of(context).vTour,
                ),
-                ServicesContainer(
-                  onTap: () {
-                    Navigator.of(context).push(
-                      MaterialPageRoute(
-                        builder: (BuildContext context) => MyWebView(
-                          title: TranslationBase.of(context).hmgNews,
-                          selectedUrl:
-                              "https://twitter.com/hashtag/مجموعة_د_سليمان_الحبيب_الطبية?src=hashtag_click&f=live",
-                        ),
-                      ),
-                    );
-                  },
-                  imageLocation:
-                      'assets/images/new-design/twitter_dashboard_icon.png',
-                  title: TranslationBase.of(context).latestNews,
-                ),
+                // ServicesContainer(
+                //   onTap: () {
+                //     Navigator.of(context).push(
+                //       MaterialPageRoute(
+                //         builder: (BuildContext context) => MyWebView(
+                //           title: TranslationBase.of(context).hmgNews,
+                //           selectedUrl:
+                //               "https://twitter.com/hashtag/مجموعة_د_سليمان_الحبيب_الطبية?src=hashtag_click&f=live",
+                //         ),
+                //       ),
+                //     );
+                //   },
+                //   imageLocation:
+                //       'assets/images/new-design/twitter_dashboard_icon.png',
+                //   title: TranslationBase.of(context).latestNews,
+                // ),
                ServicesContainer(
                  onTap: () => Navigator.push(
                    context,
--- a/lib/pages/MyAppointments/models/ArrivedButtons.dart
+++ b/lib/pages/MyAppointments/models/ArrivedButtons.dart
@ -3,12 +3,12 @@ import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';

 class ArrivedButtons {
  static var buttons = [
-    {
-      "title":  TranslationBase.of(AppGlobal.context).arrived,
-      "subtitle": TranslationBase.of(AppGlobal.context).status,
-      "icon": "assets/images/new-design/waiting-room.png",
-      "caller": "openReschedule"
-    },
+    // {
+    //   "title":  TranslationBase.of(AppGlobal.context).arrived,
+    //   "subtitle": TranslationBase.of(AppGlobal.context).status,
+    //   "icon": "assets/images/new-design/waiting-room.png",
+    //   "caller": "openReschedule"
+    // },
    {
      "title": TranslationBase.of(AppGlobal.context).medicines,
      "subtitle": TranslationBase.of(AppGlobal.context).medicinesSubtitle,
--- a/lib/pages/MyAppointments/widgets/AppointmentActions.dart
+++ b/lib/pages/MyAppointments/widgets/AppointmentActions.dart
@ -1,3 +1,4 @@
+import 'package:diplomaticquarterapp/core/model/labs/patient_lab_orders.dart';
 import 'package:diplomaticquarterapp/core/model/prescriptions/prescription_report_enh.dart';
 import 'package:diplomaticquarterapp/core/model/radiology/final_radiology.dart';
 import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
@ -16,6 +17,7 @@ import 'package:diplomaticquarterapp/pages/MyAppointments/widgets/askDocDialog.d
 import 'package:diplomaticquarterapp/pages/MyAppointments/widgets/reminder_dialog.dart';
 import 'package:diplomaticquarterapp/pages/feedback/feedback_home_page.dart';
 import 'package:diplomaticquarterapp/pages/insurance/insurance_approval_screen.dart';
+import 'package:diplomaticquarterapp/pages/medical/labs/laboratory_result_page.dart';
 import 'package:diplomaticquarterapp/pages/medical/radiology/radiology_details_page.dart';
 import 'package:diplomaticquarterapp/pages/medical/vital_sign/vital_sign_details_screen.dart';
 import 'package:diplomaticquarterapp/services/appointment_services/GetDoctorsList.dart';
@ -62,8 +64,8 @@ class _AppointmentActionsState extends State<AppointmentActions> {
    toDoProvider = Provider.of<ToDoCountProviderModel>(context);
    var size = MediaQuery.of(context).size;
    final double itemHeight = projectViewModel.isArabic
-        ? ((size.height - kToolbarHeight - 24) * 0.47) / 2
-        : ((size.height - kToolbarHeight - 24) * 0.4) / 2;
+        ? ((size.height - kToolbarHeight - 24) * 0.5) / 2
+        : ((size.height - kToolbarHeight - 24) * 0.45) / 2;
    final double itemWidth = size.width / 2;

    return Container(
@ -83,7 +85,7 @@ class _AppointmentActionsState extends State<AppointmentActions> {
                          _handleButtonClicks(e);
                        },
                        child: Column(
-                          mainAxisSize: MainAxisSize.min,
+                          mainAxisSize: MainAxisSize.max,
                          children: [
                            Container(
                              // height: 100.0,
@ -100,7 +102,7 @@ class _AppointmentActionsState extends State<AppointmentActions> {
                                  color: Colors.white),
                              child: Column(
                                crossAxisAlignment: CrossAxisAlignment.start,
-                                mainAxisSize: MainAxisSize.min,
+                                mainAxisSize: MainAxisSize.max,
                                children: <Widget>[
                                  Container(
                                    margin:
@ -196,6 +198,10 @@ class _AppointmentActionsState extends State<AppointmentActions> {
        openAppointmentRadiology();
        break;

+      case "labResult":
+        openAppointmentLabResults();
+        break;
+
      case "prescriptions":
        openPrescriptionReport();
        break;
@ -403,6 +409,36 @@ class _AppointmentActionsState extends State<AppointmentActions> {
    });
  }

+  openAppointmentLabResults() {
+    GifLoaderDialogUtils.showMyDialog(context);
+    DoctorsListService service = new DoctorsListService();
+    PatientLabOrders patientLabOrders = new PatientLabOrders();
+    service
+        .getPatientLabOrdersByAppoNo(widget.appo.appointmentNo,
+            widget.appo.projectID, widget.appo.clinicID, context)
+        .then((res) {
+      print(res['ListLabResultsByAppNo']);
+      GifLoaderDialogUtils.hideDialog(context);
+      if (res['ListLabResultsByAppNo'] != null) {
+        patientLabOrders.orderNo =
+            res['ListLabResultsByAppNo'][0]['OrderNo'].toString();
+        patientLabOrders.invoiceNo =
+            res['ListLabResultsByAppNo'][0]['InvoiceNo'].toString();
+        patientLabOrders.clinicID = widget.appo.clinicID;
+        patientLabOrders.projectID = widget.appo.projectID.toString();
+        print(patientLabOrders.invoiceNo);
+        print(patientLabOrders.orderNo);
+        navigateToLabResults(patientLabOrders);
+      } else {
+        AppToast.showErrorToast(message: res['ErrorEndUserMessage']);
+      }
+    }).catchError((err) {
+      GifLoaderDialogUtils.hideDialog(context);
+      print(err);
+      AppToast.showErrorToast(message: err);
+    });
+  }
+
  openAppointmentRadiology() {
    GifLoaderDialogUtils.showMyDialog(context);
    DoctorsListService service = new DoctorsListService();
@ -438,10 +474,12 @@ class _AppointmentActionsState extends State<AppointmentActions> {
          prescriptionReportEnhList.add(PrescriptionReportEnh.fromJson(report));
        });
        print(prescriptionReportEnhList.length);
+        navigateToMedicinePrescriptionReport(prescriptionReportEnhList, res['ListPRM']);
      } else {
        AppToast.showErrorToast(message: TranslationBase.of(context).noRecords);
      }
    }).catchError((err) {
+      print(err);
      GifLoaderDialogUtils.hideDialog(context);
      AppToast.showErrorToast(message: err);
    });
@ -459,6 +497,15 @@ class _AppointmentActionsState extends State<AppointmentActions> {
                appo: widget.appo)));
  }

+  Future navigateToLabResults(PatientLabOrders patientLabOrders) async {
+    Navigator.push(
+            context,
+            MaterialPageRoute(
+                builder: (context) =>
+                    LaboratoryResultPage(patientLabOrders: patientLabOrders)))
+        .then((value) {});
+  }
+
  Future navigateToRadiologyDetails(FinalRadiology finalRadiology) async {
    Navigator.push(
            context,
--- a/lib/services/appointment_services/GetDoctorsList.dart
+++ b/lib/services/appointment_services/GetDoctorsList.dart
@ -1087,6 +1087,44 @@ class DoctorsListService extends BaseService {
    return Future.value(localRes);
  }

+  Future<Map> getPatientLabOrdersByAppoNo(dynamic appoNo, dynamic projID, dynamic clinicID, BuildContext context) async {
+    Map<String, dynamic> request;
+    if (await this.sharedPref.getObject(USER_PROFILE) != null) {
+      var data = AuthenticatedUser.fromJson(
+          await this.sharedPref.getObject(USER_PROFILE));
+      authUser = data;
+    }
+    var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
+    Request req = appGlobal.getPublicRequest();
+    request = {
+      "AppointmentNo": appoNo,
+      "ProjectID": projID,
+      "ClinicID": clinicID,
+      "VersionID": req.VersionID,
+      "Channel": req.Channel,
+      "LanguageID": languageID == 'ar' ? 1 : 2,
+      "IPAdress": req.IPAdress,
+      "generalid": req.generalid,
+      "PatientOutSA": authUser.outSA,
+      "SessionID": "YckwoXhUmWBsnHKEKig",
+      "isDentalAllowedBackend": false,
+      "DeviceTypeID": req.DeviceTypeID,
+      "PatientID": authUser.patientID,
+      "TokenID": "@dm!n",
+      "PatientTypeID": authUser.patientType,
+      "PatientType": authUser.patientType
+    };
+
+    dynamic localRes;
+    await baseAppClient.post(GET_PATIENT_LAB_ORDERS_BY_APPOINTMENT,
+        onSuccess: (response, statusCode) async {
+          localRes = response;
+        }, onFailure: (String error, int statusCode) {
+          throw error;
+        }, body: request);
+    return Future.value(localRes);
+  }
+
  Future<Map> getPatientPrescriptionReports(
      AppoitmentAllHistoryResultList appo, BuildContext context) async {
    Map<String, dynamic> request;