From 2d61b4c9358a8a6fa0ac9cad926e09afdbc10a6b Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Fri, 6 Mar 2026 08:49:03 +0100 Subject: [PATCH 1/2] FIX: 13462: Wrongly bordered fields that are not mandatory. --- .../main/java/de/symeda/sormas/ui/caze/CaseCreateForm.java | 4 ++-- .../java/de/symeda/sormas/ui/person/PersonCreateForm.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseCreateForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseCreateForm.java index bf267593713..abace2c3dbd 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseCreateForm.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseCreateForm.java @@ -484,7 +484,7 @@ protected void addFields() { initializeVisibilitiesAndAllowedVisibilities(); setRequired(true, CaseDataDto.REPORT_DATE, CaseDataDto.DISEASE, FACILITY_TYPE_GROUP_LOC, CaseDataDto.FACILITY_TYPE); - FieldHelper.addSoftRequiredStyle(plagueType, communityCombo, facilityDetails); + FieldHelper.addSoftRequiredStyle(plagueType, communityCombo); FieldHelper .setVisibleWhen(getFieldGroup(), Arrays.asList(CaseDataDto.DISEASE_DETAILS), CaseDataDto.DISEASE, Arrays.asList(Disease.OTHER), true); @@ -757,7 +757,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()); } diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/person/PersonCreateForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/person/PersonCreateForm.java index 7be0b02cd71..11e51e69ecb 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/person/PersonCreateForm.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/person/PersonCreateForm.java @@ -196,7 +196,7 @@ protected void addFields() { ComboBox presentCondition = addField(PersonDto.PRESENT_CONDITION, ComboBox.class); presentCondition.setVisible(showPresentCondition); - FieldHelper.addSoftRequiredStyle(presentCondition, sex); + FieldHelper.addSoftRequiredStyle(sex); if (showSymptomsOnsetDate) { addCustomField( From 8ae7d903e3dc5e22a0576939068c44116bde9cc5 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Fri, 6 Mar 2026 12:11:29 +0100 Subject: [PATCH 2/2] FIX: 13462: Wrongly bordered fields that are not mandatory. --- .../sormas/ui/action/ActionEditForm.java | 2 - .../CampaignFormDataFilterForm.java | 6 +- .../campaign/campaigns/CampaignEditForm.java | 3 - .../CampaignStatisticsFilterForm.java | 6 +- .../campaign/components/CampaignSelector.java | 1 - .../sormas/ui/caze/BulkCaseDataForm.java | 17 ---- .../symeda/sormas/ui/caze/CaseCreateForm.java | 3 - .../symeda/sormas/ui/caze/CaseDataForm.java | 11 +-- .../ui/caze/CaseFacilityChangeForm.java | 1 - .../sormas/ui/caze/PlaceOfStayEditForm.java | 3 - .../linelisting/LineListingLayout.java | 8 +- .../ui/contact/BulkContactDataForm.java | 6 -- .../sormas/ui/contact/ContactCreateForm.java | 2 - .../sormas/ui/contact/ContactDataForm.java | 1 - .../AbstractDocgenerationLayout.java | 2 - .../sormas/ui/events/EventDataForm.java | 20 ----- .../PreviousHospitalizationEditForm.java | 7 +- .../form/ImmunizationCreationForm.java | 2 - .../components/form/ImmunizationDataForm.java | 5 +- .../sormas/ui/person/PersonCreateForm.java | 1 - .../sormas/ui/samples/PathogenTestForm.java | 4 +- .../ui/selfreport/SelfReportDataForm.java | 2 - .../sormas/ui/statistics/StatisticsView.java | 2 +- .../StatisticsVisualizationComponent.java | 6 +- .../sormas/ui/symptoms/SymptomsForm.java | 82 +++-------------- .../sormas/ui/task/BulkTaskDataForm.java | 2 - .../ui/travelentry/TravelEntryDataForm.java | 2 - .../components/TravelEntryCreateForm.java | 2 - .../sormas/ui/user/UserRoleCreateForm.java | 1 - .../sormas/ui/utils/AbstractEditForm.java | 12 --- .../de/symeda/sormas/ui/utils/CssStyles.java | 1 - .../symeda/sormas/ui/utils/FieldHelper.java | 89 ------------------- .../linelisting/person/PersonField.java | 6 +- .../MultiDaySelectorField.java | 1 - 34 files changed, 34 insertions(+), 285 deletions(-) diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/action/ActionEditForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/action/ActionEditForm.java index 69a354b2339..cb31ef714ec 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/action/ActionEditForm.java +++ b/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(""); diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/campaign/campaigndata/CampaignFormDataFilterForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/campaign/campaigndata/CampaignFormDataFilterForm.java index 66876352485..bbfc4c4a7b8 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/campaign/campaigndata/CampaignFormDataFilterForm.java +++ b/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 { @@ -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()); diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/campaign/campaigns/CampaignEditForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/campaign/campaigns/CampaignEditForm.java index 4596f3afdca..206d2c4219a 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/campaign/campaigns/CampaignEditForm.java +++ b/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 { @@ -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 = diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/campaign/campaignstatistics/CampaignStatisticsFilterForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/campaign/campaignstatistics/CampaignStatisticsFilterForm.java index 384806a00e7..960e35cc9e6 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/campaign/campaignstatistics/CampaignStatisticsFilterForm.java +++ b/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 { @@ -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()); diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/campaign/components/CampaignSelector.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/campaign/components/CampaignSelector.java index ca1341553bf..a6deabfc60c 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/campaign/components/CampaignSelector.java +++ b/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); } diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/BulkCaseDataForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/BulkCaseDataForm.java index 4cdcf912dd1..6a2746c2458 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/BulkCaseDataForm.java +++ b/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 selectedDiseases = this.selectedCases.stream().map(c -> c.getDisease()).collect(Collectors.toSet()); List 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)) { diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseCreateForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseCreateForm.java index abace2c3dbd..0b3b65175ae 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseCreateForm.java +++ b/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); FieldHelper .setVisibleWhen(getFieldGroup(), Arrays.asList(CaseDataDto.DISEASE_DETAILS), CaseDataDto.DISEASE, Arrays.asList(Disease.OTHER), true); diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseDataForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseDataForm.java index 77eef65f7fe..a5637717bcd 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseDataForm.java +++ b/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() diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseFacilityChangeForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseFacilityChangeForm.java index 78de4d74f13..5329cca1dab 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseFacilityChangeForm.java +++ b/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); } diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/PlaceOfStayEditForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/PlaceOfStayEditForm.java index fb152af00c5..f07e9821d8f 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/PlaceOfStayEditForm.java +++ b/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); diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/components/linelisting/LineListingLayout.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/components/linelisting/LineListingLayout.java index be2923b5df7..cee86819bed 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/components/linelisting/LineListingLayout.java +++ b/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(); } diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/contact/BulkContactDataForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/contact/BulkContactDataForm.java index 16443e89f9c..309cd97e60b 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/contact/BulkContactDataForm.java +++ b/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 selectedDiseases = this.selectedContacts.stream().map(c -> c.getDisease()).collect(Collectors.toSet()); List assignableContactOfficers = null; diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/contact/ContactCreateForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/contact/ContactCreateForm.java index 46657d0163d..5d0d6c9888b 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/contact/ContactCreateForm.java +++ b/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 diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/contact/ContactDataForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/contact/ContactDataForm.java index 7648bf32f55..5db625a892e 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/contact/ContactDataForm.java +++ b/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)); diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/docgeneration/AbstractDocgenerationLayout.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/docgeneration/AbstractDocgenerationLayout.java index 742c36004ed..3526b30bbcd 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/docgeneration/AbstractDocgenerationLayout.java +++ b/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()); 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); diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/hospitalization/PreviousHospitalizationEditForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/hospitalization/PreviousHospitalizationEditForm.java index be9d0e3bcb9..a67339ca127 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/hospitalization/PreviousHospitalizationEditForm.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/hospitalization/PreviousHospitalizationEditForm.java @@ -70,7 +70,10 @@ public class PreviousHospitalizationEditForm extends AbstractEditForm filteredValues = Arrays.stream(MeansOfImmunization.values()).filter(value -> { diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/person/PersonCreateForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/person/PersonCreateForm.java index 11e51e69ecb..5babead768d 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/person/PersonCreateForm.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/person/PersonCreateForm.java @@ -196,7 +196,6 @@ protected void addFields() { ComboBox presentCondition = addField(PersonDto.PRESENT_CONDITION, ComboBox.class); presentCondition.setVisible(showPresentCondition); - FieldHelper.addSoftRequiredStyle(sex); if (showSymptomsOnsetDate) { addCustomField( diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/samples/PathogenTestForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/samples/PathogenTestForm.java index c0eb6e660fa..7ac59a0bdb4 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/samples/PathogenTestForm.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/samples/PathogenTestForm.java @@ -242,7 +242,6 @@ public class PathogenTestForm extends AbstractEditForm { private ComboBox seroGrpSepcCB; private TextField seroGrpSpecTxt; - public PathogenTestForm( AbstractSampleForm sampleForm, boolean create, @@ -439,7 +438,6 @@ protected void addFields() { seroTypingMethodText.setVisible(false); pcrTestSpecification = addField(PathogenTestDto.PCR_TEST_SPECIFICATION, ComboBox.class); testTypeTextField = addField(PathogenTestDto.TEST_TYPE_TEXT, TextField.class); - FieldHelper.addSoftRequiredStyle(testTypeTextField); DateTimeField testDateField = addField(PathogenTestDto.TEST_DATE_TIME, DateTimeField.class); testDateField.removeAllValidators(); testDateField.addValidator( @@ -598,7 +596,7 @@ protected void addFields() { seroGrpSepcCB = addField(PathogenTestDto.SERO_GROUP_SPECIFICATION, ComboBox.class); seroGrpSepcCB.setVisible(false); seroGrpSpecTxt = addField(PathogenTestDto.SERO_GROUP_SPECIFICATION_TEXT, TextField.class); - + TextField cqValueField = addField(FieldConfiguration.withConversionError(PathogenTestDto.CQ_VALUE, Validations.onlyNumbersAllowed)); if (!FacadeProvider.getConfigFacade().isConfiguredCountry(CountryHelper.COUNTRY_CODE_LUXEMBOURG)) { cqValueField.setVisible(false); diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/selfreport/SelfReportDataForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/selfreport/SelfReportDataForm.java index 902941e6a3b..0378ce83893 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/selfreport/SelfReportDataForm.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/selfreport/SelfReportDataForm.java @@ -173,7 +173,6 @@ protected void addFields() { TextField phoneNumberField = addField(SelfReportDto.PHONE_NUMBER, TextField.class); phoneNumberField .addValidator(new PhoneNumberValidator(I18nProperties.getValidationError(Validations.validPhoneNumber, phoneNumberField.getCaption()))); - setSoftRequired(true, SelfReportDto.EMAIL, SelfReportDto.PHONE_NUMBER); addFields( SelfReportDto.DATE_OF_TEST, @@ -182,7 +181,6 @@ protected void addFields() { SelfReportDto.DATE_WORKPLACE, SelfReportDto.ISOLATION_DATE, SelfReportDto.CONTACT_DATE); - setSoftRequired(true, SelfReportDto.DATE_OF_TEST, SelfReportDto.DATE_OF_SYMPTOMS); FieldHelper.setVisibleWhen(getFieldGroup(), SelfReportDto.CONTACT_DATE, SelfReportDto.TYPE, SelfReportType.CONTACT, true); addField(SelfReportDto.COMMENT, TextArea.class).setRows(6); diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/statistics/StatisticsView.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/statistics/StatisticsView.java index 2965e8409b7..54c76d4d8b1 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/statistics/StatisticsView.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/statistics/StatisticsView.java @@ -271,7 +271,7 @@ private void addOptionsLayout(VerticalLayout statisticsLayout) { tfIncidenceDivisor.setVisible(showCaseIncidence); visualizationComponent.setStackedColumnAndPieEnabled(!showCaseIncidence); }); - CssStyles.style(ogCaseCountOrIncidence, CssStyles.VSPACE_NONE, ValoTheme.OPTIONGROUP_HORIZONTAL, CssStyles.SOFT_REQUIRED); + CssStyles.style(ogCaseCountOrIncidence, CssStyles.VSPACE_NONE, ValoTheme.OPTIONGROUP_HORIZONTAL); optionsLayout.addComponent(ogCaseCountOrIncidence); tfIncidenceDivisor = new TextField(I18nProperties.getCaption(Captions.statisticsIncidenceDivisor)); diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/statistics/StatisticsVisualizationComponent.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/statistics/StatisticsVisualizationComponent.java index 53b1321077f..b7ca4fafef4 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/statistics/StatisticsVisualizationComponent.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/statistics/StatisticsVisualizationComponent.java @@ -81,7 +81,7 @@ public void valueChange(ValueChangeEvent event) { } } }); - CssStyles.style(visualizationSelect, CssStyles.VSPACE_NONE, ValoTheme.OPTIONGROUP_HORIZONTAL, CssStyles.SOFT_REQUIRED); + CssStyles.style(visualizationSelect, CssStyles.VSPACE_NONE, ValoTheme.OPTIONGROUP_HORIZONTAL); visualizationSelect.setNullSelectionAllowed(false); addComponent(visualizationSelect); setExpandRatio(visualizationSelect, 0); @@ -96,7 +96,7 @@ public void valueChange(ValueChangeEvent event) { visualizationMapType = (StatisticsVisualizationMapType) event.getProperty().getValue(); } }); - CssStyles.style(visualizationMapSelect, CssStyles.VSPACE_NONE, ValoTheme.OPTIONGROUP_HORIZONTAL, CssStyles.SOFT_REQUIRED); + CssStyles.style(visualizationMapSelect, CssStyles.VSPACE_NONE, ValoTheme.OPTIONGROUP_HORIZONTAL); visualizationMapSelect.setNullSelectionAllowed(false); addComponent(visualizationMapSelect); setExpandRatio(visualizationSelect, 0); @@ -112,7 +112,7 @@ public void valueChange(ValueChangeEvent event) { updateComponentVisibility(); } }); - CssStyles.style(visualizationChartSelect, CssStyles.VSPACE_NONE, ValoTheme.OPTIONGROUP_HORIZONTAL, CssStyles.SOFT_REQUIRED); + CssStyles.style(visualizationChartSelect, CssStyles.VSPACE_NONE, ValoTheme.OPTIONGROUP_HORIZONTAL); visualizationChartSelect.setNullSelectionAllowed(false); addComponent(visualizationChartSelect); setExpandRatio(visualizationChartSelect, 0); diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/symptoms/SymptomsForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/symptoms/SymptomsForm.java index da4d28f5d3b..5f488247388 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/symptoms/SymptomsForm.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/symptoms/SymptomsForm.java @@ -34,7 +34,6 @@ import java.util.Comparator; import java.util.Date; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Optional; @@ -96,7 +95,6 @@ import de.symeda.sormas.api.utils.YesNoUnknown; import de.symeda.sormas.api.utils.fieldaccess.UiFieldAccessCheckers; import de.symeda.sormas.api.utils.fieldvisibility.FieldVisibilityCheckers; -import de.symeda.sormas.api.visit.VisitStatus; import de.symeda.sormas.ui.ControllerProvider; import de.symeda.sormas.ui.hospitalization.HospitalizationView; import de.symeda.sormas.ui.utils.AbstractEditForm; @@ -864,8 +862,6 @@ public String getFormattedHtmlMessage() { FieldHelper.setVisibleWhen(getFieldGroup(), JAUNDICE_WITHIN_24_HOURS_OF_BIRTH, JAUNDICE, Arrays.asList(SymptomState.YES), true); } - FieldHelper.addSoftRequiredStyle(getField(LESIONS_ONSET_DATE)); - boolean isInfant = person != null && person.getApproximateAge() != null && ((person.getApproximateAge() <= 12 && person.getApproximateAgeType() == ApproximateAgeType.MONTHS) || person.getApproximateAge() <= 1); @@ -1157,12 +1153,6 @@ protected String createHtmlLayout() { } public void initializeSymptomRequirementsForVisit(NullableOptionGroup visitStatus) { - FieldHelper.addSoftRequiredStyleWhen( - getFieldGroup(), - visitStatus, - Arrays.asList(TEMPERATURE, TEMPERATURE_SOURCE), - Arrays.asList(VisitStatus.COOPERATIVE), - disease); addSoftRequiredStyleWhenSymptomaticAndCooperative( getFieldGroup(), ONSET_DATE, @@ -1230,54 +1220,6 @@ private void addSoftRequiredStyleWhenSymptomaticAndCooperative( if (!targetField.isVisible()) { return; } - - if (visitStatusField != null) { - if (isAnySymptomSetToYes(fieldGroup, sourcePropertyIds, sourceValues) && visitStatusField.getNullableValue() == VisitStatus.COOPERATIVE) { - FieldHelper.addSoftRequiredStyle(targetField); - } else { - FieldHelper.removeSoftRequiredStyle(targetField); - } - } else { - if (isAnySymptomSetToYes(fieldGroup, sourcePropertyIds, sourceValues)) { - FieldHelper.addSoftRequiredStyle(targetField); - } else { - FieldHelper.removeSoftRequiredStyle(targetField); - } - } - - // Add listeners - for (Object sourcePropertyId : sourcePropertyIds) { - Field sourceField = fieldGroup.getField(sourcePropertyId); - sourceField.addValueChangeListener(event -> { - if (visitStatusField != null) { - if (isAnySymptomSetToYes(fieldGroup, sourcePropertyIds, sourceValues) && visitStatusField.getValue() == VisitStatus.COOPERATIVE) { - FieldHelper.addSoftRequiredStyle(targetField); - } else { - FieldHelper.removeSoftRequiredStyle(targetField); - } - } else { - if (isAnySymptomSetToYes(fieldGroup, sourcePropertyIds, sourceValues)) { - FieldHelper.addSoftRequiredStyle(targetField); - } else { - FieldHelper.removeSoftRequiredStyle(targetField); - } - } - }); - } - - if (visitStatusField != null) { - visitStatusField.addValueChangeListener(new ValueChangeListener() { - - @Override - public void valueChange(com.vaadin.v7.data.Property.ValueChangeEvent event) { - if (isAnySymptomSetToYes(fieldGroup, sourcePropertyIds, sourceValues) && visitStatusField.getValue() == VisitStatus.COOPERATIVE) { - FieldHelper.addSoftRequiredStyle(targetField); - } else { - FieldHelper.removeSoftRequiredStyle(targetField); - } - } - }); - } } /** @@ -1423,16 +1365,16 @@ public Button createButtonSetClearedToSymptomState(String caption, SymptomState // Clear YesNoUnknown fields - map SymptomState to YesNoUnknown YesNoUnknown yesNoValue; switch (symptomState) { - case YES: - yesNoValue = YesNoUnknown.YES; - break; - case NO: - yesNoValue = YesNoUnknown.NO; - break; - case UNKNOWN: - default: - yesNoValue = YesNoUnknown.UNKNOWN; - break; + case YES: + yesNoValue = YesNoUnknown.YES; + break; + case NO: + yesNoValue = YesNoUnknown.NO; + break; + case UNKNOWN: + default: + yesNoValue = YesNoUnknown.UNKNOWN; + break; } YES_NO_UNKNOWN_SYMPTOM_FIELD_IDS.forEach(symptomId -> { final Field field = (Field) getFieldGroup().getField(symptomId); @@ -1461,14 +1403,14 @@ public Button createButtonSetClearedToSymptomState(String caption, SymptomState } // if we have a set as value, add the new value - if(valueSet != null) { + if (valueSet != null) { safeSetFieldValue(field, Collections.singleton(yesNoValue)); return; } // we have a raw value, set it safeSetFieldValue(field, yesNoValue); - + }); }, ValoTheme.BUTTON_LINK); diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/task/BulkTaskDataForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/task/BulkTaskDataForm.java index 2a01ff908a1..b0864d38721 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/task/BulkTaskDataForm.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/task/BulkTaskDataForm.java @@ -118,8 +118,6 @@ protected void addFields() { getContent().addComponent(assigneeCheckbox, ASSIGNEE_CHECKBOX); ComboBox assignee = addField(TaskBulkEditData.ASSIGNEE_USER, ComboBox.class); assignee.setEnabled(false); - FieldHelper - .addSoftRequiredStyleWhen(getFieldGroup(), assigneeCheckbox, Arrays.asList(TaskBulkEditData.ASSIGNEE_USER), Arrays.asList(true), null); Label assigneeHint = new Label(); getContent().addComponent(assigneeHint, ASSIGNEE_HINT); diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/travelentry/TravelEntryDataForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/travelentry/TravelEntryDataForm.java index f73ced0d30d..7f1a323e167 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/travelentry/TravelEntryDataForm.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/travelentry/TravelEntryDataForm.java @@ -3,7 +3,6 @@ import static de.symeda.sormas.ui.utils.CssStyles.ERROR_COLOR_PRIMARY; import static de.symeda.sormas.ui.utils.CssStyles.FORCE_CAPTION; 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.fluidColumnLoc; @@ -177,7 +176,6 @@ protected void addFields() { responsibleDistrict.setRequired(true); responsibleCommunity = addInfrastructureField(TravelEntryDto.RESPONSIBLE_COMMUNITY); responsibleCommunity.setNullSelectionAllowed(true); - responsibleCommunity.addStyleName(SOFT_REQUIRED); InfrastructureFieldsHelper.initInfrastructureFields(responsibleRegion, responsibleDistrict, responsibleCommunity); diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/travelentry/components/TravelEntryCreateForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/travelentry/components/TravelEntryCreateForm.java index 0e8e974759a..e7db5f2688a 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/travelentry/components/TravelEntryCreateForm.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/travelentry/components/TravelEntryCreateForm.java @@ -2,7 +2,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.fluidColumnLoc; @@ -136,7 +135,6 @@ protected void addFields() { responsibleDistrict.setRequired(true); responsibleCommunity = addInfrastructureField(TravelEntryDto.RESPONSIBLE_COMMUNITY); responsibleCommunity.setNullSelectionAllowed(true); - responsibleCommunity.addStyleName(SOFT_REQUIRED); InfrastructureFieldsHelper.initInfrastructureFields(responsibleRegion, responsibleDistrict, responsibleCommunity); diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/user/UserRoleCreateForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/user/UserRoleCreateForm.java index 3a932216f7d..d526e28caf9 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/user/UserRoleCreateForm.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/user/UserRoleCreateForm.java @@ -68,7 +68,6 @@ protected void addFields() { getContent().addComponent(infoLabel, TEMPLATE_INFO_LOC); ComboBox templateRoleCombo = addCustomField(TEMPLATE_USER_ROLE, UserRoleDto.class, ComboBox.class); - setSoftRequired(true, TEMPLATE_USER_ROLE); UserRoleFormHelper.setTemplateRoleItems(templateRoleCombo); templateRoleCombo.addValueChangeListener(e -> applyTemplateData((UserRoleDto) e.getProperty().getValue())); diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/utils/AbstractEditForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/utils/AbstractEditForm.java index b5bc57d0af2..1d75e388707 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/utils/AbstractEditForm.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/utils/AbstractEditForm.java @@ -447,18 +447,6 @@ protected void setRequired(boolean required, String... fieldOrPropertyIds) { } } - protected void setSoftRequired(boolean required, String... fieldOrPropertyIds) { - - for (String propertyId : fieldOrPropertyIds) { - Field field = getField(propertyId); - if (required) { - FieldHelper.addSoftRequiredStyle(field); - } else { - FieldHelper.removeSoftRequiredStyle(field); - } - } - } - protected void addFieldListeners(String fieldOrPropertyId, ValueChangeListener... listeners) { for (ValueChangeListener listener : listeners) { diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/utils/CssStyles.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/utils/CssStyles.java index 16f23ec8d98..73c4ab36c99 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/utils/CssStyles.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/utils/CssStyles.java @@ -200,7 +200,6 @@ private CssStyles() { public static final String CAPTION_OVERFLOW = "caption-overflow"; public static final String CAPTION_FIXED_WIDTH_100 = "caption-fixed-width-100"; - public static final String SOFT_REQUIRED = "soft-required"; public static final String ERROR_COLOR_PRIMARY = "error-color-primary"; public static final String ALIGN_CENTER = "align-center"; diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/utils/FieldHelper.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/utils/FieldHelper.java index f016b8bbf47..01ba5435805 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/utils/FieldHelper.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/utils/FieldHelper.java @@ -745,95 +745,6 @@ public static void removeItems(ComboBox select) { select.clear(); } - public static void addSoftRequiredStyle(Field... fields) { - - for (Field field : fields) { - if (!field.getStyleName().contains(CssStyles.SOFT_REQUIRED)) { - CssStyles.style(field, CssStyles.SOFT_REQUIRED); - } - } - } - - public static void removeSoftRequiredStyle(Field... fields) { - - for (Field field : fields) { - CssStyles.removeStyles(field, CssStyles.SOFT_REQUIRED); - } - } - - @SuppressWarnings("rawtypes") - public static void addSoftRequiredStyleWhen(Field sourceField, List> targetFields, final List sourceValues) { - - if (sourceField instanceof AbstractField) { - ((AbstractField) sourceField).setImmediate(true); - } - - // initialize - { - boolean softRequired = sourceValues.contains(getNullableSourceFieldValue(sourceField)); - for (Field targetField : targetFields) { - if (softRequired) { - addSoftRequiredStyle(targetField); - } else { - removeSoftRequiredStyle(targetField); - } - } - } - - sourceField.addValueChangeListener(event -> { - boolean softRequired = sourceValues.contains(getNullableSourceFieldValue(((Field) event.getProperty()))); - for (Field targetField : targetFields) { - if (softRequired) { - addSoftRequiredStyle(targetField); - } else { - removeSoftRequiredStyle(targetField); - } - } - }); - } - - @SuppressWarnings("rawtypes") - public static void addSoftRequiredStyleWhen( - FieldGroup fieldGroup, - Field sourceField, - List targetPropertyIds, - final List sourceValues, - Disease disease) { - - if (sourceField instanceof AbstractField) { - ((AbstractField) sourceField).setImmediate(true); - } - - // initialize - { - boolean required = sourceValues.contains(getNullableSourceFieldValue(sourceField)); - for (Object targetPropertyId : targetPropertyIds) { - Field targetField = fieldGroup.getField(targetPropertyId); - if (disease == null || Diseases.DiseasesConfiguration.isDefined(SymptomsDto.class, (String) targetPropertyId, disease)) { - if (required) { - addSoftRequiredStyle(targetField); - } else { - removeSoftRequiredStyle(targetField); - } - } - } - } - - sourceField.addValueChangeListener(event -> { - boolean required = sourceValues.contains(getNullableSourceFieldValue(((Field) event.getProperty()))); - for (Object targetPropertyId : targetPropertyIds) { - Field targetField = fieldGroup.getField(targetPropertyId); - if (disease == null || Diseases.DiseasesConfiguration.isDefined(SymptomsDto.class, (String) targetPropertyId, disease)) { - if (required) { - addSoftRequiredStyle(targetField); - } else { - removeSoftRequiredStyle(targetField); - } - } - } - }); - } - public static Stream stream(Component parent) { if (parent instanceof HasComponents) { diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/utils/components/linelisting/person/PersonField.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/utils/components/linelisting/person/PersonField.java index cc88114d51c..ffa4a8a3b0c 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/utils/components/linelisting/person/PersonField.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/utils/components/linelisting/person/PersonField.java @@ -90,8 +90,8 @@ public void showCaptions() { } public void hideCaptions() { - CssStyles.style(firstname, CssStyles.SOFT_REQUIRED, CssStyles.CAPTION_HIDDEN); - CssStyles.style(lastname, CssStyles.SOFT_REQUIRED, CssStyles.CAPTION_HIDDEN); - CssStyles.style(sex, CssStyles.SOFT_REQUIRED, CssStyles.CAPTION_HIDDEN); + CssStyles.style(firstname, CssStyles.CAPTION_HIDDEN); + CssStyles.style(lastname, CssStyles.CAPTION_HIDDEN); + CssStyles.style(sex, CssStyles.CAPTION_HIDDEN); } } diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/utils/components/multidayselector/MultiDaySelectorField.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/utils/components/multidayselector/MultiDaySelectorField.java index 160b00bc913..683523dc339 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/utils/components/multidayselector/MultiDaySelectorField.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/utils/components/multidayselector/MultiDaySelectorField.java @@ -144,7 +144,6 @@ public void showCaptions() { startDate.removeStyleName(CssStyles.CAPTION_HIDDEN); endDate.setCaption(I18nProperties.getPrefixCaption(prefix, properties.getProperty("lastDate"))); endDate.removeStyleName(CssStyles.CAPTION_HIDDEN); - endDate.addStyleName(CssStyles.SOFT_REQUIRED); } private void enableValidationForEndDate(boolean enable) {