diff --git a/lib/config/config.dart b/lib/config/config.dart index bbf0fdc4..16628fda 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -135,7 +135,7 @@ const ADD_SICK_LEAVE = 'Services/DoctorApplication.svc/REST/PostSickLeave'; const GET_SICK_LEAVE = 'Services/Patients.svc/REST/GetPatientSickLeave'; const EXTEND_SICK_LEAVE = 'Services/DoctorApplication.svc/REST/ExtendSickLeave'; -const GET_OFFTIME = 'Services/DoctorApplication.svc/REST/GetMasterLookUpList'; +const GET_MASTER_LOOKUP_LIST = 'Services/DoctorApplication.svc/REST/GetMasterLookUpList'; const GET_COVERING_DOCTORS = 'Services/DoctorApplication.svc/REST/GetCoveringDoctor'; const ADD_RESCHDEULE = 'Services/DoctorApplication.svc/REST/PostRequisition'; diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index df70b1ec..eb052bc5 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -1140,6 +1140,6 @@ const Map> localizedValues = { "doseDetails": {"en": "Dose Details", "ar":"تفاصيل الجرعة"}, "selectCondition": {"en": "Select Condition", "ar":"قم بتحديد الشرط"}, "yourOrderAddedSuccessfully": {"en": "Your Order Added Successfully", "ar":"تم إضافة طلبك بنجاح"}, - "youCannotAddOnlySpaces": {"en": "You Can't Add Only Spaces", "ar":"تم إضافة طلبك بنجاح"}, - "conditionDescription": {"en": "Condition Description", "ar":"وصف الحالة"}, + "youCannotAddOnlySpaces": {"en": "You Can't Add Only Spaces", "ar":""}, + "conditionDescription": {"en": "Condition Description", "ar":"لا يمكنك إضافة مسافات فقط"}, }; diff --git a/lib/core/service/base/lookup-service.dart b/lib/core/service/base/lookup-service.dart index d321b7f0..f68aa01a 100644 --- a/lib/core/service/base/lookup-service.dart +++ b/lib/core/service/base/lookup-service.dart @@ -60,7 +60,7 @@ class LookupService extends BaseService { Map body = { "MasterInput": masterKeys.getMasterKeyService() }; - await baseAppClient.post(GET_OFFTIME, + await baseAppClient.post(GET_MASTER_LOOKUP_LIST, onSuccess: (dynamic response, int statusCode) { setMasterLookupInCorrectArray( response['MasterLookUpList']['entityList'], masterKeys); diff --git a/lib/core/service/patient/patient_service.dart b/lib/core/service/patient/patient_service.dart index 593df0eb..7db9fd1b 100644 --- a/lib/core/service/patient/patient_service.dart +++ b/lib/core/service/patient/patient_service.dart @@ -82,8 +82,6 @@ class PatientService extends BaseService { List stpMasterList = []; - - // TODO: replace var with model var _insuranceApporvalsList = []; @@ -574,10 +572,6 @@ class PatientService extends BaseService { onSuccess: (dynamic response, int statusCode) { stpMasterList = []; stpMasterList = response['List_STPMasterList']; - // response['List_STPMasterList'].forEach((v) { - // _stpMasterList - // .add(StpMasterListResponseModel.fromJson(v)); - // }); }, onFailure: (String error, int statusCode) { hasError = true; diff --git a/lib/core/service/patient_medical_file/sick_leave/sickleave_service.dart b/lib/core/service/patient_medical_file/sick_leave/sickleave_service.dart index ea97f02b..333ffeea 100644 --- a/lib/core/service/patient_medical_file/sick_leave/sickleave_service.dart +++ b/lib/core/service/patient_medical_file/sick_leave/sickleave_service.dart @@ -186,7 +186,7 @@ class SickLeaveService extends BaseService { hasError = false; await baseAppClient.post( - GET_OFFTIME, + GET_MASTER_LOOKUP_LIST, onSuccess: (dynamic response, int statusCode) { offTime = []; response['MasterLookUpList']['entityList'].forEach((item) => { @@ -208,7 +208,7 @@ class SickLeaveService extends BaseService { hasError = false; await baseAppClient.post( - GET_OFFTIME, + GET_MASTER_LOOKUP_LIST, onSuccess: (dynamic response, int statusCode) { reasonse = []; reasonse = response['MasterLookUpList']['entityList']; diff --git a/lib/core/viewModel/patient_view_model.dart b/lib/core/viewModel/patient_view_model.dart index 894be5f7..242ba6c3 100644 --- a/lib/core/viewModel/patient_view_model.dart +++ b/lib/core/viewModel/patient_view_model.dart @@ -361,7 +361,7 @@ class PatientViewModel extends BaseViewModel { if (isLocalBusy) setState(ViewState.ErrorLocal); else - setState(ViewState.ErrorLocal); + setState(ViewState.Error); } else { setState(ViewState.Idle); }