Merge remote-tracking branch 'origin/development' into 3409_prohibition-to-work-fields

# Conflicts:
#	sormas-app/app/src/main/java/de/symeda/sormas/app/backend/common/DatabaseHelper.java
#	sormas-backend/src/main/resources/sql/sormas_schema.sql

Author: lgal

DEVELOPMENT_ENVIRONMENT.md

@@ -51,7 +51,7 @@
 - Clone the SORMAS-Project repository and open the project in IntelliJ
 	- make sure the under "File -> Project Structure -> Modules" all the modules (except the android app - this should not be added) are recognized, if not add the modules with +
 - Make sure under "File -> Settings -> Plugins" Glassfish & Ant integrations are enabled (look into the "Installed" tab)
-- Install the Vaadin Designer plugin
+- Install the Vaadin plugin (not the Vaadin Designer plugin!)
 - Make a copy of "build.properties.example" contained in "sormas-base", rename it to "build.properties" and set "glassfish.domain.root" to the location of the sormas domain located in the "glassfish/domains" folder inside your payara installation
 - Run "Maven install" on the sormas-base project
 - Add a Payara server to IntelliJ:

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

@@ -45,6 +45,10 @@ public class EventIndexDto extends PseudonymizableIndexDto implements Serializab
 	public static final String SRC_LAST_NAME = "srcLastName";
 	public static final String SRC_TEL_NO = "srcTelNo";
 	public static final String REPORT_DATE_TIME = "reportDateTime";
+	public static final String REGION = "region";
+	public static final String DISTRICT = "district";
+	public static final String COMMUNITY = "community";
+	public static final String ADDRESS = "address";
 
 	private String uuid;
 	private EventStatus eventStatus;
@@ -247,6 +251,22 @@ public void setParticipantCount(long participantCount) {
 		this.participantCount = participantCount;
 	}
 
+	public String getRegion() {
+		return getEventLocation().getRegion();
+	}
+
+	public String getDistrict() {
+		return getEventLocation().getDistrict();
+	}
+
+	public String getCommunity() {
+		return getEventLocation().getCommunity();
+	}
+
+	public String getAddress() {
+		return getEventLocation().getAddress();
+	}
+
 	public EventReferenceDto toReference() {
 		return new EventReferenceDto(getUuid(), getDisease(), getDiseaseDetails(), getEventStatus(), getEventInvestigationStatus(), getStartDate());
 	}
@@ -302,6 +322,22 @@ public EventIndexLocation(
 			this.additionalInformation = additionalInformation;
 		}
 
+		public String getRegion() {
+			return regionName;
+		}
+
+		public String getDistrict() {
+			return districtName;
+		}
+
+		public String getCommunity() {
+			return communityName;
+		}
+
+		public String getAddress() {
+			return LocationReferenceDto.buildCaption(city, street, houseNumber, additionalInformation);
+		}
+
 		@Override
 		public String toString() {
 			return LocationReferenceDto.buildCaption(regionName, districtName, communityName, city, street, houseNumber, additionalInformation);

sormas-api/src/main/java/de/symeda/sormas/api/location/LocationReferenceDto.java

@@ -87,9 +87,40 @@ public static String buildCaption(
 			stringBuilder.append(street);
 		}
 		if (!DataHelper.isNullOrEmpty(houseNumber)) {
+			if (stringBuilder.length() > 0 && DataHelper.isNullOrEmpty(street)) {
+				stringBuilder.append(", ");
+			}
+			stringBuilder.append(houseNumber);
+		}
+		if (!DataHelper.isNullOrEmpty(additionalInformation)) {
+			if (stringBuilder.length() > 0) {
+				stringBuilder.append(", ");
+			}
+			stringBuilder.append(additionalInformation);
+		}
+		return stringBuilder.toString();
+	}
+
+	public static String buildCaption(String city, String street, String houseNumber, String additionalInformation) {
+
+		StringBuilder stringBuilder = new StringBuilder();
+
+		if (!DataHelper.isNullOrEmpty(city)) {
+			if (stringBuilder.length() > 0) {
+				stringBuilder.append(", ");
+			}
+			stringBuilder.append(city);
+		}
+		if (!DataHelper.isNullOrEmpty(street)) {
 			if (stringBuilder.length() > 0) {
 				stringBuilder.append(", ");
 			}
+			stringBuilder.append(street);
+		}
+		if (!DataHelper.isNullOrEmpty(houseNumber)) {
+			if (stringBuilder.length() > 0 && DataHelper.isNullOrEmpty(street)) {
+				stringBuilder.append(", ");
+			}
 			stringBuilder.append(houseNumber);
 		}
 		if (!DataHelper.isNullOrEmpty(additionalInformation)) {

sormas-app/app/src/main/java/de/symeda/sormas/app/backend/common/DatabaseHelper.java

@@ -1775,10 +1775,8 @@ public void onUpgrade(SQLiteDatabase db, ConnectionSource connectionSource, int
 				getDao(EpiData.class).executeRaw("DROP TABLE tmp_epidata;");
 			case 247:
 				currentVersion = 247;
-
-				getDao(Contact.class).executeRaw("ALTER TABLE contacts ADD column multidaycontact boolean default false;");
-				getDao(Contact.class).executeRaw("ALTER TABLE contacts ADD column firstcontactdate timestamp;");
-
+				getDao(Contact.class).executeRaw("ALTER TABLE contacts ADD column multiDayContact boolean default false;");
+				getDao(Contact.class).executeRaw("ALTER TABLE contacts ADD column firstContactDate timestamp;");
 			case 248:
 				currentVersion = 248;
 
@@ -1790,8 +1788,6 @@ public void onUpgrade(SQLiteDatabase db, ConnectionSource connectionSource, int
 				getDao(Case.class).executeRaw("ALTER TABLE cases ADD COLUMN nosocomialOutbreak boolean DEFAULT false");
 				getDao(Case.class).executeRaw("ALTER TABLE cases ADD COLUMN infectionSetting varchar(255)");
 
-				break;
-
 			case 250:
 				currentVersion = 250;
 

sormas-app/app/src/main/java/de/symeda/sormas/app/backend/contact/ContactDtoHelper.java

@@ -88,6 +88,7 @@ public void fillInnerFromDto(Contact target, ContactDto source) {
 		target.setContactOfficer(DatabaseHelper.getUserDao().getByReferenceDto(source.getContactOfficer()));
 
 		target.setMultiDayContact(source.isMultiDayContact());
+		target.setFirstContactDate(source.getFirstContactDate());
 		target.setLastContactDate(source.getLastContactDate());
 		target.setContactIdentificationSource(source.getContactIdentificationSource());
 		target.setContactIdentificationSourceDetails(source.getContactIdentificationSourceDetails());
@@ -210,6 +211,8 @@ public void fillInnerFromAdo(ContactDto target, Contact source) {
 		}
 		target.setReportDateTime(source.getReportDateTime());
 
+		target.setMultiDayContact(source.isMultiDayContact());
+		target.setFirstContactDate(source.getFirstContactDate());
 		target.setLastContactDate(source.getLastContactDate());
 		target.setContactIdentificationSource(source.getContactIdentificationSource());
 		target.setContactIdentificationSourceDetails(source.getContactIdentificationSourceDetails());

sormas-backend/src/main/java/de/symeda/sormas/backend/event/EventFacadeEjb.java

@@ -296,6 +296,24 @@ public List<EventIndexDto> getIndexList(EventCriteria eventCriteria, Integer fir
 					order.add(sortProperty.ascending ? cb.asc(expression) : cb.desc(expression));
 					expression = community.get(Community.NAME);
 					break;
+				case EventIndexDto.REGION:
+					expression = region.get(Region.NAME);
+					break;
+				case EventIndexDto.DISTRICT:
+					expression = district.get(District.NAME);
+					break;
+				case EventIndexDto.COMMUNITY:
+					expression = community.get(Community.NAME);
+					break;
+				case EventIndexDto.ADDRESS:
+					expression = location.get(Location.CITY);
+					order.add(sortProperty.ascending ? cb.asc(expression) : cb.desc(expression));
+					expression = location.get(Location.STREET);
+					order.add(sortProperty.ascending ? cb.asc(expression) : cb.desc(expression));
+					expression = location.get(Location.HOUSE_NUMBER);
+					order.add(sortProperty.ascending ? cb.asc(expression) : cb.desc(expression));
+					expression = location.get(Location.ADDITIONAL_INFORMATION);
+					break;
 				default:
 					throw new IllegalArgumentException(sortProperty.propertyName);
 				}

sormas-backend/src/main/java/de/symeda/sormas/backend/sormastosormas/SormasToSormasShareInfo.java

@@ -20,6 +20,7 @@
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 
@@ -54,7 +55,7 @@ public class SormasToSormasShareInfo extends AbstractDomainObject {
 
 	private String comment;
 
-	@ManyToOne
+	@ManyToOne(fetch = FetchType.LAZY)
 	@JoinColumn
 	public Case getCaze() {
 		return caze;
@@ -64,7 +65,7 @@ public void setCaze(Case caze) {
 		this.caze = caze;
 	}
 
-	@ManyToOne
+	@ManyToOne(fetch = FetchType.LAZY)
 	@JoinColumn
 	public Contact getContact() {
 		return contact;
@@ -74,7 +75,7 @@ public void setContact(Contact contact) {
 		this.contact = contact;
 	}
 
-	@ManyToOne
+	@ManyToOne(fetch = FetchType.LAZY)
 	@JoinColumn
 	public Sample getSample() {
 		return sample;

sormas-backend/src/main/resources/sql/sormas_schema.sql

@@ -5982,6 +5982,13 @@ ALTER TABLE person_history
 
 INSERT INTO schema_version (version_number, comment) VALUES (285, 'SurvNet Adaptations - Create new field “name of guardians” for persons #3413');
 
+-- 2020-12-08 SurvNet Adaptations - Add multi day contat to contact history #3408
+
+ALTER TABLE contact_history ADD column multidaycontact boolean;
+ALTER TABLE contact_history ADD column firstcontactdate timestamp;
+
+INSERT INTO schema_version (version_number, comment) VALUES (286, 'Add date of first contact for contact history #3408');
+
 -- 2020-11-25 SurvNet Adaptations - Create new field “Prohibition to work” for case and contact #3409
 ALTER TABLE cases
     ADD COLUMN prohibitiontowork varchar(255),
@@ -6003,6 +6010,6 @@ ALTER TABLE contact_history
     ADD COLUMN prohibitiontoworkfrom timestamp,
     ADD COLUMN prohibitiontoworkuntil timestamp;
 
-INSERT INTO schema_version (version_number, comment) VALUES (286, 'Create new field “Prohibition to work” for case and contact #3409');
+INSERT INTO schema_version (version_number, comment) VALUES (287, 'Create new field “Prohibition to work” for case and contact #3409');
 
 -- *** Insert new sql commands BEFORE this line ***

sormas-ui/src/main/java/de/symeda/sormas/ui/AboutView.java

@@ -119,11 +119,15 @@ public AboutView() {
 		FileDownloader dataDictionaryDownloader = new FileDownloader(new ClassResource("/doc/SORMAS_Data_Dictionary.xlsx"));
 		dataDictionaryDownloader.extend(dataDictionaryButton);
 
-		Link technicalManualLink = new Link(
-			I18nProperties.getCaption(Captions.aboutTechnicalManual),
-			new ExternalResource("https://github.com/hzi-braunschweig/SORMAS-Project/files/2585973/SORMAS_Technical_Manual_Webversion_20180911.pdf"));
-		technicalManualLink.setTargetName("_blank");
-		documentsLayout.addComponent(technicalManualLink);
+		// This link is hidden until an updated version of the document is provided
+		/*
+		 * Link technicalManualLink = new Link(
+		 * I18nProperties.getCaption(Captions.aboutTechnicalManual),
+		 * new ExternalResource(
+		 * "https://github.com/hzi-braunschweig/SORMAS-Project/files/2585973/SORMAS_Technical_Manual_Webversion_20180911.pdf"));
+		 * technicalManualLink.setTargetName("_blank");
+		 * documentsLayout.addComponent(technicalManualLink);
+		 */
 
 		setSizeFull();
 		setStyleName("about-view");

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

@@ -20,9 +20,8 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-
-import org.apache.commons.text.StringEscapeUtils;
-
+import com.vaadin.data.provider.DataProvider;
+import com.vaadin.data.provider.ListDataProvider;
 import com.vaadin.navigator.Navigator;
 import com.vaadin.server.Page;
 import com.vaadin.server.Sizeable;
@@ -44,7 +43,11 @@
 import de.symeda.sormas.api.event.EventCriteria;
 import de.symeda.sormas.api.event.EventDto;
 import de.symeda.sormas.api.event.EventIndexDto;
+import de.symeda.sormas.api.event.EventParticipantCriteria;
 import de.symeda.sormas.api.event.EventParticipantDto;
+import de.symeda.sormas.api.event.EventParticipantFacade;
+import de.symeda.sormas.api.event.EventParticipantIndexDto;
+import de.symeda.sormas.api.event.EventParticipantReferenceDto;
 import de.symeda.sormas.api.event.EventReferenceDto;
 import de.symeda.sormas.api.i18n.Captions;
 import de.symeda.sormas.api.i18n.I18nProperties;
@@ -60,6 +63,8 @@
 import de.symeda.sormas.ui.utils.CommitDiscardWrapperComponent.CommitListener;
 import de.symeda.sormas.ui.utils.VaadinUiUtil;
 
+import org.apache.commons.text.StringEscapeUtils;
+
 public class EventController {
 
 	public void registerViews(Navigator navigator) {
@@ -105,7 +110,7 @@ public void onCommit() {
 
 					EventReferenceDto eventReferenceDto = new EventReferenceDto(selectedEvent.getUuid());
 					if (!eventIndexDto.contains(selectedEvent)) {
-						createEventParticipantWithCase(eventReferenceDto, caseDataDto, caseRef);
+						linkCaseToEvent(eventReferenceDto, caseDataDto, caseRef);
 					}
 				} else {
 					create(caseRef);
@@ -153,7 +158,19 @@ public void selectOrCreateEvent(ContactDto contact) {
 		VaadinUiUtil.showModalPopupWindow(component, I18nProperties.getString(Strings.headingPickOrCreateEvent));
 	}
 
-	public void createEventParticipantWithCase(EventReferenceDto eventReferenceDto, CaseDataDto caseDataDto, CaseReferenceDto caseRef) {
+	public void linkCaseToEvent(EventReferenceDto eventReferenceDto, CaseDataDto caseDataDto, CaseReferenceDto caseRef) {
+		// Check whether Person is already enlisted as EventParticipant in this Event
+		EventParticipantReferenceDto eventParticipantRef =
+			FacadeProvider.getEventParticipantFacade().getReferenceByEventAndPerson(eventReferenceDto.getUuid(), caseDataDto.getPerson().getUuid());
+		if (eventParticipantRef != null) {
+			EventParticipantDto eventParticipant =
+				FacadeProvider.getEventParticipantFacade().getEventParticipantByUuid(eventParticipantRef.getUuid());
+			eventParticipant.setResultingCase(caseRef);
+			FacadeProvider.getEventParticipantFacade().saveEventParticipant(eventParticipant);
+			return;
+		}
+
+		// Create new EventParticipant for this Person
 		PersonDto personDto = FacadeProvider.getPersonFacade().getPersonByUuid(caseDataDto.getPerson().getUuid());
 		EventParticipantDto eventParticipantDto;
 		eventParticipantDto =
@@ -242,7 +259,7 @@ public void onCommit() {
 					if (caseRef != null) {
 						EventReferenceDto createdEvent = new EventReferenceDto(dto.getUuid());
 
-						createEventParticipantWithCase(createdEvent, finalCaseDataDto, caseRef);
+						linkCaseToEvent(createdEvent, finalCaseDataDto, caseRef);
 						SormasUI.refreshView();
 					} else {
 						navigateToParticipants(dto.getUuid());