Covid test translations

4 years ago · ff0d66ccdb
parent 4f1f7dcefd
commit ff0d66ccdb
5 changed files with 75 additions and 58 deletions
--- a/lib/config/localized_values.dart
+++ b/lib/config/localized_values.dart
@ -1178,5 +1178,13 @@ const Map localizedValues = {
  "referralNumber": {
    "en": "Referral Number",
    "ar": "رقم الإحالة"
+  },
+  "covidTest": {
+    "en": "COVID-19 TEST",
+    "ar": "فحص كورونا"
+  },
+  "driveThru": {
+    "en": "Drive-Thru",
+    "ar": "من السيارة"
  }
 };
--- a/lib/pages/Covid-DriveThru/Covid-TimeSlots.dart
+++ b/lib/pages/Covid-DriveThru/Covid-TimeSlots.dart
@ -9,13 +9,13 @@ import 'package:diplomaticquarterapp/services/covid-drivethru/covid-drivethru.da
 import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
 import 'package:diplomaticquarterapp/uitl/app_toast.dart';
 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/others/app_scaffold_widget.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:intl/intl.dart';
-import 'package:smart_progress_bar/smart_progress_bar.dart';
 import 'package:table_calendar/table_calendar.dart';

 class CovidTimeSlots extends StatefulWidget {
@ -469,9 +469,7 @@ class _CovidTimeSlotsState extends State<CovidTimeSlots>
  }

  bookCovidTestAppointment() {
-//    Navigator.push(context,
-//        MaterialPageRoute(builder: (context) => CovidPaymentAlert()));
-
+    GifLoaderDialogUtils.showMyDialog(context);
    DoctorList docObject = new DoctorList();
    docObject.doctorID = widget.selectedDoctorID;
    docObject.clinicID = widget.selectedClinicID;
@ -494,11 +492,12 @@ class _CovidTimeSlotsState extends State<CovidTimeSlots>
      print(res);
      if (res['MessageStatus'] == 1) {
        AppToast.showSuccessToast(message: "Appointment Booked Successfully");
-        Future.delayed(new Duration(milliseconds: 1800), () {
-          getPatientShare(context, res['AppointmentNo'], docObject.clinicID,
-              docObject.projectID, docObject);
-        });
+        // Future.delayed(new Duration(milliseconds: 1800), () {
+        getPatientShare(context, res['AppointmentNo'], docObject.clinicID,
+            docObject.projectID, docObject);
+        // });
      } else {
+        GifLoaderDialogUtils.hideDialog(context);
        appo = new AppoitmentAllHistoryResultList();
        appo.appointmentNo = res['SameClinicApptList'][0]['AppointmentNo'];
        appo.clinicID = res['SameClinicApptList'][0]['DoctorID'];
@ -521,28 +520,32 @@ class _CovidTimeSlotsState extends State<CovidTimeSlots>
        dialog.showAlertDialog(context);
      }
    }).catchError((err) {
+      GifLoaderDialogUtils.hideDialog(context);
      AppToast.showErrorToast(message: err);
      print(err);
-    }).showProgressBar(
-            text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6));
+    });
  }

  cancelAppointment(DoctorList docObject, AppoitmentAllHistoryResultList appo,
      BuildContext context) {
+    GifLoaderDialogUtils.showMyDialog(context);
    ConfirmDialog.closeAlertDialog(context);
    DoctorsListService service = new DoctorsListService();
    service.cancelAppointment(appo, context).then((res) {
+      GifLoaderDialogUtils.hideDialog(context);
      if (res['MessageStatus'] == 1) {
-        Future.delayed(new Duration(milliseconds: 1500), () {
-          insertAppointmentCovidTest(context, docObject);
-        });
+        // Future.delayed(new Duration(milliseconds: 1500), () {
+        insertAppointmentCovidTest(context, docObject);
+        // });
      } else {
+        GifLoaderDialogUtils.hideDialog(context);
        AppToast.showErrorToast(message: res['ErrorEndUserMessage']);
      }
    }).catchError((err) {
+      GifLoaderDialogUtils.hideDialog(context);
+      AppToast.showErrorToast(message: err);
      print(err);
-    }).showProgressBar(
-        text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6));
+    });
  }

  getPatientShare(context, String appointmentNo, int clinicID, int projectID,
@ -551,17 +554,14 @@ class _CovidTimeSlotsState extends State<CovidTimeSlots>
    service
        .getPatientShare(appointmentNo, clinicID, projectID, context)
        .then((res) {
-          print(res);
-          widget.patientShareResponse = new PatientShareResponse.fromJson(res);
-        })
-        .catchError((err) {
-          print(err);
-        })
-        .showProgressBar(
-            text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6))
-        .then((value) {
-          navigateToPaymentAlert();
-        });
+      GifLoaderDialogUtils.hideDialog(context);
+      widget.patientShareResponse = new PatientShareResponse.fromJson(res);
+      navigateToPaymentAlert();
+    }).catchError((err) {
+      GifLoaderDialogUtils.hideDialog(context);
+      AppToast.showErrorToast(message: err);
+      print(err);
+    });
  }

  navigateToPaymentAlert() {
@ -573,8 +573,10 @@ class _CovidTimeSlotsState extends State<CovidTimeSlots>
  }

  getCovidFreeSlots(BuildContext context, int projectID) {
+    GifLoaderDialogUtils.showMyDialog(context);
    CovidDriveThruService service = new CovidDriveThruService();
    service.getCovidFreeSlots(context, projectID).then((res) {
+      GifLoaderDialogUtils.hideDialog(context);
      print(res['COVID19_FreeTimeSlots']);
      if (res['MessageStatus'] == 1) {
        if (res['COVID19_FreeTimeSlots'].length != 0) {
@ -592,11 +594,13 @@ class _CovidTimeSlotsState extends State<CovidTimeSlots>
              });
        } else {}
      } else {
+        GifLoaderDialogUtils.hideDialog(context);
        AppToast.showErrorToast(message: res['ErrorEndUserMessage']);
      }
    }).catchError((err) {
+      GifLoaderDialogUtils.hideDialog(context);
+      AppToast.showErrorToast(message: err);
      print(err);
-    }).showProgressBar(
-        text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6));
+    });
  }
 }
--- a/lib/pages/Covid-DriveThru/covid-drivethru-location.dart
+++ b/lib/pages/Covid-DriveThru/covid-drivethru-location.dart
@ -3,11 +3,12 @@ import 'package:diplomaticquarterapp/models/CovidDriveThru/DriveThroughTestingCe
 import 'package:diplomaticquarterapp/pages/Covid-DriveThru/covid-payment-details.dart';
 import 'package:diplomaticquarterapp/routes.dart';
 import 'package:diplomaticquarterapp/services/covid-drivethru/covid-drivethru.dart';
+import 'package:diplomaticquarterapp/uitl/app_toast.dart';
+import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
 import 'package:diplomaticquarterapp/uitl/utils.dart';
 import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
 import 'package:flutter/material.dart';
 import 'package:maps_launcher/maps_launcher.dart';
-import 'package:smart_progress_bar/smart_progress_bar.dart';

 class CovidDrivethruLocation extends StatefulWidget {
  @override
@ -253,6 +254,8 @@ class _CovidDrivethruLocationState extends State<CovidDrivethruLocation> {
  }

  getPaymentInfo(BuildContext context, String projectID) {
+    GifLoaderDialogUtils.showMyDialog(context);
+
    CovidDriveThruService service = new CovidDriveThruService();

    CovidPaymentInfoResponse covidPaymentInfoResponse =
@ -261,33 +264,33 @@ class _CovidDrivethruLocationState extends State<CovidDrivethruLocation> {
    service
        .getCovidPaymentInformation(context, int.parse(projectID))
        .then((res) {
-          if (res['MessageStatus'] == 1) {
-            setState(() {
-              covidPaymentInfoResponse = CovidPaymentInfoResponse.fromJson(
-                  res['COVID19_PatientShare']);
-              print(covidPaymentInfoResponse.procedureNameField);
-            });
-          } else {}
-        })
-        .catchError((err) {
-          print(err);
-        })
-        .showProgressBar(
-            text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6))
-        .then((value) {
-          Navigator.push(
-              context,
-              MaterialPageRoute(
-                  builder: (context) => CovidPaymentDetails(
-                        covidPaymentInfoResponse: covidPaymentInfoResponse,
-                        projectID: int.parse(projectID),
-                      )));
+      GifLoaderDialogUtils.hideDialog(context);
+      if (res['MessageStatus'] == 1) {
+        setState(() {
+          covidPaymentInfoResponse =
+              CovidPaymentInfoResponse.fromJson(res['COVID19_PatientShare']);
+          print(covidPaymentInfoResponse.procedureNameField);
        });
+        Navigator.push(
+            context,
+            MaterialPageRoute(
+                builder: (context) => CovidPaymentDetails(
+                      covidPaymentInfoResponse: covidPaymentInfoResponse,
+                      projectID: int.parse(projectID),
+                    )));
+      } else {}
+    }).catchError((err) {
+      GifLoaderDialogUtils.hideDialog(context);
+      AppToast.showErrorToast(message: err);
+      print(err);
+    });
  }

  getProjectsList(BuildContext context) {
+    GifLoaderDialogUtils.showMyDialog(context);
    CovidDriveThruService service = new CovidDriveThruService();
    service.getCovidProjectsList(context).then((res) {
+      GifLoaderDialogUtils.hideDialog(context);
      print(res);
      if (res['MessageStatus'] == 1) {
        print(res);
@ -298,8 +301,9 @@ class _CovidDrivethruLocationState extends State<CovidDrivethruLocation> {
        });
      } else {}
    }).catchError((err) {
+      GifLoaderDialogUtils.hideDialog(context);
+      AppToast.showErrorToast(message: err);
      print(err);
-    }).showProgressBar(
-        text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6));
+    });
  }
 }
--- a/lib/pages/landing/home_page.dart
+++ b/lib/pages/landing/home_page.dart
@ -85,10 +85,10 @@ class _HomePageState extends State<HomePage> {
                                              borderRadius: BorderRadius.all(
                                                  Radius.circular(5))),
                                          child: Container(
-                                            margin: EdgeInsets.only(top: 10.0),
+                                            margin: EdgeInsets.only(top: 5.0),
                                            child: Column(
                                              children: <Widget>[
-                                                Text("COVID-19 TEST",
+                                                Text(TranslationBase.of(context).covidTest,
                                                    style: TextStyle(
                                                        color: Colors.white,
                                                        fontWeight:
@ -107,10 +107,10 @@ class _HomePageState extends State<HomePage> {
                                                    Container(
                                                      margin: EdgeInsets.only(
                                                          left: 10.0,
-                                                          top: 10.0),
+                                                          top: 5.0),
                                                      child: Column(
                                                        children: <Widget>[
-                                                          Text("Drive-Thru",
+                                                          Text(TranslationBase.of(context).driveThru,
                                                              style: TextStyle(
                                                                  color: Colors
                                                                      .white,
@ -147,7 +147,7 @@ class _HomePageState extends State<HomePage> {
                                                                navigateToCovidDriveThru();
                                                              },
                                                              child: Text(
-                                                                  "BOOK NOW",
+                                                                  TranslationBase.of(context).bookNow,
                                                                  style: TextStyle(
                                                                      fontSize:
                                                                      12.0)),
--- a/lib/uitl/translations_delegate_base.dart
+++ b/lib/uitl/translations_delegate_base.dart
@ -898,11 +898,12 @@ String get fileno => localizedValues['fileno'][locale.languageCode];
  String get addedChild => localizedValues['added-child'][locale.languageCode];
  String get appUpdate => localizedValues['appUpdate'][locale.languageCode];
  String get ereferralSaveSuccess => localizedValues['ereferralSaveSuccess'][locale.languageCode];
-
  String get referralStatus => localizedValues['referralStatus'][locale.languageCode];
  String get referralDate => localizedValues['referralDate'][locale.languageCode];
  String get patientName => localizedValues['patientName'][locale.languageCode];
  String get referralNumber => localizedValues['referralNumber'][locale.languageCode];
+  String get covidTest => localizedValues['covidTest'][locale.languageCode];
+  String get driveThru => localizedValues['driveThru'][locale.languageCode];


 }