SORMAS-Foundation#2972 Add warning regarding "Place Description"

Author: danRosca

sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java

@@ -776,6 +776,7 @@ public interface Strings {
 	String promptTypeToAdd = "promptTypeToAdd";
 	String promptUserSearch = "promptUserSearch";
 	String promtSampleDataType = "promtSampleDataType";
+	String pseudonymisedCasesSelectedWarning = "pseudonymisedCasesSelectedWarning";
 	String quarantineEnd = "quarantineEnd";
 	String quarterShort = "quarterShort";
 	String reportedBy = "reportedBy";

sormas-api/src/main/resources/strings.properties

@@ -580,6 +580,7 @@ messageCreateContactCase=The final laboratory result of the contact the sample a
 messageDatabaseExportFailed = Please contact an admin and notify them about this problem
 messageEntryCreated = Entry created
 messageEpiDataHint = <i>Please indicate if any of the following is relevant for the patient during the incubation period.</i>
+pseudonymisedCasesSelectedWarning =<p> For of the bulked edited cases you have only limited access to the sensitive data.</p><p> For those cases the value you put into "Place Description" will be ignored.</p>
 messageEpidNumberWarning = The entered epid number is already used by another case. Please assign a new epid number to this or the other case.
 messageErrorReportNotAvailable = The error report file is not available. Please contact an admin and tell them about this issue.
 messageEventArchived = Event has been archived

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

@@ -17,10 +17,18 @@
  *******************************************************************************/
 package de.symeda.sormas.ui.caze;
 
+import com.vaadin.server.ThemeResource;
+import com.vaadin.shared.ui.ContentMode;
+import com.vaadin.ui.Image;
+import com.vaadin.ui.Label;
 import com.vaadin.ui.themes.ValoTheme;
+import de.symeda.sormas.api.caze.CaseIndexDto;
 import de.symeda.sormas.api.event.TypeOfPlace;
 import de.symeda.sormas.api.facility.FacilityReferenceDto;
+import de.symeda.sormas.api.i18n.Strings;
 import de.symeda.sormas.ui.utils.CssStyles;
+import static de.symeda.sormas.ui.utils.CssStyles.LABEL_WARNING;
+import static de.symeda.sormas.ui.utils.CssStyles.TEXTFIELD_ROW;
 import static de.symeda.sormas.ui.utils.CssStyles.VSPACE_4;
 import static de.symeda.sormas.ui.utils.LayoutUtil.fluidColumn;
 import static de.symeda.sormas.ui.utils.LayoutUtil.fluidColumnLoc;
@@ -30,6 +38,7 @@
 import static de.symeda.sormas.ui.utils.LayoutUtil.locs;
 
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
@@ -67,9 +76,9 @@ public class BulkCaseDataForm extends AbstractEditForm<CaseBulkEditData> {
 	private static final String TYPE_GROUP_LOC = "typeGroupLoc";
 	private static final String TYPE_LOC = "typeLoc";
 	private static final String FACILITY_OR_HOME_LOC = "facilityOrHomeLoc";
-	private static final String FACILITY_TYPE_GROUP_LOC = "typeGroupLoc";
 	private static final String HEALTH_FACILITY_DETAILS = "healthFacilityDetails";
-
+	private static final String WARNING_ICON = "warningIcon";
+	private static final String WARNING_LABEL = "warningLabel";
 
 	//@formatter:off
 	private static final String HTML_LAYOUT = 
@@ -94,7 +103,9 @@ public class BulkCaseDataForm extends AbstractEditForm<CaseBulkEditData> {
 					CaseBulkEditData.DISTRICT,
 					CaseBulkEditData.COMMUNITY) +
 			fluidRowLocs(FACILITY_OR_HOME_LOC,TYPE_GROUP_LOC, TYPE_LOC)+
-			fluidRowLocs(CaseDataDto.HEALTH_FACILITY,CaseBulkEditData.HEALTH_FACILITY_DETAILS);
+					fluidRowLocs(WARNING_ICON)+
+					fluidRowLocs(WARNING_LABEL)+
+					fluidRowLocs(CaseDataDto.HEALTH_FACILITY,BulkCaseDataForm.HEALTH_FACILITY_DETAILS);
 	//@formatter:on
 
 	private final DistrictReferenceDto singleSelectedDistrict;
@@ -110,16 +121,21 @@ public class BulkCaseDataForm extends AbstractEditForm<CaseBulkEditData> {
 	private ComboBox facilityTypeGroup;
 	private ComboBox facilityType;
 	private TextField healthFacilityDetails;
+	private Label warningLabel;
+	private Collection selectedCases;
+	private Image warningIcon;
+
 
-	public BulkCaseDataForm(DistrictReferenceDto singleSelectedDistrict) {
+	public BulkCaseDataForm(DistrictReferenceDto singleSelectedDistrict, Collection<? extends CaseIndexDto> selectedCases) {
 		super(CaseBulkEditData.class, CaseDataDto.I18N_PREFIX);
 		this.singleSelectedDistrict = singleSelectedDistrict;
 		setWidth(680, Unit.PIXELS);
 		hideValidationUntilNextCommit();
 		initialized = true;
+		this.selectedCases = selectedCases;
 		addFields();
 	}
-
+	@SuppressWarnings("deprecation")
 	@Override
 	protected void addFields() {
 		if (!initialized) {
@@ -299,7 +315,12 @@ protected void addFields() {
 				}
 			}
 		});
-
+		warningLabel = new Label(I18nProperties.getString(Strings.pseudonymisedCasesSelectedWarning));
+		warningLabel.setContentMode(ContentMode.HTML);
+		CssStyles.style(warningLabel, CssStyles.LABEL_BOLD, CssStyles.LABEL_UPPERCASE,LABEL_WARNING);
+		warningIcon = new Image(null, new ThemeResource("img/warning-icon.png"));
+		warningIcon.setHeight(35, Unit.PIXELS);
+		warningIcon.setWidth(35, Unit.PIXELS);
 		facilityOrHome.addValueChangeListener(e -> {
 			FieldHelper.removeItems(facility);
 			if (TypeOfPlace.FACILITY.equals(facilityOrHome.getValue())) {
@@ -313,7 +334,14 @@ protected void addFields() {
 				if (facilityType.getValue() != null) {
 					updateFacility((DistrictReferenceDto) district.getValue(), (CommunityReferenceDto) community.getValue(), facility);
 				}
+				this.getContent().removeComponent(warningLabel);
 			} else {
+		long pseudonymizedCount = selectedCases.stream().filter(caze->
+								((CaseIndexDto)caze).isPseudonymized()).count();
+		if(pseudonymizedCount>0){
+			this.getContent().addComponent(warningIcon,WARNING_ICON);
+			this.getContent().addComponent(warningLabel,WARNING_LABEL);
+		}
 				FacilityReferenceDto noFacilityRef = FacadeProvider.getFacilityFacade().getByUuid(FacilityDto.NONE_FACILITY_UUID).toReference();
 				facility.addItem(noFacilityRef);
 				facility.setValue(noFacilityRef);
@@ -431,10 +459,10 @@ private void updateFacilityFields(ComboBox cbFacility, TextField tfFacilityDetai
 			boolean visibleAndRequired = otherHealthFacility || noneHealthFacility;
 
 			tfFacilityDetails.setVisible(visibleAndRequired);
-			tfFacilityDetails.setRequired(visibleAndRequired);
 
 			if (otherHealthFacility) {
 				tfFacilityDetails.setCaption(I18nProperties.getPrefixCaption(CaseDataDto.I18N_PREFIX, CaseDataDto.HEALTH_FACILITY_DETAILS));
+				tfFacilityDetails.setRequired(visibleAndRequired);
 			}
 			if (noneHealthFacility) {
 				tfFacilityDetails.setCaption(I18nProperties.getCaption(Captions.CaseData_noneHealthFacilityDetails));

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

@@ -34,7 +34,6 @@ public class CaseBulkEditData extends EntityDto {
 	public static final String DISTRICT = "district";
 	public static final String COMMUNITY = "community";
 	public static final String HEALTH_FACILITY = "healthFacility";
-	public static final String HEALTH_FACILITY_DETAILS = "healthFacilityDetails";
 
 	private Disease disease;
 	private String diseaseDetails;

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

@@ -642,7 +642,7 @@ public void showBulkCaseDataEditComponent(Collection<? extends CaseIndexDto> sel
 		bulkEditData.setRegion(region);
 		bulkEditData.setDistrict(district);
 
-		BulkCaseDataForm form = new BulkCaseDataForm(district);
+		BulkCaseDataForm form = new BulkCaseDataForm(district,selectedCases);
 		form.setValue(bulkEditData);
 		final CommitDiscardWrapperComponent<BulkCaseDataForm> editView =
 			new CommitDiscardWrapperComponent<BulkCaseDataForm>(form, form.getFieldGroup());