[GITFLOW]merging 'hotfix-1.69.1' into 'master'

SORMAS-Foundation · Mar 15, 2022 · 84c5b7b · 84c5b7b
2 parents 4943fea + 831feed
commit 84c5b7b
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 18 deletions.
diff --git a/sormas-api/pom.xml b/sormas-api/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>de.symeda.sormas</groupId>
 		<artifactId>sormas-base</artifactId>
-		<version>1.69.0</version>
+		<version>1.69.1</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

diff --git a/sormas-app/pom.xml b/sormas-app/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>sormas-base</artifactId>
 		<groupId>de.symeda.sormas</groupId>
-		<version>1.69.0</version>
+		<version>1.69.1</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

diff --git a/sormas-backend/pom.xml b/sormas-backend/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>sormas-base</artifactId>
 		<groupId>de.symeda.sormas</groupId>
-		<version>1.69.0</version>
+		<version>1.69.1</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

diff --git a/sormas-base/dependencies/serverlibs.pom b/sormas-base/dependencies/serverlibs.pom
@@ -8,7 +8,7 @@
     <parent>
         <artifactId>sormas-base</artifactId>
         <groupId>de.symeda.sormas</groupId>
-        <version>1.69.0</version>
+        <version>1.69.1</version>
         <relativePath>../</relativePath>
     </parent>
 

diff --git a/sormas-base/pom.xml b/sormas-base/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>de.symeda.sormas</groupId>
 	<artifactId>sormas-base</artifactId>
 	<packaging>pom</packaging>
-	<version>1.69.0</version>
+	<version>1.69.1</version>
 
 	<properties>
 		<maven.compiler.source>1.8</maven.compiler.source>

diff --git a/sormas-cargoserver/pom.xml b/sormas-cargoserver/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>de.symeda.sormas</groupId>
         <artifactId>sormas-base</artifactId>
-        <version>1.69.0</version>
+        <version>1.69.1</version>
         <relativePath>../sormas-base</relativePath>
     </parent>
 

diff --git a/sormas-ear/pom.xml b/sormas-ear/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>de.symeda.sormas</groupId>
 		<artifactId>sormas-base</artifactId>
-		<version>1.69.0</version>
+		<version>1.69.1</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 

diff --git a/sormas-keycloak-service-provider/pom.xml b/sormas-keycloak-service-provider/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>sormas-base</artifactId>
 		<groupId>de.symeda.sormas</groupId>
-		<version>1.69.0</version>
+		<version>1.69.1</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

diff --git a/sormas-rest/pom.xml b/sormas-rest/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>de.symeda.sormas</groupId>
 		<artifactId>sormas-base</artifactId>
-		<version>1.69.0</version>
+		<version>1.69.1</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 

diff --git a/sormas-ui/pom.xml b/sormas-ui/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>sormas-base</artifactId>
 		<groupId>de.symeda.sormas</groupId>
-		<version>1.69.0</version>
+		<version>1.69.1</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

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
@@ -810,13 +810,15 @@ public void setPerson(PersonDto person) {
 
 		if (showHomeAddressForm) {
 			PersonDto searchedPerson = getSearchedPerson();
-			enterHomeAddressNow.setEnabled(searchedPerson != null ? false : true);
-			if (searchedPerson == null) {
+			enterHomeAddressNow.setEnabled(searchedPerson == null);
+			if (searchedPerson == null && (person == null || person.getAddress() == null)) {
 				homeAddressForm.clear();
 				homeAddressForm.setFacilityFieldsVisible(false, true);
 				homeAddressForm.setVisible(false);
-			} else {
+			} else if (searchedPerson != null) {
 				enterHomeAddressNow.setValue(false);
+			} else {
+				enterHomeAddressNow.setValue(person.getAddress() != null);
 			}
 		}
 
@@ -927,8 +929,10 @@ private void addHomeAddressForm() {
 			boolean isChecked = (boolean) e.getProperty().getValue();
 			addressHeader.setVisible(isChecked);
 			homeAddressForm.setVisible(isChecked);
-			homeAddressForm.clear();
 			homeAddressForm.setFacilityFieldsVisible(isChecked, true);
+			if (!isChecked) {
+				homeAddressForm.clear();
+			}
 		});
 	}
 

diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/docgeneration/QuarantineOrderLayout.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/docgeneration/QuarantineOrderLayout.java
@@ -214,9 +214,15 @@ protected void performTemplateUpdates() {
 		boolean showVaccinationSelector = documentVariables.isUsedEntity(RootEntityType.ROOT_VACCINATION.getEntityName());
 		if (showSampleSelector || showPathogenTestSelector || showVaccinationSelector) {
 			showAdditionalParameters();
-			sampleSelector.setVisible(showSampleSelector);
-			pathogenTestSelector.setVisible(showPathogenTestSelector);
-			vaccinationSelector.setVisible(showVaccinationSelector);
+			if (sampleSelector != null) {
+				sampleSelector.setVisible(showSampleSelector);
+			}
+			if (pathogenTestSelector != null) {
+				pathogenTestSelector.setVisible(showPathogenTestSelector);
+			}
+			if (vaccinationSelector != null) {
+				vaccinationSelector.setVisible(showVaccinationSelector);
+			}
 		} else {
 			hideAdditionalParameters();
 		}

diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/labmessage/LabMessageController.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/labmessage/LabMessageController.java
@@ -267,6 +267,7 @@ public void deleteAllSelectedItems(Collection<LabMessageIndexDto> selectedRows,
 	private PersonDto buildPerson(LabMessageMapper mapper) {
 		final PersonDto personDto = PersonDto.build();
 		mapper.mapToPerson(personDto);
+		mapper.mapToLocation(personDto.getAddress());
 		return personDto;
 	}
 

diff --git a/sormas-widgetset/pom.xml b/sormas-widgetset/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sormas-base</artifactId>
         <groupId>de.symeda.sormas</groupId>
-        <version>1.69.0</version>
+        <version>1.69.1</version>
         <relativePath>../sormas-base</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>