From e3a31543f33c0af89293910b613dc13d836b31c5 Mon Sep 17 00:00:00 2001 From: Flava177 Date: Thu, 23 Jan 2025 10:55:55 +0000 Subject: [PATCH] Updated patient travel details to fix date fragment not showing and resolved an error in caseeditriskfactor. --- .../sormas/app/caze/edit/CaseEditRiskFactorFragment.java | 2 +- .../app/riskfactor/PatientTravelDetailsDuringDialog.java | 3 +++ .../app/riskfactor/PatientTravelDetailsPriorDialog.java | 5 +++-- .../dialog_patient_travel_details_during_edit_layout.xml | 2 ++ .../dialog_patient_travel_details_prior_edit_layout.xml | 2 ++ .../layout/row_epid_patient_travel_details_prior_layout.xml | 1 - 6 files changed, 11 insertions(+), 4 deletions(-) diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/caze/edit/CaseEditRiskFactorFragment.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/caze/edit/CaseEditRiskFactorFragment.java index 981a529acb4..b8f9eff53bc 100644 --- a/sormas-app/app/src/main/java/de/symeda/sormas/app/caze/edit/CaseEditRiskFactorFragment.java +++ b/sormas-app/app/src/main/java/de/symeda/sormas/app/caze/edit/CaseEditRiskFactorFragment.java @@ -111,7 +111,7 @@ public void onLayoutBinding(final FragmentCaseEditRiskfactorLayoutBinding conten .setFieldVisibilitiesAndAccesses(PatientTravelDetailsDuring.class, (ViewGroup) v, new FieldVisibilityCheckers(), getFieldAccessCheckers())); contentBinding.setPatientTravelDetailsPriorList(getPatientTravelDetailsPriors()); - contentBinding.setPatientTravelDetailsPriorItemClickCallback(onPatientTravelDetailsDuringItemClickListener); + contentBinding.setPatientTravelDetailsPriorItemClickCallback(onPatientTravelDetailsPriorItemClickListener); contentBinding.setPatientTravelDetailsPriorListBindCallback( v -> FieldVisibilityAndAccessHelper .setFieldVisibilitiesAndAccesses(PatientTravelDetailsPrior.class, (ViewGroup) v, new FieldVisibilityCheckers(), getFieldAccessCheckers())); diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/riskfactor/PatientTravelDetailsDuringDialog.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/riskfactor/PatientTravelDetailsDuringDialog.java index d9beed43f2c..4d8207064e7 100644 --- a/sormas-app/app/src/main/java/de/symeda/sormas/app/riskfactor/PatientTravelDetailsDuringDialog.java +++ b/sormas-app/app/src/main/java/de/symeda/sormas/app/riskfactor/PatientTravelDetailsDuringDialog.java @@ -8,6 +8,7 @@ import androidx.databinding.ViewDataBinding; import androidx.fragment.app.FragmentActivity; +import de.symeda.sormas.api.utils.TravelLocation; import de.symeda.sormas.api.utils.ValidationException; import de.symeda.sormas.api.utils.YesNoUnknown; import de.symeda.sormas.api.utils.fieldaccess.UiFieldAccessCheckers; @@ -60,6 +61,8 @@ protected void setContentBinding(Context context, ViewDataBinding binding, Strin @Override protected void initializeContentView(ViewDataBinding rootBinding, ViewDataBinding buttonPanelBinding) { + contentBinding.patientTravelDetailsDuringDateOfTravel.initializeDateField(getFragmentManager()); + contentBinding.setTravelClass(TravelLocation.class); if (data.getId() == null) { setLiveValidationDisabled(true); diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/riskfactor/PatientTravelDetailsPriorDialog.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/riskfactor/PatientTravelDetailsPriorDialog.java index 55bf5afea54..769a0da3e73 100644 --- a/sormas-app/app/src/main/java/de/symeda/sormas/app/riskfactor/PatientTravelDetailsPriorDialog.java +++ b/sormas-app/app/src/main/java/de/symeda/sormas/app/riskfactor/PatientTravelDetailsPriorDialog.java @@ -8,6 +8,7 @@ import androidx.databinding.ViewDataBinding; import androidx.fragment.app.FragmentActivity; +import de.symeda.sormas.api.utils.TravelLocation; import de.symeda.sormas.api.utils.ValidationException; import de.symeda.sormas.api.utils.fieldaccess.UiFieldAccessCheckers; import de.symeda.sormas.api.utils.fieldvisibility.FieldVisibilityCheckers; @@ -58,6 +59,8 @@ protected void setContentBinding(Context context, ViewDataBinding binding, Strin @Override protected void initializeContentView(ViewDataBinding rootBinding, ViewDataBinding buttonPanelBinding) { + contentBinding.patientTravelDetailsPriorDateOfTravel.initializeDateField(getFragmentManager()); + contentBinding.setTravelClass(TravelLocation.class); if (data.getId() == null) { setLiveValidationDisabled(true); @@ -69,8 +72,6 @@ protected void onPositiveClick() { setLiveValidationDisabled(false); try { FragmentValidator.validate(getContext(), contentBinding); -// this.data.setDateOfTravel(contentBinding.patientTravelDetailsPriorDateOfTravel.getValue()); -// this.data.setPlaceOfTravel(contentBinding.patientTravelDetailsPriorPlaceOfTravel.getValue()); } catch (ValidationException e) { NotificationHelper.showDialogNotification(PatientTravelDetailsPriorDialog.this, ERROR, e.getMessage()); return; diff --git a/sormas-app/app/src/main/res/layout/dialog_patient_travel_details_during_edit_layout.xml b/sormas-app/app/src/main/res/layout/dialog_patient_travel_details_during_edit_layout.xml index db4a7dcc299..a4613cc6d24 100644 --- a/sormas-app/app/src/main/res/layout/dialog_patient_travel_details_during_edit_layout.xml +++ b/sormas-app/app/src/main/res/layout/dialog_patient_travel_details_during_edit_layout.xml @@ -9,6 +9,7 @@ + diff --git a/sormas-app/app/src/main/res/layout/dialog_patient_travel_details_prior_edit_layout.xml b/sormas-app/app/src/main/res/layout/dialog_patient_travel_details_prior_edit_layout.xml index ccc714219ac..e7264ff0306 100644 --- a/sormas-app/app/src/main/res/layout/dialog_patient_travel_details_prior_edit_layout.xml +++ b/sormas-app/app/src/main/res/layout/dialog_patient_travel_details_prior_edit_layout.xml @@ -9,6 +9,7 @@ + diff --git a/sormas-app/app/src/main/res/layout/row_epid_patient_travel_details_prior_layout.xml b/sormas-app/app/src/main/res/layout/row_epid_patient_travel_details_prior_layout.xml index c28942c09b1..c551bbe8aae 100644 --- a/sormas-app/app/src/main/res/layout/row_epid_patient_travel_details_prior_layout.xml +++ b/sormas-app/app/src/main/res/layout/row_epid_patient_travel_details_prior_layout.xml @@ -8,7 +8,6 @@ -