FIX: 13462: Wrongly bordered fields that are not mandatory.

sormas-ui/src/main/java/de/symeda/sormas/ui/action/ActionEditForm.java

@@ -17,7 +17,6 @@
  *******************************************************************************/
 package de.symeda.sormas.ui.action;
 
-import static de.symeda.sormas.ui.utils.CssStyles.SOFT_REQUIRED;
 import static de.symeda.sormas.ui.utils.LayoutUtil.fluidRow;
 import static de.symeda.sormas.ui.utils.LayoutUtil.fluidRowLocs;
 import static de.symeda.sormas.ui.utils.LayoutUtil.loc;
@@ -99,7 +98,6 @@ protected void addFields() {
 
 		addField(ActionDto.ACTION_MEASURE, TextField.class);
 		TextField title = addField(ActionDto.TITLE, TextField.class);
-		title.addStyleName(SOFT_REQUIRED);
 		RichTextArea description = addField(ActionDto.DESCRIPTION, RichTextArea.class);
 
 		description.setNullRepresentation("");

sormas-ui/src/main/java/de/symeda/sormas/ui/campaign/campaigndata/CampaignFormDataFilterForm.java

@@ -36,7 +36,6 @@
 import de.symeda.sormas.ui.utils.AbstractFilterForm;
 import de.symeda.sormas.ui.utils.CssStyles;
 import de.symeda.sormas.ui.utils.FieldConfiguration;
-import de.symeda.sormas.ui.utils.FieldHelper;
 
 public class CampaignFormDataFilterForm extends AbstractFilterForm<CampaignFormDataCriteria> {
 
@@ -50,8 +49,7 @@ protected CampaignFormDataFilterForm() {
 		super(
 			CampaignFormDataCriteria.class,
 			CampaignFormDataDto.I18N_PREFIX,
-			JurisdictionFieldConfig
-				.of(CampaignFormDataCriteria.REGION, CampaignFormDataCriteria.DISTRICT, CampaignFormDataCriteria.COMMUNITY));
+			JurisdictionFieldConfig.of(CampaignFormDataCriteria.REGION, CampaignFormDataCriteria.DISTRICT, CampaignFormDataCriteria.COMMUNITY));
 		formActionButtonsComponent.style(CssStyles.FORCE_CAPTION);
 		formActionButtonsComponent.setSpacing(false);
 		formActionButtonsComponent.setSizeFull();
@@ -77,8 +75,6 @@ protected void addFields() {
 				200));
 		cbCampaignForm.addItems(FacadeProvider.getCampaignFormMetaFacade().getAllCampaignFormMetasAsReferences());
 
-		FieldHelper.addSoftRequiredStyle(cbCampaignForm);
-
 		if (formMetaChangedCallback != null) {
 			cbCampaignForm.addValueChangeListener(e -> {
 				formMetaChangedCallback.accept((CampaignFormMetaReferenceDto) e.getProperty().getValue());

sormas-ui/src/main/java/de/symeda/sormas/ui/campaign/campaigns/CampaignEditForm.java

@@ -47,7 +47,6 @@
 import de.symeda.sormas.api.i18n.Validations;
 import de.symeda.sormas.ui.utils.AbstractEditForm;
 import de.symeda.sormas.ui.utils.DateComparisonValidator;
-import de.symeda.sormas.ui.utils.FieldHelper;
 
 public class CampaignEditForm extends AbstractEditForm<CampaignDto> {
 
@@ -139,8 +138,6 @@ protected void addFields() {
 
 		setRequired(true, CampaignDto.UUID, CampaignDto.CREATING_USER, CampaignDto.START_DATE, CampaignDto.END_DATE, CampaignDto.NAME);
 
-		FieldHelper.addSoftRequiredStyle(description);
-
 		final HorizontalLayout usageLayout = new HorizontalLayout();
 		usageLayout.setWidthFull();
 		Label usageLabel =

sormas-ui/src/main/java/de/symeda/sormas/ui/campaign/campaignstatistics/CampaignStatisticsFilterForm.java

@@ -22,7 +22,6 @@
 import de.symeda.sormas.ui.utils.AbstractFilterForm;
 import de.symeda.sormas.ui.utils.CssStyles;
 import de.symeda.sormas.ui.utils.FieldConfiguration;
-import de.symeda.sormas.ui.utils.FieldHelper;
 
 public class CampaignStatisticsFilterForm extends AbstractFilterForm<CampaignStatisticsCriteria> {
 
@@ -34,8 +33,7 @@ protected CampaignStatisticsFilterForm() {
 		super(
 			CampaignStatisticsCriteria.class,
 			CampaignStatisticsDto.I18N_PREFIX,
-			JurisdictionFieldConfig
-				.of(CampaignStatisticsCriteria.REGION, CampaignStatisticsCriteria.DISTRICT, CampaignStatisticsCriteria.COMMUNITY));
+			JurisdictionFieldConfig.of(CampaignStatisticsCriteria.REGION, CampaignStatisticsCriteria.DISTRICT, CampaignStatisticsCriteria.COMMUNITY));
 		formActionButtonsComponent.style(CssStyles.FORCE_CAPTION);
 		formActionButtonsComponent.setSpacing(false);
 		formActionButtonsComponent.setSizeFull();
@@ -61,8 +59,6 @@ protected void addFields() {
 				200));
 		cbCampaignForm.addItems(FacadeProvider.getCampaignFormMetaFacade().getAllCampaignFormMetasAsReferences());
 
-		FieldHelper.addSoftRequiredStyle(cbCampaignForm);
-
 		if (formMetaChangedCallback != null) {
 			cbCampaignForm.addValueChangeListener(e -> {
 				formMetaChangedCallback.accept((CampaignFormMetaReferenceDto) e.getProperty().getValue());

sormas-ui/src/main/java/de/symeda/sormas/ui/campaign/components/CampaignSelector.java

@@ -37,7 +37,6 @@ public CampaignSelector() {
 		if (lastStartedCampaign != null) {
 			campaignCombo.setValue(lastStartedCampaign);
 		}
-		CssStyles.style(campaignCombo, CssStyles.SOFT_REQUIRED);
 		addComponent(campaignCombo);
 	}
 

sormas-ui/src/main/java/de/symeda/sormas/ui/caze/BulkCaseDataForm.java

@@ -268,12 +268,6 @@ protected void addFields() {
 			getContent().addComponent(surveillanceOfficerCheckBox, SURVEILLANCE_OFFICER_CHECKBOX);
 			ComboBox surveillanceOfficer = addField(CaseBulkEditData.SURVEILLANCE_OFFICER, ComboBox.class);
 			surveillanceOfficer.setEnabled(false);
-			FieldHelper.addSoftRequiredStyleWhen(
-				getFieldGroup(),
-				surveillanceOfficerCheckBox,
-				Arrays.asList(CaseBulkEditData.SURVEILLANCE_OFFICER),
-				Arrays.asList(true),
-				null);
 			Set<Disease> selectedDiseases = this.selectedCases.stream().map(c -> c.getDisease()).collect(Collectors.toSet());
 			List<UserReferenceDto> assignableCaseResponsibles = null;
 
@@ -458,12 +452,6 @@ protected void addFields() {
 		}
 
 		FieldHelper.setRequiredWhen(getFieldGroup(), diseaseCheckBox, Arrays.asList(CaseBulkEditData.DISEASE), Arrays.asList(true));
-		FieldHelper.addSoftRequiredStyleWhen(
-			getFieldGroup(),
-			diseaseVariantCheckBox,
-			Arrays.asList(CaseBulkEditData.DISEASE_VARIANT),
-			Arrays.asList(true),
-			null);
 		FieldHelper
 			.setRequiredWhen(getFieldGroup(), classificationCheckBox, Arrays.asList(CaseBulkEditData.CASE_CLASSIFICATION), Arrays.asList(true));
 		FieldHelper
@@ -527,11 +515,6 @@ protected void addFields() {
 			healthFacilityDetails.setEnabled((boolean) e.getProperty().getValue());
 			facilityType.setEnabled((boolean) e.getProperty().getValue());
 			facility.setEnabled((boolean) e.getProperty().getValue());
-			if ((boolean) e.getProperty().getValue()) {
-				FieldHelper.addSoftRequiredStyle(community);
-			} else {
-				FieldHelper.removeSoftRequiredStyle(community);
-			}
 		});
 
 		if (UiUtil.enabled(FeatureType.HIDE_JURISDICTION_FIELDS)) {

sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseCreateForm.java

@@ -17,7 +17,6 @@
 
 import static de.symeda.sormas.ui.utils.CssStyles.ERROR_COLOR_PRIMARY;
 import static de.symeda.sormas.ui.utils.CssStyles.H3;
-import static de.symeda.sormas.ui.utils.CssStyles.SOFT_REQUIRED;
 import static de.symeda.sormas.ui.utils.CssStyles.VSPACE_3;
 import static de.symeda.sormas.ui.utils.CssStyles.style;
 import static de.symeda.sormas.ui.utils.LayoutUtil.fluidColumn;
@@ -236,7 +235,6 @@ protected void addFields() {
 		responsibleDistrictCombo.setRequired(true);
 		responsibleCommunityCombo = addInfrastructureField(CaseDataDto.RESPONSIBLE_COMMUNITY);
 		responsibleCommunityCombo.setNullSelectionAllowed(true);
-		responsibleCommunityCombo.addStyleName(SOFT_REQUIRED);
 
 		InfrastructureFieldsHelper.initInfrastructureFields(responsibleRegionCombo, responsibleDistrictCombo, responsibleCommunityCombo);
 
@@ -484,7 +482,6 @@ protected void addFields() {
 		initializeVisibilitiesAndAllowedVisibilities();
 
 		setRequired(true, CaseDataDto.REPORT_DATE, CaseDataDto.DISEASE, FACILITY_TYPE_GROUP_LOC, CaseDataDto.FACILITY_TYPE);
-		FieldHelper.addSoftRequiredStyle(plagueType, communityCombo, facilityDetails);
 
 		FieldHelper
 			.setVisibleWhen(getFieldGroup(), Arrays.asList(CaseDataDto.DISEASE_DETAILS), CaseDataDto.DISEASE, Arrays.asList(Disease.OTHER), true);
@@ -757,7 +754,7 @@ public void setValue(CaseDataDto caseDataDto) throws com.vaadin.v7.data.Property
 		PersonDto personByUuid = personUuid == null ? null : FacadeProvider.getPersonFacade().getByUuid(personUuid);
 		personCreateForm.setPerson(personByUuid);
 
-		if(caseDataDto.getSymptoms() != null) {
+		if (caseDataDto.getSymptoms() != null) {
 			personCreateForm.setSymptoms(caseDataDto.getSymptoms());
 		}
 

sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseDataForm.java

@@ -19,7 +19,6 @@
 import static de.symeda.sormas.ui.utils.CssStyles.H3;
 import static de.symeda.sormas.ui.utils.CssStyles.LABEL_WHITE_SPACE_NORMAL;
 import static de.symeda.sormas.ui.utils.CssStyles.LAYOUT_COL_HIDE_INVSIBLE;
-import static de.symeda.sormas.ui.utils.CssStyles.SOFT_REQUIRED;
 import static de.symeda.sormas.ui.utils.CssStyles.VSPACE_2;
 import static de.symeda.sormas.ui.utils.CssStyles.VSPACE_3;
 import static de.symeda.sormas.ui.utils.CssStyles.style;
@@ -37,10 +36,8 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 import org.apache.commons.collections4.CollectionUtils;
@@ -774,7 +771,6 @@ protected void addFields() {
 		districtCombo = addInfrastructureField(CaseDataDto.DISTRICT);
 		communityCombo = addInfrastructureField(CaseDataDto.COMMUNITY);
 		communityCombo.setNullSelectionAllowed(true);
-		communityCombo.addStyleName(SOFT_REQUIRED);
 
 		FieldHelper.setVisibleWhen(
 			differentPlaceOfStayJurisdiction,
@@ -1039,7 +1035,7 @@ protected void addFields() {
 			// Set the initial visibility of the info label to false it will be set to true in the medical information section
 			vaccinationStatusInfoLabel.setVisible(false);
 			getContent().addComponent(vaccinationStatusInfoLabel, VACCINATION_STATUS_INFO_LOC);
-			
+
 		}
 		addFields(CaseDataDto.SMALLPOX_VACCINATION_SCAR, CaseDataDto.SMALLPOX_VACCINATION_RECEIVED);
 		addDateField(CaseDataDto.SMALLPOX_LAST_VACCINATION_DATE, DateField.class, 0);
@@ -1084,7 +1080,6 @@ protected void addFields() {
 		responsibleDistrict.setRequired(true);
 		responsibleCommunity = addInfrastructureField(CaseDataDto.RESPONSIBLE_COMMUNITY);
 		responsibleCommunity.setNullSelectionAllowed(true);
-		responsibleCommunity.addStyleName(SOFT_REQUIRED);
 
 		InfrastructureFieldsHelper.initInfrastructureFields(responsibleRegion, responsibleDistrict, responsibleCommunity);
 		InfrastructureFieldsHelper.initPointOfEntry(responsibleDistrict, pointOfEntry);
@@ -1114,7 +1109,8 @@ protected void addFields() {
 				disease,
 				FieldVisibilityCheckers.withDisease(disease)
 					.add(new CountryFieldVisibilityChecker(FacadeProvider.getConfigFacade().getCountryLocale())),
-				UiFieldAccessCheckers.getDefault(true, FacadeProvider.getConfigFacade().getCountryLocale()))).setCaption(null);
+				UiFieldAccessCheckers.getDefault(true, FacadeProvider.getConfigFacade().getCountryLocale())))
+			.setCaption(null);
 
 		//diagnosis criteria
 		if ((FacadeProvider.getConfigFacade().isConfiguredCountry(CountryHelper.COUNTRY_CODE_LUXEMBOURG)) && disease == Disease.TUBERCULOSIS) {
@@ -1154,7 +1150,6 @@ protected void addFields() {
 			CaseDataDto.INVESTIGATION_STATUS,
 			CaseDataDto.OUTCOME,
 			CaseDataDto.DISEASE);
-		setSoftRequired(true, CaseDataDto.INVESTIGATED_DATE, CaseDataDto.OUTCOME_DATE, CaseDataDto.PLAGUE_TYPE, CaseDataDto.SURVEILLANCE_OFFICER);
 
 		if (diseaseClassificationExists()
 			&& FacadeProvider.getConfigFacade().getCaseClassificationCalculationMode(disease).isManualEnabled()

sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseFacilityChangeForm.java

@@ -218,7 +218,6 @@ protected void addFields() {
 		});
 		region.addItems(FacadeProvider.getRegionFacade().getAllActiveByServerCountry());
 
-		FieldHelper.addSoftRequiredStyle(community, facilityDetails, officer);
 		setRequired(true, CaseDataDto.REGION, CaseDataDto.DISTRICT, FACILITY_OR_HOME_LOC, TYPE_GROUP_LOC, TYPE_LOC);
 		officer.setNullSelectionAllowed(true);
 	}

sormas-ui/src/main/java/de/symeda/sormas/ui/caze/PlaceOfStayEditForm.java

@@ -17,7 +17,6 @@
 
 import static de.symeda.sormas.ui.caze.CaseDataForm.updateFacilityDetails;
 import static de.symeda.sormas.ui.utils.CssStyles.LABEL_WHITE_SPACE_NORMAL;
-import static de.symeda.sormas.ui.utils.CssStyles.SOFT_REQUIRED;
 import static de.symeda.sormas.ui.utils.CssStyles.VSPACE_3;
 import static de.symeda.sormas.ui.utils.LayoutUtil.fluidRowLocs;
 
@@ -99,7 +98,6 @@ protected void addFields() {
 		responsibleDistrict.setReadOnly(true);
 		responsibleCommunity = addInfrastructureField(CaseDataDto.RESPONSIBLE_COMMUNITY);
 		responsibleCommunity.setNullSelectionAllowed(true);
-		responsibleCommunity.addStyleName(SOFT_REQUIRED);
 		responsibleCommunity.setReadOnly(true);
 		InfrastructureFieldsHelper.initInfrastructureFields(responsibleRegion, responsibleDistrict, responsibleCommunity);
 
@@ -109,7 +107,6 @@ protected void addFields() {
 		districtCombo.setVisible(false);
 		communityCombo = addInfrastructureField(CaseDataDto.COMMUNITY);
 		communityCombo.setNullSelectionAllowed(true);
-		communityCombo.addStyleName(SOFT_REQUIRED);
 		communityCombo.setVisible(false);
 
 		facilityCombo = addInfrastructureField(CaseDataDto.HEALTH_FACILITY);

sormas-ui/src/main/java/de/symeda/sormas/ui/caze/components/linelisting/LineListingLayout.java

@@ -443,7 +443,6 @@ public CaseLineLayout(int lineIndex) {
 			community = new ComboBox<>();
 			community.setItemCaptionGenerator(item -> item.buildCaption());
 			community.setId("lineListingCommunity_" + lineIndex);
-			community.addStyleName(CssStyles.SOFT_REQUIRED);
 			community.addValueChangeListener(e -> {
 				FieldHelper.removeItems(facility);
 				CommunityReferenceDto communityDto = e.getValue();
@@ -467,7 +466,6 @@ public CaseLineLayout(int lineIndex) {
 			binder.forField(facility).asRequired().bind(CaseLineDto.FACILITY);
 			facilityDetails = new TextField();
 			facilityDetails.setId("lineListingFacilityDetails_" + lineIndex);
-			CssStyles.style(facilityDetails, CssStyles.SOFT_REQUIRED);
 			facilityDetails.setVisible(false);
 			updateFacilityFields(facility, facilityDetails);
 			binder.forField(facilityDetails).bind(CaseLineDto.FACILITY_DETAILS);
@@ -536,9 +534,9 @@ private void formatAsFirstLine() {
 
 		private void formatAsOtherLine() {
 
-			CssStyles.style(dateOfReport, CssStyles.SOFT_REQUIRED, CssStyles.CAPTION_HIDDEN);
-			CssStyles.style(facility, CssStyles.SOFT_REQUIRED, CssStyles.CAPTION_HIDDEN);
-			CssStyles.style(facilityDetails, CssStyles.SOFT_REQUIRED, CssStyles.CAPTION_HIDDEN);
+			CssStyles.style(dateOfReport, CssStyles.CAPTION_HIDDEN);
+			CssStyles.style(facility, CssStyles.CAPTION_HIDDEN);
+			CssStyles.style(facilityDetails, CssStyles.CAPTION_HIDDEN);
 			person.hideCaptions();
 		}
 

sormas-ui/src/main/java/de/symeda/sormas/ui/contact/BulkContactDataForm.java

@@ -91,12 +91,6 @@ protected void addFields() {
 			getContent().addComponent(contactOfficerCheckBox, CONTACT_OFFICER_CHECKBOX);
 			ComboBox contactOfficer = addField(ContactBulkEditData.CONTACT_OFFICER, ComboBox.class);
 			contactOfficer.setEnabled(false);
-			FieldHelper.addSoftRequiredStyleWhen(
-				getFieldGroup(),
-				contactOfficerCheckBox,
-				Arrays.asList(ContactBulkEditData.CONTACT_OFFICER),
-				Arrays.asList(true),
-				null);
 
 			Set<Disease> selectedDiseases = this.selectedContacts.stream().map(c -> c.getDisease()).collect(Collectors.toSet());
 			List<UserReferenceDto> assignableContactOfficers = null;

sormas-ui/src/main/java/de/symeda/sormas/ui/contact/ContactCreateForm.java

@@ -236,8 +236,6 @@ protected void addFields() {
 
 		initializeVisibilitiesAndAllowedVisibilities();
 
-		CssStyles.style(CssStyles.SOFT_REQUIRED, firstContactDate, lastContactDate, contactProximities, relationToCase);
-
 		region.addValueChangeListener(e -> {
 			RegionReferenceDto regionDto = (RegionReferenceDto) e.getProperty().getValue();
 			FieldHelper

sormas-ui/src/main/java/de/symeda/sormas/ui/contact/ContactDataForm.java

@@ -737,7 +737,6 @@ public String getFormattedHtmlMessage() {
 		});
 
 		setRequired(true, ContactDto.CONTACT_CLASSIFICATION, ContactDto.CONTACT_STATUS, ContactDto.REPORT_DATE_TIME);
-		FieldHelper.addSoftRequiredStyle(firstContactDate, lastContactDate, contactProximities, relationToCase);
 		// Prophylaxis details for IMI
 		CheckBox prophylaxisPrescribed = addField(ContactDto.PROPHYLAXIS_PRESCRIBED, CheckBox.class);
 		prophylaxisPrescribed.setCaption(I18nProperties.getCaption(Captions.Contact_prophylaxisPrescribed));

sormas-ui/src/main/java/de/symeda/sormas/ui/docgeneration/AbstractDocgenerationLayout.java

@@ -138,7 +138,6 @@ private void addDiseaseSelector(Disease defaultDisease) {
 		diseaseSelector.setPlaceholder(I18nProperties.getString(Strings.all));
 		diseaseSelector.setEmptySelectionAllowed(true);
 		diseaseSelector.setWidth(100F, Unit.PERCENTAGE);
-		diseaseSelector.addStyleName(CssStyles.SOFT_REQUIRED);
 		diseaseSelector.setValue(defaultDisease);
 
 		diseaseSelector.addValueChangeListener(e -> {
@@ -185,7 +184,6 @@ private void addTemplateSelector(String captionTemplateSelector, Function<Docume
 				}
 			}
 		});
-		templateSelector.addStyleName(CssStyles.SOFT_REQUIRED);
 
 		addComponent(templateSelector);
 	}

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

@@ -82,7 +82,6 @@
 import de.symeda.sormas.ui.location.LocationEditForm;
 import de.symeda.sormas.ui.utils.AbstractEditForm;
 import de.symeda.sormas.ui.utils.CheckBoxTree;
-import de.symeda.sormas.ui.utils.CssStyles;
 import de.symeda.sormas.ui.utils.DateComparisonValidator;
 import de.symeda.sormas.ui.utils.DateTimeField;
 import de.symeda.sormas.ui.utils.FieldAccessHelper;
@@ -262,7 +261,6 @@ protected void addFields() {
 		DateComparisonValidator.addStartEndValidators(investigationStartDate, investigationEndDate, true);
 		DateComparisonValidator.addStartEndValidators(startDate, investigationStartDate, true);
 		TextField title = addField(EventDto.EVENT_TITLE, TextField.class);
-		title.addStyleName(CssStyles.SOFT_REQUIRED);
 
 		TextArea descriptionField = addField(EventDto.EVENT_DESC, TextArea.class, new ResizableTextAreaWrapper<>());
 		descriptionField.setRows(2);
@@ -596,24 +594,6 @@ protected void addFields() {
 			addRegionAndDistrict(responsibleUserField);
 		});
 
-		FieldHelper.addSoftRequiredStyle(
-			startDate,
-			endDate,
-			typeOfPlace,
-			meansOfTransport,
-			meansOfTransportDetails,
-			connectionNumber,
-			travelDate,
-			responsibleUserField,
-			srcType,
-			srcInstitutionalPartnerType,
-			srcInstitutionalPartnerTypeDetails,
-			srcFirstName,
-			srcLastName,
-			srcTelNo,
-			srcMediaWebsite,
-			srcMediaName);
-
 		// Make external ID field read-only when SORMAS is connected to a SurvNet instance
 		if (StringUtils.isNotEmpty(FacadeProvider.getConfigFacade().getExternalSurveillanceToolGatewayUrl())) {
 			setEnabled(false, EventDto.EXTERNAL_ID);

sormas-ui/src/main/java/de/symeda/sormas/ui/hospitalization/PreviousHospitalizationEditForm.java

@@ -70,7 +70,10 @@ public class PreviousHospitalizationEditForm extends AbstractEditForm<PreviousHo
 			PreviousHospitalizationDto.INTENSIVE_CARE_UNIT,
 			PreviousHospitalizationDto.INTENSIVE_CARE_UNIT_START,
 			PreviousHospitalizationDto.INTENSIVE_CARE_UNIT_END)
-		+ fluidRowLocs(PreviousHospitalizationDto.ICU_LENGTH_OF_STAY, PreviousHospitalizationDto.OXYGEN_PRESCRIBED, PreviousHospitalizationDto.STILL_HOSPITALIZED)
+		+ fluidRowLocs(
+			PreviousHospitalizationDto.ICU_LENGTH_OF_STAY,
+			PreviousHospitalizationDto.OXYGEN_PRESCRIBED,
+			PreviousHospitalizationDto.STILL_HOSPITALIZED)
 		+ fluidRowLocs(PreviousHospitalizationDto.DESCRIPTION);
 
 	private NullableOptionGroup intensiveCareUnit;
@@ -290,8 +293,6 @@ protected void addFields() {
 		// Show icuLengthOfStay when ICU dates are not available but survey has length information
 		FieldHelper.setVisibleWhen(intensiveCareUnit, Collections.singletonList(icuLengthOfStayField), Arrays.asList(YesNoUnknown.YES), true);
 
-		FieldHelper.addSoftRequiredStyle(admissionDate, dischargeDate, facilityCommunity, healthFacilityDetails);
-
 		if (isEditableAllowed(PreviousHospitalizationDto.HEALTH_FACILITY)) {
 			setRequired(true, PreviousHospitalizationDto.REGION, PreviousHospitalizationDto.DISTRICT, PreviousHospitalizationDto.HEALTH_FACILITY);
 		} else {