Skip to content
This repository was archived by the owner on May 5, 2021. It is now read-only.

Commit a4f2284

Browse files
author
Thomas Broyer
committed
Merge remote-tracking branch 'origin/development' into hzi_2328_document_database
Change-Id: I048dc5d29a0be97d5671e9d73163ab9dd4a320b3
2 parents 1617ff2 + 9ea67fe commit a4f2284

193 files changed

Lines changed: 18061 additions & 105 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,4 +112,7 @@ public interface ConfigFacade {
112112
boolean isExternalJournalActive();
113113

114114
int getDashboardMapMarkerLimit();
115+
116+
boolean isSmsServiceSetUp();
117+
115118
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ public CaseReferenceDto toReference() {
505505
* Returns true if the case is an original point of entry case and has not yet
506506
* been assigned a health facility.
507507
*/
508-
public boolean isUnreferredPortHealthCase() {
508+
public boolean checkIsUnreferredPortHealthCase() {
509509
return caseOrigin == CaseOrigin.POINT_OF_ENTRY && healthFacility == null;
510510
}
511511

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,8 @@ public interface Strings {
427427
String infoAddTestsToSample = "infoAddTestsToSample";
428428
String infoArchivedCases = "infoArchivedCases";
429429
String infoArchivedEvents = "infoArchivedEvents";
430+
String infoAssigneeMissingEmail = "infoAssigneeMissingEmail";
431+
String infoAssigneeMissingEmailOrPhoneNumber = "infoAssigneeMissingEmailOrPhoneNumber";
430432
String infoBAGExport = "infoBAGExport";
431433
String infoBasicExport = "infoBasicExport";
432434
String infoCalculateCompleteness = "infoCalculateCompleteness";

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

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ actionDeselectAll=Keine auswählen
9696
actionDiscard=Abbrechen
9797
actionGenerate=Erstellen
9898
actionImport=Importieren
99+
actionImportAllCountries=Import all countries
99100
actionLogout=Abmelden
100101
actionNewEntry=Neuer Eintrag
101102
actionOkay=Okay
@@ -201,6 +202,7 @@ campaignAdditionalForm=Formular hinzufügen
201202
campaignAdditionalChart=Diagramm hinzufügen
202203
campaignDashboardChart=Kampagnendaten Diagramm
203204
campaignDashboardTabName=Name des Reiters
205+
campaignDashboardSubTabName=Sub-tab name
204206
campaignDashboardChartWidth=Breite in %
205207
campaignDashboardChartHeight=Höhe in %
206208
campaignDashboardOrder=Verfügung
@@ -512,6 +514,7 @@ contactDetailedOverview=Detailliert
512514
contactFollowUpVisitsOverview=Follow-up/Nachverfolgung-Anrufe
513515
contactMinusDays=Vorheriger
514516
contactPlusDays=Weiter
517+
contactNoContactsForEventParticipant=There are no contacts for this event participant
515518
contactOnlyHighPriorityContacts=Nur Kontakte mit hoher Priorität
516519
contactChooseCase=Fall wählen
517520
contactRemoveCase=Fall entfernen
@@ -522,6 +525,7 @@ contactOnlyWithExtendedQuarantine=Nur Kontakte mit verlängerter Quarantäne
522525
contactOnlyWithReducedQuarantine=Nur Kontakte mit verkürzter Quarantäne
523526
contactInludeContactsFromOtherJurisdictions=Kontakte aus anderen Zuständigkeitsbereichen einbeziehen
524527
contactOnlyWithSharedEventWithSourceCase=Nur Kontakte, deren Indexfall mit dem spezifizierten Ereignis verknüpft ist
528+
contactOnlyWithSourceCaseInGivenEvent=Only contacts whose source case is linked to this event
525529
contactFollowUpDay=Tag
526530
contactQuarantineNotOrdered=Keine Isolation angeordnet
527531
contactCreatePIAAccount = Symptomtagebuch
@@ -953,6 +957,8 @@ Event.typeOfPlace=Art des Ortes
953957
Event.typeOfPlaceText=Anderen Veranstaltungsort angeben
954958
Event.uuid=Ereignis-ID
955959
eventNoEventLinkedToCase=Kein Ereignis mit Fall verknüpft
960+
eventNoEventLinkedToContact=No event linked to contact
961+
eventOnlyWithContactSourceCaseInvolved=Only events in which the contact's source case is involved
956962
eventLinkToCases=Fälle für dieses Ereignis ansehen
957963
eventLinkToContacts=Kontakte für dieses Ereignis ansehen
958964

@@ -972,8 +978,10 @@ EventAction.actionReplyingUser=Auf die Aktion antwortender Benutzer
972978

973979
# EventParticipant
974980
eventParticipantAddPerson=Person hinzufügen
981+
eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event
975982

976983
EventParticipant=Ereignisteilnehmer
984+
EventParticipant.contactCount=Contact count
977985
EventParticipant.event=Ereignis
978986
EventParticipant.caseUuid=Fall-ID
979987
EventParticipant.approximateAge=Alter
@@ -1345,6 +1353,14 @@ Prescription.typeOfDrug=Medikamententyp
13451353
PrescriptionExport.caseUuid=Fall-ID
13461354
PrescriptionExport.caseName=Fall Name
13471355

1356+
# Country
1357+
Country.archived=Archived
1358+
Country.externalId=External ID
1359+
Country.defaultName=Default name
1360+
Country.displayName=Name
1361+
Country.isoCode=ISO code
1362+
Country.unoCode=UNO code
1363+
13481364
# Region
13491365
regionActiveRegions=Aktive Kantone
13501366
regionArchivedRegions=Archivierte Kantone
@@ -1825,6 +1841,8 @@ View.configuration.outbreaks=Ausbrüche Einstellungen
18251841
View.configuration.outbreaks.short=Ausbrüche
18261842
View.configuration.areas=Einstellung Gebiete
18271843
View.configuration.areas.short=Gebiete
1844+
View.configuration.countries=Countries Configuration
1845+
View.configuration.countries.short=Countries
18281846
View.configuration.regions=Kantonskonfiguration
18291847
View.configuration.regions.short=Kantone
18301848
View.configuration.templates=Vorlagenkonfiguration
@@ -1955,4 +1973,4 @@ SurvnetGateway.send=an eigene SurvNet-Instanz senden
19551973
patientDiaryRegistrationError=Person konnte nicht im Symptomtagebuch registriert werden.
19561974
patientDiaryPersonNotExportable=Die Person kann nicht in das Symptomtagebuch exportiert werden. Die Person benötigt ein gültiges Geburtsdatum und entweder eine gültige Telefonnummer oder E-Mail Adresse.
19571975

1958-
showPlacesOnMap=Anzeigen
1976+
showPlacesOnMap=Anzeigen

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

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ actionDeselectAll=Keine auswählen
9696
actionDiscard=Verwerfen
9797
actionGenerate=Erstellen
9898
actionImport=Import
99+
actionImportAllCountries=Import all countries
99100
actionLogout=Abmelden
100101
actionNewEntry=Neuer Eintrag
101102
actionOkay=Okay
@@ -201,6 +202,7 @@ campaignAdditionalForm=Formular hinzufügen
201202
campaignAdditionalChart=Diagramm hinzufügen
202203
campaignDashboardChart=Kampagnendaten Diagramm
203204
campaignDashboardTabName=Name des Reiters
205+
campaignDashboardSubTabName=Sub-tab name
204206
campaignDashboardChartWidth=Breite in %
205207
campaignDashboardChartHeight=Höhe in %
206208
campaignDashboardOrder=Verfügung
@@ -512,6 +514,7 @@ contactDetailedOverview=Detailliert
512514
contactFollowUpVisitsOverview=Follow-up/Nachverfolgung-Anrufe
513515
contactMinusDays=Vorheriger
514516
contactPlusDays=Weiter
517+
contactNoContactsForEventParticipant=There are no contacts for this event participant
515518
contactOnlyHighPriorityContacts=Nur Kontakte mit hoher Priorität
516519
contactChooseCase=Fall wählen
517520
contactRemoveCase=Fall entfernen
@@ -522,6 +525,7 @@ contactOnlyWithExtendedQuarantine=Nur Kontakte mit verlängerter Quarantäne
522525
contactOnlyWithReducedQuarantine=Nur Kontakte mit verkürzter Quarantäne
523526
contactInludeContactsFromOtherJurisdictions=Kontakte aus anderen Zuständigkeitsbereichen einbeziehen
524527
contactOnlyWithSharedEventWithSourceCase=Nur Kontakte, deren Indexfall mit dem spezifizierten Ereignis verknüpft ist
528+
contactOnlyWithSourceCaseInGivenEvent=Only contacts whose source case is linked to this event
525529
contactFollowUpDay=Tag
526530
contactQuarantineNotOrdered=Keine Quarantäne verordnet
527531
contactCreatePIAAccount = Symptomtagebuch
@@ -953,6 +957,8 @@ Event.typeOfPlace=Art des Ortes
953957
Event.typeOfPlaceText=Anderen Veranstaltungsort angeben
954958
Event.uuid=Ereignis-ID
955959
eventNoEventLinkedToCase=Kein Ereignis mit Fall verknüpft
960+
eventNoEventLinkedToContact=No event linked to contact
961+
eventOnlyWithContactSourceCaseInvolved=Only events in which the contact's source case is involved
956962
eventLinkToCases=Fälle für dieses Ereignis ansehen
957963
eventLinkToContacts=Kontakte für dieses Ereignis ansehen
958964

@@ -972,8 +978,10 @@ EventAction.actionReplyingUser=Auf die Aktion reagierender Benutzer
972978

973979
# EventParticipant
974980
eventParticipantAddPerson=Person hinzufügen
981+
eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event
975982

976983
EventParticipant=Ereignisteilnehmer
984+
EventParticipant.contactCount=Contact count
977985
EventParticipant.event=Ereignis
978986
EventParticipant.caseUuid=Fall-ID
979987
EventParticipant.approximateAge=Alter
@@ -1345,6 +1353,14 @@ Prescription.typeOfDrug=Medikamententyp
13451353
PrescriptionExport.caseUuid=Fall-ID
13461354
PrescriptionExport.caseName=Fall Name
13471355

1356+
# Country
1357+
Country.archived=Archived
1358+
Country.externalId=External ID
1359+
Country.defaultName=Default name
1360+
Country.displayName=Name
1361+
Country.isoCode=ISO code
1362+
Country.unoCode=UNO code
1363+
13481364
# Region
13491365
regionActiveRegions=Aktive Bundesländer
13501366
regionArchivedRegions=Archivierte Bundesländer
@@ -1825,6 +1841,8 @@ View.configuration.outbreaks=Ausbrüche Einstellungen
18251841
View.configuration.outbreaks.short=Ausbrüche
18261842
View.configuration.areas=Gebiete-Konfiguration
18271843
View.configuration.areas.short=Gebiete
1844+
View.configuration.countries=Countries Configuration
1845+
View.configuration.countries.short=Countries
18281846
View.configuration.regions=Bundesland-Konfiguration
18291847
View.configuration.regions.short=Bundesländer
18301848
View.configuration.templates=Vorlagenkonfiguration
@@ -1955,4 +1973,4 @@ SurvnetGateway.send=an eigene SurvNet-Instanz senden
19551973
patientDiaryRegistrationError=Person konnte nicht im Symptomtagebuch registriert werden.
19561974
patientDiaryPersonNotExportable=Die Person kann nicht in das Symptomtagebuch exportiert werden. Die Person benötigt ein gültiges Geburtsdatum und entweder eine gültige Telefonnummer oder E-Mail Adresse.
19571975

1958-
showPlacesOnMap=Anzeigen
1976+
showPlacesOnMap=Anzeigen

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

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ actionDeselectAll=Deselect all
9696
actionDiscard=Discard
9797
actionGenerate=Generate
9898
actionImport=Import
99+
actionImportAllCountries=Import all countries
99100
actionLogout=Logout
100101
actionNewEntry=New entry
101102
actionOkay=Okay
@@ -201,6 +202,7 @@ campaignAdditionalForm=Add form
201202
campaignAdditionalChart=Add chart
202203
campaignDashboardChart=Campaign data chart
203204
campaignDashboardTabName=Tab name
205+
campaignDashboardSubTabName=Sub-tab name
204206
campaignDashboardChartWidth=Width in %
205207
campaignDashboardChartHeight=Height in %
206208
campaignDashboardOrder=Order
@@ -512,6 +514,7 @@ contactDetailedOverview=Detailed
512514
contactFollowUpVisitsOverview=Follow-up Visits
513515
contactMinusDays=Previous
514516
contactPlusDays=Next
517+
contactNoContactsForEventParticipant=There are no contacts for this event participant
515518
contactOnlyHighPriorityContacts=Only high priority contacts
516519
contactChooseCase=Choose Case
517520
contactRemoveCase=Remove Case
@@ -522,6 +525,7 @@ contactOnlyWithExtendedQuarantine=Only contacts with extended quarantine
522525
contactOnlyWithReducedQuarantine=Only contacts with reduced quarantine
523526
contactInludeContactsFromOtherJurisdictions=Include contacts from other jurisdictions
524527
contactOnlyWithSharedEventWithSourceCase=Only contacts with source case linked to the specified event
528+
contactOnlyWithSourceCaseInGivenEvent=Only contacts whose source case is linked to this event
525529
contactFollowUpDay=Day
526530
contactQuarantineNotOrdered=No quarantine ordered
527531
contactCreatePIAAccount = PIA
@@ -953,6 +957,8 @@ Event.typeOfPlace=Type of place
953957
Event.typeOfPlaceText=Specify other event place
954958
Event.uuid=Event ID
955959
eventNoEventLinkedToCase=No event linked to case
960+
eventNoEventLinkedToContact=No event linked to contact
961+
eventOnlyWithContactSourceCaseInvolved=Only events in which the contact's source case is involved
956962
eventLinkToCases=See cases for this event
957963
eventLinkToContacts=See contacts for this event
958964

@@ -972,8 +978,10 @@ EventAction.actionReplyingUser=Action replying user
972978

973979
# EventParticipant
974980
eventParticipantAddPerson=Add person
981+
eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event
975982

976983
EventParticipant=Event participant
984+
EventParticipant.contactCount=Contact count
977985
EventParticipant.event=Event
978986
EventParticipant.caseUuid=Case ID
979987
EventParticipant.approximateAge=Age
@@ -1345,6 +1353,14 @@ Prescription.typeOfDrug=Type of drug
13451353
PrescriptionExport.caseUuid=Case ID
13461354
PrescriptionExport.caseName=Case name
13471355

1356+
# Country
1357+
Country.archived=Archived
1358+
Country.externalId=External ID
1359+
Country.defaultName=Default name
1360+
Country.displayName=Name
1361+
Country.isoCode=ISO code
1362+
Country.unoCode=UNO code
1363+
13481364
# Region
13491365
regionActiveRegions=Active provinces
13501366
regionArchivedRegions=Archived provinces
@@ -1825,6 +1841,8 @@ View.configuration.outbreaks=Outbreaks Configuration
18251841
View.configuration.outbreaks.short=Outbreaks
18261842
View.configuration.areas=Regions Configuration
18271843
View.configuration.areas.short=Regions
1844+
View.configuration.countries=Countries Configuration
1845+
View.configuration.countries.short=Countries
18281846
View.configuration.regions=Provinces Configuration
18291847
View.configuration.regions.short=Provinces
18301848
View.configuration.templates=Templates Configuration
@@ -1955,4 +1973,4 @@ SurvnetGateway.send=send to own SurvNet instance
19551973
patientDiaryRegistrationError=Could not register person in the patient diary.
19561974
patientDiaryPersonNotExportable=Cannot export the person to the patient diary. The person needs a valid birthdate and either a valid phone number or email address.
19571975

1958-
showPlacesOnMap=Show
1976+
showPlacesOnMap=Show

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

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ actionDeselectAll=Deseleccionar todo
9696
actionDiscard=Descartar
9797
actionGenerate=Generar
9898
actionImport=Importar
99+
actionImportAllCountries=Importar todos los países
99100
actionLogout=Cerrar sesión
100101
actionNewEntry=Nueva entrada
101102
actionOkay=Ok
@@ -201,6 +202,7 @@ campaignAdditionalForm=Añadir formulario
201202
campaignAdditionalChart=Añadir gráfico
202203
campaignDashboardChart=Gráfico de datos de campaña
203204
campaignDashboardTabName=Nombre de tab
205+
campaignDashboardSubTabName=Nombre de sub-pestaña
204206
campaignDashboardChartWidth=Ancho en %
205207
campaignDashboardChartHeight=Altura en %
206208
campaignDashboardOrder=Pedido
@@ -512,6 +514,7 @@ contactDetailedOverview=Detallado
512514
contactFollowUpVisitsOverview=Visitas de seguimiento
513515
contactMinusDays=Anterior
514516
contactPlusDays=Siguiente
517+
contactNoContactsForEventParticipant=There are no contacts for this event participant
515518
contactOnlyHighPriorityContacts=Sólo contactos de alta prioridad
516519
contactChooseCase=Elegir caso
517520
contactRemoveCase=Eliminar caso
@@ -522,6 +525,7 @@ contactOnlyWithExtendedQuarantine=Sólo contactos con cuarentena extendida
522525
contactOnlyWithReducedQuarantine=Sólo contactos con cuarentena reducida
523526
contactInludeContactsFromOtherJurisdictions=Incluir contactos de otras jurisdicciones
524527
contactOnlyWithSharedEventWithSourceCase=Sólo contactos con caso de origen vinculado al evento especificado
528+
contactOnlyWithSourceCaseInGivenEvent=Only contacts whose source case is linked to this event
525529
contactFollowUpDay=Día
526530
contactQuarantineNotOrdered=No hay cuarentena ordenada
527531
contactCreatePIAAccount = PIA
@@ -953,6 +957,8 @@ Event.typeOfPlace=Tipo de lugar
953957
Event.typeOfPlaceText=Especificar otro lugar del evento
954958
Event.uuid=ID del evento
955959
eventNoEventLinkedToCase=Ningún evento vinculado al caso
960+
eventNoEventLinkedToContact=No event linked to contact
961+
eventOnlyWithContactSourceCaseInvolved=Only events in which the contact's source case is involved
956962
eventLinkToCases=Ver casos para este evento
957963
eventLinkToContacts=Ver contactos para este evento
958964

@@ -972,8 +978,10 @@ EventAction.actionReplyingUser=Acción en respuesta a usuario
972978

973979
# EventParticipant
974980
eventParticipantAddPerson=Añadir persona
981+
eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event
975982

976983
EventParticipant=Participante de evento
984+
EventParticipant.contactCount=Contact count
977985
EventParticipant.event=Evento
978986
EventParticipant.caseUuid=ID de caso
979987
EventParticipant.approximateAge=Edad
@@ -1345,6 +1353,14 @@ Prescription.typeOfDrug=Tipo de medicamento
13451353
PrescriptionExport.caseUuid=ID del caso
13461354
PrescriptionExport.caseName=Nombre del caso
13471355

1356+
# Country
1357+
Country.archived=Archivado
1358+
Country.externalId=ID externa
1359+
Country.defaultName=Nombre por defecto
1360+
Country.displayName=Nombre
1361+
Country.isoCode=Código ISO
1362+
Country.unoCode=Código UNO
1363+
13481364
# Region
13491365
regionActiveRegions=Provincias activas
13501366
regionArchivedRegions=Provincias archivadas
@@ -1825,6 +1841,8 @@ View.configuration.outbreaks=Configuración de brotes
18251841
View.configuration.outbreaks.short=Brotes
18261842
View.configuration.areas=Configuración de zonas
18271843
View.configuration.areas.short=Zonas
1844+
View.configuration.countries=Configuración de países
1845+
View.configuration.countries.short=Países
18281846
View.configuration.regions=Configuración de provincias
18291847
View.configuration.regions.short=Provincias
18301848
View.configuration.templates=Configuración de plantillas
@@ -1955,4 +1973,4 @@ SurvnetGateway.send=enviar a instancia de SurvNet propia
19551973
patientDiaryRegistrationError=No se pudo registrar a la persona en el diario de pacientes.
19561974
patientDiaryPersonNotExportable=No se puede exportar la persona al diario de pacientes. La persona necesita una fecha de nacimiento válida y un número telefónico o dirección de correo electrónico válidos.
19571975

1958-
showPlacesOnMap=Mostrar
1976+
showPlacesOnMap=Mostrar

0 commit comments

Comments
 (0)