Merge pull request SORMAS-Foundation#4102 from GIP-GRADeS-BFC/hzi_4047_open_risk_level_to_all_event_status

Open event's risk level to all event statuses SORMAS-Foundation#4047

Author: MateStrysewske

sormas-app/app/src/main/res/layout/fragment_event_edit_layout.xml

@@ -98,8 +98,6 @@
             <de.symeda.sormas.app.component.controls.ControlSwitchField
                 android:id="@+id/event_riskLevel"
                 style="@style/ControlSingleColumnStyle"
-                app:dependencyParentField="@{eventEventStatus}"
-                app:dependencyParentValue="@{EventStatus.CLUSTER}"
                 app:enumClass="@{riskLevelClass}"
                 app:value="@={data.riskLevel}"/>
 

sormas-app/app/src/main/res/layout/fragment_event_read_layout.xml

@@ -70,9 +70,7 @@
             <de.symeda.sormas.app.component.controls.ControlTextReadField
                     android:id="@+id/event_riskLevel"
                     style="@style/ControlSingleColumnStyle"
-                    app:value="@{data.riskLevel}"
-                    app:dependencyParentField="@{eventEventStatus}"
-                    app:dependencyParentValue="@{EventStatus.CLUSTER}" />
+                    app:value="@{data.riskLevel}" />
 
             <LinearLayout
                 android:layout_width="match_parent"

sormas-ui/src/main/java/de/symeda/sormas/ui/events/EventDataForm.java

@@ -164,21 +164,14 @@ protected void addFields() {
 		addField(EventDto.DISEASE_DETAILS, TextField.class);
 		addFields(EventDto.EXTERNAL_ID);
 		addFields(EventDto.EXTERNAL_TOKEN);
+
 		DateField startDate = addField(EventDto.START_DATE, DateField.class);
 		CheckBox multiDayCheckbox = addField(EventDto.MULTI_DAY_EVENT, CheckBox.class);
 		DateField endDate = addField(EventDto.END_DATE, DateField.class);
-
 		initEventDateValidation(startDate, endDate, multiDayCheckbox);
 
 		addField(EventDto.EVENT_STATUS, NullableOptionGroup.class);
-
 		addField(EventDto.RISK_LEVEL);
-		FieldHelper.setVisibleWhen(
-			getFieldGroup(),
-			Collections.singletonList(EventDto.RISK_LEVEL),
-			EventDto.EVENT_STATUS,
-			Collections.singletonList(EventStatus.CLUSTER),
-			true);
 
 		addField(EventDto.EVENT_INVESTIGATION_STATUS, NullableOptionGroup.class);
 		addField(EventDto.EVENT_INVESTIGATION_START_DATE, DateField.class);
@@ -191,11 +184,13 @@ protected void addFields() {
 			false);
 		TextField title = addField(EventDto.EVENT_TITLE, TextField.class);
 		title.addStyleName(CssStyles.SOFT_REQUIRED);
+
 		TextArea descriptionField = addField(EventDto.EVENT_DESC, TextArea.class, new TextFieldWithMaxLengthWrapper<>());
 		descriptionField.setRows(2);
 		descriptionField.setDescription(
 			I18nProperties.getPrefixDescription(EventDto.I18N_PREFIX, EventDto.EVENT_DESC, "") + "\n"
 				+ I18nProperties.getDescription(Descriptions.descGdpr));
+
 		addField(EventDto.DISEASE_TRANSMISSION_MODE, ComboBox.class);
 		addField(EventDto.NOSOCOMIAL, NullableOptionGroup.class);