From eb09cda2a187573e9d473c33ccf2b9b23f7249a3 Mon Sep 17 00:00:00 2001 From: Mohammad ALjammal Date: Wed, 10 Jun 2020 11:04:53 +0300 Subject: [PATCH] fix issues in patients provider --- lib/client/base_app_client.dart | 2 +- lib/config/config.dart | 4 +-- lib/providers/patients_provider.dart | 45 +++++++++++++++++++++++----- 3 files changed, 41 insertions(+), 10 deletions(-) diff --git a/lib/client/base_app_client.dart b/lib/client/base_app_client.dart index 124e361e..031c70ac 100644 --- a/lib/client/base_app_client.dart +++ b/lib/client/base_app_client.dart @@ -57,7 +57,7 @@ class BaseAppClient { body['IsLoginForDoctorApp'] = IS_LOGIN_FOR_DOCTOR_APP; body['PatientOutSA'] = PATIENT_OUT_SA; - if (await Helpers.checkConnection()) { + if (await Helpers.checkConnection()) { final response = await http.post(url, body: json.encode(body), headers: { diff --git a/lib/config/config.dart b/lib/config/config.dart index 6e75ccf2..e80acab5 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -2,8 +2,8 @@ const MAX_SMALL_SCREEN = 660; const ONLY_NUMBERS = "[0-9]"; const ONLY_LETTERS = "[a-zA-Z]"; const ONLY_DATE = "[0-9/]"; -// const BASE_URL = 'https://hmgwebservices.com/Services/'; -const BASE_URL = 'https://uat.hmgwebservices.com/Services/'; + const BASE_URL = 'https://hmgwebservices.com/Services/'; +//const BASE_URL = 'https://uat.hmgwebservices.com/Services/'; const PHARMACY_ITEMS_URL = "Lists.svc/REST/GetPharmcyItems_Region"; const PHARMACY_LIST_URL = "Patients.svc/REST/GetPharmcyList"; const PATIENT_PROGRESS_NOTE_URL = "DoctorApplication.svc/REST/GetProgressNoteForInPatient"; diff --git a/lib/providers/patients_provider.dart b/lib/providers/patients_provider.dart index ca88a5b7..0770ad47 100644 --- a/lib/providers/patients_provider.dart +++ b/lib/providers/patients_provider.dart @@ -68,14 +68,15 @@ class PatientsProvider with ChangeNotifier { PatiantInformtion _selectedPatient; - Future getPatientList(PatientModel patient, patientType) async { + getPatientList(PatientModel patient, patientType) async { int val = int.parse(patientType); try { - await BaseAppClient.post( SERVICES_PATIANT[val], - onSuccess: (dynamic response, int statusCode) { - return Future.value(response); - }, onFailure: (String error, int statusCode) { + var localResponse ; + await BaseAppClient.post( 'DoctorApplication.svc/REST/'+SERVICES_PATIANT[val], + onSuccess: (dynamic response, int statusCode) async{ + localResponse = response; + }, onFailure: (String error, int statusCode) async{ throw error; }, body: { "ProjectID": patient.ProjectID, @@ -99,9 +100,12 @@ class PatientsProvider with ChangeNotifier { "IsLoginForDoctorApp": patient.IsLoginForDoctorApp, "PatientOutSA": patient.PatientOutSA }); + + return localResponse; } catch (err) { handelCatchErrorCase(error); } + } setBasicData() { @@ -138,11 +142,15 @@ class PatientsProvider with ChangeNotifier { a.vitalSignDate.microsecondsSinceEpoch; }); patientVitalSignOrderdSubList.clear(); - for (int x = 0; x < 20; x++) { + int length = patientVitalSignOrderdSubListTemp.length >= 20 ? 20 : patientVitalSignOrderdSubListTemp.length; + for (int x = 0; x < length; x++) { patientVitalSignOrderdSubList .add(patientVitalSignOrderdSubListTemp[x]); } } + isLoading = false; + isError = false; + this.error = ''; }, onFailure: (String error, int statusCode) { isLoading = false; @@ -174,6 +182,9 @@ class PatientsProvider with ChangeNotifier { response['List_GetLabOreders'].forEach((v) { patientLabResultOrdersList.add(new LabOrdersResModel.fromJson(v)); }); + isLoading = false; + isError = false; + this.error = ''; }, onFailure: (String error, int statusCode) { isLoading = false; @@ -203,6 +214,9 @@ class PatientsProvider with ChangeNotifier { patientPrescriptionsList .add(new PrescriptionResModel.fromJson(v)); }); + isLoading = false; + isError = false; + this.error = ''; }, onFailure: (String error, int statusCode) { isLoading = false; @@ -300,6 +314,9 @@ class PatientsProvider with ChangeNotifier { response['List_GetRadOreders'].forEach((v) { patientRadiologyList.add(new RadiologyResModel.fromJson(v)); }); + isLoading = false; + isError = false; + this.error = ''; }, onFailure: (String error, int statusCode) { isLoading = false; @@ -343,6 +360,9 @@ class PatientsProvider with ChangeNotifier { await BaseAppClient.post(PATIENT_INSURANCE_APPROVALS_URL, onSuccess: (dynamic response, int statusCode) { insuranceApporvalsList = response['List_ApprovalMain_InPatient']; + isLoading = false; + isError = false; + this.error = ''; }, onFailure: (String error, int statusCode) { isLoading = false; @@ -367,6 +387,9 @@ class PatientsProvider with ChangeNotifier { await BaseAppClient.post(PATIENT_PROGRESS_NOTE_URL, onSuccess: (dynamic response, int statusCode) { patientProgressNoteList = response['List_GetPregressNoteForInPatient']; + isLoading = false; + isError = false; + this.error = ''; }, onFailure: (String error, int statusCode) { isLoading = false; @@ -391,6 +414,9 @@ class PatientsProvider with ChangeNotifier { await BaseAppClient.post(PATIENT_GET_DOCTOR_BY_CLINIC_URL, onSuccess: (dynamic response, int statusCode) { doctorsList = response['List_Doctors_All']; + isLoading = false; + isError = false; + this.error = ''; }, onFailure: (String error, int statusCode) { isLoading = false; @@ -421,6 +447,9 @@ class PatientsProvider with ChangeNotifier { await BaseAppClient.post(PATIENT_GET_CLINIC_BY_PROJECT_URL, onSuccess: (dynamic response, int statusCode) { clinicsList = response['List_Clinic_All']; + isLoading = false; + isError = false; + this.error = ''; }, onFailure: (String error, int statusCode) { isLoading = false; @@ -446,13 +475,15 @@ class PatientsProvider with ChangeNotifier { *@desc: getReferralFrequancyList */ getReferralFrequancyList() async { - String token = await sharedPref.getString(TOKEN); setBasicData(); try { await BaseAppClient.post(PATIENT_GET_LIST_REFERAL_URL, onSuccess: (dynamic response, int statusCode) { referalFrequancyList = response['list_STPReferralFrequency']; + isLoading = false; + isError = false; + this.error = ''; }, onFailure: (String error, int statusCode) { isLoading = false;