SORMAS-Foundation#2963 - merge from develop

barnabartha · barnabartha · commit dc3807647a75 · 2020-10-16T13:30:42.000+03:00
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/campaign/campaigndata/CampaignFormBuilder.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/campaign/campaigndata/CampaignFormBuilder.java
@@ -51,8 +51,6 @@
 import de.symeda.sormas.ui.utils.NumberValidator;
 import de.symeda.sormas.ui.utils.SormasFieldGroupFieldFactory;
 
-import de.symeda.sormas.ui.utils.UiFieldAccessCheckers;
-
 public class CampaignFormBuilder {
 
 	private final List<CampaignFormElement> formElements;
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
@@ -115,7 +115,7 @@ public class BulkCaseDataForm extends AbstractEditForm<CaseBulkEditData> {
 	private ComboBox facilityType;
 	private TextField healthFacilityDetails;
 	private Collection<? extends CaseIndexDto> selectedCases;
-	OptionGroup facilityOrHome;
+	private NullableOptionGroup facilityOrHome;
 	private HorizontalLayout warningLayout;
 
 	public BulkCaseDataForm(DistrictReferenceDto singleSelectedDistrict, Collection<? extends CaseIndexDto> selectedCases) {
@@ -210,7 +210,7 @@ protected void addFields() {
 		ComboBox community = addInfrastructureField(CaseBulkEditData.COMMUNITY);
 		community.setNullSelectionAllowed(true);
 		community.setEnabled(false);
-		facilityOrHome = new OptionGroup(I18nProperties.getCaption(Captions.casePlaceOfStay), TypeOfPlace.getTypesOfPlaceForCases());
+		facilityOrHome = new NullableOptionGroup(I18nProperties.getCaption(Captions.casePlaceOfStay), TypeOfPlace.getTypesOfPlaceForCases());
 		facilityOrHome.setId("facilityOrHome");
 		facilityOrHome.setWidth(100, Unit.PERCENTAGE);
 		facilityOrHome.setEnabled(false);
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/maternalhistory/MaternalHistoryForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/maternalhistory/MaternalHistoryForm.java
@@ -23,7 +23,6 @@
 import de.symeda.sormas.ui.utils.AbstractEditForm;
 import de.symeda.sormas.ui.utils.FieldHelper;
 import de.symeda.sormas.ui.utils.NullableOptionGroup;
-import de.symeda.sormas.ui.utils.UiFieldAccessCheckers;
 import de.symeda.sormas.ui.utils.ViewMode;
 
 public class MaternalHistoryForm extends AbstractEditForm<MaternalHistoryDto> {
@@ -50,7 +49,11 @@ public class MaternalHistoryForm extends AbstractEditForm<MaternalHistoryDto> {
 	//@formatter:on
 
 	public MaternalHistoryForm(ViewMode viewMode, boolean isPseudonymized) {
-		super(MaternalHistoryDto.class, MaternalHistoryDto.I18N_PREFIX, true, new FieldVisibilityCheckers(),
+		super(
+			MaternalHistoryDto.class,
+			MaternalHistoryDto.I18N_PREFIX,
+			true,
+			new FieldVisibilityCheckers(),
 			UiFieldAccessCheckers.forSensitiveData(isPseudonymized));
 		this.viewMode = viewMode;
 	}
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
@@ -73,6 +73,7 @@
 import de.symeda.sormas.api.utils.DateHelper;
 import de.symeda.sormas.api.utils.Diseases.DiseasesConfiguration;
 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.ui.ControllerProvider;
 import de.symeda.sormas.ui.UserProvider;
@@ -82,7 +83,6 @@
 import de.symeda.sormas.ui.utils.CssStyles;
 import de.symeda.sormas.ui.utils.FieldHelper;
 import de.symeda.sormas.ui.utils.NullableOptionGroup;
-import de.symeda.sormas.ui.utils.UiFieldAccessCheckers;
 import de.symeda.sormas.ui.utils.VaadinUiUtil;
 import de.symeda.sormas.ui.utils.ViewMode;
 
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/epidata/EpiDataBurialEditForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/epidata/EpiDataBurialEditForm.java
@@ -32,7 +32,6 @@
 import de.symeda.sormas.ui.utils.DateComparisonValidator;
 import de.symeda.sormas.ui.utils.FieldHelper;
 import de.symeda.sormas.ui.utils.NullableOptionGroup;
-import de.symeda.sormas.ui.utils.UiFieldAccessCheckers;
 
 public class EpiDataBurialEditForm extends AbstractEditForm<EpiDataBurialDto> {
 
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/epidata/EpiDataForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/epidata/EpiDataForm.java
@@ -51,7 +51,6 @@
 import de.symeda.sormas.ui.utils.CssStyles;
 import de.symeda.sormas.ui.utils.FieldHelper;
 import de.symeda.sormas.ui.utils.NullableOptionGroup;
-import de.symeda.sormas.ui.utils.UiFieldAccessCheckers;
 
 public class EpiDataForm extends AbstractEditForm<EpiDataDto> {
 
@@ -140,7 +139,11 @@ public class EpiDataForm extends AbstractEditForm<EpiDataDto> {
 	private final Disease disease;
 
 	public EpiDataForm(Disease disease, boolean isPseudonymized) {
-		super(EpiDataDto.class, EpiDataDto.I18N_PREFIX, false, FieldVisibilityCheckers.withDisease(disease),
+		super(
+			EpiDataDto.class,
+			EpiDataDto.I18N_PREFIX,
+			false,
+			FieldVisibilityCheckers.withDisease(disease),
 			UiFieldAccessCheckers.forSensitiveData(isPseudonymized));
 		this.disease = disease;
 		addFields();
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
@@ -35,10 +35,12 @@
 import de.symeda.sormas.api.region.CommunityReferenceDto;
 import de.symeda.sormas.api.region.DistrictReferenceDto;
 import de.symeda.sormas.api.region.RegionReferenceDto;
+import de.symeda.sormas.api.utils.fieldaccess.UiFieldAccessCheckers;
 import de.symeda.sormas.api.utils.fieldvisibility.FieldVisibilityCheckers;
 import de.symeda.sormas.ui.utils.AbstractEditForm;
 import de.symeda.sormas.ui.utils.DateComparisonValidator;
 import de.symeda.sormas.ui.utils.FieldHelper;
+import de.symeda.sormas.ui.utils.NullableOptionGroup;
 
 public class PreviousHospitalizationEditForm extends AbstractEditForm<PreviousHospitalizationDto> {
 
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/samples/AbstractSampleForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/samples/AbstractSampleForm.java
@@ -44,6 +44,7 @@
 import de.symeda.sormas.api.sample.SpecimenCondition;
 import de.symeda.sormas.api.user.UserReferenceDto;
 import de.symeda.sormas.api.user.UserRight;
+import de.symeda.sormas.api.utils.fieldaccess.UiFieldAccessCheckers;
 import de.symeda.sormas.ui.ControllerProvider;
 import de.symeda.sormas.ui.UserProvider;
 import de.symeda.sormas.ui.utils.AbstractEditForm;
@@ -54,8 +55,6 @@
 import de.symeda.sormas.ui.utils.DateTimeField;
 import de.symeda.sormas.ui.utils.FieldHelper;
 import de.symeda.sormas.ui.utils.NullableOptionGroup;
-import de.symeda.sormas.ui.utils.UiFieldAccessCheckers;
-
 
 public abstract class AbstractSampleForm extends AbstractEditForm<SampleDto> {
 
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
@@ -42,14 +42,14 @@
 import de.symeda.sormas.api.sample.PathogenTestType;
 import de.symeda.sormas.api.sample.SampleDto;
 import de.symeda.sormas.api.sample.SamplePurpose;
+import de.symeda.sormas.api.utils.fieldaccess.UiFieldAccessCheckers;
 import de.symeda.sormas.api.utils.fieldvisibility.FieldVisibilityCheckers;
 import de.symeda.sormas.ui.utils.AbstractEditForm;
 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.FieldHelper;
 import de.symeda.sormas.ui.utils.NullableOptionGroup;
-import de.symeda.sormas.ui.utils.UiFieldAccessCheckers;
 
 public class PathogenTestForm extends AbstractEditForm<PathogenTestDto> {
 
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/therapy/PrescriptionForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/therapy/PrescriptionForm.java
@@ -17,12 +17,12 @@
 import de.symeda.sormas.api.therapy.PrescriptionDto;
 import de.symeda.sormas.api.therapy.TreatmentRoute;
 import de.symeda.sormas.api.therapy.TreatmentType;
+import de.symeda.sormas.api.utils.fieldaccess.UiFieldAccessCheckers;
 import de.symeda.sormas.api.utils.fieldvisibility.FieldVisibilityCheckers;
 import de.symeda.sormas.ui.utils.AbstractEditForm;
 import de.symeda.sormas.ui.utils.DateComparisonValidator;
 import de.symeda.sormas.ui.utils.FieldHelper;
 import de.symeda.sormas.ui.utils.NullableOptionGroup;
-import de.symeda.sormas.ui.utils.UiFieldAccessCheckers;
 
 public class PrescriptionForm extends AbstractEditForm<PrescriptionDto> {
 
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/therapy/TreatmentForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/therapy/TreatmentForm.java
@@ -19,7 +19,6 @@
 import de.symeda.sormas.ui.utils.DateTimeField;
 import de.symeda.sormas.ui.utils.FieldHelper;
 import de.symeda.sormas.ui.utils.NullableOptionGroup;
-import de.symeda.sormas.ui.utils.UiFieldAccessCheckers;
 
 public class TreatmentForm extends AbstractEditForm<TreatmentDto> {
 
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/utils/NullableOptionGroup.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/utils/NullableOptionGroup.java
@@ -26,8 +26,6 @@
 
 public class NullableOptionGroup extends OptionGroup {
 
-//	Object oldValue;
-
 	public NullableOptionGroup() {
 		setup();
 	}
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/visit/VisitEditForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/visit/VisitEditForm.java
@@ -46,7 +46,6 @@
 import de.symeda.sormas.ui.utils.DateTimeField;
 import de.symeda.sormas.ui.utils.FieldHelper;
 import de.symeda.sormas.ui.utils.NullableOptionGroup;
-import de.symeda.sormas.ui.utils.UiFieldAccessCheckers;
 
 public class VisitEditForm extends AbstractEditForm<VisitDto> {
 
@@ -119,8 +118,8 @@ protected void addFields() {
 		addField(VisitDto.VISIT_DATE_TIME, DateTimeField.class);
 		NullableOptionGroup visitStatus = addField(VisitDto.VISIT_STATUS, NullableOptionGroup.class);
 		addField(VisitDto.VISIT_REMARKS, TextField.class).setDescription(
-				I18nProperties.getPrefixDescription(VisitDto.I18N_PREFIX, VisitDto.VISIT_REMARKS) + "\n"
-						+ I18nProperties.getDescription(Descriptions.descGdpr));
+			I18nProperties.getPrefixDescription(VisitDto.I18N_PREFIX, VisitDto.VISIT_REMARKS) + "\n"
+				+ I18nProperties.getDescription(Descriptions.descGdpr));
 
 		symptomsForm = new SymptomsForm(null, disease, person, SymptomsContext.VISIT, null, fieldAccessCheckers);
 		getFieldGroup().bind(symptomsForm, VisitDto.SYMPTOMS);
