Evol2550rgpd (SORMAS-Foundation#3063)

* add gdpr window after loggin

* add reminder gdpr on fields

* add import facadeprovider

* SORMAS-Foundation#2550 review merge

* SORMAS-Foundation#2545 review merge2

* SORMAS-Foundation#2545 review merge3

Author: mouloud-mala

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

@@ -1607,6 +1607,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

@@ -594,6 +594,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_fr-FR.properties

@@ -1737,6 +1737,7 @@ userUpdatePasswordConfirmation=Voulez-vous vraiment mettre à jour le mot de pas
 User=Utilisateur
 User.active=Actif ?
 User.associatedOfficer=Agent associé
+User.hasConsentedToGdpr=RGPD
 User.healthFacility=Établissement
 User.laboratory=Laboratoire
 User.limitedDisease=Maladie limitée

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

@@ -66,6 +66,7 @@ descContactOnlyWithExtendedQuarantine = Only list contacts whose quarantine peri
 descCaseFilterWithReducedQuarantine = Only list cases whose quarantine period has been reduced
 descCaseFilterRelatedToEvent = Only list cases related to events
 descContactOnlyWithReducedQuarantine = Only list contacts whose quarantine period has been reduced
+descGdpr = Reminder: All comments entered must comply with GDPR rules as described during connection.
 
 # EpiData
 EpiData.bats = Did you have contact with live or dead bats or their excreta during the incubation period?
@@ -195,4 +196,4 @@ User.limitedDisease = Select a disease here if the user should be restricted to
 # Visit
 Visit.visitDateTime = Enter the date of the follow-up visit (dd/mm/yyyy)
 Visit.visitRemarks = Type your remarks of the visit
-Visit.visitStatus = Select the visit status
+Visit.visitStatus = Select the visit status

sormas-api/src/main/resources/descriptions_fr-FR.properties

@@ -66,6 +66,7 @@ descContactOnlyWithExtendedQuarantine = Only list contacts whose quarantine peri
 descCaseFilterWithReducedQuarantine = Only list cases whose quarantine period has been reduced
 descCaseFilterRelatedToEvent = Only list cases related to events
 descContactOnlyWithReducedQuarantine = Only list contacts whose quarantine period has been reduced
+descGdpr = Rappel : Tous les commentaires saisis doivent être conformes aux règles RGPD telles que décrites lors de la connexion.
 
 # EpiData
 EpiData.bats = Avez-vous été en contact avec des chauves-souris vivantes ou mortes ou leurs excréments pendant la période d'incubation?
@@ -195,4 +196,4 @@ User.limitedDisease = Sélectionnez une maladie ici si l'utilisateur doit être
 # Visit
 Visit.visitDateTime = Entrez la date de la visite de suivi (dd/mm/yyy)
 Visit.visitRemarks = Tapez vos remarques sur la visite
-Visit.visitStatus = Sélectionnez le statut de la visite
+Visit.visitStatus = Sélectionnez le statut de la visite

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

@@ -602,6 +602,8 @@ messageFollowUpCanceled = Follow-up of all selected contacts has been canceled
 messageFollowUpStatusChanged = Follow-up of all selected contacts that have follow-up has been set to lost to follow-up
 messageFacilityChanged = You have changed the facility of this case. Do you want to transfer the case to the new facility (the hospitalization may be updated) or do you only want to edit the data to correct a mistake?
 messageFacilityMulitChanged = You have changed the facility of multiple cases. Do you want to transfer these cases to the new facility (the hospitalization may be updated) or do you only want to edit their data to correct mistakes?
+messageGdpr = In accordance with the principle of data minimization imposed by the GDPR, you must ensure that you enter here only objective data absolutely necessary for the processing of the file. In particular, you must not enter genetic or biometric data, philosophical, political, religious, trade union opinions, sexual life or orientation, ethnic origin, offenses, convictions, security measures, criminal record ... or any other data that does not would not be related to the health survey.
+messageGdprCheck = I have read this information, please don't show this window again
 messageImportCanceled = <b>Import canceled!</b><br/>The import has been canceled. All already processed rows have been successfully imported. You can now close this window.
 messageImportCanceledErrors = <b>Import canceled!</b><br/>The import has been canceled. Some of the already processed rows could not be imported due to malformed data.<br/>Please close this window and download the error report.
 messageImportError = Could not import file.
@@ -839,4 +841,4 @@ headingNetworkDiagramTooManyContacts = Too many contacts
 warningNetworkDiagramTooManyContacts = There are %d contacts and it is possible that your browser will freeze while displaying the diagram.<br/>Please choose a smaller time window.
 confirmNetworkDiagramTooManyContacts = Do you really want to update the diagram?
 
-headingContactTracingFirstContact = First contact with Contact Tracing
+headingContactTracingFirstContact = First contact with Contact Tracing

sormas-api/src/main/resources/strings_fr-FR.properties

@@ -715,6 +715,8 @@ messageSampleOpened = Échantillon ouvert trouvé pour la chaîne de recherche
 messageSystemFollowUpCanceled = [System] Suivi annulé automatiquement car le contact a été converti en un cas
 messageSetContactRegionAndDistrict = Veuillez choisir une région, un département et enregistrer le contact avant de supprimer le cas source.
 messageAllCampaignFormsValid = Tous les formulaires de campagne ont été validés avec succès
+messageGdpr = Conformément au principe de minimisation des données imposé par le RGPD, vous devez veiller à ne saisir ici que des données objectives absolument nécessaires au traitement du dossier. En particulier, vous ne devez pas saisir de données génétiques ou biométriques, opinions philosophiques, politiques, religieuses, syndicales, vie sexuelle ou orientation, origine ethnique, infractions, condamnations, mesures de sûreté, casier judiciaire… ou toutes autres données qui ne seraient pas en rapport avec l’enquête sanitaire.
+messageGdprCheck = J'ai bien lu ces informations, je ne veux plus afficher cette fenêtre
 
 # Notifications
 notificationCaseClassificationChanged = La classification du cas %s a changé en %s.
@@ -839,4 +841,4 @@ headingNetworkDiagramTooManyContacts = Too many contacts
 warningNetworkDiagramTooManyContacts = There are %d contacts and it is possible that your browser will freeze while displaying the diagram.<br/>Please choose a smaller time window.
 confirmNetworkDiagramTooManyContacts = Do you really want to update the diagram?
 
-headingContactTracingFirstContact = First contact with Contact Tracing
+headingContactTracingFirstContact = First contact with Contact Tracing