Merge remote-tracking branch 'origin/development' into feature-3488-LabMessage_UI

Author: ChristopherRiedel

SERVER_SETUP.md

@@ -140,6 +140,10 @@ In case Keycloak is set up alongside an already running instance of SORMAS, thes
 2. Login to SORMAS and trigger the **Sync Users** button from the **Users** page
 3. This will sync users to Keycloak keeping their original password - see [SORMAS Keycloak Service Provider](sormas-keycloak-service-provider/README.md) for more information about this
 
+### Keycloak configuration
+
+More about the default configuration and how to customize can be found here [Keycloak](sormas-base/doc/keycloak.md)
+
 ## Web Server Setup
 
 ### Apache Web Server

sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseClassification.java

@@ -19,6 +19,9 @@
 
 import de.symeda.sormas.api.i18n.I18nProperties;
 import de.symeda.sormas.api.statistics.StatisticsGroupingKey;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.Set;
 
 public enum CaseClassification
 	implements
@@ -71,4 +74,13 @@ public int keyCompareTo(StatisticsGroupingKey o) {
 	public int getSeverity() {
 		return severity;
 	}
+
+	public static Set<CaseClassification> getConfirmedClassifications() {
+		return Collections
+				.unmodifiableSet(EnumSet.of(
+						CaseClassification.CONFIRMED,
+						CaseClassification.CONFIRMED_NO_SYMPTOMS,
+						CaseClassification.CONFIRMED_UNKNOWN_SYMPTOMS
+				));
+	}
 }

sormas-api/src/main/java/de/symeda/sormas/api/contact/ContactFacade.java

@@ -42,7 +42,7 @@ public interface ContactFacade {
 
 	ContactDto saveContact(ContactDto dto);
 
-	ContactDto saveContact(ContactDto dto, boolean handleChanges);
+	ContactDto saveContact(ContactDto dto, boolean handleChanges, boolean handleCaseChanges);
 
 	ContactReferenceDto getReferenceByUuid(String uuid);
 

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

@@ -633,6 +633,7 @@ public interface Captions {
 	String dashboardGt1ProbableCases = "dashboardGt1ProbableCases";
 	String dashboardGt1SuspectCases = "dashboardGt1SuspectCases";
 	String dashboardGtThreeDays = "dashboardGtThreeDays";
+	String dashboardHideDataLabels = "dashboardHideDataLabels";
 	String dashboardHideOtherCountries = "dashboardHideOtherCountries";
 	String dashboardHideOverview = "dashboardHideOverview";
 	String dashboardHigh = "dashboardHigh";
@@ -689,6 +690,7 @@ public interface Captions {
 	String dashboardShowCases = "dashboardShowCases";
 	String dashboardShowConfirmedContacts = "dashboardShowConfirmedContacts";
 	String dashboardShowContacts = "dashboardShowContacts";
+	String dashboardShowDataLabels = "dashboardShowDataLabels";
 	String dashboardShowEvents = "dashboardShowEvents";
 	String dashboardShowFirstDiseases = "dashboardShowFirstDiseases";
 	String dashboardShowMinimumEntries = "dashboardShowMinimumEntries";

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

@@ -781,6 +781,7 @@ public interface Strings {
 	String notificationContactSymptomatic = "notificationContactSymptomatic";
 	String notificationContactWithoutCaseSymptomatic = "notificationContactWithoutCaseSymptomatic";
 	String notificationDiseaseChanged = "notificationDiseaseChanged";
+	String notificationEventParticipantCaseClassificationConfirmed = "notificationEventParticipantCaseClassificationConfirmed";
 	String notificationLabResultArrived = "notificationLabResultArrived";
 	String notificationLabResultArrivedContact = "notificationLabResultArrivedContact";
 	String notificationLabResultArrivedEventParticipant = "notificationLabResultArrivedEventParticipant";

sormas-api/src/main/java/de/symeda/sormas/api/person/PersonAddressType.java

@@ -18,6 +18,7 @@ public static PersonAddressType[] getValues(String countryCode) {
 			return new PersonAddressType[] {
 				HOME,
 				PLACE_OF_WORK,
+				PLACE_OF_ISOLATION,
 				OTHER_ADDRESS };
 		}
 

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

@@ -784,6 +784,8 @@ dashboardContactClassificationChart=Contact Classification Chart
 dashboardFollowUpUntilChart=Follow-Up Until Chart
 dashboardShowPercentageValues=Show percentage values
 dashboardShowTotalValues=Show total values
+dashboardShowDataLabels=Show data labels
+dashboardHideDataLabels=Hide data labels
 dashboardAggregatedNumber=Count
 dashboardProportion=Proportion (%)
 
@@ -1189,7 +1191,7 @@ lineListingSetEndDateForAll=Set end date for all
 Location=Location
 Location.additionalInformation=Additional information
 Location.addressType=Address Type
-Location.addressTypeDetails=Address Type specification
+Location.addressTypeDetails=Address name / description
 Location.areaType=Area type (urban/rural)
 Location.details=Community contact person
 Location.facility=Facility

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

@@ -223,7 +223,7 @@ Campaign.description=Beschreibung
 Campaign.startDate=Startdatum
 Campaign.endDate=Enddatum
 Campaign.creatingUser=Benutzer erstellen
-Campaign.viewForms=Öffentlich
+Campaign.open=Open
 Campaign.edit=Bearbeiten
 Campaign.area=Gebiet
 Campaign.region=Kanton
@@ -311,6 +311,7 @@ CaseData.doses=Wie viele Dosen
 CaseData.epiData=Epidemiologische Daten
 CaseData.epidNumber=EPID-Nummer
 CaseData.externalID=Externe ID
+CaseData.externalToken=External Token
 CaseData.facilityType=Art der Einrichtung
 CaseData.healthFacility=Einrichtung
 CaseData.healthFacilityDetails=Name & Beschreibung der Einrichtung
@@ -430,12 +431,15 @@ CaseExport.travelHistory=Reisegeschichte
 CaseExport.numberOfPrescriptions=Anzahl der Rezepte
 CaseExport.numberOfTreatments=Anzahl der Behandlungen
 CaseExport.numberOfClinicalVisits=Anzahl an klinischen Bewertungen
+CaseExport.sampleUuid1=Latest sample uuid
 CaseExport.sampleDateTime1=Neueste Probe Datum Zeit
 CaseExport.sampleLab1=Labor der letzten Probe
 CaseExport.sampleResult1=Neueste Probe finales Laborergebnis
+CaseExport.sampleUuid2=2nd latest sample uuid
 CaseExport.sampleDateTime2=Vorletzte Probe Datum Zeit
 CaseExport.sampleLab2=Labor der vorletzten Probe
 CaseExport.sampleResult2=Vorletzte Probe finales Laborergebnis
+CaseExport.sampleUuid3=3rd latest sample uuid
 CaseExport.sampleDateTime3=Drittletzte Probe Datum Zeit
 CaseExport.sampleLab3=Labor der drittletzten Probe
 CaseExport.sampleResult3=Drittletzte Probe finales Laborergebnis
@@ -579,6 +583,7 @@ Contact.disease=Krankheit des Indexfalls
 Contact.district=Zuständiger Bezirk
 Contact.epiData=Epidemiologische Daten
 Contact.externalID=Externe ID
+Contact.externalToken=External Token
 Contact.firstContactDate=Datum des ersten Kontakts
 Contact.firstName=Vorname der Kontaktperson
 Contact.followUpComment=Nachverfolgungs-Status-Kommentar
@@ -876,6 +881,7 @@ Event.eventActions=Ereignisaktionen
 Event.endDate=Enddatum
 Event.multiDayEvent=Mehrtägiges Ereignis
 Event.externalId=Externe ID
+Event.externalToken=External Token
 Event.eventTitle=Titel
 Event.eventDesc=Beschreibung
 Event.nosocomial=Nosokomial
@@ -1349,6 +1355,7 @@ Person.uuid=Person-ID
 Person.hasCovidApp=Hat COVID App
 Person.covidCodeDelivered=COVID Code wurde generiert und ausgeliefert
 Person.externalId=Externe ID
+Person.externalToken=External Token
 Person.symptomJournalStatus=Symptomtagebuch-Status
 Person.salutation=Anrede
 Person.otherSalutation=Andere Anrede

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

@@ -61,7 +61,7 @@ reportingUser=Meldender Nutzer
 about=Info
 aboutDocuments=Dokumente
 aboutSormasVersion=Version
-aboutBrandedSormasVersion=%s powered by SORMAS
+aboutBrandedSormasVersion=%s mit SORMAS betrieben
 aboutCaseClassificationRules=Falldefinitionskategorienregeln (HTML)
 aboutChangelog=Vollständiges Änderungsprotokoll
 aboutDataDictionary=Datenbeschreibungsverzeichnis (XLSX)
@@ -223,7 +223,7 @@ Campaign.description=Beschreibung
 Campaign.startDate=Startdatum
 Campaign.endDate=Enddatum
 Campaign.creatingUser=Benutzer erstellen
-Campaign.viewForms=Öffentlich
+Campaign.open=Öffnen
 Campaign.edit=Bearbeiten
 Campaign.area=Gebiet
 Campaign.region=Bundesland
@@ -311,6 +311,7 @@ CaseData.doses=Wie viele Dosen
 CaseData.epiData=Epidemiologische Daten
 CaseData.epidNumber=EPID-Nummer
 CaseData.externalID=Externe ID
+CaseData.externalToken=Aktenzeichen
 CaseData.facilityType=Art der Einrichtung
 CaseData.healthFacility=Einrichtung
 CaseData.healthFacilityDetails=Name & Beschreibung der Einrichtung
@@ -406,7 +407,6 @@ CaseData.prohibitionToWork=Tätigkeitsverbot
 CaseData.prohibitionToWorkFrom=Beginn des Tätigkeitsverbots
 CaseData.prohibitionToWorkUntil=Ende des Tätigkeitsverbots
 CaseData.reportingDistrict=Meldende/r Landkreis/Kreisfreie Stadt
-
 # CaseExport
 CaseExport.address=Adresse
 CaseExport.addressRegion=Adresse Bundesland
@@ -431,12 +431,15 @@ CaseExport.travelHistory=Reisegeschichte
 CaseExport.numberOfPrescriptions=Anzahl der Verschreibungen
 CaseExport.numberOfTreatments=Anzahl der Behandlungen
 CaseExport.numberOfClinicalVisits=Anzahl an klinischen Bewertungen
+CaseExport.sampleUuid1=Letzte Proben ID
 CaseExport.sampleDateTime1=Neueste Probe Datum Zeit
 CaseExport.sampleLab1=Labor der letzten Probe
 CaseExport.sampleResult1=Neueste Probe finales Laborergebnis
+CaseExport.sampleUuid2=Zweitletzte Proben ID
 CaseExport.sampleDateTime2=Vorletzte Probe Datum Zeit
 CaseExport.sampleLab2=Labor der vorletzten Probe
 CaseExport.sampleResult2=Vorletzte Probe finales Laborergebnis
+CaseExport.sampleUuid3=Drittletzte Proben ID
 CaseExport.sampleDateTime3=Drittletzte Probe Datum Zeit
 CaseExport.sampleLab3=Labor der drittletzten Probe
 CaseExport.sampleResult3=Drittletzte Probe finales Laborergebnis
@@ -580,6 +583,7 @@ Contact.disease=Krankheit des Indexfalls
 Contact.district=Zuständige/r Landkreis/Kreisfreie Stadt
 Contact.epiData=Epidemiologische Daten
 Contact.externalID=Externe ID
+Contact.externalToken=Aktenzeichen
 Contact.firstContactDate=Datum des ersten Kontakts
 Contact.firstName=Vorname der Kontaktperson
 Contact.followUpComment=Nachverfolgungs-Status-Kommentar
@@ -877,6 +881,7 @@ Event.eventActions=Ereignisaktionen
 Event.endDate=Enddatum
 Event.multiDayEvent=Mehrtägiges Ereignis
 Event.externalId=Externe ID
+Event.externalToken=Aktenzeichen
 Event.eventTitle=Titel
 Event.eventDesc=Beschreibung
 Event.nosocomial=Nosokomial
@@ -1031,7 +1036,7 @@ Exposure.animalContactTypeDetails=Details zur Art der Kontakts
 Exposure.contactToCase=Kontakt zum Indexfall
 Exposure.gatheringType=Art der Versammlung
 Exposure.gatheringDetails=Details zur Art der Versammlung
-Exposure.habitationType=Art der Behausung
+Exposure.habitationType=Art der Behausung/ des Aufenthalts
 Exposure.habitationDetails=Details zur Art der Behausung/ des Aufenthalts
 Exposure.typeOfAnimal=Art des Tieres
 Exposure.typeOfAnimalDetails=Details zur Art des Tieres
@@ -1329,7 +1334,7 @@ Person.occupationFacilityDetails=Name & Beschreibung der Einrichtung
 Person.occupationFacilityType=Art der Einrichtung
 Person.occupationRegion=Bundesland der Einrichtung
 Person.occupationType=Beschäftigungsart
-Person.other.occupationDetails=Bitte geben Sie Ihren Beruf an
+Person.other.occupationDetails=Beruf spezifizieren
 Person.armedForcesRelationType=Zugehörigkeit zur Bundeswehr
 Person.phone=Telefonnummer
 Person.phoneOwner=Besitzer des Telefons
@@ -1350,6 +1355,7 @@ Person.uuid=Personen-ID
 Person.hasCovidApp=Hat COVID App
 Person.covidCodeDelivered=COVID Code wurde generiert und ausgeliefert
 Person.externalId=Externe ID
+Person.externalToken=Aktenzeichen
 Person.symptomJournalStatus=Symptomtagebuch-Status
 Person.salutation=Anrede
 Person.otherSalutation=Andere Anrede

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

@@ -223,12 +223,12 @@ Campaign.description=Description
 Campaign.startDate=Start date
 Campaign.endDate=End date
 Campaign.creatingUser=Creating user
-Campaign.viewForms=Open
+Campaign.open=Open
 Campaign.edit=Edit
 Campaign.area=Region
 Campaign.region=Province
 Campaign.district=District
-Campaign.community=Community
+Campaign.community=Cluster
 
 CampaignFormData.campaign = Campaign
 CampaignFormData.campaignFormMeta = Form
@@ -311,6 +311,7 @@ CaseData.doses=How many doses
 CaseData.epiData=Epidemiological data
 CaseData.epidNumber=EPID number
 CaseData.externalID=External ID
+CaseData.externalToken=External Token
 CaseData.facilityType=Facility type
 CaseData.healthFacility=Facility
 CaseData.healthFacilityDetails=Facility name & description
@@ -430,12 +431,15 @@ CaseExport.travelHistory=Travel history
 CaseExport.numberOfPrescriptions=Number of prescriptions
 CaseExport.numberOfTreatments=Number of treatments
 CaseExport.numberOfClinicalVisits=Number of clinical assessments
+CaseExport.sampleUuid1=Latest sample uuid
 CaseExport.sampleDateTime1=Latest sample date time
 CaseExport.sampleLab1=Latest sample laboratory
 CaseExport.sampleResult1=Latest sample final laboratory result
+CaseExport.sampleUuid2=2nd latest sample uuid
 CaseExport.sampleDateTime2=2nd latest sample date time
 CaseExport.sampleLab2=2nd latest sample laboratory
 CaseExport.sampleResult2=2nd latest sample final laboratory result
+CaseExport.sampleUuid3=3rd latest sample uuid
 CaseExport.sampleDateTime3=3rd latest sample date time
 CaseExport.sampleLab3=3rd latest sample laboratory
 CaseExport.sampleResult3=3rd latest sample final laboratory result
@@ -579,6 +583,7 @@ Contact.disease=Disease of source case
 Contact.district=Responsible district
 Contact.epiData=Epidemiological data
 Contact.externalID=External ID
+Contact.externalToken=External Token
 Contact.firstContactDate=Date of first contact
 Contact.firstName=First name of contact person
 Contact.followUpComment=Follow-up status comment
@@ -876,6 +881,7 @@ Event.eventActions=Event actions
 Event.endDate=End date
 Event.multiDayEvent=Multi-day event
 Event.externalId=External ID
+Event.externalToken=External Token
 Event.eventTitle=Title
 Event.eventDesc=Description
 Event.nosocomial=Nosocomial
@@ -1349,6 +1355,7 @@ Person.uuid=Person ID
 Person.hasCovidApp=Has COVID app
 Person.covidCodeDelivered=COVID code was generated and delivered
 Person.externalId=External ID
+Person.externalToken=External Token
 Person.symptomJournalStatus=Symptom journal status
 Person.salutation=Salutation
 Person.otherSalutation=Other salutation
@@ -1905,8 +1912,8 @@ View.cases.maternalhistory=Maternal History
 View.cases.porthealthinfo=Port Health Information
 View.cases.visits=Case Visits
 
-View.configuration.communities=Communities Configuration
-View.configuration.communities.short=Communities
+View.configuration.communities=Clusters Configuration
+View.configuration.communities.short=Clusters
 View.configuration.districts=Districts Configuration
 View.configuration.districts.short=District
 View.configuration.documentTemplates=Document Templates Management