Merge branch 'development' into feature-2890-CampaignDataByJurisdiction

# Conflicts:
#	sormas-ui/src/main/java/de/symeda/sormas/ui/campaign/campaigndata/CampaignFormDataEditForm.java

Author: barnabartha

SERVER_DEV_SETUP.md

@@ -1,7 +1,7 @@
 
 
 # Installing a SORMAS Server for development
-**Note: This guide explains how to configure a SORMAS server on Linux and Windows systems for development. Please note that there is no database setup because the script supposes the use of the Docker Postgresql image (see [SORMAS-Docker][https://github.com/hzi-braunschweig/SORMAS-Docker]).**
+**Note: This guide explains how to configure a SORMAS server on Linux and Windows systems for development. Please note that there is no database setup because the script supposes the use of the Docker Postgresql image (see [SORMAS-Docker](https://github.com/hzi-braunschweig/SORMAS-Docker)).**
 
 ## Content
 * [Prerequisites](#prerequisites)
@@ -50,6 +50,10 @@ See [Keycloak](SERVER_SETUP.md#keycloak-server) for how to install Docker locall
 
 If you are doing active development on Keycloak (themes, authentication mechanisms, translations, etc.) it's recommended to install the standalone variant.
 
+## VAADIN Debug Mode
+
+To enable [VAADIN Debug Mode](https://vaadin.com/docs/v8/framework/advanced/advanced-debug.html), go to ``sormas-ui/src/main/webapp/WEB-INF/web.xml`` and set ``productionMode`` to ``false``.
+Make sure not to commit your changes to these files, for example by using .gitignore. To access the debug Window, got to <url>/sormas-ui/?debug. You may need to log in as admin once first.
 
 ## Other components
 

sormas-api/src/main/java/de/symeda/sormas/api/EntityDtoAccessHelper.java

@@ -0,0 +1,118 @@
+package de.symeda.sormas.api;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+import de.symeda.sormas.api.utils.DataHelper;
+
+public class EntityDtoAccessHelper {
+
+	public static Object getPropertyValue(HasUuid entity, String propertyKey) throws InvocationTargetException, IllegalAccessException {
+		if (entity == null) {
+			return null;
+		}
+		Class<? extends HasUuid> entityClass = entity.getClass();
+		while (entityClass != null) {
+			Method[] declaredMethods = entityClass.getDeclaredMethods();
+			for (Method method : declaredMethods) {
+				String methodName = method.getName();
+				if (methodName.startsWith("get") || methodName.startsWith("is")) {
+					String propertyName = methodName.replaceAll("(^(is|get))|((Reference)?Dto$)", "").toUpperCase();
+					if (propertyName.equals(propertyKey.toUpperCase())) {
+						return method.invoke(entity);
+					}
+				}
+			}
+			Class<?> superclass = entityClass.getSuperclass();
+			entityClass = HasUuid.class.isAssignableFrom(superclass) ? (Class<? extends HasUuid>) superclass : null;
+		}
+		throw new IllegalArgumentException("No property " + propertyKey + " in class " + entity.getClass().getSimpleName());
+	}
+
+	public static Object getPropertyPathValue(HasUuid entity, String propertyPath) {
+		return getPropertyPathValue(entity, propertyPath, null);
+	}
+
+	public static Object getPropertyPathValue(HasUuid entity, String propertyPath, IReferenceDtoResolver referenceDtoResolver) {
+		String[] propertyKeys = propertyPath.split("[.]");
+		Object currentEntity = entity;
+		for (int i = 0; i < propertyKeys.length; i++) {
+			if (currentEntity == null) {
+				return null;
+			}
+			boolean isResolvable = referenceDtoResolver != null && ReferenceDto.class.isAssignableFrom(currentEntity.getClass());
+
+			if (!HasUuid.class.isAssignableFrom(currentEntity.getClass())) {
+				String errorPropertyPath = entity.getClass().getSimpleName() + "." + String.join(".", Arrays.copyOfRange(propertyKeys, 0, i));
+				throw new IllegalArgumentException(errorPropertyPath + " is not an EntityDto or ReferenceDto");
+			}
+			Object propertyValue = null;
+			try {
+				propertyValue = getPropertyValue((HasUuid) currentEntity, propertyKeys[i]);
+			} catch (InvocationTargetException | IllegalAccessException e) {
+				throw new IllegalArgumentException(e);
+			} catch (IllegalArgumentException e) {
+				if (!isResolvable) {
+					throw e;
+				}
+			}
+			if (propertyValue != null) {
+				currentEntity = propertyValue;
+			} else {
+				if (isResolvable) {
+					try {
+						currentEntity = getPropertyValue(referenceDtoResolver.resolve((ReferenceDto) currentEntity), propertyKeys[i]);
+					} catch (InvocationTargetException | IllegalAccessException e) {
+						throw new IllegalArgumentException(e);
+					}
+				} else {
+					currentEntity = null;
+				}
+			}
+		}
+		return currentEntity;
+	}
+
+	public static String getPropertyPathValueString(HasUuid entity, String propertyPath, IReferenceDtoResolver referenceDtoResolver) {
+		return DataHelper.valueToString(getPropertyPathValue(entity, propertyPath, referenceDtoResolver));
+	}
+
+	public interface IReferenceDtoResolver {
+
+		EntityDto resolve(ReferenceDto referenceDto);
+	}
+
+	public static class CachedReferenceDtoResolver implements IReferenceDtoResolver {
+
+		private Map<String, EntityDto> referenceCache = new HashMap<>();
+		private IReferenceDtoResolver referenceDtoResolver;
+
+		public CachedReferenceDtoResolver(IReferenceDtoResolver referenceDtoResolver) {
+			this.referenceDtoResolver = referenceDtoResolver;
+		}
+
+		public EntityDto resolve(ReferenceDto referenceDto) {
+			if (referenceDto != null) {
+				EntityDto entityDto = referenceCache.get(referenceDto.getUuid());
+				if (entityDto != null) {
+					return entityDto;
+				}
+			}
+			if (referenceDtoResolver != null) {
+				EntityDto resolvedEntity = referenceDtoResolver.resolve(referenceDto);
+				addReference(referenceDto, resolvedEntity);
+				return resolvedEntity;
+			}
+			return null;
+		}
+
+		public void addReference(ReferenceDto referenceDto, EntityDto entityDto) {
+			if (referenceDto != null && entityDto != null) {
+				referenceCache.put(referenceDto.getUuid(), entityDto);
+			}
+		}
+	}
+}

sormas-api/src/main/java/de/symeda/sormas/api/FacadeProvider.java

@@ -36,6 +36,7 @@
 import de.symeda.sormas.api.contact.ContactFacade;
 import de.symeda.sormas.api.disease.DiseaseConfigurationFacade;
 import de.symeda.sormas.api.disease.DiseaseFacade;
+import de.symeda.sormas.api.docgeneneration.QuarantineOrderFacade;
 import de.symeda.sormas.api.epidata.EpiDataFacade;
 import de.symeda.sormas.api.event.EventFacade;
 import de.symeda.sormas.api.event.EventParticipantFacade;
@@ -305,11 +306,15 @@ public static AreaFacade getAreaFacade() {
 		return get().lookupEjbRemote(AreaFacade.class);
 	}
 
-    public static ExternalJournalFacade getExternalJournalFacade() {
+	public static QuarantineOrderFacade getQuarantineOrderFacade() {
+		return get().lookupEjbRemote(QuarantineOrderFacade.class);
+	}
+
+  public static ExternalJournalFacade getExternalJournalFacade() {
 		return get().lookupEjbRemote(ExternalJournalFacade.class);
-    }
+  }
 
-    @SuppressWarnings("unchecked")
+  @SuppressWarnings("unchecked")
 	public <P> P lookupEjbRemote(Class<P> clazz) {
 		try {
 			return (P) get().ic.lookup(buildJndiLookupName(clazz));

sormas-api/src/main/java/de/symeda/sormas/api/contact/ContactReferenceDto.java

@@ -116,6 +116,9 @@ public static class PersonName implements Serializable {
 		@SensitiveData
 		private String lastName;
 
+		public PersonName() {
+		}
+
 		public PersonName(String firstName, String lastName) {
 			this.firstName = firstName;
 			this.lastName = lastName;

sormas-api/src/main/java/de/symeda/sormas/api/contact/QuarantineType.java

@@ -1,5 +1,8 @@
 package de.symeda.sormas.api.contact;
 
+import java.util.Arrays;
+import java.util.List;
+
 import de.symeda.sormas.api.CountryHelper;
 import de.symeda.sormas.api.i18n.I18nProperties;
 import de.symeda.sormas.api.utils.HideForCountriesExcept;
@@ -18,6 +21,12 @@ public enum QuarantineType {
 	UNKNOWN,
 	OTHER;
 
+	public static final List<QuarantineType> QUARANTINE_IN_EFFECT = Arrays.asList(HOME, INSTITUTIONELL, HOSPITAL, HOTEL, ASYLUM_ACCOMMODATION);
+
+	public static boolean isQuarantineInEffect(QuarantineType quarantineType) {
+		return QUARANTINE_IN_EFFECT.contains(quarantineType);
+	}
+
 	public String toString() {
 		return I18nProperties.getEnumCaption(this);
 	}

sormas-api/src/main/java/de/symeda/sormas/api/docgeneneration/QuarantineOrderFacade.java

@@ -0,0 +1,27 @@
+package de.symeda.sormas.api.docgeneneration;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Properties;
+
+import javax.ejb.Remote;
+
+import de.symeda.sormas.api.ReferenceDto;
+
+@Remote
+public interface QuarantineOrderFacade {
+
+	byte[] getGeneratedDocument(String templateName, ReferenceDto rootEntityReference, Properties extraProperties) throws IOException;
+
+	byte[] getTemplate(String templateName) throws IOException;
+
+	List<String> getAvailableTemplates();
+
+	boolean isExistingTemplate(String templateName);
+
+	List<String> getAdditionalVariables(String templateName) throws IOException;
+
+	void writeQuarantineTemplate(String fileName, byte[] document) throws IOException;
+
+	boolean deleteQuarantineTemplate(String fileName);
+}

sormas-api/src/main/java/de/symeda/sormas/api/event/DashboardEventDto.java

@@ -30,10 +30,12 @@ public class DashboardEventDto implements Serializable {
 	public static final String I18N_PREFIX = "Event";
 
 	public static final String EVENT_STATUS = "eventStatus";
+	public static final String EVENT_INVESTIGATION_STATUS = "eventInvestigationStatus";
 	public static final String DISEASE = "disease";
 
 	private String uuid;
 	private EventStatus eventStatus;
+	private EventInvestigationStatus eventInvestigationStatus;
 	private Disease disease;
 	private String diseaseDetails;
 	private Date eventDate;
@@ -48,6 +50,7 @@ public class DashboardEventDto implements Serializable {
 	public DashboardEventDto(
 		String uuid,
 		EventStatus eventStatus,
+		EventInvestigationStatus eventInvestigationStatus,
 		Disease disease,
 		String diseaseDetails,
 		Date eventDate,
@@ -64,6 +67,7 @@ public DashboardEventDto(
 
 		this.uuid = uuid;
 		this.eventStatus = eventStatus;
+		this.eventInvestigationStatus = eventInvestigationStatus;
 		this.disease = disease;
 		this.diseaseDetails = diseaseDetails;
 		this.eventDate = eventDate;
@@ -92,6 +96,14 @@ public void setEventStatus(EventStatus eventStatus) {
 		this.eventStatus = eventStatus;
 	}
 
+	public EventInvestigationStatus getEventInvestigationStatus() {
+		return eventInvestigationStatus;
+	}
+
+	public void setEventInvestigationStatus(EventInvestigationStatus eventInvestigationStatus) {
+		this.eventInvestigationStatus = eventInvestigationStatus;
+	}
+
 	public Disease getDisease() {
 		return disease;
 	}
@@ -154,7 +166,7 @@ public DistrictReferenceDto getDistrict() {
 
 	@Override
 	public String toString() {
-		return EventReferenceDto.buildCaption(getDisease(), getDiseaseDetails(), getEventStatus(), getEventDate());
+		return EventReferenceDto.buildCaption(getDisease(), getDiseaseDetails(), getEventStatus(), getEventInvestigationStatus(), getEventDate());
 	}
 
 	public EventJurisdictionDto getJurisdiction() {

sormas-api/src/main/java/de/symeda/sormas/api/event/EventActionIndexDto.java

@@ -35,6 +35,7 @@ public class EventActionIndexDto implements Serializable {
 	public static final String EVENT_START_DATE = "eventStartDate";
 	public static final String EVENT_END_DATE = "eventEndDate";
 	public static final String EVENT_STATUS = "eventStatus";
+	public static final String EVENT_INVESTIGATION_STATUS = "eventInvestigationStatus";
 	public static final String ACTION_TITLE = "actionTitle";
 	public static final String ACTION_CREATION_DATE = "actionCreationDate";
 	public static final String ACTION_CHANGE_DATE = "actionChangeDate";
@@ -47,6 +48,7 @@ public class EventActionIndexDto implements Serializable {
 	private Date eventStartDate;
 	private Date eventEndDate;
 	private EventStatus eventStatus;
+	private EventInvestigationStatus eventInvestigationStatus;
 	private String actionTitle;
 	private Date actionCreationDate;
 	private Date actionChangeDate;
@@ -60,6 +62,7 @@ public EventActionIndexDto(
 		Date eventStartDate,
 		Date eventEndDate,
 		EventStatus eventStatus,
+		EventInvestigationStatus eventInvestigationStatus,
 		String actionTitle,
 		Date actionCreationDate,
 		Date actionChangeDate,
@@ -74,6 +77,7 @@ public EventActionIndexDto(
 		this.eventStartDate = eventStartDate;
 		this.eventEndDate = eventEndDate;
 		this.eventStatus = eventStatus;
+		this.eventInvestigationStatus = eventInvestigationStatus;
 		this.actionTitle = actionTitle;
 		this.actionCreationDate = actionCreationDate;
 		this.actionChangeDate = actionChangeDate;
@@ -122,6 +126,14 @@ public void setEventStatus(EventStatus eventStatus) {
 		this.eventStatus = eventStatus;
 	}
 
+	public EventInvestigationStatus getEventInvestigationStatus() {
+		return eventInvestigationStatus;
+	}
+
+	public void setEventInvestigationStatus(EventInvestigationStatus eventInvestigationStatus) {
+		this.eventInvestigationStatus = eventInvestigationStatus;
+	}
+
 	public String getActionTitle() {
 		return actionTitle;
 	}

sormas-api/src/main/java/de/symeda/sormas/api/event/EventCriteria.java

@@ -41,10 +41,12 @@ public class EventCriteria extends BaseCriteria implements Serializable {
 	public static final String SURVEILLANCE_OFFICER = "surveillanceOfficer";
 	public static final String FREE_TEXT = "freeText";
 	public static final String EVENT_STATUS = "eventStatus";
+	public static final String EVENT_INVESTIGATION_STATUS = "eventInvestigationStatus";
 	public static final String DISTRICT = "district";
 	public static final String REGION = "region";
 
 	private EventStatus eventStatus;
+	private EventInvestigationStatus eventInvestigationStatus;
 	private Disease disease;
 	private UserRole reportingUserRole;
 	private Boolean deleted = Boolean.FALSE;
@@ -83,6 +85,19 @@ public void setEventStatus(EventStatus eventStatus) {
 		this.eventStatus = eventStatus;
 	}
 
+	public EventInvestigationStatus getEventInvestigationStatus() {
+		return eventInvestigationStatus;
+	}
+
+	public void setEventInvestigationStatus(EventInvestigationStatus eventInvestigationStatus) {
+		this.eventInvestigationStatus = eventInvestigationStatus;
+	}
+
+	public EventCriteria eventInvestigationStatus(EventInvestigationStatus eventInvestigationStatus) {
+		this.eventInvestigationStatus = eventInvestigationStatus;
+		return this;
+	}
+
 	public Disease getDisease() {
 		return disease;
 	}