Updated patient travel details to fix date fragment not showing and r…

…esolved an error in caseeditriskfactor.
ePareto-Information-System · Jan 23, 2025 · e3a3154 · e3a3154
1 parent cf17bf1
commit e3a3154
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 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
@@ -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/...p/app/src/main/java/de/symeda/sormas/app/riskfactor/PatientTravelDetailsDuringDialog.java b/...p/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/...pp/app/src/main/java/de/symeda/sormas/app/riskfactor/PatientTravelDetailsPriorDialog.java b/...pp/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
@@ -9,6 +9,7 @@
         <import type="de.symeda.sormas.api.i18n.Strings" />
 
         <variable name="data" type="de.symeda.sormas.app.backend.patienttraveldetailsduring.PatientTravelDetailsDuring" />
+        <variable name="TravelClass" type="Class" />
     </data>
 
     <ScrollView
@@ -43,6 +44,7 @@
                 android:id="@+id/patientTravelDetailsDuring_placeOfTravel"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                app:enumClass="@{TravelClass}"
                 app:value="@{data.placeOfTravel}"
                 style="@style/ControlSingleColumnStyle" />
 

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
@@ -9,6 +9,7 @@
         <import type="de.symeda.sormas.api.i18n.Strings" />
 
         <variable name="data" type="de.symeda.sormas.app.backend.patienttraveldetailsprior.PatientTravelDetailsPrior" />
+        <variable name="TravelClass" type="Class" />
     </data>
 
     <ScrollView
@@ -43,6 +44,7 @@
                 android:id="@+id/patientTravelDetailsPrior_placeOfTravel"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                app:enumClass="@{TravelClass}"
                 app:value="@{data.placeOfTravel}"
                 style="@style/ControlSingleColumnStyle" />
 

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
@@ -8,7 +8,6 @@
 
         <variable name="data" type="de.symeda.sormas.app.backend.patienttraveldetailsprior.PatientTravelDetailsPrior" />
         <variable name="index" type="java.lang.Integer" />
-
         <variable name="callback" type="de.symeda.sormas.app.core.IEntryItemOnClickListener" />
     </data>
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,6 @@ @@
             <variable name="data" type="de.symeda.sormas.app.backend.patienttraveldetailsprior.PatientTravelDetailsPrior" />
             <variable name="index" type="java.lang.Integer" />
             <variable name="callback" type="de.symeda.sormas.app.core.IEntryItemOnClickListener" />
         </data>
@@ Expand Down @@