#180: Added Disease diagnosis and event diagnosis to case edit for ID…

…SR. Added the fields to the fragment case read layouts
ePareto-Information-System · Oct 8, 2024 · c4b39d3 · c4b39d3
1 parent 8aa442e
commit c4b39d3
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 0 deletions.
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/caze/edit/CaseEditFragment.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/caze/edit/CaseEditFragment.java
@@ -41,6 +41,7 @@
 import de.symeda.sormas.api.caze.DengueFeverType;
 import de.symeda.sormas.api.caze.EndOfIsolationReason;
 import de.symeda.sormas.api.caze.HospitalWardType;
+import de.symeda.sormas.api.caze.IdsrType;
 import de.symeda.sormas.api.caze.InfectionSetting;
 import de.symeda.sormas.api.caze.PlagueType;
 import de.symeda.sormas.api.caze.QuarantineReason;
@@ -132,6 +133,7 @@ public class CaseEditFragment extends BaseEditFragment<FragmentCaseEditLayoutBin
     private List<Item> caseConfirmationBasisList;
 
 	private boolean differentPlaceOfStayJurisdiction;
+	private List<Item> idsrTypeList;
 
 	// Static methods
 
@@ -413,6 +415,7 @@ record = getActivityRootData();
 		caseTransmissionClassificationsList = DataUtils.getEnumItems(TransmissionClassification.class, true);
 		infectionSettingList = DataUtils.getEnumItems(InfectionSetting.class, true);
 		caseConfirmationBasisList = DataUtils.getEnumItems(CaseConfirmationBasis.class, true);
+		idsrTypeList = DataUtils.getEnumItems(IdsrType.class, true);
 	}
 
 	@Override
@@ -595,6 +598,7 @@ public void onChange(ControlPropertyField field) {
 			filteredValues = new VaccinationStatus[] {};
 		}
 		contentBinding.setFilteredVaccinationStatusValues(filteredValues);
+		contentBinding.caseDataIdsrDiagnosis.initializeSpinner(idsrTypeList);
 
 		contentBinding.caseDataQuarantineTo.addValueChangedListener(new ValueChangeListener() {
 

diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/caze/read/CaseReadFragment.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/caze/read/CaseReadFragment.java
@@ -50,6 +50,7 @@
 import de.symeda.sormas.app.util.DiseaseConfigurationCache;
 import de.symeda.sormas.app.util.FieldVisibilityAndAccessHelper;
 import de.symeda.sormas.app.util.InfrastructureDaoHelper;
+import de.symeda.sormas.api.caze.IdsrType;
 
 public class CaseReadFragment extends BaseReadFragment<FragmentCaseReadLayoutBinding, Case, Case> {
 

diff --git a/sormas-app/app/src/main/res/layout/fragment_case_edit_layout.xml b/sormas-app/app/src/main/res/layout/fragment_case_edit_layout.xml
@@ -46,6 +46,7 @@
         <import type="de.symeda.sormas.api.i18n.I18nProperties" />
         <import type="de.symeda.sormas.api.i18n.Strings" />
         <import type="de.symeda.sormas.api.disease.DiseaseVariant" />
+        <import type="de.symeda.sormas.api.caze.IdsrType" />
 
         <variable name="hosp" type="de.symeda.sormas.app.backend.hospitalization.Hospitalization" />
         <variable name="data" type="de.symeda.sormas.app.backend.caze.Case"/>
@@ -341,6 +342,20 @@
                     app:userEditRight="@{UserRight.CASE_CHANGE_DISEASE}"
                     style="@style/ControlSingleColumnStyle" />
 
+                <de.symeda.sormas.app.component.controls.ControlSpinnerField
+                    android:id="@+id/caseData_idsrDiagnosis"
+                    style="@style/ControlSingleColumnStyle"
+                    app:dependencyParentField="@{caseDataDisease}"
+                    app:dependencyParentValue="@{Disease.IMMEDIATE_CASE_BASED_FORM_OTHER_CONDITIONS}"
+                    app:value="@={data.idsrDiagnosis}" />
+
+                <de.symeda.sormas.app.component.controls.ControlTextEditField
+                    android:id="@+id/caseData_specifyEventDiagnosis"
+                    style="@style/ControlSingleColumnStyle"
+                    app:dependencyParentField="@{caseDataIdsrDiagnosis}"
+                    app:dependencyParentValue="@{IdsrType.OTHER}"
+                    app:value="@={data.specifyEventDiagnosis}" />
+
                 <de.symeda.sormas.app.component.controls.ControlSwitchField
                     android:id="@+id/caseData_reInfection"
                     style="@style/ControlSingleColumnStyle"

diff --git a/sormas-app/app/src/main/res/layout/fragment_case_read_layout.xml b/sormas-app/app/src/main/res/layout/fragment_case_read_layout.xml
@@ -39,6 +39,7 @@
         <import type="de.symeda.sormas.api.i18n.I18nProperties" />
         <import type="de.symeda.sormas.api.i18n.Strings" />
         <import type="de.symeda.sormas.api.disease.DiseaseVariant" />
+        <import type="de.symeda.sormas.api.caze.IdsrType" />
 
         <variable name="data" type="de.symeda.sormas.app.backend.caze.Case" />
         <variable name="caseTransmissionClassificationClass" type="de.symeda.sormas.api.caze.TransmissionClassification" />
@@ -243,6 +244,21 @@
                         app:dependencyParentValue="@{Disease.RABIES}"
                         style="@style/ControlSecondOfTwoColumnsStyle" />
 
+                    <de.symeda.sormas.app.component.controls.ControlTextReadField
+                        android:id="@+id/caseData_idsrDiagnosis"
+                        app:value="@{data.idsrDiagnosis}"
+                        app:dependencyParentField="@{caseDataDisease}"
+                        app:dependencyParentValue="@{Disease.IMMEDIATE_CASE_BASED_FORM_OTHER_CONDITIONS}"
+                        style="@style/ControlSecondOfTwoColumnsStyle" />
+
+                    <de.symeda.sormas.app.component.controls.ControlTextReadField
+                        android:id="@+id/caseData_specifyEventDiagnosis"
+                        app:value="@{data.specifyEventDiagnosis}"
+                        app:dependencyParentField="@{caseDataIdsrDiagnosis}"
+                        app:dependencyParentValue="@{IdsrType.OTHER}"
+                        app:dependencyParentVisibility="@{true}"
+                        style="@style/ControlSecondOfTwoColumnsStyle" />
+
                 </LinearLayout>
 
                 <de.symeda.sormas.app.component.controls.ControlTextReadField