From 29768feefdadd11f80df273340d3a8a034e2cacd Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Sun, 9 Aug 2020 10:12:51 +0300 Subject: [PATCH] merge master --- lib/config/config.dart | 6 +----- lib/core/service/client/base_app_client.dart | 6 ++---- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/lib/config/config.dart b/lib/config/config.dart index 6d3ddde8..361f6350 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -15,14 +15,10 @@ const GET_DOCTOR_RATING = '/Doctors.svc/REST/dr_GetAvgDoctorRating'; ///Prescriptions const PRESCRIPTIONS = '/Patients.svc/REST/GetPrescriptionApptList'; -const GET_PRESCRIPTIONS_ALL_ORDERS = - '/Patients.svc/REST/PatientER_GetPatientAllPresOrders'; +const GET_PRESCRIPTIONS_ALL_ORDERS = '/Patients.svc/REST/PatientER_GetPatientAllPresOrders'; const GET_PRESCRIPTION_REPORT = '/Patients.svc/REST/INP_GetPrescriptionReport'; const SEND_PRESCRIPTION_EMAIL = '/Notifications.svc/REST/SendPrescriptionEmail'; -const GET_PRESCRIPTIONS_ALL_ORDERS = '/Patients.svc/REST/PatientER_GetPatientAllPresOrders'; -const GET_PRESCRIPTION_REPORT = '/Patients.svc/REST/INP_GetPrescriptionReport'; const GET_PRESCRIPTION_REPORT_ENH = '/Patients.svc/REST/GetPrescriptionReport_enh'; -const SEND_PRESCRIPTION_EMAIL = '/Notifications.svc/REST/SendPrescriptionEmail'; ///Lab Order const GET_Patient_LAB_ORDERS = '/Patients.svc/REST/GetPatientLabOrders'; diff --git a/lib/core/service/client/base_app_client.dart b/lib/core/service/client/base_app_client.dart index dfeee3e9..f20d6a9c 100644 --- a/lib/core/service/client/base_app_client.dart +++ b/lib/core/service/client/base_app_client.dart @@ -1,6 +1,7 @@ import 'dart:convert'; import 'package:diplomaticquarterapp/config/config.dart'; +import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; import 'package:diplomaticquarterapp/uitl/utils.dart'; import 'package:http/http.dart' as http; @@ -64,10 +65,7 @@ class BaseAppClient { } else { logout(); } - // await helpers.logout(); - //helpers.showErrorToast('Your session expired Please login agian'); - var asd =""; - // TODO create logout fun + } else if (parsed['MessageStatus'] == 1 || parsed['SMSLoginRequired'] == true) { onSuccess(parsed, statusCode);