Merge remote-tracking branch 'remotes/origin/development' into 2975_full_export_switzerland

# Conflicts:
#	sormas-api/src/main/resources/strings.properties

Author: lgal

sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java

@@ -1608,6 +1608,7 @@ public interface Captions {
 	String User_active = "User.active";
 	String User_address = "User.address";
 	String User_associatedOfficer = "User.associatedOfficer";
+	String User_hasConsentedToGdpr = "User.hasConsentedToGdpr";
 	String User_healthFacility = "User.healthFacility";
 	String User_laboratory = "User.laboratory";
 	String User_limitedDisease = "User.limitedDisease";

sormas-api/src/main/java/de/symeda/sormas/api/i18n/Descriptions.java

@@ -28,4 +28,5 @@ public interface Descriptions {
 	String descCaseFilterRelatedToEvent = "descCaseFilterRelatedToEvent";
 	String descContactOnlyWithExtendedQuarantine = "descContactOnlyWithExtendedQuarantine";
 	String descContactOnlyWithReducedQuarantine = "descContactOnlyWithReducedQuarantine";
+	String descGdpr = "descGdpr";
 }

sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java

@@ -595,6 +595,8 @@ public interface Strings {
 	String messageFollowUpCanceled = "messageFollowUpCanceled";
 	String messageFollowUpStatusChanged = "messageFollowUpStatusChanged";
 	String messageFormHasErrorsPathogenTest = "messageFormHasErrorsPathogenTest";
+	String messageGdpr = "messageGdpr";
+	String messageGdprCheck = "messageGdprCheck";
 	String messageImportCanceled = "messageImportCanceled";
 	String messageImportCanceledErrors = "messageImportCanceledErrors";
 	String messageImportError = "messageImportError";

sormas-api/src/main/java/de/symeda/sormas/api/user/UserDto.java

@@ -17,7 +17,6 @@
  *******************************************************************************/
 package de.symeda.sormas.api.user;
 
-import java.awt.geom.Area;
 import java.util.Set;
 
 import de.symeda.sormas.api.Disease;
@@ -59,6 +58,7 @@ public class UserDto extends EntityDto {
 	public static final String POINT_OF_ENTRY = "pointOfEntry";
 	public static final String LIMITED_DISEASE = "limitedDisease";
 	public static final String LANGUAGE = "language";
+	public static final String HAS_CONSENTED_TO_GDPR = "hasConsentedToGdpr";
 
 	private boolean active = true;
 
@@ -90,6 +90,8 @@ public class UserDto extends EntityDto {
 
 	private Language language;
 
+	private boolean hasConsentedToGdpr;
+
 	public static UserDto build() {
 		UserDto user = new UserDto();
 		user.setUuid(DataHelper.createUuid());
@@ -253,4 +255,12 @@ public Language getLanguage() {
 	public void setLanguage(Language language) {
 		this.language = language;
 	}
+
+	public boolean isHasConsentedToGdpr() {
+		return hasConsentedToGdpr;
+	}
+
+	public void setHasConsentedToGdpr(boolean hasConsentedToGdpr) {
+		this.hasConsentedToGdpr = hasConsentedToGdpr;
+	}
 }

sormas-api/src/main/resources/captions.properties

@@ -1738,6 +1738,7 @@ userUpdatePasswordConfirmation=Really update password?
 User=User
 User.active=Active?
 User.associatedOfficer=Associated officer
+User.hasConsentedToGdpr=GDPR
 User.healthFacility=Facility
 User.laboratory=Laboratory
 User.limitedDisease=Limited disease

sormas-api/src/main/resources/captions_de-CH.properties

@@ -52,7 +52,7 @@ inaccessibleValue=Vertraulich
 numberOfCharacters=Anzahl der Zeichen\: %d / %d
 facility=Einrichtung
 pointOfEntry=Einreiseort
-remove=Remove
+remove=Entfernen
 
 # About
 aboutSormasVersion=SORMAS-Version
@@ -196,13 +196,13 @@ campaignCampaignData=Kampagnendaten
 campaignCampaignDataForm=Datenformular
 campaignCampaignForm=Formular
 campaignValidateForms=Formulare validieren
-campaignAdditionalForm=Add form
-campaignAdditionalChart=Add chart
-campaignDashboardChart=Campaign data chart
-campaignDashboardTabName=Tab name
-campaignDashboardChartWidth=Width in %
-campaignDashboardChartHeight=Height in %
-campaignDashboardOrder=Order
+campaignAdditionalForm=Formular hinzufügen
+campaignAdditionalChart=Diagramm hinzufügen
+campaignDashboardChart=Kampagnendaten Diagramm
+campaignDashboardTabName=Name des Reiters
+campaignDashboardChartWidth=Breite in %
+campaignDashboardChartHeight=Höhe in %
+campaignDashboardOrder=Verfügung
 
 Campaign=Kampagne
 Campaign.name=Name
@@ -214,6 +214,7 @@ Campaign.creatingUser=Benutzer erstellen
 CampaignFormData.campaign = Kampagne
 CampaignFormData.campaignFormMeta = Formular
 CampaignFormData.formDate = Formulardatum
+CampaignFormData.area = Gebiet
 
 # CaseData
 caseCasesList=Fall-Liste
@@ -1737,6 +1738,7 @@ userUpdatePasswordConfirmation=Passwort wirklich erneuern?
 User=Benutzer
 User.active=Aktiv?
 User.associatedOfficer=Verbundener Beauftragte*r
+User.hasConsentedToGdpr=GDPR
 User.healthFacility=Einrichtung
 User.laboratory=Labor
 User.limitedDisease=Ausgewählte Krankheit

sormas-api/src/main/resources/captions_de-DE.properties

@@ -214,6 +214,7 @@ Campaign.creatingUser=Benutzer erstellen
 CampaignFormData.campaign = Kampagne
 CampaignFormData.campaignFormMeta = Formular
 CampaignFormData.formDate = Formulardatum
+CampaignFormData.area = Gebiet
 
 # CaseData
 caseCasesList=Fall-Liste
@@ -1737,6 +1738,7 @@ userUpdatePasswordConfirmation=Passwort wirklich erneuern?
 User=Benutzer
 User.active=Aktiv?
 User.associatedOfficer=Verbundener Beauftragte*r
+User.hasConsentedToGdpr=GDPR
 User.healthFacility=Einrichtung
 User.laboratory=Labor
 User.limitedDisease=Ausgewählte Krankheit

sormas-api/src/main/resources/captions_en-AF.properties

@@ -214,6 +214,7 @@ Campaign.creatingUser=Creating user
 CampaignFormData.campaign = Campaign
 CampaignFormData.campaignFormMeta = Form
 CampaignFormData.formDate = Form date
+CampaignFormData.area = Area
 
 # CaseData
 caseCasesList=Cases list
@@ -1737,6 +1738,7 @@ userUpdatePasswordConfirmation=Really update password?
 User=User
 User.active=Active?
 User.associatedOfficer=Associated officer
+User.hasConsentedToGdpr=GDPR
 User.healthFacility=Facility
 User.laboratory=Laboratory
 User.limitedDisease=Limited disease

sormas-api/src/main/resources/captions_es-CU.properties

@@ -52,7 +52,7 @@ inaccessibleValue=Confidencial
 numberOfCharacters=Número de caracteres\: %d / %d
 facility=Centro
 pointOfEntry=Punto de entrada
-remove=Remove
+remove=Eliminar
 
 # About
 aboutSormasVersion=Versión de SORMAS
@@ -196,13 +196,13 @@ campaignCampaignData=Datos de campaña
 campaignCampaignDataForm=Formulario de datos
 campaignCampaignForm=Formulario
 campaignValidateForms=Validar formularios
-campaignAdditionalForm=Add form
-campaignAdditionalChart=Add chart
-campaignDashboardChart=Campaign data chart
-campaignDashboardTabName=Tab name
-campaignDashboardChartWidth=Width in %
-campaignDashboardChartHeight=Height in %
-campaignDashboardOrder=Order
+campaignAdditionalForm=Añadir formulario
+campaignAdditionalChart=Añadir gráfico
+campaignDashboardChart=Gráfico de datos de campaña
+campaignDashboardTabName=Nombre de tab
+campaignDashboardChartWidth=Ancho en %
+campaignDashboardChartHeight=Altura en %
+campaignDashboardOrder=Pedido
 
 Campaign=Campaña
 Campaign.name=Nombre
@@ -214,6 +214,7 @@ Campaign.creatingUser=Creando usuario
 CampaignFormData.campaign = Campaña
 CampaignFormData.campaignFormMeta = Formulario
 CampaignFormData.formDate = Fecha del formulario
+CampaignFormData.area = Zona
 
 # CaseData
 caseCasesList=Lista de casos
@@ -1491,7 +1492,7 @@ statisticsDataDisplayed=Datos mostrados
 symptomsLesionsLocations=Localización de las lesiones
 symptomsMaxTemperature=Temperatura corporal máxima en °C
 symptomsSetClearedToNo=Marcar limpios como No
-symptomsSetClearedToUnknown=Set cleared to Unknown
+symptomsSetClearedToUnknown=Marcar limpios como Desconocido
 
 Symptoms=Síntomas
 Symptoms.abdominalPain=Dolor abdominal
@@ -1737,6 +1738,7 @@ userUpdatePasswordConfirmation=¿Realmente actualizar la contraseña?
 User=Usuario
 User.active=¿Activo?
 User.associatedOfficer=Funcionario asociado
+User.hasConsentedToGdpr=GDPR
 User.healthFacility=Centro de salud
 User.laboratory=Laboratorio
 User.limitedDisease=Enfermedad limitada

sormas-api/src/main/resources/captions_es-EC.properties

@@ -214,6 +214,7 @@ Campaign.creatingUser=Creating user
 CampaignFormData.campaign = Campaign
 CampaignFormData.campaignFormMeta = Form
 CampaignFormData.formDate = Form date
+CampaignFormData.area = Area
 
 # CaseData
 caseCasesList=Lista de casos
@@ -1737,6 +1738,7 @@ userUpdatePasswordConfirmation=¿Actualizar realmente la contraseña?
 User=Usuario
 User.active=¿Activo?
 User.associatedOfficer=Oficial asociado
+User.hasConsentedToGdpr=GDPR
 User.healthFacility=Facility
 User.laboratory=Laboratorio
 User.limitedDisease=Enfermedad limitada