[GITFLOW]merging 'release-1.43.0' into 'master'

Author: jenkins

DEVELOPMENT_ENVIRONMENT.md

@@ -2,7 +2,7 @@
 # SORMAS Development Environment
 
 ## Server
-- [Install your local server](SERVER_SETUP.md)
+- Install [your local server](SERVER_SETUP.md) or [a more dev specific one](SERVER_DEV_SETUP.md) (Docker is needed to run Postgresql image)
 
 ## Git
 - Install [Git for your OS](https://git-scm.com/downloads)
@@ -53,6 +53,8 @@
 	- under Startup/Connection tab make sure you do not pass environment variables (it's a currently open bug in intellij) - ignore warning about debug config not being correct
 	- edit your domain config ..\payara5\glassfish\domains\sormas\config\domain.xml and make sure the java-config node contains:
 	 ``<java-config classpath-suffix="" debug-enabled="true" debug-options="-agentlib:jdwp=transport=dt_socket,address=6009,server=n,suspend=y" ...``
+- Open the Ant window, click on the "+" icon and select the build.xml file from the sormas-base project
+- Execute the "install" and "deploy-serverlibs" scripts in this order
 - Configure code formatting:
 	- install Eclipse Code Formatter for IntelliJ (https://plugins.jetbrains.com/plugin/6546-eclipse-code-formatter)
 	- open the plugin settings (Other Settings -> Eclipse Code Formatter) and select "Use the Eclipse Code Formatter"

I18N.md

@@ -3,31 +3,31 @@
 
 ## Who is translating SORMAS?
 
-The translation of SORMAS currently relies on people from the community. If you would like to see SORMAS translated to your language please read the points below and take part in the process.
+The translation of SORMAS relies on people from the community. If you would like to see SORMAS translated to your language, please read the points below and take part in the process.
 
 ## How is SORMAS translated?
 
-The official SORMAS translation is done using the crowdin platform: https://crwd.in/sormas
+The official SORMAS translation is done using the Crowdin platform: https://crwd.in/sormas
 
 All translations done on the platform are automatically fed into SORMAS and are part of the bi-weekly release schedule.
 This means that any text you translate will likely be part of the next SORMAS release. Once your server (or the server of your country) is updated you will be able to see the translations in the web app and mobile app.
 
 ## How to participate in translating SORMAS
 
-You can join the translation project by creating a free account on crowdin. You can also use your existing github account.
+You can join the translation project by creating a free account on Crowdin. You can also use your existing GitHub account. Before starting to translate, you need to request write access to the project. A member of the project will either accept your request or get in touch with you as soon as possible.
 
 Afterwards open the SORMAS project https://crwd.in/sormas and select the language you would like to translate.
 
-You will see all files that contain translatable texts. 
+You will see all files that contain translatable texts:
 
 <img alt="SORMAS translation files" src="I18nFiles.png"/>
 
-The most important one is captions.properties. It contains the captions for all the data entry fields of SORMAS. The captions are shared by web app and mobile app.
+The most important one is captions.properties. It contains the captions for all the data entry fields of SORMAS. The captions are shared by the web app and mobile app.
 
-Click on the file to open the crowdin editor that allows you to go though all translation entries one by one as shown in the picture below:
+Click on the file to open the Crowdin editor that allows you to go through all translation entries one by one as shown in the picture below:
 
 <img alt="SORMAS translation editor" src="I18nEditor.png"/>
 
 ## 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/hzi-braunschweig/SORMAS-Project
+If the language you would like to translate is not available yet, please get in contact with us: https://github.com/hzi-braunschweig/SORMAS-Project

README.md

@@ -35,7 +35,7 @@ The project consists of the following modules:
 - **sormas-backend:** Server entity services, facades, etc.
 - **sormas-base:** Base project that also contains build scripts
 - **sormas-ear:** The ear needed to build the application
-- **sormas-rest:** The REST interface
+- **sormas-rest:** The REST interface; see [`sormas-rest/README.md`](sormas-rest/README.md)
 - **sormas-ui:** The web application
 
 ## Server Management

SERVER_DEV_SETUP.md

@@ -0,0 +1,48 @@
+
+
+# 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]).**
+
+## Content
+* [Prerequisites](#prerequisites)
+  * [Java 8](#java-8)
+  * [ant](#ant)
+  * [Postgres Database](#postgres-database)
+* [SORMAS Server](#sormas-server)
+
+## Related
+* [Installing a SORMAS Server](SERVER_SETUP.md)
+
+## Prerequisites
+
+### Java 8
+
+See [Installing Java](SERVER_SETUP.md#java-8)
+
+### Ant
+
+Download and install Ant, it can be done from [Ant site](https://ant.apache.org/bindownload.cgi) or with packages from your Linux distribution.
+
+### Postgres Database
+
+See [Installing Postgresql](SERVER_SETUP.md#java-8)
+
+Alternatively you can use the Docker image available in [SORMAS-Docker](https://github.com/hzi-braunschweig/SORMAS-Docker) repository.
+
+## SORMAS Server
+
+Install you own Payara server (see [installing SORMAS Server](SERVER_SETUP.md#sormas-server)) or run ``bash ./server-setup-dev-docker.sh``
+
+This script will download Payara (if needed) and install SORMAS in the Payara server.
+
+You can edit this script to change paths and ports.
+
+Other steps :
+* **IMPORTANT**: Adjust the SORMAS configuration for your country in /opt/domains/sormas/sormas.properties
+* Adjust the logging configuration in ``${HOME}/opt/domains/sormas/config/logback.xml`` based on your needs (e.g. configure and activate email appender)
+* Build and deploy applications (ear and war) with you IDE.
+
+
+## Other components
+
+See [Installing a SORMAS Server](SERVER_SETUP.md)

sormas-api/pom.xml

@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>de.symeda.sormas</groupId>
 		<artifactId>sormas-base</artifactId>
-		<version>1.42.3</version>
+		<version>1.43.0</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

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

@@ -75,4 +75,8 @@ public interface ConfigFacade {
 	int getMapZoom();
 
 	String getGeocodingOsgtsEndpoint();
+
+	String getPIAUrl();
+
+	void validateExternalUrls();
 }

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

@@ -44,6 +44,7 @@
 import de.symeda.sormas.api.infrastructure.PopulationDataFacade;
 import de.symeda.sormas.api.outbreak.OutbreakFacade;
 import de.symeda.sormas.api.person.PersonFacade;
+import de.symeda.sormas.api.region.AreaFacade;
 import de.symeda.sormas.api.region.CommunityFacade;
 import de.symeda.sormas.api.region.DistrictFacade;
 import de.symeda.sormas.api.region.GeoShapeProvider;
@@ -259,6 +260,10 @@ public static CampaignFacade getCampaignFacade() {
 		return get().lookupEjbRemote(CampaignFacade.class);
 	}
 
+	public static AreaFacade getAreaFacade() {
+		return get().lookupEjbRemote(AreaFacade.class);
+	}
+
 	@SuppressWarnings("unchecked")
 	public <P> P lookupEjbRemote(Class<P> clazz) {
 		try {

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

@@ -14,10 +14,13 @@ public enum Language {
 	EN_NG(new Locale("en", "NG"), "dd/MM/yyyy", "dd/MM/yyyy h:mm a", "dd/MM"),
 	EN_GH(new Locale("en", "GH"), "dd/MM/yyyy", "dd/MM/yyyy h:mm a", "dd/MM"),
 	FR(new Locale("fr", "FR"), "dd/MM/yyyy", "dd/MM/yyyy HH:mm", "dd/MM"),
+	FR_CH(new Locale("fr", "CH"), "dd/MM/yyyy", "dd/MM/yyyy HH:mm", "dd/MM"),
 	DE(new Locale("de", "DE"), "dd.MM.yyyy", "dd.MM.yyyy HH:mm", "dd.MM"),
+	DE_CH(new Locale("de", "CH"), "dd.MM.yyyy", "dd.MM.yyyy HH:mm", "dd.MM"),
 	ES_EC(new Locale("es", "EC"), "dd/MM/yyyy", "dd/MM/yyyy H:mm", "dd/MM"),
 	ES_CU(new Locale("es", "CU"), "dd/MM/yyyy", "dd/MM/yyyy H:mm", "dd/MM"),
 	IT(new Locale("it", "IT"), "dd/MM/yyyy", "dd/MM/yyyy H:mm", "dd/MM"),
+	IT_CH(new Locale("it", "CH"), "dd/MM/yyyy", "dd/MM/yyyy H:mm", "dd/MM"),
 	FI(new Locale("fi", "FI"), "dd.MM.yyyy", "dd.MM.yyyy H.mm", "dd.MM");
 
 	/**

sormas-api/src/main/java/de/symeda/sormas/api/campaign/CampaignFacade.java

@@ -22,4 +22,5 @@ public interface CampaignFacade {
 	void deleteCampaign(String uuid);
 
 	void archiveOrDearchiveCampaign(String campaignUuid, boolean archive);
+
 }

sormas-api/src/main/java/de/symeda/sormas/api/campaign/form/CampaignFormDto.java

@@ -0,0 +1,51 @@
+package de.symeda.sormas.api.campaign.form;
+
+import java.util.List;
+
+import de.symeda.sormas.api.EntityDto;
+
+public class CampaignFormDto extends EntityDto {
+
+	private static final long serialVersionUID = -1163673887940552133L;
+
+	public static final String FORM_ID = "formId";
+	public static final String LANGUAGE_CODE = "languageCode";
+	public static final String CAMPAIGN_FORM_ELEMENTS = "campaignFormElements";
+
+	private String formId;
+	private String languageCode;
+	private List<CampaignFormElement> campaignFormElements;
+	private List<CampaignFormTranslations> campaignFormTranslations;
+
+	public String getFormId() {
+		return formId;
+	}
+
+	public void setFormId(String formId) {
+		this.formId = formId;
+	}
+
+	public String getLanguageCode() {
+		return languageCode;
+	}
+
+	public void setLanguageCode(String languageCode) {
+		this.languageCode = languageCode;
+	}
+
+	public List<CampaignFormElement> getCampaignFormElements() {
+		return campaignFormElements;
+	}
+
+	public void setCampaignFormElements(List<CampaignFormElement> campaignFormElements) {
+		this.campaignFormElements = campaignFormElements;
+	}
+
+	public List<CampaignFormTranslations> getCampaignFormTranslations() {
+		return campaignFormTranslations;
+	}
+
+	public void setCampaignFormTranslations(List<CampaignFormTranslations> campaignFormTranslations) {
+		this.campaignFormTranslations = campaignFormTranslations;
+	}
+}