#158: Updated positioning of fields at case create

ePareto-Information-System · Oct 7, 2024 · 0fd90de · 0fd90de
1 parent 6c4adfe
commit 0fd90de
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 22 deletions.
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/caze/edit/CaseNewFragment.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/caze/edit/CaseNewFragment.java
@@ -183,6 +183,7 @@ public void onLayoutBinding(FragmentCaseNewLayoutBinding contentBinding) {
 			() -> Boolean.TRUE.equals(contentBinding.caseDataDifferentPlaceOfStayJurisdiction.getValue()));
 
 			contentBinding.caseDataCaseTransmissionClassification.initializeSpinner(caseTransmissionClassificationsList);
+			contentBinding.caseDataCaseTransmissionClassification.setVisibility(GONE);
 			// InfrastructureDaoHelper.initializeFacilityFields(
 			InfrastructureFieldsDependencyHandler.instance.initializeFacilityFields(
 			record,

diff --git a/sormas-app/app/src/main/res/layout/fragment_case_new_layout.xml b/sormas-app/app/src/main/res/layout/fragment_case_new_layout.xml
@@ -51,21 +51,6 @@
 
             <requestFocus />
 
-            <de.symeda.sormas.app.component.controls.ControlSwitchField
-                android:id="@+id/caseData_caseOrigin"
-                android:tag="case_origin_tag"
-                style="@style/ControlSingleColumnStyle"
-                app:enumClass="@{caseOriginClass}"
-                app:nullable="false"
-                app:required="true"
-                app:value="@={data.caseOrigin}" />
-
-            <de.symeda.sormas.app.component.controls.ControlSpinnerField
-                android:id="@+id/caseData_caseTransmissionClassification"
-                style="@style/ControlSingleColumnStyle"
-                app:required="true"
-                app:value="@={data.caseTransmissionClassification}" />
-
             <de.symeda.sormas.app.component.controls.ControlSpinnerField
                 android:id="@+id/caseData_disease"
                 android:tag="disease_tag"
@@ -123,6 +108,28 @@
                 app:customizableEnumValue="@{Boolean.TRUE}"
                 style="@style/ControlSingleColumnStyle" />
 
+            <de.symeda.sormas.app.component.controls.ControlSwitchField
+                android:id="@+id/caseData_caseOrigin"
+                android:tag="case_origin_tag"
+                style="@style/ControlSingleColumnStyle"
+                app:enumClass="@{caseOriginClass}"
+                app:nullable="false"
+                app:required="true"
+                app:value="@={data.caseOrigin}" />
+
+            <de.symeda.sormas.app.component.controls.ControlSpinnerField
+                android:id="@+id/caseData_caseTransmissionClassification"
+                style="@style/ControlSingleColumnStyle"
+                app:required="true"
+                app:value="@={data.caseTransmissionClassification}" />
+
+            <de.symeda.sormas.app.component.controls.ControlTextEditField
+                android:id="@+id/caseData_epidNumber"
+                android:tag="epid_number_tag"
+                app:value="@={data.epidNumber}"
+                app:userViewRight="@{UserRight.CASE_CHANGE_EPID_NUMBER}"
+                style="@style/ControlSingleColumnStyle" />
+
             <TextView
                 android:id="@+id/caseData_headingCaseResponsibleJurisidction"
                 android:layout_width="match_parent"
@@ -255,13 +262,6 @@
                 app:required="true"
                 app:value="@={data.pointOfEntryDetails}" />
 
-            <de.symeda.sormas.app.component.controls.ControlTextEditField
-                android:id="@+id/caseData_epidNumber"
-                android:tag="epid_number_tag"
-                app:value="@={data.epidNumber}"
-                app:userViewRight="@{UserRight.CASE_CHANGE_EPID_NUMBER}"
-                style="@style/ControlSingleColumnStyle" />
-
             <LinearLayout
                 android:id="@+id/token_fields_layout"
                 android:layout_width="match_parent"