Merge branch 'refs/heads/development' into l10n_development

obinna-h-n · obinna-h-n · commit ce071422ee3a · 2024-08-03T11:33:39.000+01:00
# Conflicts:
#	sormas-api/src/main/resources/captions_es-CU.properties
#	sormas-api/src/main/resources/enum_es-CU.properties
#	sormas-api/src/main/resources/strings_es-CU.properties
#	sormas-api/src/main/resources/validations_es-CU.properties
diff --git a/docs/I18N.md b/docs/I18N.md
@@ -30,4 +30,4 @@ Click on the file to open the Crowdin editor that allows you to go through all t
 
 ## How to add a new language to SORMAS
 
-If the language you would like to translate is not available yet, please get in contact with us: <https://github.com/sormas-foundation/SORMAS-Project>
+If the language you would like to translate is not available yet, please get in contact with us at info@sormas.org, through our community at <https://community.sormas.org>, or by creating an issue on the main repository at: <https://github.com/sormas-foundation/SORMAS-Project>
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.97.0-SNAPSHOT</version>
+        <version>1.98.0-SNAPSHOT</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/sormas-api/src/main/resources/doc/SORMAS_Data_Dictionary.xlsx b/sormas-api/src/main/resources/doc/SORMAS_Data_Dictionary.xlsx
diff --git a/sormas-api/src/main/resources/doc/SORMAS_User_Roles.xlsx b/sormas-api/src/main/resources/doc/SORMAS_User_Roles.xlsx
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.97.0-SNAPSHOT</version>
+        <version>1.98.0-SNAPSHOT</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/sormas-backend/src/main/resources/sql/sormas_schema.sql b/sormas-backend/src/main/resources/sql/sormas_schema.sql
@@ -12834,7 +12834,7 @@ ALTER TABLE userroles_history ADD COLUMN restrictAccessToAssignedEntities boolea
 INSERT INTO schema_version (version_number, comment) VALUES (536, 'Assign case(s) to a User and allow them to see the data of only the assigned case(s) in the system #12697');
 
 -- 2023-12-18 Move hide jurisdiction fields feature property to dedicated feature type #12806
-INSERT INTO featureconfiguration (id, uuid, creationdate, changedate, enabled, featuretype)VALUES (nextval('entity_seq'), generate_base32_uuid(), now(), now(), (SELECT properties::jsonb->'HIDE_JURISDICTION_FIELDS' FROM featureconfiguration WHERE featuretype = 'CASE_SURVEILANCE')::text::boolean, 'HIDE_JURISDICTION_FIELDS');
+INSERT INTO featureconfiguration (id, uuid, creationdate, changedate, enabled, featuretype)VALUES (nextval('entity_seq'), generate_base32_uuid(), now(), now(), coalesce((SELECT properties::jsonb->'HIDE_JURISDICTION_FIELDS' FROM featureconfiguration WHERE featuretype = 'CASE_SURVEILANCE')::text::boolean, false), 'HIDE_JURISDICTION_FIELDS');
 
 UPDATE featureconfiguration SET properties = properties::jsonb - 'HIDE_JURISDICTION_FIELDS' WHERE featuretype = 'CASE_SURVEILANCE';
 
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.97.0-SNAPSHOT</version>
+    <version>1.98.0-SNAPSHOT</version>
 
 	<properties>
 		<maven.minimum.version>3.6.3</maven.minimum.version>
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.97.0-SNAPSHOT</version>
+        <version>1.98.0-SNAPSHOT</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.97.0-SNAPSHOT</version>
+        <version>1.98.0-SNAPSHOT</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.97.0-SNAPSHOT</version>
+        <version>1.98.0-SNAPSHOT</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.97.0-SNAPSHOT</version>
+        <version>1.98.0-SNAPSHOT</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 
diff --git a/sormas-rest/swagger.json b/sormas-rest/swagger.json
@@ -7,7 +7,7 @@
       "url" : "https://www.gnu.org/licenses/gpl-3.0.html"
     },
     "title" : "SORMAS REST API",
-    "version" : "1.97.0-SNAPSHOT"
+    "version" : "1.98.0-SNAPSHOT"
   },
   "servers" : [ {
     "url" : "/sormas-rest"
diff --git a/sormas-rest/swagger.yaml b/sormas-rest/swagger.yaml
@@ -10,7 +10,7 @@ info:
     name: GPL v3
     url: https://www.gnu.org/licenses/gpl-3.0.html
   title: SORMAS REST API
-  version: 1.97.0-SNAPSHOT
+  version: 1.98.0-SNAPSHOT
 servers:
 - url: /sormas-rest
 paths:
diff --git a/sormas-serverlibs/pom.xml b/sormas-serverlibs/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>sormas-base</artifactId>
 		<groupId>de.symeda.sormas</groupId>
-        <version>1.97.0-SNAPSHOT</version>
+        <version>1.98.0-SNAPSHOT</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
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.97.0-SNAPSHOT</version>
+        <version>1.98.0-SNAPSHOT</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/samples/environmentsample/EnvironmentSampleEditForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/samples/environmentsample/EnvironmentSampleEditForm.java
@@ -369,10 +369,14 @@ private void addValidators() {
 	}
 
 	private Date getEarliestPathogenTestDate() {
-		List<PathogenTestDto> pathogenTests = FacadeProvider.getPathogenTestFacade().getAllByEnvironmentSample(getValue().toReference());
-		if (pathogenTests.isEmpty()) {
+		if (!isCreate) {
+			List<PathogenTestDto> pathogenTests = FacadeProvider.getPathogenTestFacade().getAllByEnvironmentSample(getValue().toReference());
+			if (pathogenTests.isEmpty()) {
+				return null;
+			}
+			return pathogenTests.stream().map(PathogenTestDto::getTestDateTime).filter(Objects::nonNull).min(Date::compareTo).orElseGet(() -> null);
+		} else {
 			return null;
 		}
-		return pathogenTests.stream().map(PathogenTestDto::getTestDateTime).filter(Objects::nonNull).min(Date::compareTo).orElseGet(() -> null);
 	}
 }
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.97.0-SNAPSHOT</version>
+        <version>1.98.0-SNAPSHOT</version>
         <relativePath>../sormas-base</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

Original file line number	Diff line number	Diff line change
`@@ -30,4 +30,4 @@ Click on the file to open the Crowdin editor that allows you to go through all t`
`30`	`30`
`31`	`31`	`## How to add a new language to SORMAS`
`32`	`32`
`33`		`-If the language you would like to translate is not available yet, please get in contact with us: <https://github.com/sormas-foundation/SORMAS-Project>`
	`33`	`+If the language you would like to translate is not available yet, please get in contact with us at info@sormas.org, through our community at <https://community.sormas.org>, or by creating an issue on the main repository at: <https://github.com/sormas-foundation/SORMAS-Project>`