diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 8bd2ae36..87f17bbf 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -1921,6 +1921,8 @@ const Map localizedValues = { "consent": {"en": "Consent", "ar": "التنويم"}, "generalInstructionsTitle": {"en": "General", "ar": "تعليمات"}, "generalInstructionsSubTitle": {"en": "Instructions", "ar": "التنويم العامة"}, + "generalConsentTitle": {"en": "General", "ar": "الموافقة"}, + "generalConsentSubTitle": {"en": "Consent", "ar": "العامة"}, "medicalInstructionsTitle": {"en": "Medical", "ar": "التعليمات الطبية"}, "medicalInstructionsSubTitle": {"en": "Instructions", "ar": "قبل التنويم"}, "mealPlanTitle": {"en": "Meal Plan", "ar": "خدمات"}, diff --git a/lib/pages/InPatientServices/components/inpatient_pending_advance_payment.dart b/lib/pages/InPatientServices/components/inpatient_pending_advance_payment.dart index e636e810..14bf116f 100644 --- a/lib/pages/InPatientServices/components/inpatient_pending_advance_payment.dart +++ b/lib/pages/InPatientServices/components/inpatient_pending_advance_payment.dart @@ -32,7 +32,7 @@ class _InPatientPendingAdvancePaymentState extends State { openPatientGeneralConsent(); }, child: MedicalProfileItem( - title: TranslationBase.of(context).generalInstructionsTitle, + title: TranslationBase.of(context).generalConsentTitle, imagePath: 'general_instructions.svg', - subTitle: TranslationBase.of(context).consent, + subTitle: TranslationBase.of(context).generalConsentSubTitle, width: 50.0, height: 40.0, isInPatient: true, @@ -278,7 +278,6 @@ class _InPatientServicesHomeState extends State { ClinicListService service = new ClinicListService(); GifLoaderDialogUtils.showMyDialog(context); service.getDischargeMedicationOrder(projectViewModel.getAdmissionInfoResponseModel).then((res) { - print(res["PatientHasDischargeMedicineList"].length); setState(() { if (res["PatientHasDischargeMedicineList"].length != 0) { isReceivePrescriptionEnabled = true; @@ -311,7 +310,6 @@ class _InPatientServicesHomeState extends State { service.getBirthNotification(projectViewModel.user.patientID!, projectViewModel.isArabic ? 1 : 2, context).then((res) { GifLoaderDialogUtils.hideDialog(context); if (res["MessageStatus"] == 1) { - print(res['birthNotification']); Navigator.push(context, FadePage(page: BirthNotification())); } else { AppToast.showErrorToast(message: res["endUserMessage"]); @@ -335,7 +333,6 @@ class _InPatientServicesHomeState extends State { getGeneralInstructionsList.add(new GetGeneralInstructions.fromJson(v)); }); GifLoaderDialogUtils.hideDialog(context); - print(res['generalInstructions']); Navigator.push(context, FadePage(page: GeneralInstructions(getGeneralInstructionsList: getGeneralInstructionsList))); } else { GifLoaderDialogUtils.hideDialog(context); @@ -356,7 +353,6 @@ class _InPatientServicesHomeState extends State { getMedicalInstructionsList.add(new GetMedicalInstructions.fromJson(v)); }); GifLoaderDialogUtils.hideDialog(context); - print(res['MedicalInstruction']); Navigator.push(context, FadePage(page: MedicalInstructionsPage(getMedicalInstructionsList: getMedicalInstructionsList))); } else { GifLoaderDialogUtils.hideDialog(context); @@ -380,7 +376,7 @@ class _InPatientServicesHomeState extends State { .then((res) { GifLoaderDialogUtils.hideDialog(context); if (res["MessageStatus"] == 1) { - if (res['responseInpatient'] != null) { + if (res['responseInpatient'] != null && res['responseInpatient']['responseInpatientAdvanceInfo'].length != 0) { inPatientAdvanceResponseModel = InPatientAdvanceResponseModel.fromJson(res["responseInpatient"]); Navigator.push(context, FadePage(page: InPatientAdvancePayment(isHasData: inPatientAdvanceResponseModel.responseInpatientAdvanceInfo != null, inPatientAdvanceResponseModel: inPatientAdvanceResponseModel))); @@ -398,8 +394,6 @@ class _InPatientServicesHomeState extends State { } void checkCurrentTime(BuildContext context) { - print(DateTime.now().hour); - print(DateTime.now().minute); if (DateTime.now().hour >= 7 && DateTime.now().hour <= 22) { Navigator.push(context, FadePage(page: HelpPRO())); } else { @@ -415,8 +409,6 @@ class _InPatientServicesHomeState extends State { } bool checkAdmissionRequestDate() { - print(DateUtil.convertStringToDate(projectViewModel.getAdmissionRequestInfoResponseModel.expectedAdmissionDate)); - print(DateUtil.convertStringToDate(projectViewModel.getAdmissionRequestInfoResponseModel.expectedAdmissionDate).difference(DateTime.now()).inHours); if (DateUtil.convertStringToDate(projectViewModel.getAdmissionRequestInfoResponseModel.expectedAdmissionDate).difference(DateTime.now()).inHours > 24) { return false; } diff --git a/lib/uitl/translations_delegate_base.dart b/lib/uitl/translations_delegate_base.dart index 7686e463..862eb931 100644 --- a/lib/uitl/translations_delegate_base.dart +++ b/lib/uitl/translations_delegate_base.dart @@ -3018,8 +3018,8 @@ class TranslationBase { String get continueAgreeTerms => localizedValues["continueAgreeTerms"][locale.languageCode]; String get agreeText => localizedValues["agreeText"][locale.languageCode]; String get ERCheckInSuccess => localizedValues["ERCheckInSuccess"][locale.languageCode]; - - + String get generalConsentTitle => localizedValues["generalConsentTitle"][locale.languageCode]; + String get generalConsentSubTitle => localizedValues["generalConsentSubTitle"][locale.languageCode]; } class TranslationBaseDelegate extends LocalizationsDelegate {