diff --git a/lib/client/base_app_client.dart b/lib/client/base_app_client.dart index 53117116..ed14ecac 100644 --- a/lib/client/base_app_client.dart +++ b/lib/client/base_app_client.dart @@ -79,16 +79,17 @@ class BaseAppClient { 'Accept': 'application/json' }); final int statusCode = response.statusCode; - print("status: $statusCode}"); if (statusCode < 200 || statusCode >= 400 || json == null) { onFailure('Error While Fetching data', statusCode); } else { var parsed = json.decode(response.body.toString()); - print("IsAuthenticated? ${parsed['IsAuthenticated']}"); - if (!parsed['IsAuthenticated']) { - await helpers.logout(); - helpers.showErrorToast('Your session expired Please login again'); - } else if (parsed['MessageStatus'] == 1) { + // if (!parsed['IsAuthenticated']) { + // // TODO: return it back when IsAuthenticated work fine in all service + // // await helpers.logout(); + // + // helpers.showErrorToast('Your session expired Please login agian'); + // } else + if (parsed['MessageStatus'] == 1) { onSuccess(parsed, statusCode); } else { String error = @@ -100,10 +101,9 @@ class BaseAppClient { if (parsed["ValidationErrors"]["ValidationErrors"] != null && parsed["ValidationErrors"]["ValidationErrors"].length != 0) { - error = ''; for (var i = 0; - i < parsed["ValidationErrors"]["ValidationErrors"].length; - i++) { + i < parsed["ValidationErrors"]["ValidationErrors"].length; + i++) { error = error + parsed["ValidationErrors"]["ValidationErrors"][i] ["Messages"][0] + diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index d626ff18..fb2d3cf8 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -306,6 +306,11 @@ const Map> localizedValues = { 'en': "EXTEND SICK LEAVE", 'ar': 'قم بتمديد الإجازة المرضية' }, + "empty-message": {"en": "Please enter Value", "ar": "يرجى ادخال القيمه"}, + "chiefComplaintLength": { + "en": "Chief Complaint length should be greater than 25", + "ar": "يجب أن يكون طول شكوى الرئيس أكبر من 25" + }, 'patient-target': {'en': 'Target Patient', 'ar': 'الهدف المريض'}, 'no-priscription-listed': { 'en': 'No Prescription Listed', @@ -316,7 +321,6 @@ const Map> localizedValues = { 'en': 'HEALTH RECORD INFORMATION', 'ar': 'معلومات السجل الصحي' }, - "empty-message": {"en": "Please enter message", "ar": "يرجى ادخال الموضوع"}, 'referTo': {'en': "Refer To", 'ar': 'محال إلى'}, 'referredFrom': {'en': "Referred From", 'ar': 'محال من'}, 'branch': {'en': "Branch", 'ar': 'الفرع'}, diff --git a/lib/core/service/base/lookup-service.dart b/lib/core/service/base/lookup-service.dart index ac03657b..9426c9fb 100644 --- a/lib/core/service/base/lookup-service.dart +++ b/lib/core/service/base/lookup-service.dart @@ -27,6 +27,11 @@ class LookupService extends BaseService { List listOfPhysiotherapyGoals = []; + List get physicalExaminationList => _physicalExaminationList; + List _physicalExaminationList = []; + + // List listOfPhysiotherapyGoals = []; + Future getMasterLookup(MasterKeysService masterKeys) async { hasError = false; Map body = { diff --git a/lib/util/translations_delegate_base.dart b/lib/util/translations_delegate_base.dart index 986174cc..c977eb8e 100644 --- a/lib/util/translations_delegate_base.dart +++ b/lib/util/translations_delegate_base.dart @@ -349,6 +349,9 @@ class TranslationBase { String get emptyMessage => localizedValues['empty-message'][locale.languageCode]; + String get chiefComplaintLength => + localizedValues['chiefComplaintLength'][locale.languageCode]; + String get referTo => localizedValues['referTo'][locale.languageCode]; String get referredFrom => localizedValues['referredFrom'][locale.languageCode];