From ec890228ebb99c62191d7f9ab40b52bc9ab1f415 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Wed, 18 Feb 2026 14:38:15 +0100 Subject: [PATCH 001/134] IMPLEMENTS: #13832: External Survey Integration (NgSurvey). --- .../externalmessage/ExternalMessageType.java | 3 +- .../symeda/sormas/api/survey/SurveyDto.java | 11 ++ .../sormas/api/survey/SurveyTokenDto.java | 10 ++ .../ExternalSurveyProviderFacade.java | 11 ++ .../external/views/ExternalSurveyView.java | 79 +++++++++ .../external/views/QuestionAnswersView.java | 165 ++++++++++++++++++ .../symeda/sormas/backend/survey/Survey.java | 10 ++ .../sormas/backend/survey/SurveyToken.java | 11 ++ .../main/resources/sql/sormas_schema_next.sql | 10 ++ .../sormas/ui/survey/SurveyDataForm.java | 18 +- .../sormas/ui/survey/SurveyTokenDataForm.java | 1 + 11 files changed, 319 insertions(+), 10 deletions(-) create mode 100644 sormas-api/src/main/java/de/symeda/sormas/api/survey/external/ExternalSurveyProviderFacade.java create mode 100644 sormas-api/src/main/java/de/symeda/sormas/api/survey/external/views/ExternalSurveyView.java create mode 100644 sormas-api/src/main/java/de/symeda/sormas/api/survey/external/views/QuestionAnswersView.java create mode 100644 sormas-backend/src/main/resources/sql/sormas_schema_next.sql diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageType.java b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageType.java index 2a8eb1f1502..af77fc3e659 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageType.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageType.java @@ -5,7 +5,8 @@ public enum ExternalMessageType { LAB_MESSAGE, - PHYSICIANS_REPORT; + PHYSICIANS_REPORT, + SURVEY_RESPONSE; @Override public String toString() { diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/survey/SurveyDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/survey/SurveyDto.java index fa61b595833..d7b71a818d3 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/survey/SurveyDto.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/survey/SurveyDto.java @@ -40,6 +40,8 @@ public class SurveyDto extends EntityDto { public static final String NAME = "name"; + public static final String EXTERNAL_ID = "externalId"; + @NotBlank(message = Validations.requiredField) @Size(max = FieldConstraints.CHARACTER_LIMIT_SMALL, message = Validations.textTooLong) private String name; @@ -47,6 +49,7 @@ public class SurveyDto extends EntityDto { private Disease disease; private DocumentTemplateReferenceDto documentTemplate; private DocumentTemplateReferenceDto emailTemplate; + private String externalId; public static SurveyDto build() { SurveyDto survey = new SurveyDto(); @@ -90,4 +93,12 @@ public void setEmailTemplate(DocumentTemplateReferenceDto emailTemplate) { public SurveyReferenceDto toReference() { return new SurveyReferenceDto(getUuid(), getName()); } + + public String getExternalId() { + return externalId; + } + + public void setExternalId(String externalId) { + this.externalId = externalId; + } } diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/survey/SurveyTokenDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/survey/SurveyTokenDto.java index d67306abec1..6426a435682 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/survey/SurveyTokenDto.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/survey/SurveyTokenDto.java @@ -44,6 +44,7 @@ public class SurveyTokenDto extends EntityDto { public static final String GENERATED_DOCUMENT = "generatedDocument"; public static final String RESPONSE_RECEIVED = "responseReceived"; public static final String RESPONSE_RECEIVED_DATE = "responseReceivedDate"; + public static final String EXTERNAL_RESPONDENT_ID = "externalRespondentId"; @NotNull(message = Validations.requiredField) private SurveyReferenceDto survey; @@ -57,6 +58,7 @@ public class SurveyTokenDto extends EntityDto { private DocumentReferenceDto generatedDocument; private boolean responseReceived; private Date responseReceivedDate; + private String externalRespondentId; public static SurveyTokenDto build() { SurveyTokenDto token = new SurveyTokenDto(); @@ -140,4 +142,12 @@ public void setResponseReceivedDate(Date responseReceivedDate) { public SurveyTokenReferenceDto toReference() { return new SurveyTokenReferenceDto(getUuid()); } + + public String getExternalRespondentId() { + return externalRespondentId; + } + + public void setExternalRespondentId(String externalRespondentId) { + this.externalRespondentId = externalRespondentId; + } } diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/ExternalSurveyProviderFacade.java b/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/ExternalSurveyProviderFacade.java new file mode 100644 index 00000000000..79858a71486 --- /dev/null +++ b/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/ExternalSurveyProviderFacade.java @@ -0,0 +1,11 @@ +package de.symeda.sormas.api.survey.external; + +import de.symeda.sormas.api.survey.external.views.ExternalSurveyView; + +/** + * To avoid integrating a specific survey-tool integration within SORMAS, this contract was specified to stay tool-agnostic. + */ +public interface ExternalSurveyProviderFacade { + + ExternalSurveyView getExternalSurveyView(String externalSurveyId, String externalRespondentId); +} diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/views/ExternalSurveyView.java b/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/views/ExternalSurveyView.java new file mode 100644 index 00000000000..3be1fdc3986 --- /dev/null +++ b/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/views/ExternalSurveyView.java @@ -0,0 +1,79 @@ +package de.symeda.sormas.api.survey.external.views; + +import java.util.List; + +/** + * View used to display + */ +public class ExternalSurveyView { + + private List questionAnswersViews; + + ExternalSurveyView(List questionAnswersViews) { + this.questionAnswersViews = questionAnswersViews; + } + + public static SurveyViewBuilder builder() { + return new SurveyViewBuilder(); + } + + public List getQuestionAnswersViews() { + return this.questionAnswersViews; + } + + public void setQuestionAnswersViews(List questionAnswersViews) { + this.questionAnswersViews = questionAnswersViews; + } + + public boolean equals(final Object o) { + if (o == this) + return true; + if (!(o instanceof ExternalSurveyView)) + return false; + final ExternalSurveyView other = (ExternalSurveyView) o; + if (!other.canEqual((Object) this)) + return false; + final Object this$questionAnswersViews = this.getQuestionAnswersViews(); + final Object other$questionAnswersViews = other.getQuestionAnswersViews(); + if (this$questionAnswersViews == null ? other$questionAnswersViews != null : !this$questionAnswersViews.equals(other$questionAnswersViews)) + return false; + return true; + } + + protected boolean canEqual(final Object other) { + return other instanceof ExternalSurveyView; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $questionAnswersViews = this.getQuestionAnswersViews(); + result = result * PRIME + ($questionAnswersViews == null ? 43 : $questionAnswersViews.hashCode()); + return result; + } + + public String toString() { + return "SurveyView(questionAnswersViews=" + this.getQuestionAnswersViews() + ")"; + } + + public static class SurveyViewBuilder { + + private List questionAnswersViews; + + SurveyViewBuilder() { + } + + public SurveyViewBuilder questionAnswersViews(List questionAnswersViews) { + this.questionAnswersViews = questionAnswersViews; + return this; + } + + public ExternalSurveyView build() { + return new ExternalSurveyView(this.questionAnswersViews); + } + + public String toString() { + return "SurveyView.SurveyViewBuilder(questionAnswersViews=" + this.questionAnswersViews + ")"; + } + } +} diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/views/QuestionAnswersView.java b/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/views/QuestionAnswersView.java new file mode 100644 index 00000000000..bc4840defb7 --- /dev/null +++ b/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/views/QuestionAnswersView.java @@ -0,0 +1,165 @@ +package de.symeda.sormas.api.survey.external.views; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + +import javax.annotation.Nullable; +import javax.validation.constraints.NotNull; + +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public class QuestionAnswersView { + + @NotNull + private String question; + + @Nullable + private String answer; + + /** + * Some questions can be grouped together. + * Example: PersonalInfo: + * - PhoneNumber + * - Email + */ + private List subquestions = new ArrayList<>(); + + public QuestionAnswersView(@NotNull String question, @Nullable String answer, List subquestions) { + this.question = question; + this.answer = answer; + this.subquestions = subquestions; + } + + public QuestionAnswersView() { + } + + private static List $default$subquestions() { + return new ArrayList<>(); + } + + public static QuestionAnswersViewBuilder builder() { + return new QuestionAnswersViewBuilder(); + } + + public String getQuestion() { + return Optional.ofNullable(question).filter(StringUtils::isNotBlank).orElse(answer); + } + + @Nullable + public String getAnswer() { + if (CollectionUtils.isNotEmpty(subquestions)) { + return answer; + } + + return Optional.ofNullable(answer).filter(StringUtils::isNotBlank).orElse(question); + } + + @JsonProperty("singleIdentifier") + public boolean singleIdentifier() { + return StringUtils.equals(getQuestion(), getAnswer()); + } + + public List getSubquestions() { + return this.subquestions; + } + + public void setQuestion(@NotNull String question) { + this.question = question; + } + + public void setAnswer(@Nullable String answer) { + this.answer = answer; + } + + public void setSubquestions(List subquestions) { + this.subquestions = subquestions; + } + + public boolean equals(final Object o) { + if (o == this) + return true; + if (!(o instanceof QuestionAnswersView)) + return false; + final QuestionAnswersView other = (QuestionAnswersView) o; + if (!other.canEqual((Object) this)) + return false; + final Object this$question = this.getQuestion(); + final Object other$question = other.getQuestion(); + if (this$question == null ? other$question != null : !this$question.equals(other$question)) + return false; + final Object this$answer = this.getAnswer(); + final Object other$answer = other.getAnswer(); + if (this$answer == null ? other$answer != null : !this$answer.equals(other$answer)) + return false; + final Object this$subquestions = this.getSubquestions(); + final Object other$subquestions = other.getSubquestions(); + if (this$subquestions == null ? other$subquestions != null : !this$subquestions.equals(other$subquestions)) + return false; + return true; + } + + protected boolean canEqual(final Object other) { + return other instanceof QuestionAnswersView; + } + + public int hashCode() { + final int PRIME = 59; + int result = 1; + final Object $question = this.getQuestion(); + result = result * PRIME + ($question == null ? 43 : $question.hashCode()); + final Object $answer = this.getAnswer(); + result = result * PRIME + ($answer == null ? 43 : $answer.hashCode()); + final Object $subquestions = this.getSubquestions(); + result = result * PRIME + ($subquestions == null ? 43 : $subquestions.hashCode()); + return result; + } + + public String toString() { + return "QuestionAnswersView(question=" + this.getQuestion() + ", answer=" + this.getAnswer() + ", subquestions=" + this.getSubquestions() + + ")"; + } + + public static class QuestionAnswersViewBuilder { + + private @NotNull String question; + private String answer; + private List subquestions$value; + private boolean subquestions$set; + + QuestionAnswersViewBuilder() { + } + + public QuestionAnswersViewBuilder question(@NotNull String question) { + this.question = question; + return this; + } + + public QuestionAnswersViewBuilder answer(@Nullable String answer) { + this.answer = answer; + return this; + } + + public QuestionAnswersViewBuilder subquestions(List subquestions) { + this.subquestions$value = subquestions; + this.subquestions$set = true; + return this; + } + + public QuestionAnswersView build() { + List subquestions$value = this.subquestions$value; + if (!this.subquestions$set) { + subquestions$value = QuestionAnswersView.$default$subquestions(); + } + return new QuestionAnswersView(this.question, this.answer, subquestions$value); + } + + public String toString() { + return "QuestionAnswersView.QuestionAnswersViewBuilder(question=" + this.question + ", answer=" + this.answer + ", subquestions$value=" + + this.subquestions$value + ")"; + } + } +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/Survey.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/Survey.java index fab0d9c144b..72734809718 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/Survey.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/Survey.java @@ -41,6 +41,7 @@ public class Survey extends AbstractDomainObject { private Disease disease; private DocumentTemplate documentTemplate; private DocumentTemplate emailTemplate; + private String externalId; @Column(nullable = false, length = FieldConstraints.CHARACTER_LIMIT_DEFAULT) public String getName() { @@ -77,4 +78,13 @@ public DocumentTemplate getEmailTemplate() { public void setEmailTemplate(DocumentTemplate emailTemplate) { this.emailTemplate = emailTemplate; } + + @Column(nullable = false, length = FieldConstraints.CHARACTER_LIMIT_DEFAULT) + public String getExternalId() { + return externalId; + } + + public void setExternalId(String externalId) { + this.externalId = externalId; + } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyToken.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyToken.java index 37f5dc97d7b..ed7b943e4ed 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyToken.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyToken.java @@ -43,6 +43,7 @@ public class SurveyToken extends AbstractDomainObject { public static final String RESPONSE_RECEIVED = "responseReceived"; public static final String GENERATED_DOCUMENT = "generatedDocument"; public static final String RESPONSE_RECEIVED_DATE = "responseReceivedDate"; + public static final String EXTERNAL_RESPONDENT_ID = "externalRespondentId"; private String token; private Survey survey; @@ -52,6 +53,7 @@ public class SurveyToken extends AbstractDomainObject { private Document generatedDocument; private boolean responseReceived; private Date responseReceivedDate; + private String externalRespondentId; @Column(nullable = false, length = FieldConstraints.CHARACTER_LIMIT_SMALL) public String getToken() { @@ -124,4 +126,13 @@ public Date getResponseReceivedDate() { public void setResponseReceivedDate(Date responseReceivedDate) { this.responseReceivedDate = responseReceivedDate; } + + @Column(length = FieldConstraints.CHARACTER_LIMIT_UUID_MAX) + public String getExternalRespondentId() { + return externalRespondentId; + } + + public void setExternalRespondentId(String externalRespondentId) { + this.externalRespondentId = externalRespondentId; + } } diff --git a/sormas-backend/src/main/resources/sql/sormas_schema_next.sql b/sormas-backend/src/main/resources/sql/sormas_schema_next.sql new file mode 100644 index 00000000000..6cf8fa3a570 --- /dev/null +++ b/sormas-backend/src/main/resources/sql/sormas_schema_next.sql @@ -0,0 +1,10 @@ +-- TODO: meant to be merged into sormas_schema.sql - used to avoid conflicts with development branch + +-- Add fields used for +ALTER TABLE surveys + ADD COLUMN external_survey_id TEXT; +ALTER TABLE surveytokens + ADD COLUMN external_respondent_id TEXT; + +INSERT INTO schema_version (version_number, comment) +VALUES (609, '#13832 - External Survey facade'); \ No newline at end of file diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/survey/SurveyDataForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/survey/SurveyDataForm.java index f0a3cfb5f09..69fc6aeee4c 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/survey/SurveyDataForm.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/survey/SurveyDataForm.java @@ -43,21 +43,21 @@ protected void addFields() { addField(SurveyDto.SURVEY_NAME, TextField.class); + addField(SurveyDto.EXTERNAL_ID, TextField.class); + DocumentTemplateSection documentTemplateSection = new DocumentTemplateSection( - new DocumentTemplateCriteria(DocumentWorkflow.SURVEY_DOCUMENT, null, surveyReference), - false, - new SurveyDocumentTemplateReceiver(DocumentWorkflow.SURVEY_DOCUMENT, surveyReference)); + new DocumentTemplateCriteria(DocumentWorkflow.SURVEY_DOCUMENT, null, surveyReference), + false, + new SurveyDocumentTemplateReceiver(DocumentWorkflow.SURVEY_DOCUMENT, surveyReference)); DocumentTemplateSection emailTemplateSection = new DocumentTemplateSection( - new DocumentTemplateCriteria(DocumentWorkflow.SURVEY_EMAIL, null, surveyReference), - false, - new SurveyEmailTemplateReceiver(DocumentWorkflow.SURVEY_EMAIL, surveyReference)); + new DocumentTemplateCriteria(DocumentWorkflow.SURVEY_EMAIL, null, surveyReference), + false, + new SurveyEmailTemplateReceiver(DocumentWorkflow.SURVEY_EMAIL, surveyReference)); documentTemplateSection.setMargin(false); emailTemplateSection.setMargin(false); - gridLayout = new VerticalLayout( - documentTemplateSection, - emailTemplateSection); + gridLayout = new VerticalLayout(documentTemplateSection, emailTemplateSection); gridLayout.setWidth(100, Unit.PERCENTAGE); gridLayout.setMargin(new MarginInfo(true, false, true, false)); diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/survey/SurveyTokenDataForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/survey/SurveyTokenDataForm.java index 9b386ac077c..2309152a5a4 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/survey/SurveyTokenDataForm.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/survey/SurveyTokenDataForm.java @@ -55,6 +55,7 @@ protected void addFields() { addField(SurveyTokenDto.RECIPIENT_EMAIL).setReadOnly(true); addField(SurveyTokenDto.RESPONSE_RECEIVED).addStyleName(CssStyles.FORCE_CAPTION); addField(SurveyTokenDto.RESPONSE_RECEIVED_DATE); + addField(SurveyTokenDto.EXTERNAL_RESPONDENT_ID).setReadOnly(true); FieldHelper.setVisibleWhen(getFieldGroup(), SurveyTokenDto.RESPONSE_RECEIVED_DATE, SurveyTokenDto.RESPONSE_RECEIVED, true, true); } From ad4c38f80f276594d9ebc8b81144440ae1699f10 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Wed, 18 Feb 2026 14:41:27 +0100 Subject: [PATCH 002/134] missing translation message --- sormas-api/src/main/resources/enum.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/sormas-api/src/main/resources/enum.properties b/sormas-api/src/main/resources/enum.properties index 540aa615de2..9d84305dd1a 100644 --- a/sormas-api/src/main/resources/enum.properties +++ b/sormas-api/src/main/resources/enum.properties @@ -2480,6 +2480,7 @@ ExternalMessageStatus.UNCLEAR=Unclear # ExternalMessageType ExternalMessageType.LAB_MESSAGE=Lab message ExternalMessageType.PHYSICIANS_REPORT=Physician's report +ExternalMessageType.SURVEY_RESPONSE=Survey response # ShareRequestDataType ShareRequestDataType.CASE = Case From 37a496089f082c273138cd7db880ce09c8b7a309 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Thu, 19 Feb 2026 09:05:03 +0100 Subject: [PATCH 003/134] prepared patch-api --- .../sormas/api/patch/DataPatchFailure.java | 58 +++++++ .../api/patch/DataPatchFailureCause.java | 24 +++ .../sormas/api/patch/DataPatchRequest.java | 61 ++++++++ .../sormas/api/patch/DataPatchResponse.java | 59 ++++++++ .../symeda/sormas/api/patch/DataPatcher.java | 13 ++ .../sormas/api/patch/DataReplacementType.java | 6 + .../sormas/api/patch/EmptyValueBehavior.java | 9 ++ .../java/de/symeda/sormas/api/patch/TODO.md | 2 + .../external/SurveyAnswerPatchRequest.java | 141 ++++++++++++++++++ .../external/views/ExternalSurveyView.java | 66 +------- .../external/views/QuestionAnswersView.java | 137 ++--------------- 11 files changed, 393 insertions(+), 183 deletions(-) create mode 100644 sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailure.java create mode 100644 sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java create mode 100644 sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchRequest.java create mode 100644 sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchResponse.java create mode 100644 sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatcher.java create mode 100644 sormas-api/src/main/java/de/symeda/sormas/api/patch/DataReplacementType.java create mode 100644 sormas-api/src/main/java/de/symeda/sormas/api/patch/EmptyValueBehavior.java create mode 100644 sormas-api/src/main/java/de/symeda/sormas/api/patch/TODO.md create mode 100644 sormas-api/src/main/java/de/symeda/sormas/api/survey/external/SurveyAnswerPatchRequest.java diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailure.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailure.java new file mode 100644 index 00000000000..bd2aae6fd5a --- /dev/null +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailure.java @@ -0,0 +1,58 @@ +package de.symeda.sormas.api.patch; + +public class DataPatchFailure { + + private DataPatchFailureCause dataPatchFailureCause; + + private String fieldName; + + private Object existingFieldValue; + private Object providedFieldValue; + + private String description; + + public DataPatchFailureCause getDataPatchFailureCause() { + return dataPatchFailureCause; + } + + public DataPatchFailure setDataPatchFailureCause(DataPatchFailureCause dataPatchFailureCause) { + this.dataPatchFailureCause = dataPatchFailureCause; + return this; + } + + public String getFieldName() { + return fieldName; + } + + public DataPatchFailure setFieldName(String fieldName) { + this.fieldName = fieldName; + return this; + } + + public Object getExistingFieldValue() { + return existingFieldValue; + } + + public DataPatchFailure setExistingFieldValue(Object existingFieldValue) { + this.existingFieldValue = existingFieldValue; + return this; + } + + public Object getProvidedFieldValue() { + return providedFieldValue; + } + + public DataPatchFailure setProvidedFieldValue(Object providedFieldValue) { + this.providedFieldValue = providedFieldValue; + return this; + } + + public String getDescription() { + return description; + } + + public DataPatchFailure setDescription(String description) { + this.description = description; + return this; + } +} diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java new file mode 100644 index 00000000000..e3d5c97ba1a --- /dev/null +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java @@ -0,0 +1,24 @@ +package de.symeda.sormas.api.patch; + +public enum DataPatchFailureCause { + /** + * Invalid field name was provided that cannot be matched with an existing field. + */ + FIELD_DOES_NOT_EXIST, + + /** + * Might occur if following patch config was used: {@link DataReplacementType#IF_NOT_ALREADY_PRESENT}. + */ + CURRENT_VALUE_NOT_OVERRIDDEN, + + /** + * Example: Expected number but got "a". + */ + INVALID_VALUE_TYPE, + + /** + * This means there is a hole in the implementation. + */ + TECHNICAL + +} diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchRequest.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchRequest.java new file mode 100644 index 00000000000..bdf089bfa15 --- /dev/null +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchRequest.java @@ -0,0 +1,61 @@ +package de.symeda.sormas.api.patch; + +import java.util.Map; + +import javax.validation.constraints.NotNull; + +import de.symeda.sormas.api.info.InfoFacade; + +public class DataPatchRequest { + + @NotNull + private String caseUuid; + + @NotNull + private DataReplacementType replacementType = DataReplacementType.IF_NOT_ALREADY_PRESENT; + + private EmptyValueBehavior emptyValueBehavior = EmptyValueBehavior.IGNORE; + + /** + * Key are those from with root being the {@link de.symeda.sormas.api.caze.CaseDataDto}. + * The accepted fields are those from {@link InfoFacade#generateDataDictionary()}. + */ + @NotNull + private Map patchDictionary; + + public String getCaseUuid() { + return caseUuid; + } + + public DataPatchRequest setCaseUuid(String caseUuid) { + this.caseUuid = caseUuid; + return this; + } + + public DataReplacementType getReplacementType() { + return replacementType; + } + + public DataPatchRequest setReplacementType(DataReplacementType replacementType) { + this.replacementType = replacementType; + return this; + } + + public Map getPatchDictionary() { + return patchDictionary; + } + + public DataPatchRequest setPatchDictionary(Map patchDictionary) { + this.patchDictionary = patchDictionary; + return this; + } + + public EmptyValueBehavior getEmptyValueBehavior() { + return emptyValueBehavior; + } + + public DataPatchRequest setEmptyValueBehavior(EmptyValueBehavior emptyValueBehavior) { + this.emptyValueBehavior = emptyValueBehavior; + return this; + } +} diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchResponse.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchResponse.java new file mode 100644 index 00000000000..225da5e11db --- /dev/null +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchResponse.java @@ -0,0 +1,59 @@ +package de.symeda.sormas.api.patch; + +import java.util.HashMap; +import java.util.Map; + +import org.apache.commons.collections4.MapUtils; + +/** + * + */ +public class DataPatchResponse { + + /** + * Actual patched values for the specified keys. + * Will NOT contain fields that were NOT patched (even though passed in original patchDictionary). + */ + private Map patchDictionary = new HashMap<>(); + + /** + * Provides + */ + private Map failures = new HashMap<>(); + + public Map getPatchDictionary() { + return patchDictionary; + } + + public DataPatchResponse setPatchDictionary(Map patchDictionary) { + this.patchDictionary = patchDictionary; + return this; + } + + public Map getFailures() { + return failures; + } + + public DataPatchResponse setFailures(Map failures) { + this.failures = failures; + return this; + } + + /** + * True means data was patched on SORMAS entities, false means nothing was changed. + * + * @return boolean to indicate if data was patched: operation was a success. + */ + public boolean patched() { + return !failed(); + } + + /** + * Patch are atomic operations: either fully or not at all. + * + * @return true if operation was NOT applied, else false. + */ + public boolean failed() { + return MapUtils.isNotEmpty(failures); + } +} diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatcher.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatcher.java new file mode 100644 index 00000000000..65029218738 --- /dev/null +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatcher.java @@ -0,0 +1,13 @@ +package de.symeda.sormas.api.patch; + +public interface DataPatcher { + + /** + * Allow patching data for a specific case. + * + * @param request + * instructions for the data patch + * @return response that indicates + */ + DataPatchResponse patch(DataPatchRequest request); +} diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataReplacementType.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataReplacementType.java new file mode 100644 index 00000000000..c7e2b48fe2f --- /dev/null +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataReplacementType.java @@ -0,0 +1,6 @@ +package de.symeda.sormas.api.patch; + +public enum DataReplacementType { + ALWAYS, + IF_NOT_ALREADY_PRESENT +} diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/EmptyValueBehavior.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/EmptyValueBehavior.java new file mode 100644 index 00000000000..7369de2ae1f --- /dev/null +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/EmptyValueBehavior.java @@ -0,0 +1,9 @@ +package de.symeda.sormas.api.patch; + +/** + * Defines how Empty values: null or "" (empty string) should be taken into account during patch operation. + */ +public enum EmptyValueBehavior { + IGNORE, + REPLACE +} diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/TODO.md b/sormas-api/src/main/java/de/symeda/sormas/api/patch/TODO.md new file mode 100644 index 00000000000..8f1cece1cff --- /dev/null +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/TODO.md @@ -0,0 +1,2 @@ +# TODO: + diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/SurveyAnswerPatchRequest.java b/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/SurveyAnswerPatchRequest.java new file mode 100644 index 00000000000..c4c9637a45e --- /dev/null +++ b/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/SurveyAnswerPatchRequest.java @@ -0,0 +1,141 @@ +package de.symeda.sormas.api.survey.external; + +import java.time.OffsetDateTime; +import java.util.Map; + +import javax.validation.constraints.NotNull; + +import de.symeda.sormas.api.patch.DataReplacementType; +import de.symeda.sormas.api.patch.EmptyValueBehavior; + +/** + * Request sent to SORMAS to update the information. + */ +public class SurveyAnswerPatchRequest { + + @NotNull + private String surveyId; + + @NotNull + private String token; + + @NotNull + private String respondentId; + + @NotNull + private OffsetDateTime answerDate; + + @NotNull + private DataReplacementType dataReplacementType = DataReplacementType.IF_NOT_ALREADY_PRESENT; + + @NotNull + private EmptyValueBehavior emptyValueBehavior = EmptyValueBehavior.IGNORE; + + /** + * Key is a field to replace and value is the actual value that will be replaced. + *

+ * Values will be applied according to the dataReplacementType. + */ + @NotNull + private Map patchDictionary; + + /** + * Could imagine that the cron in addition to the webhook could process elements twice. + * Set to false to force a refresh: data etc. + */ + private boolean skipIfAlreadyProcessed = true; + + /** + * In case 1 or more fields cannot be mapped, should the entire patch fail (nothing applied). + * True: means will not be applied in case of error, false: patching will still be applied. + */ + private boolean failOnError = false; + + public String getSurveyId() { + return surveyId; + } + + public SurveyAnswerPatchRequest setSurveyId(String surveyId) { + this.surveyId = surveyId; + return this; + } + + public String getToken() { + return token; + } + + public SurveyAnswerPatchRequest setToken(String token) { + this.token = token; + return this; + } + + public String getRespondentId() { + return respondentId; + } + + public SurveyAnswerPatchRequest setRespondentId(String respondentId) { + this.respondentId = respondentId; + return this; + } + + public OffsetDateTime getAnswerDate() { + return answerDate; + } + + public SurveyAnswerPatchRequest setAnswerDate(OffsetDateTime answerDate) { + this.answerDate = answerDate; + return this; + } + + public DataReplacementType getDataReplacementType() { + return dataReplacementType; + } + + public SurveyAnswerPatchRequest setDataReplacementType(DataReplacementType dataReplacementType) { + this.dataReplacementType = dataReplacementType; + return this; + } + + public EmptyValueBehavior getEmptyValueBehavior() { + return emptyValueBehavior; + } + + public SurveyAnswerPatchRequest setEmptyValueBehavior(EmptyValueBehavior emptyValueBehavior) { + this.emptyValueBehavior = emptyValueBehavior; + return this; + } + + public Map getPatchDictionary() { + return patchDictionary; + } + + public SurveyAnswerPatchRequest setPatchDictionary(Map patchDictionary) { + this.patchDictionary = patchDictionary; + return this; + } + + public boolean isSkipIfAlreadyProcessed() { + return skipIfAlreadyProcessed; + } + + public SurveyAnswerPatchRequest setSkipIfAlreadyProcessed(boolean skipIfAlreadyProcessed) { + this.skipIfAlreadyProcessed = skipIfAlreadyProcessed; + return this; + } + + public boolean isFailOnError() { + return failOnError; + } + + public SurveyAnswerPatchRequest setFailOnError(boolean failOnError) { + this.failOnError = failOnError; + return this; + } + + @Override + public String toString() { + return "SurveyAnswerPatchRequest{" + "surveyId='" + surveyId + '\'' + ", token='" + token + '\'' + ", respondentId='" + respondentId + '\'' + + ", answerDate=" + answerDate + ", dataReplacementType=" + dataReplacementType + ", emptyValueBehavior=" + emptyValueBehavior + + ", patchDictionary=" + patchDictionary + ", skipIfAlreadyProcessed=" + skipIfAlreadyProcessed + ", failOnError=" + failOnError + '}'; + } +} diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/views/ExternalSurveyView.java b/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/views/ExternalSurveyView.java index 3be1fdc3986..8df8fe9f80a 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/views/ExternalSurveyView.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/views/ExternalSurveyView.java @@ -3,77 +3,23 @@ import java.util.List; /** - * View used to display + * View used to display an external Survey in an tool-agnostic manner. */ public class ExternalSurveyView { private List questionAnswersViews; - ExternalSurveyView(List questionAnswersViews) { - this.questionAnswersViews = questionAnswersViews; - } - - public static SurveyViewBuilder builder() { - return new SurveyViewBuilder(); - } - public List getQuestionAnswersViews() { - return this.questionAnswersViews; + return questionAnswersViews; } - public void setQuestionAnswersViews(List questionAnswersViews) { + public ExternalSurveyView setQuestionAnswersViews(List questionAnswersViews) { this.questionAnswersViews = questionAnswersViews; + return this; } - public boolean equals(final Object o) { - if (o == this) - return true; - if (!(o instanceof ExternalSurveyView)) - return false; - final ExternalSurveyView other = (ExternalSurveyView) o; - if (!other.canEqual((Object) this)) - return false; - final Object this$questionAnswersViews = this.getQuestionAnswersViews(); - final Object other$questionAnswersViews = other.getQuestionAnswersViews(); - if (this$questionAnswersViews == null ? other$questionAnswersViews != null : !this$questionAnswersViews.equals(other$questionAnswersViews)) - return false; - return true; - } - - protected boolean canEqual(final Object other) { - return other instanceof ExternalSurveyView; - } - - public int hashCode() { - final int PRIME = 59; - int result = 1; - final Object $questionAnswersViews = this.getQuestionAnswersViews(); - result = result * PRIME + ($questionAnswersViews == null ? 43 : $questionAnswersViews.hashCode()); - return result; - } - + @Override public String toString() { - return "SurveyView(questionAnswersViews=" + this.getQuestionAnswersViews() + ")"; - } - - public static class SurveyViewBuilder { - - private List questionAnswersViews; - - SurveyViewBuilder() { - } - - public SurveyViewBuilder questionAnswersViews(List questionAnswersViews) { - this.questionAnswersViews = questionAnswersViews; - return this; - } - - public ExternalSurveyView build() { - return new ExternalSurveyView(this.questionAnswersViews); - } - - public String toString() { - return "SurveyView.SurveyViewBuilder(questionAnswersViews=" + this.questionAnswersViews + ")"; - } + return "ExternalSurveyView{" + "questionAnswersViews=" + questionAnswersViews + '}'; } } diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/views/QuestionAnswersView.java b/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/views/QuestionAnswersView.java index bc4840defb7..c907c73ca8e 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/views/QuestionAnswersView.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/views/QuestionAnswersView.java @@ -2,16 +2,10 @@ import java.util.ArrayList; import java.util.List; -import java.util.Optional; import javax.annotation.Nullable; import javax.validation.constraints.NotNull; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; - -import com.fasterxml.jackson.annotation.JsonProperty; - public class QuestionAnswersView { @NotNull @@ -28,138 +22,35 @@ public class QuestionAnswersView { */ private List subquestions = new ArrayList<>(); - public QuestionAnswersView(@NotNull String question, @Nullable String answer, List subquestions) { - this.question = question; - this.answer = answer; - this.subquestions = subquestions; - } - - public QuestionAnswersView() { - } - - private static List $default$subquestions() { - return new ArrayList<>(); - } - - public static QuestionAnswersViewBuilder builder() { - return new QuestionAnswersViewBuilder(); + public String getQuestion() { + return question; } - public String getQuestion() { - return Optional.ofNullable(question).filter(StringUtils::isNotBlank).orElse(answer); + public QuestionAnswersView setQuestion(String question) { + this.question = question; + return this; } - @Nullable public String getAnswer() { - if (CollectionUtils.isNotEmpty(subquestions)) { - return answer; - } - - return Optional.ofNullable(answer).filter(StringUtils::isNotBlank).orElse(question); + return answer; } - @JsonProperty("singleIdentifier") - public boolean singleIdentifier() { - return StringUtils.equals(getQuestion(), getAnswer()); + public QuestionAnswersView setAnswer(String answer) { + this.answer = answer; + return this; } public List getSubquestions() { - return this.subquestions; - } - - public void setQuestion(@NotNull String question) { - this.question = question; + return subquestions; } - public void setAnswer(@Nullable String answer) { - this.answer = answer; - } - - public void setSubquestions(List subquestions) { + public QuestionAnswersView setSubquestions(List subquestions) { this.subquestions = subquestions; + return this; } - public boolean equals(final Object o) { - if (o == this) - return true; - if (!(o instanceof QuestionAnswersView)) - return false; - final QuestionAnswersView other = (QuestionAnswersView) o; - if (!other.canEqual((Object) this)) - return false; - final Object this$question = this.getQuestion(); - final Object other$question = other.getQuestion(); - if (this$question == null ? other$question != null : !this$question.equals(other$question)) - return false; - final Object this$answer = this.getAnswer(); - final Object other$answer = other.getAnswer(); - if (this$answer == null ? other$answer != null : !this$answer.equals(other$answer)) - return false; - final Object this$subquestions = this.getSubquestions(); - final Object other$subquestions = other.getSubquestions(); - if (this$subquestions == null ? other$subquestions != null : !this$subquestions.equals(other$subquestions)) - return false; - return true; - } - - protected boolean canEqual(final Object other) { - return other instanceof QuestionAnswersView; - } - - public int hashCode() { - final int PRIME = 59; - int result = 1; - final Object $question = this.getQuestion(); - result = result * PRIME + ($question == null ? 43 : $question.hashCode()); - final Object $answer = this.getAnswer(); - result = result * PRIME + ($answer == null ? 43 : $answer.hashCode()); - final Object $subquestions = this.getSubquestions(); - result = result * PRIME + ($subquestions == null ? 43 : $subquestions.hashCode()); - return result; - } - + @Override public String toString() { - return "QuestionAnswersView(question=" + this.getQuestion() + ", answer=" + this.getAnswer() + ", subquestions=" + this.getSubquestions() - + ")"; - } - - public static class QuestionAnswersViewBuilder { - - private @NotNull String question; - private String answer; - private List subquestions$value; - private boolean subquestions$set; - - QuestionAnswersViewBuilder() { - } - - public QuestionAnswersViewBuilder question(@NotNull String question) { - this.question = question; - return this; - } - - public QuestionAnswersViewBuilder answer(@Nullable String answer) { - this.answer = answer; - return this; - } - - public QuestionAnswersViewBuilder subquestions(List subquestions) { - this.subquestions$value = subquestions; - this.subquestions$set = true; - return this; - } - - public QuestionAnswersView build() { - List subquestions$value = this.subquestions$value; - if (!this.subquestions$set) { - subquestions$value = QuestionAnswersView.$default$subquestions(); - } - return new QuestionAnswersView(this.question, this.answer, subquestions$value); - } - - public String toString() { - return "QuestionAnswersView.QuestionAnswersViewBuilder(question=" + this.question + ", answer=" + this.answer + ", subquestions$value=" - + this.subquestions$value + ")"; - } + return "QuestionAnswersView{" + "question='" + question + '\'' + ", answer='" + answer + '\'' + ", subquestions=" + subquestions + '}'; } } From cc030affc183bba778d109ce2ad9ce178d56f0b2 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Thu, 19 Feb 2026 10:38:55 +0100 Subject: [PATCH 004/134] Prepared registries. --- .../sormas/api/patch/DataPatchRequest.java | 1 + .../api/patch/mapping/FieldCustomMapper.java | 7 + .../sormas/api/patch/mapping/ValueMapper.java | 61 ++++ .../symeda/sormas/patch/DataPatcherImpl.java | 25 ++ .../java/de/symeda/sormas/patch/fields.js | 332 ++++++++++++++++++ .../mapping/FieldCustomMapperRegistry.java | 19 + .../patch/mapping/ValueMapperRegistry.java | 35 ++ 7 files changed, 480 insertions(+) create mode 100644 sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldCustomMapper.java create mode 100644 sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValueMapper.java create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/patch/DataPatcherImpl.java create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/patch/fields.js create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/FieldCustomMapperRegistry.java create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/ValueMapperRegistry.java diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchRequest.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchRequest.java index bdf089bfa15..43d6615e034 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchRequest.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchRequest.java @@ -6,6 +6,7 @@ import de.symeda.sormas.api.info.InfoFacade; +// TODO: must following be supported: MULTIPLE - FIELD patching ? HOW to behave for that public class DataPatchRequest { @NotNull diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldCustomMapper.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldCustomMapper.java new file mode 100644 index 00000000000..6510ec82d0e --- /dev/null +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldCustomMapper.java @@ -0,0 +1,7 @@ +package de.symeda.sormas.api.patch.mapping; + +/** + * The patch logic was designed to be generic, nevertheless some SORMAS - fields require specific adaptions. + */ +public interface FieldCustomMapper { +} diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValueMapper.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValueMapper.java new file mode 100644 index 00000000000..2789b57f8d7 --- /dev/null +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValueMapper.java @@ -0,0 +1,61 @@ +package de.symeda.sormas.api.patch.mapping; + +import java.util.Set; + +import javax.validation.constraints.NotNull; + +// TODO: check if "in-value-type" must be checked: add self check ? +public interface ValueMapper extends Comparable { + + int HIGH_PRECEDENCE = Integer.MIN_VALUE; + int LOW_PRECEDENCE = Integer.MAX_VALUE; + + /** + * Can be used to add it to the default precedences values and a keep some "space between" the implementations ordering. + */ + int ORDER_CHUNK = 20; + + // TODO: check if must return-type must be THE specific type. + T map(Object value, Class targetType); + + @NotNull + Set> getSupportedTypes(); + + /** + * Specifies if the targetType is supported by this mapper. + * + * @param targetType + * @return + */ + default boolean supports(@NotNull Class targetType) { + + boolean directlySupportedType = getSupportedTypes().contains(targetType); + + if (directlySupportedType) { + return true; + } + + for (Class supported : getSupportedTypes()) { + if (supported.isAssignableFrom(targetType)) { + return true; + } + } + return false; + } + + /** + * Allows you to override default mappers. + * {@link #HIGH_PRECEDENCE} means this mapper will be used (among) first. + * {@link #LOW_PRECEDENCE} means this mapper will be used (among) last. + * + * @return defaults to LOW_PRECEDENCE + */ + default int getOrder() { + return LOW_PRECEDENCE; + } + + @Override + default int compareTo(ValueMapper o) { + return Integer.compare(this.getOrder(), o.getOrder()); + } +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/patch/DataPatcherImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/patch/DataPatcherImpl.java new file mode 100644 index 00000000000..fa089e11675 --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/patch/DataPatcherImpl.java @@ -0,0 +1,25 @@ +package de.symeda.sormas.patch; + +import javax.ejb.Stateless; +import javax.inject.Inject; + +import de.symeda.sormas.api.patch.DataPatchRequest; +import de.symeda.sormas.api.patch.DataPatchResponse; +import de.symeda.sormas.api.patch.DataPatcher; +import de.symeda.sormas.patch.mapping.FieldCustomMapperRegistry; +import de.symeda.sormas.patch.mapping.ValueMapperRegistry; + +@Stateless +public class DataPatcherImpl implements DataPatcher { + + @Inject + private ValueMapperRegistry valueMapperRegistry; + + @Inject + private FieldCustomMapperRegistry FieldCustomMapperRegistry; + + @Override + public DataPatchResponse patch(DataPatchRequest request) { + throw new UnsupportedOperationException("Not supported yet."); + } +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/patch/fields.js b/sormas-backend/src/main/java/de/symeda/sormas/patch/fields.js new file mode 100644 index 00000000000..0fe12fd6dcd --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/patch/fields.js @@ -0,0 +1,332 @@ +const fields = [...new Set([ + "Person.personContactDetails.details", + "Person.personContactDetails.details", + "", + "N/A", + "Person.birthdate", + "Person.sex", + "Person.occupationType", + "Person.occupationDetails", + "Person.workPlace & Person.workPlaceText ", + "Person.workPlaceText ", + "", + "N/A", + "N/A", + "", + "N/A", + "N/A", + "N/A", + "CaseData.symptoms.onsetDate", + "", + "CaseData.symptoms.reoccurrence", + "", + "CaseData.symptoms.abdominalPain", + "CaseData.symptoms.diarrhea", + "CaseData.symptoms.nausea", + "N/A", + "CaseData.symptoms.dehydration", + "CaseData.symptoms.fever", + "CaseData.symptoms.weakness", + "N/A", + "N/A", + "", + "CaseData.hospitalization.admittedToHealthFacility", + "CaseData.hospitalization.admissionDate", + "CaseData.hospitalization.dischargeDate", + "CaseData.hospitalization.currentlyHospitalized", + "", + "N/A", + "N/A", + "N/A", + "N/A", + "N/A", + "N/A", + "N/A", + "N/A", + "N/A", + "N/A", + "N/A", + "N/A", + "N/A", + "", + "", + "N/A", + "N/A", + "N/A", + "N/A", + "", + "", + "N/A", + "N/A", + "N/A", + "N/A", + "N/A", + "N/A", + "N/A", + "N/A", + "N/A", + "N/A", + "N/A", + "N/A", + "N/A", + "N/A", + "", + "CaseData.additionalDetails", + "", + "Person.personContactDetails.details", + "Person.personContactDetails.details", + "", + "N/A", + "Person.birthdate", + "Person.sex", + "Person.occupationType", + "Person.workPlace", + "Person.occupationDetails", + "", + "CaseData.additionalDetails", + "CaseData.additionalDetails", + "", + "N/A", + "N/A", + "", + "N/A", + "CaseData.symptoms.onsetDate", + "", + "CaseData.symptoms.abdominalPain", + "CaseData.symptoms.diarrhea", + "CaseData.symptoms.nausea", + "CaseData.symptoms.vomiting", + "CaseData.symptoms.lossOfAppetite", + "-", + "CaseData.symptoms.dehydration", + "CaseData.symptoms.fever", + "CaseData.symptoms.weakness", + "CaseData.symptoms.lossOfAppetite", + "-", + "-", + "-", + "CaseData.symptoms.otherNonHemorrhagicSymptoms", + "", + "CaseData.hospitalization.admittedToHealthFacility", + "CaseData.hospitalization.dischargeDate - admissionDate", + "CaseData.hospitalization.healthFacility", + "CaseData.hospitalization.admissionDate", + "CaseData.hospitalization.dischargeDate", + "", + "CaseData.sequelae", + "", + "N/A", + "N/A", + "N/A", + "N/A", + "N/A", + "N/A", + "", + "N/A", + "N/A", + "N/A", + "N/A", + "", + "N/A", + "", + "N/A", + "N/A", + "", + "-", + "-", + "", + "N/A", + "N/A", + "N/A", + "N/A", + "N/A", + "N/A", + "N/A", + "N/A", + "N/A", + "N/A", + "N/A", + "N/A", + "N/A", + "", + "N/A", + "N/A", + "EpiData.sexualTransmissionSuspected", + "", + "CaseData.additionalDetails", + "CaseData.additionalDetails", + "", + "Person.firstName", + "Person.lastName", + "Person.birthdateDD/MM/YYYY", + "", + "Person.gestationalAgeCategory", + "Person.birthWeightCategory", + "Person.birthWeight", + "Person.multipleBirth", + "", + "CaseData.healthConditions.recurrentBronchiolitis", + "CaseData.healthConditions.", + "CaseData.healthConditions.immunodeficiencyOtherThanHiv", + "CaseData.healthConditions.chronicNeurologicCondition", + "CaseData.healthConditions.chronicHeartFailure", + "CaseData.additionalDetails.otherConditions", + "", + "CaseData.vaccinationStatus", + "CaseData.vaccinationStatusDetails", + "CaseData.vaccinationStatusDetails", + "CaseData.vaccinationStatusDetails", + "", + "CaseData.symptoms.fever", + "CaseData.symptoms.runnyNose", + "CaseData.symptoms.wheezing", + "N/A", + "N/A", + "CaseData.symptoms.retractions", + "CaseData.symptoms.dyspnea", + "CaseData.symptoms.lossOfAppetite", + "CaseData.symptoms.cough", + "N/A", + "", + "CaseData.symptoms.onsetDate", + "", + "CaseData.hospitalization.admittedToHealthFacility", + "CaseData.hospitalization.healthFacilityDetails", + "CaseData.hospitalization.admissionDate", + "CaseData.hospitalization.dischargeDate", + "CaseData.hospitalization.icuAdmission", + "CaseData.hospitalization.icuLengthOfStay", + "CaseData.hospitalization.oxygenTherapy", + "", + "CaseData.additionalDetails", + "-", + "", + "Person.workPlace", + "CaseData.additionalDetails", + "", + "Person.personContactDetails.details", + "Person.personContactDetails.details", + "", + "CaseData.additionalDetails", + "", + "Person.personContactDetails.details", + "PersonContactDetail.details", + "", + "Person.firstName", + "Person.address.country", + "Person.sex", + "Person.birthdate", + "", + "CaseData.vaccinationStatus", + "CaseData.vaccinationStatusDetails", + "CaseData.vaccinationStatusDetails", + "CaseData.vaccinationStatusDetails", + "", + "Symptoms.onsetDate", + "Symptoms.endDate", + "CaseData.additionalDetails", + "", + "Symptoms.fever", + "Symptoms.cough", + "Symptoms.cough", + "Symptoms.cough", + "Symptoms.otherNonHemorrhagicSymptoms", + "", + "Hospitalization.admittedToHealthFacility", + "Hospitalization.admissionDate", + "Hospitalization.dischargeDate", + "Hospitalization.description", + "", + "CaseData.treatmentStarted", + "medicationDetails", + "", + "exposureDetails", + "directContactConfirmedCase", + "directContactConfirmedCase", + "additionalDetails", + "", + "Person.educationType & Person.educationDetails", + "Person.educationDetails", + "Person.educationDetails", + "Person.educationDetails", + +])].filter(name => !(name === "" || name === "N/A" || name === "-")).toSorted(); + +console.log(fields) + + +/* +RESULTS +[ + 'CaseData.additionalDetails', + 'CaseData.additionalDetails.otherConditions', + 'CaseData.healthConditions.', + 'CaseData.healthConditions.chronicHeartFailure', + 'CaseData.healthConditions.chronicNeurologicCondition', + 'CaseData.healthConditions.immunodeficiencyOtherThanHiv', + 'CaseData.healthConditions.recurrentBronchiolitis', + 'CaseData.hospitalization.admissionDate', + 'CaseData.hospitalization.admittedToHealthFacility', + 'CaseData.hospitalization.currentlyHospitalized', + 'CaseData.hospitalization.dischargeDate', + 'CaseData.hospitalization.dischargeDate - admissionDate', + 'CaseData.hospitalization.healthFacility', + 'CaseData.hospitalization.healthFacilityDetails', + 'CaseData.hospitalization.icuAdmission', + 'CaseData.hospitalization.icuLengthOfStay', + 'CaseData.hospitalization.oxygenTherapy', + 'CaseData.sequelae', + 'CaseData.symptoms.abdominalPain', + 'CaseData.symptoms.cough', + 'CaseData.symptoms.dehydration', + 'CaseData.symptoms.diarrhea', + 'CaseData.symptoms.dyspnea', + 'CaseData.symptoms.fever', + 'CaseData.symptoms.lossOfAppetite', + 'CaseData.symptoms.nausea', + 'CaseData.symptoms.onsetDate', + 'CaseData.symptoms.otherNonHemorrhagicSymptoms', + 'CaseData.symptoms.reoccurrence', + 'CaseData.symptoms.retractions', + 'CaseData.symptoms.runnyNose', + 'CaseData.symptoms.vomiting', + 'CaseData.symptoms.weakness', + 'CaseData.symptoms.wheezing', + 'CaseData.treatmentStarted', + 'CaseData.vaccinationStatus', + 'CaseData.vaccinationStatusDetails', + 'EpiData.sexualTransmissionSuspected', + 'Hospitalization.admissionDate', + 'Hospitalization.admittedToHealthFacility', + 'Hospitalization.description', + 'Hospitalization.dischargeDate', + 'Person.address.country', + 'Person.birthWeight', + 'Person.birthWeightCategory', + 'Person.birthdate', + 'Person.birthdateDD/MM/YYYY', + 'Person.educationDetails', + 'Person.educationType & Person.educationDetails', + 'Person.firstName', + 'Person.gestationalAgeCategory', + 'Person.lastName', + 'Person.multipleBirth', + 'Person.occupationDetails', + 'Person.occupationType', + 'Person.personContactDetails.details', + 'Person.sex', + 'Person.workPlace', + 'Person.workPlace & Person.workPlaceText ', + 'Person.workPlaceText ', + 'PersonContactDetail.details', + 'Symptoms.cough', + 'Symptoms.endDate', + 'Symptoms.fever', + 'Symptoms.onsetDate', + 'Symptoms.otherNonHemorrhagicSymptoms', + 'additionalDetails', + 'directContactConfirmedCase', + 'exposureDetails', + 'medicationDetails' +] +*/ \ No newline at end of file diff --git a/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/FieldCustomMapperRegistry.java b/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/FieldCustomMapperRegistry.java new file mode 100644 index 00000000000..c308ef9c208 --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/FieldCustomMapperRegistry.java @@ -0,0 +1,19 @@ +package de.symeda.sormas.patch.mapping; + +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Instance; +import javax.inject.Inject; + +import de.symeda.sormas.api.patch.mapping.FieldCustomMapper; + +@ApplicationScoped +public class FieldCustomMapperRegistry { + + @Inject + private Instance instances; + + // TODO: change signature. + public T map(Object value, Class targetType) { + throw new UnsupportedOperationException(); + } +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/ValueMapperRegistry.java b/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/ValueMapperRegistry.java new file mode 100644 index 00000000000..b07cceaf2f5 --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/ValueMapperRegistry.java @@ -0,0 +1,35 @@ +package de.symeda.sormas.patch.mapping; + +import java.util.List; +import java.util.stream.Collectors; + +import javax.annotation.PostConstruct; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Instance; +import javax.inject.Inject; + +import de.symeda.sormas.api.patch.mapping.ValueMapper; + +@ApplicationScoped +public class ValueMapperRegistry { + + private List orderedInstances; + + @Inject + private Instance instances; + + @PostConstruct + void init() { + // default sort uses CDI sort. + orderedInstances = instances.stream().sorted().collect(Collectors.toList()); + } + + public T map(Object value, Class targetType) { + for (ValueMapper mapper : orderedInstances) { + if (mapper.supports(targetType)) { + return mapper.map(value, targetType); + } + } + throw new IllegalArgumentException(String.format("No mapper found for: [%s]", targetType)); + } +} From f9c146b9ce788553d8f58fac856ddbb03b7b8e7f Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Thu, 19 Feb 2026 11:09:46 +0100 Subject: [PATCH 005/134] Added comments and placeholders. --- .../api/patch/DataPatchFailureCause.java | 7 +++++- .../api/patch/mapping/FieldCustomMapper.java | 5 ++++ .../symeda/sormas/patch/DataPatcherImpl.java | 24 ++++++++++++++++++- 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java index e3d5c97ba1a..5e01a2a117e 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java @@ -7,7 +7,12 @@ public enum DataPatchFailureCause { FIELD_DOES_NOT_EXIST, /** - * Might occur if following patch config was used: {@link DataReplacementType#IF_NOT_ALREADY_PRESENT}. + * Some fields are not meant to be patched: per example technical fields like UUID. + */ + FORBIDDEN_FIELD, + + /** + * Can occur if following patch config was set: {@link DataReplacementType#IF_NOT_ALREADY_PRESENT}. */ CURRENT_VALUE_NOT_OVERRIDDEN, diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldCustomMapper.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldCustomMapper.java index 6510ec82d0e..4557e161e45 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldCustomMapper.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldCustomMapper.java @@ -4,4 +4,9 @@ * The patch logic was designed to be generic, nevertheless some SORMAS - fields require specific adaptions. */ public interface FieldCustomMapper { + /* + * Implement for: + * - Phone number - email + * - BirthDate + */ } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/patch/DataPatcherImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/patch/DataPatcherImpl.java index fa089e11675..53583de2348 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/patch/DataPatcherImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/patch/DataPatcherImpl.java @@ -1,5 +1,7 @@ package de.symeda.sormas.patch; +import java.util.Set; + import javax.ejb.Stateless; import javax.inject.Inject; @@ -12,14 +14,34 @@ @Stateless public class DataPatcherImpl implements DataPatcher { + // might be more subtle: person.toto but also *.uuid (or uuid). includes approach ? + private Set forbiddenFields; + @Inject private ValueMapperRegistry valueMapperRegistry; @Inject - private FieldCustomMapperRegistry FieldCustomMapperRegistry; + private FieldCustomMapperRegistry fieldCustomMapperRegistry; @Override public DataPatchResponse patch(DataPatchRequest request) { + + /* + * Implementation steps: + * - lazily produce list of allowed fields to avoid. + * - Iterate over patch dictionary + * - Filter out empty values. + * - Check if field exists. + * - Check for forbidden fields + * - Check for FieldCustomMapper to use custom mapping strategy + * - Go to the appropriate (sub) field + * - TODO: if appropriate: multiple patching into same field strategy!! + *

+ * WARN: Root will be either: (breaks trivial check if exists approach). + * - CaseData + * - Person + */ + throw new UnsupportedOperationException("Not supported yet."); } } From 8f2f262b2127eb96fb5cb606382286ceb820f8b4 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Thu, 19 Feb 2026 16:48:17 +0100 Subject: [PATCH 006/134] continued preparation. --- ...Request.java => CaseDataPatchRequest.java} | 10 +-- ...{DataPatcher.java => CaseDataPatcher.java} | 4 +- .../api/patch/mapping/FieldCustomMapper.java | 7 ++ .../sormas/patch/CaseDataPatcherImpl.java | 74 +++++++++++++++++++ .../symeda/sormas/patch/DataPatcherImpl.java | 47 ------------ 5 files changed, 88 insertions(+), 54 deletions(-) rename sormas-api/src/main/java/de/symeda/sormas/api/patch/{DataPatchRequest.java => CaseDataPatchRequest.java} (77%) rename sormas-api/src/main/java/de/symeda/sormas/api/patch/{DataPatcher.java => CaseDataPatcher.java} (68%) create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/patch/CaseDataPatcherImpl.java delete mode 100644 sormas-backend/src/main/java/de/symeda/sormas/patch/DataPatcherImpl.java diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchRequest.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/CaseDataPatchRequest.java similarity index 77% rename from sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchRequest.java rename to sormas-api/src/main/java/de/symeda/sormas/api/patch/CaseDataPatchRequest.java index 43d6615e034..463a2b76e04 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchRequest.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/CaseDataPatchRequest.java @@ -7,7 +7,7 @@ import de.symeda.sormas.api.info.InfoFacade; // TODO: must following be supported: MULTIPLE - FIELD patching ? HOW to behave for that -public class DataPatchRequest { +public class CaseDataPatchRequest { @NotNull private String caseUuid; @@ -28,7 +28,7 @@ public String getCaseUuid() { return caseUuid; } - public DataPatchRequest setCaseUuid(String caseUuid) { + public CaseDataPatchRequest setCaseUuid(String caseUuid) { this.caseUuid = caseUuid; return this; } @@ -37,7 +37,7 @@ public DataReplacementType getReplacementType() { return replacementType; } - public DataPatchRequest setReplacementType(DataReplacementType replacementType) { + public CaseDataPatchRequest setReplacementType(DataReplacementType replacementType) { this.replacementType = replacementType; return this; } @@ -46,7 +46,7 @@ public Map getPatchDictionary() { return patchDictionary; } - public DataPatchRequest setPatchDictionary(Map patchDictionary) { + public CaseDataPatchRequest setPatchDictionary(Map patchDictionary) { this.patchDictionary = patchDictionary; return this; } @@ -55,7 +55,7 @@ public EmptyValueBehavior getEmptyValueBehavior() { return emptyValueBehavior; } - public DataPatchRequest setEmptyValueBehavior(EmptyValueBehavior emptyValueBehavior) { + public CaseDataPatchRequest setEmptyValueBehavior(EmptyValueBehavior emptyValueBehavior) { this.emptyValueBehavior = emptyValueBehavior; return this; } diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatcher.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/CaseDataPatcher.java similarity index 68% rename from sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatcher.java rename to sormas-api/src/main/java/de/symeda/sormas/api/patch/CaseDataPatcher.java index 65029218738..f1c5d27d839 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatcher.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/CaseDataPatcher.java @@ -1,6 +1,6 @@ package de.symeda.sormas.api.patch; -public interface DataPatcher { +public interface CaseDataPatcher { /** * Allow patching data for a specific case. @@ -9,5 +9,5 @@ public interface DataPatcher { * instructions for the data patch * @return response that indicates */ - DataPatchResponse patch(DataPatchRequest request); + DataPatchResponse patch(CaseDataPatchRequest request); } diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldCustomMapper.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldCustomMapper.java index 4557e161e45..9e998428454 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldCustomMapper.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldCustomMapper.java @@ -1,12 +1,19 @@ package de.symeda.sormas.api.patch.mapping; +import java.util.Optional; + +import de.symeda.sormas.api.patch.DataPatchFailure; + /** * The patch logic was designed to be generic, nevertheless some SORMAS - fields require specific adaptions. */ public interface FieldCustomMapper { + /* * Implement for: * - Phone number - email * - BirthDate */ + Optional map(String fieldName, Object value); + } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/patch/CaseDataPatcherImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/patch/CaseDataPatcherImpl.java new file mode 100644 index 00000000000..cd19696be1a --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/patch/CaseDataPatcherImpl.java @@ -0,0 +1,74 @@ +package de.symeda.sormas.patch; + +import java.util.Set; + +import javax.ejb.EJB; +import javax.ejb.Stateless; +import javax.inject.Inject; + +import de.symeda.sormas.api.caze.CaseDataDto; +import de.symeda.sormas.api.patch.CaseDataPatchRequest; +import de.symeda.sormas.api.patch.CaseDataPatcher; +import de.symeda.sormas.api.patch.DataPatchResponse; +import de.symeda.sormas.api.person.PersonDto; +import de.symeda.sormas.backend.caze.CaseFacadeEjb; +import de.symeda.sormas.backend.person.PersonFacadeEjb; +import de.symeda.sormas.patch.mapping.FieldCustomMapperRegistry; +import de.symeda.sormas.patch.mapping.ValueMapperRegistry; + +@Stateless +public class CaseDataPatcherImpl implements CaseDataPatcher { + + // might be more subtle: person.toto but also *.uuid (or uuid). includes approach ? + // TODO: must be twofold: enforced default fields : technical: uuid, user ... + custom config by admin + private Set forbiddenFields; + + @Inject + private ValueMapperRegistry valueMapperRegistry; + + @Inject + private FieldCustomMapperRegistry fieldCustomMapperRegistry; + + @EJB + private CaseFacadeEjb.CaseFacadeEjbLocal caseFacade; + + @EJB + private PersonFacadeEjb.PersonFacadeEjbLocal personFacade; + + @Override + public DataPatchResponse patch(CaseDataPatchRequest request) { + + String caseUuid = request.getCaseUuid(); + CaseDataDto caseData = caseFacade.getCaseDataByUuid(caseUuid); + + if (caseData == null) { + throw new IllegalStateException(String.format("No case found for uuid: [%s]", caseUuid)); + } + + // TODO: only fetch person when needed. + String personUuid = caseData.getPerson().getUuid(); + PersonDto person = personFacade.getByUuid(personUuid); + + if (person == null) { + throw new IllegalStateException(String.format("No person found for uuid: [%s]", personUuid)); + } + + /* + * Implementation steps: + * - lazily produce list of allowed fields to avoid. + * - Iterate over patch dictionary + * - Filter out empty values. + * - Check if field exists. + * - Check for forbidden fields + * - Check for FieldCustomMapper to use custom mapping strategy + * - Go to the appropriate (sub) field + * - TODO: if appropriate: multiple patching into same field strategy!! + *

+ * WARN: Root will be either: (breaks trivial check if exists approach). + * - CaseData + * - Person + */ + + throw new UnsupportedOperationException("Not supported yet."); + } +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/patch/DataPatcherImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/patch/DataPatcherImpl.java deleted file mode 100644 index 53583de2348..00000000000 --- a/sormas-backend/src/main/java/de/symeda/sormas/patch/DataPatcherImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package de.symeda.sormas.patch; - -import java.util.Set; - -import javax.ejb.Stateless; -import javax.inject.Inject; - -import de.symeda.sormas.api.patch.DataPatchRequest; -import de.symeda.sormas.api.patch.DataPatchResponse; -import de.symeda.sormas.api.patch.DataPatcher; -import de.symeda.sormas.patch.mapping.FieldCustomMapperRegistry; -import de.symeda.sormas.patch.mapping.ValueMapperRegistry; - -@Stateless -public class DataPatcherImpl implements DataPatcher { - - // might be more subtle: person.toto but also *.uuid (or uuid). includes approach ? - private Set forbiddenFields; - - @Inject - private ValueMapperRegistry valueMapperRegistry; - - @Inject - private FieldCustomMapperRegistry fieldCustomMapperRegistry; - - @Override - public DataPatchResponse patch(DataPatchRequest request) { - - /* - * Implementation steps: - * - lazily produce list of allowed fields to avoid. - * - Iterate over patch dictionary - * - Filter out empty values. - * - Check if field exists. - * - Check for forbidden fields - * - Check for FieldCustomMapper to use custom mapping strategy - * - Go to the appropriate (sub) field - * - TODO: if appropriate: multiple patching into same field strategy!! - *

- * WARN: Root will be either: (breaks trivial check if exists approach). - * - CaseData - * - Person - */ - - throw new UnsupportedOperationException("Not supported yet."); - } -} From 772df3be74ef7b3fb105aca453b6f895cee09711 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Fri, 20 Feb 2026 11:27:40 +0100 Subject: [PATCH 007/134] Added some mapper implementations --- .../sormas/api/caze/InfectionSetting.java | 2 + .../sormas/api/caze/QuarantineReason.java | 2 + .../de/symeda/sormas/api/caze/Trimester.java | 2 + .../sormas/api/patch/DataPatchFailure.java | 11 --- .../sormas/api/patch/DataPatchResponse.java | 2 +- .../sormas/api/patch/mapping/ValueMapper.java | 14 +++- .../api/patch/mapping/ValueMapperDefault.java | 18 +++++ .../sormas/api/person/CauseOfDeath.java | 3 + .../sormas/api/symptoms/SymptomState.java | 2 + .../symeda/sormas/api/utils/YesNoUnknown.java | 4 +- .../sormas/patch/CaseDataPatcherImpl.java | 46 ++++++++++++- .../symeda/sormas/patch/PropertyAccessor.java | 34 +++++++++ .../sormas/patch/SinglePatchResult.java | 50 ++++++++++++++ .../patch/mapping/ValueMapperRegistry.java | 8 +++ .../sormas/patch/mapping/impl/DateMapper.java | 35 ++++++++++ .../sormas/patch/mapping/impl/EnumMapper.java | 69 +++++++++++++++++++ .../patch/mapping/impl/PrimitiveMapper.java | 37 ++++++++++ 17 files changed, 324 insertions(+), 15 deletions(-) create mode 100644 sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValueMapperDefault.java create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/patch/PropertyAccessor.java create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/patch/SinglePatchResult.java create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/DateMapper.java create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/EnumMapper.java create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/PrimitiveMapper.java diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/caze/InfectionSetting.java b/sormas-api/src/main/java/de/symeda/sormas/api/caze/InfectionSetting.java index ead866aa3ed..a41be917a7e 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/caze/InfectionSetting.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/caze/InfectionSetting.java @@ -16,9 +16,11 @@ package de.symeda.sormas.api.caze; import de.symeda.sormas.api.i18n.I18nProperties; +import de.symeda.sormas.api.patch.mapping.ValueMapperDefault; public enum InfectionSetting { + @ValueMapperDefault UNKNOWN(null), AMBULATORY(null), MEDICAL_PRACTICE(AMBULATORY), diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/caze/QuarantineReason.java b/sormas-api/src/main/java/de/symeda/sormas/api/caze/QuarantineReason.java index c143186c4dd..1fd5f7013e3 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/caze/QuarantineReason.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/caze/QuarantineReason.java @@ -16,6 +16,7 @@ package de.symeda.sormas.api.caze; import de.symeda.sormas.api.i18n.I18nProperties; +import de.symeda.sormas.api.patch.mapping.ValueMapperDefault; public enum QuarantineReason { @@ -23,6 +24,7 @@ public enum QuarantineReason { ENTRY_FROM_RISK_AREA, SWISS_COVID_APP_NOTIFICATION, OUTBREAK_INVESTIGATION, + @ValueMapperDefault OTHER_REASON; @Override diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/caze/Trimester.java b/sormas-api/src/main/java/de/symeda/sormas/api/caze/Trimester.java index 42afaf93256..fa8e49b6a5b 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/caze/Trimester.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/caze/Trimester.java @@ -1,12 +1,14 @@ package de.symeda.sormas.api.caze; import de.symeda.sormas.api.i18n.I18nProperties; +import de.symeda.sormas.api.patch.mapping.ValueMapperDefault; public enum Trimester { FIRST, SECOND, THIRD, + @ValueMapperDefault UNKNOWN; @Override diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailure.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailure.java index bd2aae6fd5a..5b141fb166e 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailure.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailure.java @@ -4,8 +4,6 @@ public class DataPatchFailure { private DataPatchFailureCause dataPatchFailureCause; - private String fieldName; - private Object existingFieldValue; private Object providedFieldValue; @@ -20,15 +18,6 @@ public DataPatchFailure setDataPatchFailureCause(DataPatchFailureCause dataPatch return this; } - public String getFieldName() { - return fieldName; - } - - public DataPatchFailure setFieldName(String fieldName) { - this.fieldName = fieldName; - return this; - } - public Object getExistingFieldValue() { return existingFieldValue; } diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchResponse.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchResponse.java index 225da5e11db..8657c715ee7 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchResponse.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchResponse.java @@ -17,7 +17,7 @@ public class DataPatchResponse { private Map patchDictionary = new HashMap<>(); /** - * Provides + * Provides the reason for the failure. */ private Map failures = new HashMap<>(); diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValueMapper.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValueMapper.java index 2789b57f8d7..d805a9b1531 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValueMapper.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValueMapper.java @@ -16,7 +16,19 @@ public interface ValueMapper extends Comparable { int ORDER_CHUNK = 20; // TODO: check if must return-type must be THE specific type. - T map(Object value, Class targetType); + + /** + * + * @param value + * @param targetType + * @return actual value + * @param + * target type + * @throws RuntimeException + * in case of the value couldn't be mapped. + */ + @NotNull + T map(Object value, @NotNull Class targetType); @NotNull Set> getSupportedTypes(); diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValueMapperDefault.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValueMapperDefault.java new file mode 100644 index 00000000000..35d7b052dec --- /dev/null +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValueMapperDefault.java @@ -0,0 +1,18 @@ +package de.symeda.sormas.api.patch.mapping; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Marks an enum constant as the default fallback value for {@link ValueMapper} for enums. + * Takes precedence over the conventional "OTHER" fallback. + */ +@Target(ElementType.FIELD) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface ValueMapperDefault { + +} diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/person/CauseOfDeath.java b/sormas-api/src/main/java/de/symeda/sormas/api/person/CauseOfDeath.java index 642943ae3e1..038574d8ceb 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/person/CauseOfDeath.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/person/CauseOfDeath.java @@ -18,10 +18,13 @@ package de.symeda.sormas.api.person; import de.symeda.sormas.api.i18n.I18nProperties; +import de.symeda.sormas.api.patch.mapping.ValueMapperDefault; public enum CauseOfDeath { EPIDEMIC_DISEASE, + + @ValueMapperDefault OTHER_CAUSE; @Override diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/symptoms/SymptomState.java b/sormas-api/src/main/java/de/symeda/sormas/api/symptoms/SymptomState.java index 8b0c7020c3b..9344df6a973 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/symptoms/SymptomState.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/symptoms/SymptomState.java @@ -18,10 +18,12 @@ package de.symeda.sormas.api.symptoms; import de.symeda.sormas.api.i18n.I18nProperties; +import de.symeda.sormas.api.patch.mapping.ValueMapperDefault; public enum SymptomState { YES, + @ValueMapperDefault NO, UNKNOWN; diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/utils/YesNoUnknown.java b/sormas-api/src/main/java/de/symeda/sormas/api/utils/YesNoUnknown.java index 7d4cf2ca8ba..03bd1cea63e 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/utils/YesNoUnknown.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/utils/YesNoUnknown.java @@ -18,10 +18,12 @@ package de.symeda.sormas.api.utils; import de.symeda.sormas.api.i18n.I18nProperties; +import de.symeda.sormas.api.patch.mapping.ValueMapperDefault; public enum YesNoUnknown { YES, + @ValueMapperDefault NO, UNKNOWN; @@ -34,7 +36,7 @@ public static YesNoUnknown valueOf(Boolean value) { if (value == null) { return null; - } else if (Boolean.TRUE.equals(value)) { + } else if (value) { return YES; } else { return NO; diff --git a/sormas-backend/src/main/java/de/symeda/sormas/patch/CaseDataPatcherImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/patch/CaseDataPatcherImpl.java index cd19696be1a..bda24081029 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/patch/CaseDataPatcherImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/patch/CaseDataPatcherImpl.java @@ -1,6 +1,10 @@ package de.symeda.sormas.patch; +import java.util.List; +import java.util.Map; import java.util.Set; +import java.util.function.Predicate; +import java.util.stream.Collectors; import javax.ejb.EJB; import javax.ejb.Stateless; @@ -9,7 +13,9 @@ import de.symeda.sormas.api.caze.CaseDataDto; import de.symeda.sormas.api.patch.CaseDataPatchRequest; import de.symeda.sormas.api.patch.CaseDataPatcher; +import de.symeda.sormas.api.patch.DataPatchFailure; import de.symeda.sormas.api.patch.DataPatchResponse; +import de.symeda.sormas.api.patch.EmptyValueBehavior; import de.symeda.sormas.api.person.PersonDto; import de.symeda.sormas.backend.caze.CaseFacadeEjb; import de.symeda.sormas.backend.person.PersonFacadeEjb; @@ -53,6 +59,29 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { throw new IllegalStateException(String.format("No person found for uuid: [%s]", personUuid)); } + Predicate> filterPredicate = + request.getEmptyValueBehavior() == EmptyValueBehavior.REPLACE ? ignored -> true : buildEmptyValuePredicate(); + + Map actualDictionary = request.getPatchDictionary() + .entrySet() + .stream() + .filter(filterPredicate) + .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); + + List results = actualDictionary.entrySet().stream().map(entry -> { + return new SinglePatchResult().setFieldName(entry.getKey()); + }).collect(Collectors.toList()); + + Map patchedValuesDictionary = results.stream() + .filter(singlePatchResult -> singlePatchResult.getValue() != null) + .collect(Collectors.toMap(SinglePatchResult::getFieldName, SinglePatchResult::getValue)); + + Map failuresDictionary = results.stream() + .filter(singlePatchResult -> singlePatchResult.getFailure() != null) + .collect(Collectors.toMap(SinglePatchResult::getFieldName, SinglePatchResult::getFailure)); + + return new DataPatchResponse().setPatchDictionary(patchedValuesDictionary).setFailures(failuresDictionary); + /* * Implementation steps: * - lazily produce list of allowed fields to avoid. @@ -68,7 +97,22 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { * - CaseData * - Person */ + } + + private Predicate> buildEmptyValuePredicate() { + + return stringObjectEntry -> { + Object value = stringObjectEntry.getValue(); + + if (value == null) { + return false; + } + + if (value instanceof String) { + return !((String) value).trim().isEmpty(); + } - throw new UnsupportedOperationException("Not supported yet."); + return true; + }; } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/patch/PropertyAccessor.java b/sormas-backend/src/main/java/de/symeda/sormas/patch/PropertyAccessor.java new file mode 100644 index 00000000000..5dfed616843 --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/patch/PropertyAccessor.java @@ -0,0 +1,34 @@ +package de.symeda.sormas.patch; + +import java.lang.reflect.InvocationTargetException; +import java.util.Optional; + +import org.apache.commons.beanutils.PropertyUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class PropertyAccessor { + + private static final Logger logger = LoggerFactory.getLogger(PropertyAccessor.class); + + private PropertyAccessor() { + } + + public Optional> getNestedPropertyType(final Object bean, final String name) { + try { + return Optional.ofNullable(PropertyUtils.getPropertyType(bean, name)); + } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) { + logger.debug("Could not get property type for [{}], [{}]", name, bean, e); + return Optional.empty(); + } + } + + public static Optional setNestedProperty(final Object bean, final String name, final Object value) { + try { + PropertyUtils.setNestedProperty(bean, name, value); + return Optional.empty(); + } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) { + return Optional.of(e); + } + } +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/patch/SinglePatchResult.java b/sormas-backend/src/main/java/de/symeda/sormas/patch/SinglePatchResult.java new file mode 100644 index 00000000000..4fb8c3b4ba7 --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/patch/SinglePatchResult.java @@ -0,0 +1,50 @@ +package de.symeda.sormas.patch; + +import javax.annotation.Nullable; +import javax.validation.constraints.NotNull; + +import de.symeda.sormas.api.patch.DataPatchFailure; + +public class SinglePatchResult { + + @NotNull + private String fieldName; + + /** + * Actual patch value (after transformation). + */ + @Nullable + private Object value; + + @Nullable + private DataPatchFailure failure; + + public String getFieldName() { + return fieldName; + } + + public SinglePatchResult setFieldName(String fieldName) { + this.fieldName = fieldName; + return this; + } + + @Nullable + public Object getValue() { + return value; + } + + public SinglePatchResult setValue(@Nullable Object value) { + this.value = value; + return this; + } + + @Nullable + public DataPatchFailure getFailure() { + return failure; + } + + public SinglePatchResult setFailure(@Nullable DataPatchFailure failure) { + this.failure = failure; + return this; + } +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/ValueMapperRegistry.java b/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/ValueMapperRegistry.java index b07cceaf2f5..cf189c5d3f9 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/ValueMapperRegistry.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/ValueMapperRegistry.java @@ -25,6 +25,14 @@ void init() { } public T map(Object value, Class targetType) { + if (value == null) { + return null; + } + + if (targetType.isInstance(value)) { + return targetType.cast(value); + } + for (ValueMapper mapper : orderedInstances) { if (mapper.supports(targetType)) { return mapper.map(value, targetType); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/DateMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/DateMapper.java new file mode 100644 index 00000000000..313f8283467 --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/DateMapper.java @@ -0,0 +1,35 @@ +package de.symeda.sormas.patch.mapping.impl; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Set; + +import javax.enterprise.context.ApplicationScoped; + +import de.symeda.sormas.api.patch.mapping.ValueMapper; + +@ApplicationScoped +public class DateMapper implements ValueMapper { + + private static final Set> SUPPORTED_TYPES = Set.of(Date.class); + + private static final String DATE_FORMAT = "yyyy-MM-dd"; + + @Override + public Set> getSupportedTypes() { + return SUPPORTED_TYPES; + } + + @Override + @SuppressWarnings("unchecked") + public T map(Object value, Class targetType) { + try { + SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMAT); + sdf.setLenient(false); + return (T) sdf.parse(value.toString()); + } catch (ParseException e) { + throw new IllegalArgumentException("DateMapper: cannot parse date value '" + value + "', expected format: " + DATE_FORMAT, e); + } + } +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/EnumMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/EnumMapper.java new file mode 100644 index 00000000000..7ed92b6fd2a --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/EnumMapper.java @@ -0,0 +1,69 @@ +package de.symeda.sormas.patch.mapping.impl; + +import java.lang.reflect.Field; +import java.util.Set; + +import javax.enterprise.context.ApplicationScoped; + +import de.symeda.sormas.api.patch.mapping.ValueMapper; +import de.symeda.sormas.api.patch.mapping.ValueMapperDefault; + +@ApplicationScoped +public class EnumMapper implements ValueMapper { + + private static final Set> SUPPORTED_TYPES = Set.of(Enum.class); + + private static final String FALLBACK_NAME = "OTHER"; + + @Override + public Set> getSupportedTypes() { + return SUPPORTED_TYPES; + } + + @Override + @SuppressWarnings({ + "unchecked", + "rawtypes" }) + public T map(Object value, Class targetType) { + Class enumType = (Class) targetType; + + String name = value.toString().trim().toUpperCase(); + Enum[] constants = enumType.getEnumConstants(); + + for (Enum constant : constants) { + if (constant.name().equalsIgnoreCase(name)) { + return (T) constant; + } + } + + for (Enum constant : constants) { + if (FALLBACK_NAME.equals(constant.name())) { + return (T) constant; + } + } + + Enum annotatedDefault = findAnnotatedDefault((Class>) enumType, constants); + if (annotatedDefault != null) { + return (T) annotatedDefault; + } + + throw new IllegalArgumentException( + "EnumMapper: no constant '" + name + "' in " + enumType.getSimpleName() + ", and no @EnumMapperDefault or '" + FALLBACK_NAME + + "' member found"); + } + + private Enum findAnnotatedDefault(Class> enumType, Enum[] constants) { + for (Enum constant : constants) { + try { + Field field = enumType.getField(constant.name()); + if (field.isAnnotationPresent(ValueMapperDefault.class)) { + return constant; + } + } catch (NoSuchFieldException e) { + throw new IllegalStateException(String.format("Cannot occur for enum type [%s] and value: [%s]", enumType, constant), e); + } + } + + return null; + } +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/PrimitiveMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/PrimitiveMapper.java new file mode 100644 index 00000000000..8938f39e6ad --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/PrimitiveMapper.java @@ -0,0 +1,37 @@ +package de.symeda.sormas.patch.mapping.impl; + +import java.util.Set; + +import javax.enterprise.context.ApplicationScoped; + +import de.symeda.sormas.api.patch.mapping.ValueMapper; + +@ApplicationScoped +public class PrimitiveMapper implements ValueMapper { + + private static final Set> SUPPORTED_TYPES = Set.of(String.class, Integer.class, Double.class, Float.class, Boolean.class, boolean.class); + + @Override + public Set> getSupportedTypes() { + return SUPPORTED_TYPES; + } + + @Override + @SuppressWarnings("unchecked") + public T map(Object value, Class targetType) { + String str = value.toString(); + + if (targetType == String.class) + return (T) str; + if (targetType == Integer.class) + return (T) Integer.valueOf(str); + if (targetType == Double.class) + return (T) Double.valueOf(str); + if (targetType == Float.class) + return (T) Float.valueOf(str); + if (targetType == Boolean.class || targetType == boolean.class) + return (T) Boolean.valueOf(str); + + throw new IllegalArgumentException("PrimitiveWrapperMapper: unsupported type " + targetType.getName()); + } +} From ab4bdf6afe20365c3d9ad68a108ad55828419d22 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Fri, 20 Feb 2026 14:11:49 +0100 Subject: [PATCH 008/134] Added some mapper mapper implementations --- .../api/patch/CaseDataPatchRequest.java | 6 + .../sormas/api/patch/DataPatchFailure.java | 6 + .../sormas/api/patch/DataPatchResponse.java | 5 + .../api/patch/mapping/FieldCustomMapper.java | 11 +- .../api/patch/mapping/FieldPatchRequest.java | 71 ++++++++++ .../sormas/api/patch/mapping/ValueMapper.java | 5 +- .../de/symeda/sormas/api/utils/Tuple.java | 40 ++++++ .../sormas/patch/CaseDataPatcherImpl.java | 127 +++++++++++++++--- .../symeda/sormas/patch/PropertyAccessor.java | 15 ++- .../sormas/patch/SinglePatchResult.java | 3 - .../mapping/FieldCustomMapperRegistry.java | 20 ++- .../exceptions/ErrorDescriptionMapper.java | 45 +++++++ .../sormas/patch/mapping/impl/DateMapper.java | 2 +- .../sormas/patch/mapping/impl/EnumMapper.java | 10 +- .../patch/mapping/impl/PrimitiveMapper.java | 2 +- 15 files changed, 329 insertions(+), 39 deletions(-) create mode 100644 sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldPatchRequest.java create mode 100644 sormas-api/src/main/java/de/symeda/sormas/api/utils/Tuple.java create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/exceptions/ErrorDescriptionMapper.java diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/CaseDataPatchRequest.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/CaseDataPatchRequest.java index 463a2b76e04..11f3cfd62e6 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/CaseDataPatchRequest.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/CaseDataPatchRequest.java @@ -59,4 +59,10 @@ public CaseDataPatchRequest setEmptyValueBehavior(EmptyValueBehavior emptyValueB this.emptyValueBehavior = emptyValueBehavior; return this; } + + @Override + public String toString() { + return "CaseDataPatchRequest{" + "caseUuid='" + caseUuid + '\'' + ", replacementType=" + replacementType + ", emptyValueBehavior=" + + emptyValueBehavior + ", patchDictionary=" + patchDictionary + '}'; + } } diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailure.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailure.java index 5b141fb166e..d0385610084 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailure.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailure.java @@ -44,4 +44,10 @@ public DataPatchFailure setDescription(String description) { this.description = description; return this; } + + @Override + public String toString() { + return "DataPatchFailure{" + "dataPatchFailureCause=" + dataPatchFailureCause + ", existingFieldValue=" + existingFieldValue + + ", providedFieldValue=" + providedFieldValue + ", description='" + description + '\'' + '}'; + } } diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchResponse.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchResponse.java index 8657c715ee7..8a9368fa492 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchResponse.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchResponse.java @@ -56,4 +56,9 @@ public boolean patched() { public boolean failed() { return MapUtils.isNotEmpty(failures); } + + @Override + public String toString() { + return "DataPatchResponse{" + "patchDictionary=" + patchDictionary + ", failures=" + failures + '}'; + } } diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldCustomMapper.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldCustomMapper.java index 9e998428454..913947eca5e 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldCustomMapper.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldCustomMapper.java @@ -1,6 +1,7 @@ package de.symeda.sormas.api.patch.mapping; import java.util.Optional; +import java.util.Set; import de.symeda.sormas.api.patch.DataPatchFailure; @@ -14,6 +15,14 @@ public interface FieldCustomMapper { * - Phone number - email * - BirthDate */ - Optional map(String fieldName, Object value); + // TODO: missing 'current value' logic: if already exist do nothing. + Optional map(FieldPatchRequest request); + + /** + * Warn each field must be unique among all {@link FieldCustomMapper} implementations. + * + * @return fields supported by this specific mapper. + */ + Set supportedFields(); } diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldPatchRequest.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldPatchRequest.java new file mode 100644 index 00000000000..230c82b2987 --- /dev/null +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldPatchRequest.java @@ -0,0 +1,71 @@ +package de.symeda.sormas.api.patch.mapping; + +import java.util.Objects; + +import de.symeda.sormas.api.patch.DataReplacementType; + +public final class FieldPatchRequest { + + private String fieldName; + private Object target; + private Object value; + private DataReplacementType replacementType; + + public String getFieldName() { + return fieldName; + } + + public FieldPatchRequest setFieldName(String fieldName) { + this.fieldName = fieldName; + return this; + } + + public Object getTarget() { + return target; + } + + public FieldPatchRequest setTarget(Object target) { + this.target = target; + return this; + } + + public Object getValue() { + return value; + } + + public FieldPatchRequest setValue(Object value) { + this.value = value; + return this; + } + + public DataReplacementType getReplacementType() { + return replacementType; + } + + public FieldPatchRequest setReplacementType(DataReplacementType replacementType) { + this.replacementType = replacementType; + return this; + } + + @Override + public String toString() { + return "FieldPatchRequest{" + "fieldName='" + fieldName + '\'' + ", target=" + target + ", value=" + value + ", replacementType=" + + replacementType + '}'; + } + + @Override + public boolean equals(Object o) { + if (o == null || getClass() != o.getClass()) + return false; + FieldPatchRequest that = (FieldPatchRequest) o; + return Objects.equals(fieldName, that.fieldName) + && Objects.equals(target, that.target) + && Objects.equals(value, that.value) + && replacementType == that.replacementType; + } + + @Override + public int hashCode() { + return Objects.hash(fieldName, target, value, replacementType); + } +} diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValueMapper.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValueMapper.java index d805a9b1531..f5fc3cde491 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValueMapper.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValueMapper.java @@ -15,18 +15,19 @@ public interface ValueMapper extends Comparable { */ int ORDER_CHUNK = 20; - // TODO: check if must return-type must be THE specific type. - /** * * @param value + * raw value type, must either by String or the actual type. * @param targetType + * type that is expected. * @return actual value * @param * target type * @throws RuntimeException * in case of the value couldn't be mapped. */ + // TODO: CHECK if error handling should be done here already. | Multiple return types. @NotNull T map(Object value, @NotNull Class targetType); diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/utils/Tuple.java b/sormas-api/src/main/java/de/symeda/sormas/api/utils/Tuple.java new file mode 100644 index 00000000000..55f669cf163 --- /dev/null +++ b/sormas-api/src/main/java/de/symeda/sormas/api/utils/Tuple.java @@ -0,0 +1,40 @@ +package de.symeda.sormas.api.utils; + +import java.util.Objects; + +public class Tuple { + + private final F first; + private final S second; + + public Tuple(final F first, final S second) { + this.first = first; + this.second = second; + } + + public F getFirst() { + return first; + } + + public S getSecond() { + return second; + } + + @Override + public String toString() { + return "Tuple{" + "first=" + first + ", second=" + second + '}'; + } + + @Override + public boolean equals(Object o) { + if (o == null || getClass() != o.getClass()) + return false; + Tuple tuple = (Tuple) o; + return Objects.equals(first, tuple.first) && Objects.equals(second, tuple.second); + } + + @Override + public int hashCode() { + return Objects.hash(first, second); + } +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/patch/CaseDataPatcherImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/patch/CaseDataPatcherImpl.java index bda24081029..1d1583dd016 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/patch/CaseDataPatcherImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/patch/CaseDataPatcherImpl.java @@ -2,6 +2,7 @@ import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.Set; import java.util.function.Predicate; import java.util.stream.Collectors; @@ -10,12 +11,19 @@ import javax.ejb.Stateless; import javax.inject.Inject; +import org.jetbrains.annotations.NotNull; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import de.symeda.sormas.api.caze.CaseDataDto; import de.symeda.sormas.api.patch.CaseDataPatchRequest; import de.symeda.sormas.api.patch.CaseDataPatcher; import de.symeda.sormas.api.patch.DataPatchFailure; +import de.symeda.sormas.api.patch.DataPatchFailureCause; import de.symeda.sormas.api.patch.DataPatchResponse; import de.symeda.sormas.api.patch.EmptyValueBehavior; +import de.symeda.sormas.api.patch.mapping.FieldCustomMapper; +import de.symeda.sormas.api.patch.mapping.FieldPatchRequest; import de.symeda.sormas.api.person.PersonDto; import de.symeda.sormas.backend.caze.CaseFacadeEjb; import de.symeda.sormas.backend.person.PersonFacadeEjb; @@ -25,9 +33,11 @@ @Stateless public class CaseDataPatcherImpl implements CaseDataPatcher { + private final Logger logger = LoggerFactory.getLogger(getClass()); + // might be more subtle: person.toto but also *.uuid (or uuid). includes approach ? // TODO: must be twofold: enforced default fields : technical: uuid, user ... + custom config by admin - private Set forbiddenFields; + private Set forbiddenFields = Set.of(); @Inject private ValueMapperRegistry valueMapperRegistry; @@ -43,21 +53,12 @@ public class CaseDataPatcherImpl implements CaseDataPatcher { @Override public DataPatchResponse patch(CaseDataPatchRequest request) { + logger.debug("patch: [{}]", request); - String caseUuid = request.getCaseUuid(); - CaseDataDto caseData = caseFacade.getCaseDataByUuid(caseUuid); - - if (caseData == null) { - throw new IllegalStateException(String.format("No case found for uuid: [%s]", caseUuid)); - } + CaseDataDto caseData = getCaseDataDto(request); // TODO: only fetch person when needed. - String personUuid = caseData.getPerson().getUuid(); - PersonDto person = personFacade.getByUuid(personUuid); - - if (person == null) { - throw new IllegalStateException(String.format("No person found for uuid: [%s]", personUuid)); - } + PersonDto person = getPersonDto(caseData); Predicate> filterPredicate = request.getEmptyValueBehavior() == EmptyValueBehavior.REPLACE ? ignored -> true : buildEmptyValuePredicate(); @@ -69,7 +70,58 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); List results = actualDictionary.entrySet().stream().map(entry -> { - return new SinglePatchResult().setFieldName(entry.getKey()); + String fieldName = entry.getKey(); + SinglePatchResult singlePatchResult = new SinglePatchResult().setFieldName(fieldName); + + Object target = findAppropriateTarget(fieldName, caseData, person); + + try { // TODO: patch the same field twice ? + + if (forbiddenFields.contains(fieldName)) { + return singlePatchResult.setFailure(new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.FORBIDDEN_FIELD)); + } + + Optional mapper = fieldCustomMapperRegistry.getMapper(fieldName); + + Object untypedTargetValue = entry.getValue(); + if (mapper.isPresent()) { + Optional dataPatchFailureOpt = mapper.orElseThrow() + .map( + new FieldPatchRequest().setFieldName(fieldName) + .setReplacementType(request.getReplacementType()) + .setTarget(target) + .setValue(untypedTargetValue)); + + if (dataPatchFailureOpt.isPresent()) { + return singlePatchResult.setFailure(dataPatchFailureOpt.get()); + } + + return singlePatchResult.setValue(untypedTargetValue); + } + + Optional> nestedPropertyType = PropertyAccessor.getNestedPropertyType(target, fieldName); + + if (nestedPropertyType.isEmpty()) { + return singlePatchResult.setFailure(new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.FIELD_DOES_NOT_EXIST)); + } + Class targetType = nestedPropertyType.orElseThrow(); + + Object typedValue = valueMapperRegistry.map(untypedTargetValue, targetType); + + Optional exception = PropertyAccessor.setNestedProperty(target, fieldName, typedValue); + if (exception.isPresent()) { + return singlePatchResult.setFailure( + new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.TECHNICAL) + .setDescription(exception.orElseThrow().getMessage())); + } else { + return singlePatchResult.setValue(typedValue); + } + } catch (RuntimeException e) { + logger.error("Failure during patch operation", e); + return singlePatchResult + .setFailure(new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.TECHNICAL).setDescription(e.getMessage())); + } + }).collect(Collectors.toList()); Map patchedValuesDictionary = results.stream() @@ -80,16 +132,24 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { .filter(singlePatchResult -> singlePatchResult.getFailure() != null) .collect(Collectors.toMap(SinglePatchResult::getFieldName, SinglePatchResult::getFailure)); - return new DataPatchResponse().setPatchDictionary(patchedValuesDictionary).setFailures(failuresDictionary); + DataPatchResponse dataPatchResponse = new DataPatchResponse().setPatchDictionary(patchedValuesDictionary).setFailures(failuresDictionary); + + logger.debug("patch results: [{}]", results); + + // TODO: not necessarly both to be saved + caseFacade.save(caseData); + personFacade.save(person); + + return dataPatchResponse; /* * Implementation steps: * - lazily produce list of allowed fields to avoid. - * - Iterate over patch dictionary - * - Filter out empty values. - * - Check if field exists. - * - Check for forbidden fields - * - Check for FieldCustomMapper to use custom mapping strategy + * - OK: Iterate over patch dictionary + * - OK: Filter out empty values. + * - OK: Check for forbidden fields + * - OK: Check for FieldCustomMapper to use custom mapping strategy + * - OK: Check if field exists. * - Go to the appropriate (sub) field * - TODO: if appropriate: multiple patching into same field strategy!! *

@@ -99,6 +159,33 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { */ } + private @NotNull PersonDto getPersonDto(CaseDataDto caseData) { + String personUuid = caseData.getPerson().getUuid(); + PersonDto person = personFacade.getByUuid(personUuid); + + if (person == null) { + throw new IllegalStateException(String.format("No person found for uuid: [%s]", personUuid)); + } + return person; + } + + private @NotNull CaseDataDto getCaseDataDto(CaseDataPatchRequest request) { + String caseUuid = request.getCaseUuid(); + CaseDataDto caseData = caseFacade.getCaseDataByUuid(caseUuid); + + if (caseData == null) { + throw new IllegalStateException(String.format("No case found for uuid: [%s]", caseUuid)); + } + return caseData; + } + + private Object findAppropriateTarget(String fieldName, CaseDataDto caseData, PersonDto person) { + + fieldName = fieldName; + + return null; + } + private Predicate> buildEmptyValuePredicate() { return stringObjectEntry -> { diff --git a/sormas-backend/src/main/java/de/symeda/sormas/patch/PropertyAccessor.java b/sormas-backend/src/main/java/de/symeda/sormas/patch/PropertyAccessor.java index 5dfed616843..a059888d748 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/patch/PropertyAccessor.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/patch/PropertyAccessor.java @@ -8,17 +8,27 @@ import org.slf4j.LoggerFactory; public class PropertyAccessor { + // TODO: perform some caching of the fields private static final Logger logger = LoggerFactory.getLogger(PropertyAccessor.class); private PropertyAccessor() { } - public Optional> getNestedPropertyType(final Object bean, final String name) { + public static Optional> getNestedPropertyType(final Object bean, final String name) { try { return Optional.ofNullable(PropertyUtils.getPropertyType(bean, name)); } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) { - logger.debug("Could not get property type for [{}], [{}]", name, bean, e); + logger.info("Could not get property type for [{}], [{}]", name, bean, e); + return Optional.empty(); + } + } + + public static Optional getNestedProperty(final Object bean, final String name) { + try { + return Optional.ofNullable(PropertyUtils.getNestedProperty(bean, name)); + } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) { + logger.info("Could not get property type for [{}], [{}]", name, bean, e); return Optional.empty(); } } @@ -28,6 +38,7 @@ public static Optional setNestedProperty(final Object bean, final Str PropertyUtils.setNestedProperty(bean, name, value); return Optional.empty(); } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) { + logger.info("Could not set property for bean[{}], name [{}], value [{}]", bean, name, value, e); return Optional.of(e); } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/patch/SinglePatchResult.java b/sormas-backend/src/main/java/de/symeda/sormas/patch/SinglePatchResult.java index 4fb8c3b4ba7..8d92e4309b9 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/patch/SinglePatchResult.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/patch/SinglePatchResult.java @@ -10,9 +10,6 @@ public class SinglePatchResult { @NotNull private String fieldName; - /** - * Actual patch value (after transformation). - */ @Nullable private Object value; diff --git a/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/FieldCustomMapperRegistry.java b/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/FieldCustomMapperRegistry.java index c308ef9c208..080f86e11cf 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/FieldCustomMapperRegistry.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/FieldCustomMapperRegistry.java @@ -1,10 +1,16 @@ package de.symeda.sormas.patch.mapping; +import java.util.Map; +import java.util.Optional; +import java.util.stream.Collectors; + +import javax.annotation.PostConstruct; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Instance; import javax.inject.Inject; import de.symeda.sormas.api.patch.mapping.FieldCustomMapper; +import de.symeda.sormas.api.utils.Tuple; @ApplicationScoped public class FieldCustomMapperRegistry { @@ -12,8 +18,16 @@ public class FieldCustomMapperRegistry { @Inject private Instance instances; - // TODO: change signature. - public T map(Object value, Class targetType) { - throw new UnsupportedOperationException(); + private Map dictionary; + + @PostConstruct + void init() { + dictionary = instances.stream() + .flatMap(mapperInstance -> mapperInstance.supportedFields().stream().map(field -> new Tuple<>(field, mapperInstance))) + .collect(Collectors.toMap(Tuple::getFirst, Tuple::getSecond)); + } + + public Optional getMapper(final String fieldName) { + return Optional.ofNullable(dictionary.get(fieldName)); } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/exceptions/ErrorDescriptionMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/exceptions/ErrorDescriptionMapper.java new file mode 100644 index 00000000000..a59a867ac73 --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/exceptions/ErrorDescriptionMapper.java @@ -0,0 +1,45 @@ +package de.symeda.sormas.patch.mapping.exceptions; + +import java.text.ParseException; +import java.util.Map; +import java.util.Optional; +import java.util.function.Function; + +public class ErrorDescriptionMapper { + + // TODO: I18N + private static final Map, Function> MAPPERS = Map.ofEntries( + Map.entry(IllegalArgumentException.class, e -> formatIllegalArgument((IllegalArgumentException) e)), + Map.entry(NumberFormatException.class, e -> "Invalid number format"), + Map.entry(ParseException.class, e -> "Invalid date format"), + Map.entry(IllegalStateException.class, e -> "Invalid operation state"), + Map.entry(EnumConstantNotPresentException.class, e -> "Invalid enum member"), + // Add more: ClassCastException, NoSuchMethodException, etc. + Map.entry(RuntimeException.class, RuntimeException::getMessage) // final fallback + ); + + @SuppressWarnings("unchecked") + public static String toUserDescription(RuntimeException e) { + return findHandler(e.getClass()).orElse(RuntimeException::getMessage).apply(e); + } + + private static Optional> findHandler(Class exceptionClass) { + Class current = exceptionClass; + while (current != null) { + if (MAPPERS.containsKey(current)) { + return Optional.of((Function) MAPPERS.get(current)); + } + current = current.getSuperclass(); + } + return Optional.empty(); + } + + private static String formatIllegalArgument(IllegalArgumentException e) { + return "Invalid input: " + extractKey(e.getMessage()); + } + + // Extract field name from common patterns like "Cannot map field 'age'" + private static String extractKey(String msg) { + return msg.replaceAll(".*['\"]([^'\"]*)['\"].*", "$1"); + } +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/DateMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/DateMapper.java index 313f8283467..6be3ddeea71 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/DateMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/DateMapper.java @@ -7,7 +7,7 @@ import javax.enterprise.context.ApplicationScoped; -import de.symeda.sormas.api.patch.mapping.ValueMapper; +import de.symeda.sormas.api.patch.mapping.FieldPatchRequest.ValueMapper; @ApplicationScoped public class DateMapper implements ValueMapper { diff --git a/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/EnumMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/EnumMapper.java index 7ed92b6fd2a..718d9fdfea1 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/EnumMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/EnumMapper.java @@ -5,8 +5,8 @@ import javax.enterprise.context.ApplicationScoped; -import de.symeda.sormas.api.patch.mapping.ValueMapper; import de.symeda.sormas.api.patch.mapping.ValueMapperDefault; +import de.symeda.sormas.api.patch.mapping.FieldPatchRequest.ValueMapper; @ApplicationScoped public class EnumMapper implements ValueMapper { @@ -27,11 +27,11 @@ public Set> getSupportedTypes() { public T map(Object value, Class targetType) { Class enumType = (Class) targetType; - String name = value.toString().trim().toUpperCase(); + String memberNameCandidate = value.toString().trim().toUpperCase(); Enum[] constants = enumType.getEnumConstants(); for (Enum constant : constants) { - if (constant.name().equalsIgnoreCase(name)) { + if (constant.name().equalsIgnoreCase(memberNameCandidate)) { return (T) constant; } } @@ -47,9 +47,7 @@ public T map(Object value, Class targetType) { return (T) annotatedDefault; } - throw new IllegalArgumentException( - "EnumMapper: no constant '" + name + "' in " + enumType.getSimpleName() + ", and no @EnumMapperDefault or '" + FALLBACK_NAME - + "' member found"); + throw new EnumConstantNotPresentException(enumType, memberNameCandidate); } private Enum findAnnotatedDefault(Class> enumType, Enum[] constants) { diff --git a/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/PrimitiveMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/PrimitiveMapper.java index 8938f39e6ad..77f5bdfeb9d 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/PrimitiveMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/PrimitiveMapper.java @@ -4,7 +4,7 @@ import javax.enterprise.context.ApplicationScoped; -import de.symeda.sormas.api.patch.mapping.ValueMapper; +import de.symeda.sormas.api.patch.mapping.FieldPatchRequest.ValueMapper; @ApplicationScoped public class PrimitiveMapper implements ValueMapper { From 332d100317b3ef09756f7d12255ee877931c0226 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Fri, 20 Feb 2026 14:30:44 +0100 Subject: [PATCH 009/134] Added some todos: added replacement type check. --- .../api/patch/DataPatchFailureCause.java | 3 +- .../sormas/patch/CaseDataPatcherImpl.java | 60 ++++++++++++++----- .../symeda/sormas/patch/PropertyAccessor.java | 5 +- 3 files changed, 51 insertions(+), 17 deletions(-) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java index 5e01a2a117e..054a43019c0 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java @@ -13,8 +13,9 @@ public enum DataPatchFailureCause { /** * Can occur if following patch config was set: {@link DataReplacementType#IF_NOT_ALREADY_PRESENT}. + * Occurs only if the value is different of the current. No error if value stays the same. */ - CURRENT_VALUE_NOT_OVERRIDDEN, + FORBIDDEN_VALUE_OVERRIDE, /** * Example: Expected number but got "a". diff --git a/sormas-backend/src/main/java/de/symeda/sormas/patch/CaseDataPatcherImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/patch/CaseDataPatcherImpl.java index 1d1583dd016..6b017bcc434 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/patch/CaseDataPatcherImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/patch/CaseDataPatcherImpl.java @@ -5,6 +5,7 @@ import java.util.Optional; import java.util.Set; import java.util.function.Predicate; +import java.util.function.Supplier; import java.util.stream.Collectors; import javax.ejb.EJB; @@ -15,12 +16,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.base.Suppliers; + import de.symeda.sormas.api.caze.CaseDataDto; import de.symeda.sormas.api.patch.CaseDataPatchRequest; import de.symeda.sormas.api.patch.CaseDataPatcher; import de.symeda.sormas.api.patch.DataPatchFailure; import de.symeda.sormas.api.patch.DataPatchFailureCause; import de.symeda.sormas.api.patch.DataPatchResponse; +import de.symeda.sormas.api.patch.DataReplacementType; import de.symeda.sormas.api.patch.EmptyValueBehavior; import de.symeda.sormas.api.patch.mapping.FieldCustomMapper; import de.symeda.sormas.api.patch.mapping.FieldPatchRequest; @@ -33,6 +37,7 @@ @Stateless public class CaseDataPatcherImpl implements CaseDataPatcher { + public static final String PERSON_FIELD_NAME_PREFIX = "Person."; private final Logger logger = LoggerFactory.getLogger(getClass()); // might be more subtle: person.toto but also *.uuid (or uuid). includes approach ? @@ -58,16 +63,9 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { CaseDataDto caseData = getCaseDataDto(request); // TODO: only fetch person when needed. - PersonDto person = getPersonDto(caseData); - - Predicate> filterPredicate = - request.getEmptyValueBehavior() == EmptyValueBehavior.REPLACE ? ignored -> true : buildEmptyValuePredicate(); + Supplier person = Suppliers.memoize(() -> getPersonDto(caseData)); - Map actualDictionary = request.getPatchDictionary() - .entrySet() - .stream() - .filter(filterPredicate) - .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); + Map actualDictionary = computeActualDictionary(request); List results = actualDictionary.entrySet().stream().map(entry -> { String fieldName = entry.getKey(); @@ -96,6 +94,7 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { return singlePatchResult.setFailure(dataPatchFailureOpt.get()); } + // TODO: taint the DTO to mark it as dirty return singlePatchResult.setValue(untypedTargetValue); } @@ -108,6 +107,22 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { Object typedValue = valueMapperRegistry.map(untypedTargetValue, targetType); + if (request.getReplacementType() == DataReplacementType.IF_NOT_ALREADY_PRESENT) { + Optional nestedPropertyValue = PropertyAccessor.getNestedProperty(target, fieldName); + + if (nestedPropertyValue.isPresent()) { + Object currentValue = nestedPropertyValue.orElseThrow(); + + if (!currentValue.equals(typedValue)) { + return singlePatchResult.setFailure( + new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.FORBIDDEN_VALUE_OVERRIDE) + .setExistingFieldValue(currentValue) + .setProvidedFieldValue(typedValue)); + } + } + } + + // TODO: taint the DTO to mark it as dirty Optional exception = PropertyAccessor.setNestedProperty(target, fieldName, typedValue); if (exception.isPresent()) { return singlePatchResult.setFailure( @@ -137,8 +152,9 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { logger.debug("patch results: [{}]", results); // TODO: not necessarly both to be saved + // TODO: caseFacade.save(caseData); - personFacade.save(person); + personFacade.save(person.get()); return dataPatchResponse; @@ -159,6 +175,21 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { */ } + private @NotNull Map computeActualDictionary(CaseDataPatchRequest request) { + Predicate> filterPredicate = buildAdequateDictionaryValuePredicate(request); + + Map actualDictionary = request.getPatchDictionary() + .entrySet() + .stream() + .filter(filterPredicate) + .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); + return actualDictionary; + } + + private @NotNull Predicate> buildAdequateDictionaryValuePredicate(CaseDataPatchRequest request) { + return request.getEmptyValueBehavior() == EmptyValueBehavior.REPLACE ? ignored -> true : buildEmptyValuePredicate(); + } + private @NotNull PersonDto getPersonDto(CaseDataDto caseData) { String personUuid = caseData.getPerson().getUuid(); PersonDto person = personFacade.getByUuid(personUuid); @@ -179,11 +210,12 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { return caseData; } - private Object findAppropriateTarget(String fieldName, CaseDataDto caseData, PersonDto person) { - - fieldName = fieldName; + private Object findAppropriateTarget(String fieldName, CaseDataDto caseData, Supplier person) { + if (fieldName.startsWith(PERSON_FIELD_NAME_PREFIX)) { + return person.get(); + } - return null; + return caseData; } private Predicate> buildEmptyValuePredicate() { diff --git a/sormas-backend/src/main/java/de/symeda/sormas/patch/PropertyAccessor.java b/sormas-backend/src/main/java/de/symeda/sormas/patch/PropertyAccessor.java index a059888d748..d087de8f100 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/patch/PropertyAccessor.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/patch/PropertyAccessor.java @@ -16,6 +16,7 @@ private PropertyAccessor() { } public static Optional> getNestedPropertyType(final Object bean, final String name) { + // TODO: make nested try { return Optional.ofNullable(PropertyUtils.getPropertyType(bean, name)); } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) { @@ -28,7 +29,7 @@ public static Optional getNestedProperty(final Object bean, final String try { return Optional.ofNullable(PropertyUtils.getNestedProperty(bean, name)); } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) { - logger.info("Could not get property type for [{}], [{}]", name, bean, e); + logger.info("Could not get property value for [{}], [{}]", name, bean, e); return Optional.empty(); } } @@ -38,7 +39,7 @@ public static Optional setNestedProperty(final Object bean, final Str PropertyUtils.setNestedProperty(bean, name, value); return Optional.empty(); } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) { - logger.info("Could not set property for bean[{}], name [{}], value [{}]", bean, name, value, e); + logger.info("Could not set property for bean [{}], name [{}], value [{}]", bean, name, value, e); return Optional.of(e); } } From 5231cb49893689dac246d850a78d668e11ebcfd2 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Fri, 20 Feb 2026 15:44:10 +0100 Subject: [PATCH 010/134] TODO: prepare ReferenceData code --- README.md | 13 + .../sormas/api/patch/DataPatchFailure.java | 8 + .../sormas/api/patch/DataReplacementType.java | 7 + .../api/patch/mapping/FieldPatchRequest.java | 6 + .../sormas/api/patch/mapping/ValueMapper.java | 1 + .../ReferenceDataValueInstanceProvider.java | 37 +++ ...eferenceDataValueInstanceProviderImpl.java | 41 +++ .../sormas/patch/CaseDataPatcherImpl.java | 25 +- .../symeda/sormas/patch/PropertyAccessor.java | 59 ++++- .../PersonBirthDateFieldMapper.java | 71 ++++++ .../impl/{ => valuemapper}/DateMapper.java | 5 +- .../impl/{ => valuemapper}/EnumMapper.java | 4 +- .../{ => valuemapper}/PrimitiveMapper.java | 6 +- .../impl/valuemapper/ReferenceDtoMapper.java | 34 +++ .../sormas/patch/PropertyAccessorTest.java | 241 ++++++++++++++++++ 15 files changed, 546 insertions(+), 12 deletions(-) create mode 100644 sormas-api/src/main/java/de/symeda/sormas/api/referencedata/ReferenceDataValueInstanceProvider.java create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/backend/ReferenceDataValueInstanceProviderImpl.java create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/fieldmapper/PersonBirthDateFieldMapper.java rename sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/{ => valuemapper}/DateMapper.java (87%) rename sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/{ => valuemapper}/EnumMapper.java (93%) rename sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/{ => valuemapper}/PrimitiveMapper.java (86%) create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/valuemapper/ReferenceDtoMapper.java create mode 100644 sormas-backend/src/test/java/de/symeda/sormas/patch/PropertyAccessorTest.java diff --git a/README.md b/README.md index a95e659dbd3..b48eeef2cfb 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,6 @@ +https://github.com/SORMAS-Foundation/SORMAS-Project/compare/feat/13832-ngsurvey-integration?expand=1 + +

Wiki. ### How Does it Work? + You can give SORMAS a try on our demo server at ! ### How Can I Get Involved? + Read through our [*Contributing Readme*](docs/CONTRIBUTING.md) and contact us at info@sormas.org to learn how you can help to drive the development of SORMAS forward, or check out our [Discussions](https://github.com/sormas-foundation/SORMAS-Project/discussions) to get development support from the core developers and other community members. SORMAS is a community-driven project, and we'd love to have you on board! @@ -34,19 +40,23 @@ If you want to contribute to the code, please strictly adhere to the [*Developme Please also make sure that you've read the [*Development Contributing Guidelines*](docs/CONTRIBUTING.md#development-contributing-guidelines) before you start to develop. ### How Can I Report a Bug or Request a Feature? + If you want to report a **security issue**, please read and follow our [*Security Policies*](docs/SECURITY.md). For bugs without security implications, change and feature requests, please [create a new issue](https://github.com/sormas-foundation/SORMAS-Project/issues/new/choose) and read the [*Submitting an Issue*](docs/CONTRIBUTING.md#submitting-an-issue) guide for more detailed instructions. We appreciate your help! ### Which Browsers and Android Versions are Supported? + SORMAS officially supports and is tested on **Chromium-based browsers** (like Google Chrome) and **Mozilla Firefox**, and all Android versions starting from **Android 7.0** (Nougat). In principle, SORMAS should be usable with all web browsers that are supported by Vaadin 8 (Chrome, Firefox, Safari, Edge, Internet Explorer 11; see ). Making use of the SORMAS web application through a mobile device web browser is possible and acceptable also in countries that are subject to the General Data Protection Regulation (GDPR) as enforced by the European Union. However, in such countries that are subject to the GDPR, the Android application (.apk file) for SORMAS should not be used on mobile devices until further notice. ### Is there a ReST API documentation? + Yes! Please download the [latest release](https://github.com/sormas-foundation/SORMAS-Project/releases/latest) and copy the content of /deploy/openapi/sormas-rest.yaml to an editor that generates a visual API documentation(e.g. ). A runtime Swagger documentation of the External Visits Resource (used by external symptom journals such as CLIMEDO or PIA) is available at ``<>/sormas-rest/openapi.json`` or ``<>/sormas-rest/openapi.yaml`` ### Who is responsible for Data Protection and Data Security? + We herewith explicitly would like to draw your attention to the fact, that the respective public health agency running SORMAS is in charge of data security and data protection and has to ensure compliance with national data protection and data security regulations in their respective jurisdiction. It has to ensure that state-of-the art requirements for data protection and data security are fulfilled. All those prerequisites and examinations have to be done in the context of the country and its respective legal framework. For these reasons, HZI cannot take the responsibility from the respective public health agency running the SORMAS systems and is not liable for any violation of data protection of the agency as the data generated by SORMAS belong to that very agency. @@ -54,6 +64,7 @@ For these reasons, HZI cannot take the responsibility from the respective public

## Guidelines and Resources + If you want to learn more about the development and contribution process, setting up or customizing your own system, or technical details, please consider the following guides and resources available in this repository. You can also view this readme and all guides outside the Wiki with a full table of content and search functionality here: * **[GitHub Wiki](https://github.com/sormas-foundation/SORMAS-Project/wiki) - Our wiki contains additional guides for server customization and development instructions. Please have a look at it if you need information on anything that this readme does not contain.** @@ -69,12 +80,14 @@ If you want to learn more about the development and contribution process, settin * [Third-Party License Acknowledgement](docs/3RD_PARTY_ACK.md) - This resource contains the names and license copies of external resources that SORMAS is using. If you want to set up a SORMAS instance for production, testing or development purposes, please refer to the following guides: + * [Installing a SORMAS Server](docs/SERVER_SETUP.md) * [Updating a SORMAS Server](docs/SERVER_UPDATE.md) * [Setup Development environment](docs/DEVELOPMENT_ENVIRONMENT.md) * [Creating a Demo Android App](docs/DEMO_APP.md) ## Project Structure + The project consists of the following modules: - [**sormas-api:**](/sormas-api) General business logic and definitions for data exchange between app and server diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailure.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailure.java index d0385610084..f58f52d252a 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailure.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailure.java @@ -1,12 +1,20 @@ package de.symeda.sormas.api.patch; +import javax.annotation.Nullable; +import javax.validation.constraints.NotNull; + public class DataPatchFailure { + @NotNull private DataPatchFailureCause dataPatchFailureCause; + @Nullable private Object existingFieldValue; + + @Nullable private Object providedFieldValue; + @Nullable private String description; public DataPatchFailureCause getDataPatchFailureCause() { diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataReplacementType.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataReplacementType.java index c7e2b48fe2f..0cde2a5d20f 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataReplacementType.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataReplacementType.java @@ -1,6 +1,13 @@ package de.symeda.sormas.api.patch; public enum DataReplacementType { + /** + * No matter what the current value is, it will be replaced with the provided value. + */ ALWAYS, + + /** + * New value will not be applied if there already is a value for the specified field. + */ IF_NOT_ALREADY_PRESENT } diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldPatchRequest.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldPatchRequest.java index 230c82b2987..21815eb2c3c 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldPatchRequest.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldPatchRequest.java @@ -2,13 +2,19 @@ import java.util.Objects; +import javax.validation.constraints.NotNull; + import de.symeda.sormas.api.patch.DataReplacementType; public final class FieldPatchRequest { + @NotNull private String fieldName; + @NotNull private Object target; + @NotNull private Object value; + @NotNull private DataReplacementType replacementType; public String getFieldName() { diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValueMapper.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValueMapper.java index f5fc3cde491..acc03b17c7f 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValueMapper.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValueMapper.java @@ -28,6 +28,7 @@ public interface ValueMapper extends Comparable { * in case of the value couldn't be mapped. */ // TODO: CHECK if error handling should be done here already. | Multiple return types. + // TODO: CHECK shouldn't be string ? @NotNull T map(Object value, @NotNull Class targetType); diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/referencedata/ReferenceDataValueInstanceProvider.java b/sormas-api/src/main/java/de/symeda/sormas/api/referencedata/ReferenceDataValueInstanceProvider.java new file mode 100644 index 00000000000..08cd9bdff02 --- /dev/null +++ b/sormas-api/src/main/java/de/symeda/sormas/api/referencedata/ReferenceDataValueInstanceProvider.java @@ -0,0 +1,37 @@ +package de.symeda.sormas.api.referencedata; + +import java.util.List; +import java.util.Optional; + +import javax.ejb.Remote; +import javax.validation.constraints.NotNull; + +import de.symeda.sormas.api.ReferenceDto; + +/** + * This provider can be used to help find appropriate Reference types when only the type is known. + */ +@Remote +public interface ReferenceDataValueInstanceProvider { + + /** + * + * @param referenceType + * class to fetch. + * @return + * @param + */ + List getAll(@NotNull Class referenceType); + + /** + * + * @param caption + * used candidate to find the adequate value. + * @param referenceType + * actual referenceDto class + * @return optional reference DTO. + * @param + * exact {@link ReferenceDto} type. + */ + Optional getOne(@NotNull String caption, @NotNull Class referenceType); +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/ReferenceDataValueInstanceProviderImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/ReferenceDataValueInstanceProviderImpl.java new file mode 100644 index 00000000000..40806044f3f --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/ReferenceDataValueInstanceProviderImpl.java @@ -0,0 +1,41 @@ +package de.symeda.sormas.backend; + +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.function.Supplier; + +import javax.annotation.PostConstruct; +import javax.enterprise.context.ApplicationScoped; + +import de.symeda.sormas.api.ReferenceDto; +import de.symeda.sormas.api.infrastructure.country.CountryReferenceDto; +import de.symeda.sormas.api.referencedata.ReferenceDataValueInstanceProvider; +import de.symeda.sormas.backend.infrastructure.country.CountryFacadeEjb; + +@ApplicationScoped +public class ReferenceDataValueInstanceProviderImpl implements ReferenceDataValueInstanceProvider { + + CountryFacadeEjb ok = new CountryFacadeEjb(); + + private Map, Supplier>> dictionary; + + @PostConstruct + public void init() { + dictionary = Map.ofEntries(Map.entry(CountryReferenceDto.class, () -> getInstance(CountryFacadeEjb.class).getAllActiveAsReference())); + } + + private static CountryFacadeEjb getInstance(Class ejb) { + return referenceDataLoaderProvider(countryFacadeEjbClass); + } + + @Override + public List getAll(Class referenceType) { + return List.of(); + } + + @Override + public Optional getOne(String caption, Class referenceType) { + return Optional.empty(); + } +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/patch/CaseDataPatcherImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/patch/CaseDataPatcherImpl.java index 6b017bcc434..7c77adc95e0 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/patch/CaseDataPatcherImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/patch/CaseDataPatcherImpl.java @@ -105,6 +105,8 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { } Class targetType = nestedPropertyType.orElseThrow(); + // TODO: handle targetType being a list. TO-Check with business: add / replace + Object typedValue = valueMapperRegistry.map(untypedTargetValue, targetType); if (request.getReplacementType() == DataReplacementType.IF_NOT_ALREADY_PRESENT) { @@ -178,12 +180,11 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { private @NotNull Map computeActualDictionary(CaseDataPatchRequest request) { Predicate> filterPredicate = buildAdequateDictionaryValuePredicate(request); - Map actualDictionary = request.getPatchDictionary() + return request.getPatchDictionary() .entrySet() .stream() .filter(filterPredicate) .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); - return actualDictionary; } private @NotNull Predicate> buildAdequateDictionaryValuePredicate(CaseDataPatchRequest request) { @@ -234,4 +235,24 @@ private Predicate> buildEmptyValuePredicate() { return true; }; } + + public void setForbiddenFields(Set forbiddenFields) { + this.forbiddenFields = forbiddenFields; + } + + public void setValueMapperRegistry(ValueMapperRegistry valueMapperRegistry) { + this.valueMapperRegistry = valueMapperRegistry; + } + + public void setFieldCustomMapperRegistry(FieldCustomMapperRegistry fieldCustomMapperRegistry) { + this.fieldCustomMapperRegistry = fieldCustomMapperRegistry; + } + + public void setCaseFacade(CaseFacadeEjb.CaseFacadeEjbLocal caseFacade) { + this.caseFacade = caseFacade; + } + + public void setPersonFacade(PersonFacadeEjb.PersonFacadeEjbLocal personFacade) { + this.personFacade = personFacade; + } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/patch/PropertyAccessor.java b/sormas-backend/src/main/java/de/symeda/sormas/patch/PropertyAccessor.java index d087de8f100..90b56e45f1d 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/patch/PropertyAccessor.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/patch/PropertyAccessor.java @@ -3,7 +3,10 @@ import java.lang.reflect.InvocationTargetException; import java.util.Optional; +import org.apache.commons.beanutils.BeanUtilsBean; import org.apache.commons.beanutils.PropertyUtils; +import org.apache.commons.beanutils.PropertyUtilsBean; +import org.apache.commons.beanutils.expression.Resolver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -11,20 +14,70 @@ public class PropertyAccessor { // TODO: perform some caching of the fields private static final Logger logger = LoggerFactory.getLogger(PropertyAccessor.class); + private static final PropertyUtilsBean propertyUtils = BeanUtilsBean.getInstance().getPropertyUtils(); private PropertyAccessor() { } public static Optional> getNestedPropertyType(final Object bean, final String name) { - // TODO: make nested + if (bean == null || name == null || name.isEmpty()) { + return Optional.empty(); + } + try { - return Optional.ofNullable(PropertyUtils.getPropertyType(bean, name)); + return Optional.of(getPropertyTypeRecursive(bean.getClass(), name)); } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) { - logger.info("Could not get property type for [{}], [{}]", name, bean, e); + logger.info("Could not get property type for [{}], [{}]", name, bean.getClass().getSimpleName(), e); return Optional.empty(); } } + /** + * Resolves the type of a nested property using BeanUtils' internal resolver. + * Supports: `user.address.city`, `items[0].name`, `map[key].value` + */ + private static Class getPropertyTypeRecursive(Class beanClass, String propertyName) + throws InvocationTargetException, IllegalAccessException, NoSuchMethodException { + if (!propertyName.contains(".") && !propertyName.contains("[") && !propertyName.contains("(")) { + return PropertyUtils.getPropertyType(beanClass, propertyName); + } + + Resolver resolver = propertyUtils.getResolver(); + if (!resolver.hasNested(propertyName)) { + return PropertyUtils.getPropertyType(beanClass, propertyName); + } + + String next = resolver.next(propertyName); + String property = resolver.getProperty(next); + Class currentType = PropertyUtils.getPropertyType(beanClass, property); + + if (currentType == null) { + throw new IllegalArgumentException("No such property: " + property); + } + + if (resolver.isIndexed(next)) { + currentType = getIndexedPropertyType(currentType); + } else if (resolver.isMapped(next)) { + throw new UnsupportedOperationException("Not supported yet."); + } + + String remaining = resolver.remove(propertyName); + if (remaining.isEmpty()) { + return currentType; + } + return getPropertyTypeRecursive(currentType, remaining); + } + + private static Class getIndexedPropertyType(Class collectionType) { + if (Iterable.class.isAssignableFrom(collectionType) || collectionType.isArray()) { + if (collectionType.isArray()) { + return collectionType.getComponentType(); + } + return Object.class; + } + return collectionType; + } + public static Optional getNestedProperty(final Object bean, final String name) { try { return Optional.ofNullable(PropertyUtils.getNestedProperty(bean, name)); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/fieldmapper/PersonBirthDateFieldMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/fieldmapper/PersonBirthDateFieldMapper.java new file mode 100644 index 00000000000..b9353990f8e --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/fieldmapper/PersonBirthDateFieldMapper.java @@ -0,0 +1,71 @@ +package de.symeda.sormas.patch.mapping.impl.fieldmapper; + +import java.util.Calendar; +import java.util.Date; +import java.util.Optional; +import java.util.Set; + +import javax.enterprise.context.ApplicationScoped; +import javax.inject.Inject; + +import de.symeda.sormas.api.patch.DataPatchFailure; +import de.symeda.sormas.api.patch.DataPatchFailureCause; +import de.symeda.sormas.api.patch.DataReplacementType; +import de.symeda.sormas.api.patch.mapping.FieldCustomMapper; +import de.symeda.sormas.api.patch.mapping.FieldPatchRequest; +import de.symeda.sormas.api.person.PersonDto; +import de.symeda.sormas.patch.mapping.impl.valuemapper.DateMapper; + +@ApplicationScoped +public class PersonBirthDateFieldMapper implements FieldCustomMapper { + + @Inject + private DateMapper dateMapper; + + @Override + public Optional map(FieldPatchRequest request) { + + Object untypedTarget = request.getTarget(); + if (!(untypedTarget instanceof PersonDto)) { + return Optional.of(new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.TECHNICAL)); + } + + PersonDto person = (PersonDto) untypedTarget; + + Object untypedValue = request.getValue(); + Date birthDate = dateMapper.map(untypedValue, Date.class); + + // TODO: remove duplication. + Calendar calendar = Calendar.getInstance(); + calendar.setTime(birthDate); + int dayOfMonth = calendar.get(Calendar.DAY_OF_MONTH); + // In calendar API months are indexed from 0 @see https://docs.oracle.com/javase/7/docs/api/java/util/Calendar.html#MONTH + int birthdateMonth = calendar.get(Calendar.MONTH) + 1; + int year = calendar.get(Calendar.YEAR); + + if (request.getReplacementType() == DataReplacementType.IF_NOT_ALREADY_PRESENT) { + + Integer currentDayOfMonth = person.getBirthdateDD(); + Integer currentBirthdateMonth = person.getBirthdateMM(); + Integer currentYear = person.getBirthdateYYYY(); + + if (currentDayOfMonth != dayOfMonth || currentBirthdateMonth != birthdateMonth || currentYear != year) { + return Optional.of( + new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.FORBIDDEN_VALUE_OVERRIDE) + .setProvidedFieldValue(untypedValue)); + } + + } + + person.setBirthdateMM(birthdateMonth); + person.setBirthdateDD(dayOfMonth); + person.setBirthdateYYYY(year); + + return Optional.empty(); + } + + @Override + public Set supportedFields() { + return Set.of(PersonDto.I18N_PREFIX + "." + PersonDto.BIRTH_DATE); + } +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/DateMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/valuemapper/DateMapper.java similarity index 87% rename from sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/DateMapper.java rename to sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/valuemapper/DateMapper.java index 6be3ddeea71..08a258b316b 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/DateMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/valuemapper/DateMapper.java @@ -1,4 +1,4 @@ -package de.symeda.sormas.patch.mapping.impl; +package de.symeda.sormas.patch.mapping.impl.valuemapper; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -7,7 +7,7 @@ import javax.enterprise.context.ApplicationScoped; -import de.symeda.sormas.api.patch.mapping.FieldPatchRequest.ValueMapper; +import de.symeda.sormas.api.patch.mapping.ValueMapper; @ApplicationScoped public class DateMapper implements ValueMapper { @@ -32,4 +32,5 @@ public T map(Object value, Class targetType) { throw new IllegalArgumentException("DateMapper: cannot parse date value '" + value + "', expected format: " + DATE_FORMAT, e); } } + } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/EnumMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/valuemapper/EnumMapper.java similarity index 93% rename from sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/EnumMapper.java rename to sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/valuemapper/EnumMapper.java index 718d9fdfea1..9d2678e5204 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/EnumMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/valuemapper/EnumMapper.java @@ -1,12 +1,12 @@ -package de.symeda.sormas.patch.mapping.impl; +package de.symeda.sormas.patch.mapping.impl.valuemapper; import java.lang.reflect.Field; import java.util.Set; import javax.enterprise.context.ApplicationScoped; +import de.symeda.sormas.api.patch.mapping.ValueMapper; import de.symeda.sormas.api.patch.mapping.ValueMapperDefault; -import de.symeda.sormas.api.patch.mapping.FieldPatchRequest.ValueMapper; @ApplicationScoped public class EnumMapper implements ValueMapper { diff --git a/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/PrimitiveMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/valuemapper/PrimitiveMapper.java similarity index 86% rename from sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/PrimitiveMapper.java rename to sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/valuemapper/PrimitiveMapper.java index 77f5bdfeb9d..2c49745ca00 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/PrimitiveMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/valuemapper/PrimitiveMapper.java @@ -1,10 +1,10 @@ -package de.symeda.sormas.patch.mapping.impl; +package de.symeda.sormas.patch.mapping.impl.valuemapper; import java.util.Set; import javax.enterprise.context.ApplicationScoped; -import de.symeda.sormas.api.patch.mapping.FieldPatchRequest.ValueMapper; +import de.symeda.sormas.api.patch.mapping.ValueMapper; @ApplicationScoped public class PrimitiveMapper implements ValueMapper { @@ -19,7 +19,7 @@ public Set> getSupportedTypes() { @Override @SuppressWarnings("unchecked") public T map(Object value, Class targetType) { - String str = value.toString(); + String str = value.toString().trim(); if (targetType == String.class) return (T) str; diff --git a/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/valuemapper/ReferenceDtoMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/valuemapper/ReferenceDtoMapper.java new file mode 100644 index 00000000000..7752c97db10 --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/valuemapper/ReferenceDtoMapper.java @@ -0,0 +1,34 @@ +package de.symeda.sormas.patch.mapping.impl.valuemapper; + +import java.util.Set; + +import javax.enterprise.context.ApplicationScoped; +import javax.inject.Inject; + +import de.symeda.sormas.api.ReferenceDto; +import de.symeda.sormas.api.patch.mapping.ValueMapper; +import de.symeda.sormas.api.referencedata.ReferenceDataValueInstanceProvider; + +@ApplicationScoped +public class ReferenceDtoMapper implements ValueMapper { + + @Inject + private ReferenceDataValueInstanceProvider referenceDataValueInstanceProvider; + + @Override + public T map(Object value, Class targetType) { + String captionCandidate = value.toString(); + + return null; + } + + @Override + public Set> getSupportedTypes() { + return Set.of(ReferenceDto.class); + } + + @Override + public int getOrder() { + return LOW_PRECEDENCE - (ORDER_CHUNK * 2); + } +} diff --git a/sormas-backend/src/test/java/de/symeda/sormas/patch/PropertyAccessorTest.java b/sormas-backend/src/test/java/de/symeda/sormas/patch/PropertyAccessorTest.java new file mode 100644 index 00000000000..36174f3ef0c --- /dev/null +++ b/sormas-backend/src/test/java/de/symeda/sormas/patch/PropertyAccessorTest.java @@ -0,0 +1,241 @@ +package de.symeda.sormas.patch; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.InvocationTargetException; +import java.util.List; +import java.util.Map; +import java.util.Optional; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; + +@ExtendWith(MockitoExtension.class) +class PropertyAccessorTest { + + private static class TestBean { + + private String name; + private Address address; + private List items; + private String[] array; + private Map map; + + // Getters/setters + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Address getAddress() { + return address; + } + + public void setAddress(Address address) { + this.address = address; + } + + public List getItems() { + return items; + } + + public void setItems(List items) { + this.items = items; + } + + public String[] getArray() { + return array; + } + + public void setArray(String[] array) { + this.array = array; + } + + public Map getMap() { + return map; + } + + public void setMap(Map map) { + this.map = map; + } + } + + private static class Address { + + private String city; + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + } + + private static class Item { + + private String name; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + } + + private TestBean bean; + + @BeforeEach + void setUp() { + bean = new TestBean(); + bean.setName("test"); + bean.address = new Address(); + bean.address.setCity("Paris"); + bean.items = List.of(new Item()); // single item for [0] + bean.items.get(0).setName("item1"); + bean.array = new String[] { + "a", + "b" }; + bean.map = Map.of("key", "value"); + } + + @Test + void getNestedPropertyType_simpleProperty_returnsCorrectType() { + Optional> type = PropertyAccessor.getNestedPropertyType(bean, "name"); + assertTrue(type.isPresent()); + assertEquals(String.class, type.get()); + } + + @Test + void getNestedPropertyType_nestedProperty_returnsCorrectType() { + Optional> type = PropertyAccessor.getNestedPropertyType(bean, "address.city"); + assertTrue(type.isPresent()); + assertEquals(String.class, type.get()); + } + + @Test + void getNestedPropertyType_indexedProperty_returnsElementType() { + Optional> type = PropertyAccessor.getNestedPropertyType(bean, "items[0].name"); + assertTrue(type.isPresent()); + assertEquals(String.class, type.get()); + } + + @Test + void getNestedPropertyType_array_returnsComponentType() { + Optional> type = PropertyAccessor.getNestedPropertyType(bean, "array[0]"); + assertTrue(type.isPresent()); + assertEquals(String.class, type.get()); + } + + @Test + void getNestedPropertyType_iterable_returnsObjectClass() { + Optional> type = PropertyAccessor.getNestedPropertyType(bean, "items[0]"); + assertTrue(type.isPresent()); + assertEquals(Object.class, type.get()); + } + + @Test + void getNestedPropertyType_invalidProperty_returnsEmpty() { + Optional> type = PropertyAccessor.getNestedPropertyType(bean, "nonexistent"); + assertFalse(type.isPresent()); + } + + @Test + void getNestedPropertyType_nullInputs_returnsEmpty() { + assertFalse(PropertyAccessor.getNestedPropertyType(null, "name").isPresent()); + assertFalse(PropertyAccessor.getNestedPropertyType(bean, null).isPresent()); + assertFalse(PropertyAccessor.getNestedPropertyType(bean, "").isPresent()); + } + + @Test + void getNestedProperty_readsSimpleProperty() { + Optional value = PropertyAccessor.getNestedProperty(bean, "name"); + assertTrue(value.isPresent()); + assertEquals("test", value.get()); + } + + @Test + void getNestedProperty_readsNestedProperty() { + Optional value = PropertyAccessor.getNestedProperty(bean, "address.city"); + assertTrue(value.isPresent()); + assertEquals("Paris", value.get()); + } + + @Test + void getNestedProperty_readsIndexedProperty() { + Optional value = PropertyAccessor.getNestedProperty(bean, "items[0].name"); + assertTrue(value.isPresent()); + assertEquals("item1", value.get()); + } + + @Test + void getNestedProperty_readsArrayElement() { + Optional value = PropertyAccessor.getNestedProperty(bean, "array[0]"); + assertTrue(value.isPresent()); + assertEquals("a", value.get()); + } + + @Test + void getNestedProperty_invalidPath_returnsEmpty() { + Optional value = PropertyAccessor.getNestedProperty(bean, "nonexistent"); + assertFalse(value.isPresent()); + } + + @Test + void setNestedProperty_success_returnsEmpty() { + Optional result = PropertyAccessor.setNestedProperty(bean, "name", "newName"); + assertFalse(result.isPresent()); + assertEquals("newName", bean.getName()); + } + + @Test + void setNestedProperty_nested_success_returnsEmpty() { + Optional result = PropertyAccessor.setNestedProperty(bean, "address.city", "London"); + assertFalse(result.isPresent()); + assertEquals("London", bean.address.getCity()); + } + + @Test + void setNestedProperty_indexed_success_returnsEmpty() { + Optional result = PropertyAccessor.setNestedProperty(bean, "items[0].name", "newItem"); + assertFalse(result.isPresent()); + assertEquals("newItem", bean.items.get(0).getName()); + } + + @Test + void setNestedProperty_invalidPath_returnsException() { + Optional result = PropertyAccessor.setNestedProperty(bean, "nonexistent", "value"); + assertTrue(result.isPresent()); + assertInstanceOf(InvocationTargetException.class, result.get()); // or other expected types + } + + @Test + void getNestedPropertyType_mappedProperty_throwsUnsupported() { + assertThrows(UnsupportedOperationException.class, () -> PropertyAccessor.getNestedPropertyType(bean, "map[key]")); + } + + // Integration test with real reflection errors + @Test + void getNestedPropertyType_exception_returnsEmpty() { + class PrivateBean { + + private String secret; // private field + } + PrivateBean privateBean = new PrivateBean(); + + Optional> type = PropertyAccessor.getNestedPropertyType(privateBean, "secret"); + assertFalse(type.isPresent()); + } +} From 1f5affc8445b4b9a18247196ed1e104e7fccebbe Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Fri, 20 Feb 2026 16:30:03 +0100 Subject: [PATCH 011/134] imagined single source to fetch referenceData. To check if this is adequate or not --- ...eferenceDataValueInstanceProviderImpl.java | 30 ++++++++--- .../sormas/backend/util/InstanceProvider.java | 51 +++++++++++++++++++ 2 files changed, 75 insertions(+), 6 deletions(-) create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/backend/util/InstanceProvider.java diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/ReferenceDataValueInstanceProviderImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/ReferenceDataValueInstanceProviderImpl.java index 40806044f3f..32c97b571f2 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/ReferenceDataValueInstanceProviderImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/ReferenceDataValueInstanceProviderImpl.java @@ -1,5 +1,7 @@ package de.symeda.sormas.backend; +import java.util.Collections; +import java.util.Date; import java.util.List; import java.util.Map; import java.util.Optional; @@ -9,33 +11,49 @@ import javax.enterprise.context.ApplicationScoped; import de.symeda.sormas.api.ReferenceDto; +import de.symeda.sormas.api.infrastructure.community.CommunityReferenceDto; import de.symeda.sormas.api.infrastructure.country.CountryReferenceDto; +import de.symeda.sormas.api.infrastructure.district.DistrictReferenceDto; +import de.symeda.sormas.api.infrastructure.region.RegionReferenceDto; import de.symeda.sormas.api.referencedata.ReferenceDataValueInstanceProvider; +import de.symeda.sormas.backend.infrastructure.community.CommunityFacadeEjb; import de.symeda.sormas.backend.infrastructure.country.CountryFacadeEjb; +import de.symeda.sormas.backend.infrastructure.district.DistrictFacadeEjb; +import de.symeda.sormas.backend.infrastructure.region.RegionFacadeEjb; +import de.symeda.sormas.backend.util.InstanceProvider; @ApplicationScoped public class ReferenceDataValueInstanceProviderImpl implements ReferenceDataValueInstanceProvider { - CountryFacadeEjb ok = new CountryFacadeEjb(); - private Map, Supplier>> dictionary; @PostConstruct public void init() { - dictionary = Map.ofEntries(Map.entry(CountryReferenceDto.class, () -> getInstance(CountryFacadeEjb.class).getAllActiveAsReference())); + dictionary = Map.ofEntries( + Map.entry(CountryReferenceDto.class, () -> getInstance(CountryFacadeEjb.class).getAllActiveAsReference()), + Map.entry(RegionReferenceDto.class, () -> getInstance(RegionFacadeEjb.class).getAllActiveAsReference()), + Map.entry(DistrictReferenceDto.class, () -> getInstance(DistrictFacadeEjb.class).getAllActiveAsReference()), + Map.entry(CommunityReferenceDto.class, (Supplier) () -> getInstance(CommunityFacadeEjb.class).getAllAfter(new Date())) + + // TODO: check number of values that are loaded with those calls, otherwise you search by name + // TODO: cannot fetch all: FacilityReferenceDto + // Map.entry(FacilityReferenceDto.class, () -> getInstance(FacilityFacadeEjb.class).getAllWithoutRegionAfter(new Date())) + + ); } - private static CountryFacadeEjb getInstance(Class ejb) { - return referenceDataLoaderProvider(countryFacadeEjbClass); + private T getInstance(Class ejb) { + return InstanceProvider.getInstanceFor(ejb); } @Override public List getAll(Class referenceType) { - return List.of(); + return (List) Optional.ofNullable(dictionary.get(referenceType).get()).orElse(Collections.emptyList()); } @Override public Optional getOne(String caption, Class referenceType) { + // TODO: think f return Optional.empty(); } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/util/InstanceProvider.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/util/InstanceProvider.java new file mode 100644 index 00000000000..098303af990 --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/util/InstanceProvider.java @@ -0,0 +1,51 @@ +package de.symeda.sormas.backend.util; + +import javax.naming.InitialContext; +import javax.naming.NamingException; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +// TODO: check if caching is required +public class InstanceProvider { + + private static final Logger logger = LoggerFactory.getLogger(InstanceProvider.class); + + private final InitialContext ic; + + private static volatile InstanceProvider instance; + + protected InstanceProvider() { + if (instance != null) { + throw new IllegalStateException("BackendFacadeProvider instance already created"); + } + + try { + ic = new InitialContext(); + } catch (NamingException e) { + throw new RuntimeException(e.getMessage(), e); + } + } + + public static InstanceProvider getInstance() { + if (instance == null) { + synchronized (InstanceProvider.class) { + if (instance == null) { + instance = new InstanceProvider(); + } + } + } + return instance; + } + + public static T getInstanceFor(Class clazz) { + String classSimpleName = clazz.getSimpleName(); + + try { + // Use java:module for LOCAL lookup within same EJB module + return (T) getInstance().ic.lookup("java:module/" + classSimpleName); + } catch (NamingException e) { + throw new RuntimeException("Failed to lookup class: " + clazz, e); + } + } +} From c991e46d8a3f6e40e3404a4fcc433090658e40f2 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Mon, 23 Feb 2026 14:13:14 +0100 Subject: [PATCH 012/134] Continued patching logic --- .../clinicalcourse/HealthConditionsDto.java | 2 + .../api/patch/CaseDataPatchRequest.java | 49 +++- .../api/patch/DataPatchFailureCause.java | 2 +- ...Type.java => DataReplacementStrategy.java} | 2 +- .../api/patch/mapping/FieldPatchRequest.java | 35 ++- .../sormas/api/patch/mapping/ValueMapper.java | 16 +- .../external/SurveyAnswerPatchRequest.java | 14 +- ...eferenceDataValueInstanceProviderImpl.java | 11 +- .../backend/json/ObjectMapperProvider.java | 69 +++++ .../patch/CaseDataPatcherImpl.java | 52 ++-- .../{ => backend}/patch/PropertyAccessor.java | 33 ++- .../patch/SinglePatchResult.java | 2 +- .../sormas/{ => backend}/patch/fields.js | 0 .../mapping/FieldCustomMapperRegistry.java | 2 +- .../patch/mapping/ValueMapperRegistry.java | 6 +- .../exceptions/ErrorDescriptionMapper.java | 2 +- .../PersonBirthDateFieldMapper.java | 11 +- .../PersonContactDetailsFieldMapper.java | 100 +++++++ .../mapping/impl/valuemapper/DateMapper.java | 4 +- .../mapping/impl/valuemapper/EnumMapper.java | 6 +- .../impl/valuemapper/PrimitiveMapper.java | 4 +- .../impl/valuemapper/ReferenceDtoMapper.java | 44 ++++ .../sormas/backend/sample/SampleService.java | 2 - .../impl/valuemapper/ReferenceDtoMapper.java | 34 --- .../sormas/backend/AbstractBeanTest.java | 10 + .../sormas/backend/AbstractUnitTest.java | 15 ++ .../PersonContactDetailsFieldMapperTest.java | 248 ++++++++++++++++++ .../impl/valuemapper/DateMapperTest.java | 126 +++++++++ .../impl/valuemapper/EnumMapperTest.java | 152 +++++++++++ .../impl/valuemapper/PrimitiveMapperTest.java | 180 +++++++++++++ .../sormas/patch/CaseDataPatcherImplTest.java | 37 +++ .../sormas/patch/PropertyAccessorTest.java | 4 +- .../src/test/resources/logback-test.xml | 38 +-- 33 files changed, 1179 insertions(+), 133 deletions(-) rename sormas-api/src/main/java/de/symeda/sormas/api/patch/{DataReplacementType.java => DataReplacementStrategy.java} (87%) create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/backend/json/ObjectMapperProvider.java rename sormas-backend/src/main/java/de/symeda/sormas/{ => backend}/patch/CaseDataPatcherImpl.java (83%) rename sormas-backend/src/main/java/de/symeda/sormas/{ => backend}/patch/PropertyAccessor.java (70%) rename sormas-backend/src/main/java/de/symeda/sormas/{ => backend}/patch/SinglePatchResult.java (95%) rename sormas-backend/src/main/java/de/symeda/sormas/{ => backend}/patch/fields.js (100%) rename sormas-backend/src/main/java/de/symeda/sormas/{ => backend}/patch/mapping/FieldCustomMapperRegistry.java (95%) rename sormas-backend/src/main/java/de/symeda/sormas/{ => backend}/patch/mapping/ValueMapperRegistry.java (84%) rename sormas-backend/src/main/java/de/symeda/sormas/{ => backend}/patch/mapping/exceptions/ErrorDescriptionMapper.java (96%) rename sormas-backend/src/main/java/de/symeda/sormas/{ => backend}/patch/mapping/impl/fieldmapper/PersonBirthDateFieldMapper.java (84%) create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapper.java rename sormas-backend/src/main/java/de/symeda/sormas/{ => backend}/patch/mapping/impl/valuemapper/DateMapper.java (85%) rename sormas-backend/src/main/java/de/symeda/sormas/{ => backend}/patch/mapping/impl/valuemapper/EnumMapper.java (86%) rename sormas-backend/src/main/java/de/symeda/sormas/{ => backend}/patch/mapping/impl/valuemapper/PrimitiveMapper.java (86%) create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/ReferenceDtoMapper.java delete mode 100644 sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/valuemapper/ReferenceDtoMapper.java create mode 100644 sormas-backend/src/test/java/de/symeda/sormas/backend/AbstractUnitTest.java create mode 100644 sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapperTest.java create mode 100644 sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/DateMapperTest.java create mode 100644 sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumMapperTest.java create mode 100644 sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/PrimitiveMapperTest.java create mode 100644 sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/clinicalcourse/HealthConditionsDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/clinicalcourse/HealthConditionsDto.java index 7272c4f0433..5020036e81e 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/clinicalcourse/HealthConditionsDto.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/clinicalcourse/HealthConditionsDto.java @@ -78,6 +78,8 @@ public class HealthConditionsDto extends PseudonymizableDto { private YesNoUnknown hivArt; private YesNoUnknown chronicLiverDisease; private YesNoUnknown malignancyChemotherapy; + + //TODO: rename ? general heart issue @HideForCountries(countries = { CountryHelper.COUNTRY_CODE_GERMANY, CountryHelper.COUNTRY_CODE_SWITZERLAND }) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/CaseDataPatchRequest.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/CaseDataPatchRequest.java index 11f3cfd62e6..1561ed43994 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/CaseDataPatchRequest.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/CaseDataPatchRequest.java @@ -1,7 +1,9 @@ package de.symeda.sormas.api.patch; import java.util.Map; +import java.util.Objects; +import javax.annotation.Nullable; import javax.validation.constraints.NotNull; import de.symeda.sormas.api.info.InfoFacade; @@ -13,7 +15,7 @@ public class CaseDataPatchRequest { private String caseUuid; @NotNull - private DataReplacementType replacementType = DataReplacementType.IF_NOT_ALREADY_PRESENT; + private DataReplacementStrategy replacementStrategy = DataReplacementStrategy.IF_NOT_ALREADY_PRESENT; private EmptyValueBehavior emptyValueBehavior = EmptyValueBehavior.IGNORE; @@ -24,6 +26,12 @@ public class CaseDataPatchRequest { @NotNull private Map patchDictionary; + /** + * Can be used to add some custom descriptions in some fields. + */ + @Nullable + private String origin; + public String getCaseUuid() { return caseUuid; } @@ -33,12 +41,12 @@ public CaseDataPatchRequest setCaseUuid(String caseUuid) { return this; } - public DataReplacementType getReplacementType() { - return replacementType; + public DataReplacementStrategy getReplacementStrategy() { + return replacementStrategy; } - public CaseDataPatchRequest setReplacementType(DataReplacementType replacementType) { - this.replacementType = replacementType; + public CaseDataPatchRequest setReplacementStrategy(DataReplacementStrategy replacementStrategy) { + this.replacementStrategy = replacementStrategy; return this; } @@ -60,9 +68,36 @@ public CaseDataPatchRequest setEmptyValueBehavior(EmptyValueBehavior emptyValueB return this; } + @Nullable + public String getOrigin() { + return origin; + } + + public CaseDataPatchRequest setOrigin(@Nullable String origin) { + this.origin = origin; + return this; + } + + @Override + public boolean equals(Object o) { + if (o == null || getClass() != o.getClass()) + return false; + CaseDataPatchRequest that = (CaseDataPatchRequest) o; + return Objects.equals(caseUuid, that.caseUuid) + && replacementStrategy == that.replacementStrategy + && emptyValueBehavior == that.emptyValueBehavior + && Objects.equals(patchDictionary, that.patchDictionary) + && Objects.equals(origin, that.origin); + } + + @Override + public int hashCode() { + return Objects.hash(caseUuid, replacementStrategy, emptyValueBehavior, patchDictionary, origin); + } + @Override public String toString() { - return "CaseDataPatchRequest{" + "caseUuid='" + caseUuid + '\'' + ", replacementType=" + replacementType + ", emptyValueBehavior=" - + emptyValueBehavior + ", patchDictionary=" + patchDictionary + '}'; + return "CaseDataPatchRequest{" + "caseUuid='" + caseUuid + '\'' + ", replacementStrategy=" + replacementStrategy + ", emptyValueBehavior=" + + emptyValueBehavior + ", patchDictionary=" + patchDictionary + ", origin='" + origin + '\'' + '}'; } } diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java index 054a43019c0..0117326fae4 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java @@ -12,7 +12,7 @@ public enum DataPatchFailureCause { FORBIDDEN_FIELD, /** - * Can occur if following patch config was set: {@link DataReplacementType#IF_NOT_ALREADY_PRESENT}. + * Can occur if following patch config was set: {@link DataReplacementStrategy#IF_NOT_ALREADY_PRESENT}. * Occurs only if the value is different of the current. No error if value stays the same. */ FORBIDDEN_VALUE_OVERRIDE, diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataReplacementType.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataReplacementStrategy.java similarity index 87% rename from sormas-api/src/main/java/de/symeda/sormas/api/patch/DataReplacementType.java rename to sormas-api/src/main/java/de/symeda/sormas/api/patch/DataReplacementStrategy.java index 0cde2a5d20f..67f5ef33acd 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataReplacementType.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataReplacementStrategy.java @@ -1,6 +1,6 @@ package de.symeda.sormas.api.patch; -public enum DataReplacementType { +public enum DataReplacementStrategy { /** * No matter what the current value is, it will be replaced with the provided value. */ diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldPatchRequest.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldPatchRequest.java index 21815eb2c3c..475ca848478 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldPatchRequest.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldPatchRequest.java @@ -2,9 +2,10 @@ import java.util.Objects; +import javax.annotation.Nullable; import javax.validation.constraints.NotNull; -import de.symeda.sormas.api.patch.DataReplacementType; +import de.symeda.sormas.api.patch.DataReplacementStrategy; public final class FieldPatchRequest { @@ -15,7 +16,10 @@ public final class FieldPatchRequest { @NotNull private Object value; @NotNull - private DataReplacementType replacementType; + private DataReplacementStrategy replacementType; + + @Nullable + private String origin; public String getFieldName() { return fieldName; @@ -44,19 +48,23 @@ public FieldPatchRequest setValue(Object value) { return this; } - public DataReplacementType getReplacementType() { + public DataReplacementStrategy getReplacementType() { return replacementType; } - public FieldPatchRequest setReplacementType(DataReplacementType replacementType) { + public FieldPatchRequest setReplacementType(DataReplacementStrategy replacementType) { this.replacementType = replacementType; return this; } - @Override - public String toString() { - return "FieldPatchRequest{" + "fieldName='" + fieldName + '\'' + ", target=" + target + ", value=" + value + ", replacementType=" - + replacementType + '}'; + @Nullable + public String getOrigin() { + return origin; + } + + public FieldPatchRequest setOrigin(@Nullable String origin) { + this.origin = origin; + return this; } @Override @@ -67,11 +75,18 @@ public boolean equals(Object o) { return Objects.equals(fieldName, that.fieldName) && Objects.equals(target, that.target) && Objects.equals(value, that.value) - && replacementType == that.replacementType; + && replacementType == that.replacementType + && Objects.equals(origin, that.origin); } @Override public int hashCode() { - return Objects.hash(fieldName, target, value, replacementType); + return Objects.hash(fieldName, target, value, replacementType, origin); + } + + @Override + public String toString() { + return "FieldPatchRequest{" + "fieldName='" + fieldName + '\'' + ", target=" + target + ", value=" + value + ", replacementType=" + + replacementType + ", origin='" + origin + '\'' + '}'; } } diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValueMapper.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValueMapper.java index acc03b17c7f..a74a906beac 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValueMapper.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValueMapper.java @@ -30,7 +30,21 @@ public interface ValueMapper extends Comparable { // TODO: CHECK if error handling should be done here already. | Multiple return types. // TODO: CHECK shouldn't be string ? @NotNull - T map(Object value, @NotNull Class targetType); + default T map(Object value, @NotNull Class targetType) { + return map(value, targetType, Set.of()); + } + + /** + * + * @param value + * @param targetType + * @param inputLanguageCodes + * useful if you input language is not only 'en' for some mappers that + * @return + * @param + */ + @NotNull + T map(Object value, @NotNull Class targetType, Set inputLanguageCodes); @NotNull Set> getSupportedTypes(); diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/SurveyAnswerPatchRequest.java b/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/SurveyAnswerPatchRequest.java index c4c9637a45e..26bab902011 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/SurveyAnswerPatchRequest.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/SurveyAnswerPatchRequest.java @@ -5,7 +5,7 @@ import javax.validation.constraints.NotNull; -import de.symeda.sormas.api.patch.DataReplacementType; +import de.symeda.sormas.api.patch.DataReplacementStrategy; import de.symeda.sormas.api.patch.EmptyValueBehavior; /** @@ -26,7 +26,7 @@ public class SurveyAnswerPatchRequest { private OffsetDateTime answerDate; @NotNull - private DataReplacementType dataReplacementType = DataReplacementType.IF_NOT_ALREADY_PRESENT; + private DataReplacementStrategy dataReplacementStrategy = DataReplacementStrategy.IF_NOT_ALREADY_PRESENT; @NotNull private EmptyValueBehavior emptyValueBehavior = EmptyValueBehavior.IGNORE; @@ -87,12 +87,12 @@ public SurveyAnswerPatchRequest setAnswerDate(OffsetDateTime answerDate) { return this; } - public DataReplacementType getDataReplacementType() { - return dataReplacementType; + public DataReplacementStrategy getDataReplacementType() { + return dataReplacementStrategy; } - public SurveyAnswerPatchRequest setDataReplacementType(DataReplacementType dataReplacementType) { - this.dataReplacementType = dataReplacementType; + public SurveyAnswerPatchRequest setDataReplacementType(DataReplacementStrategy dataReplacementStrategy) { + this.dataReplacementStrategy = dataReplacementStrategy; return this; } @@ -135,7 +135,7 @@ public SurveyAnswerPatchRequest setFailOnError(boolean failOnError) { @Override public String toString() { return "SurveyAnswerPatchRequest{" + "surveyId='" + surveyId + '\'' + ", token='" + token + '\'' + ", respondentId='" + respondentId + '\'' - + ", answerDate=" + answerDate + ", dataReplacementType=" + dataReplacementType + ", emptyValueBehavior=" + emptyValueBehavior + + ", answerDate=" + answerDate + ", dataReplacementType=" + dataReplacementStrategy + ", emptyValueBehavior=" + emptyValueBehavior + ", patchDictionary=" + patchDictionary + ", skipIfAlreadyProcessed=" + skipIfAlreadyProcessed + ", failOnError=" + failOnError + '}'; } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/ReferenceDataValueInstanceProviderImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/ReferenceDataValueInstanceProviderImpl.java index 32c97b571f2..d9a9d05005d 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/ReferenceDataValueInstanceProviderImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/ReferenceDataValueInstanceProviderImpl.java @@ -1,7 +1,6 @@ package de.symeda.sormas.backend; import java.util.Collections; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Optional; @@ -11,12 +10,10 @@ import javax.enterprise.context.ApplicationScoped; import de.symeda.sormas.api.ReferenceDto; -import de.symeda.sormas.api.infrastructure.community.CommunityReferenceDto; import de.symeda.sormas.api.infrastructure.country.CountryReferenceDto; import de.symeda.sormas.api.infrastructure.district.DistrictReferenceDto; import de.symeda.sormas.api.infrastructure.region.RegionReferenceDto; import de.symeda.sormas.api.referencedata.ReferenceDataValueInstanceProvider; -import de.symeda.sormas.backend.infrastructure.community.CommunityFacadeEjb; import de.symeda.sormas.backend.infrastructure.country.CountryFacadeEjb; import de.symeda.sormas.backend.infrastructure.district.DistrictFacadeEjb; import de.symeda.sormas.backend.infrastructure.region.RegionFacadeEjb; @@ -32,8 +29,8 @@ public void init() { dictionary = Map.ofEntries( Map.entry(CountryReferenceDto.class, () -> getInstance(CountryFacadeEjb.class).getAllActiveAsReference()), Map.entry(RegionReferenceDto.class, () -> getInstance(RegionFacadeEjb.class).getAllActiveAsReference()), - Map.entry(DistrictReferenceDto.class, () -> getInstance(DistrictFacadeEjb.class).getAllActiveAsReference()), - Map.entry(CommunityReferenceDto.class, (Supplier) () -> getInstance(CommunityFacadeEjb.class).getAllAfter(new Date())) + Map.entry(DistrictReferenceDto.class, () -> getInstance(DistrictFacadeEjb.class).getAllActiveAsReference()) +// Map.entry(CommunityReferenceDto.class, (Supplier) () -> getInstance(CommunityFacadeEjb.class).getAllAfter(new Date())) // TODO: check number of values that are loaded with those calls, otherwise you search by name // TODO: cannot fetch all: FacilityReferenceDto @@ -53,7 +50,7 @@ public List getAll(Class referenceType) { @Override public Optional getOne(String caption, Class referenceType) { - // TODO: think f - return Optional.empty(); + // TODO: load properties files of a few language: + return getAll(referenceType).stream().filter(referenceDto -> referenceDto.getCaption().equalsIgnoreCase(caption)).findAny(); } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/json/ObjectMapperProvider.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/json/ObjectMapperProvider.java new file mode 100644 index 00000000000..d369cff063e --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/json/ObjectMapperProvider.java @@ -0,0 +1,69 @@ +/* + * SORMAS® - Surveillance Outbreak Response Management & Analysis System + * Copyright © 2016-2020 Helmholtz-Zentrum für Infektionsforschung GmbH (HZI) + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package de.symeda.sormas.backend.json; + +import javax.annotation.Nullable; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; + +public final class ObjectMapperProvider { + + private static final Logger logger = LoggerFactory.getLogger(ObjectMapperProvider.class); + + private static volatile ObjectMapper instance; + + private ObjectMapperProvider() { + if (instance != null) { + throw new IllegalStateException("ObjectMapper instance already created"); + } + } + + public static ObjectMapper getInstance() { + if (instance == null) { + synchronized (ObjectMapperProvider.class) { + if (instance == null) { + instance = createObjectMapper(); + } + } + } + return instance; + } + + @Nullable + public static String writeValueAsStringFailSafe(Object object) { + try { + return getInstance().writeValueAsString(object); + } catch (JsonProcessingException e) { + logger.error("Couldn't write JSON of: [{}] of type: [{}]", object, object.getClass(), e); + return null; + } + } + + private static ObjectMapper createObjectMapper() { + ObjectMapper mapper = new ObjectMapper(); + + mapper.registerModule(new JavaTimeModule()); + + mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); + + return mapper; + } +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/patch/CaseDataPatcherImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java similarity index 83% rename from sormas-backend/src/main/java/de/symeda/sormas/patch/CaseDataPatcherImpl.java rename to sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java index 7c77adc95e0..64ee16c791a 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/patch/CaseDataPatcherImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java @@ -1,4 +1,4 @@ -package de.symeda.sormas.patch; +package de.symeda.sormas.backend.patch; import java.util.List; import java.util.Map; @@ -9,6 +9,7 @@ import java.util.stream.Collectors; import javax.ejb.EJB; +import javax.ejb.LocalBean; import javax.ejb.Stateless; import javax.inject.Inject; @@ -24,21 +25,23 @@ import de.symeda.sormas.api.patch.DataPatchFailure; import de.symeda.sormas.api.patch.DataPatchFailureCause; import de.symeda.sormas.api.patch.DataPatchResponse; -import de.symeda.sormas.api.patch.DataReplacementType; +import de.symeda.sormas.api.patch.DataReplacementStrategy; import de.symeda.sormas.api.patch.EmptyValueBehavior; import de.symeda.sormas.api.patch.mapping.FieldCustomMapper; import de.symeda.sormas.api.patch.mapping.FieldPatchRequest; import de.symeda.sormas.api.person.PersonDto; import de.symeda.sormas.backend.caze.CaseFacadeEjb; +import de.symeda.sormas.backend.json.ObjectMapperProvider; +import de.symeda.sormas.backend.patch.mapping.FieldCustomMapperRegistry; +import de.symeda.sormas.backend.patch.mapping.ValueMapperRegistry; import de.symeda.sormas.backend.person.PersonFacadeEjb; -import de.symeda.sormas.patch.mapping.FieldCustomMapperRegistry; -import de.symeda.sormas.patch.mapping.ValueMapperRegistry; @Stateless +@LocalBean public class CaseDataPatcherImpl implements CaseDataPatcher { public static final String PERSON_FIELD_NAME_PREFIX = "Person."; - private final Logger logger = LoggerFactory.getLogger(getClass()); + private final static Logger logger = LoggerFactory.getLogger(CaseDataPatcherImpl.class); // might be more subtle: person.toto but also *.uuid (or uuid). includes approach ? // TODO: must be twofold: enforced default fields : technical: uuid, user ... + custom config by admin @@ -58,35 +61,34 @@ public class CaseDataPatcherImpl implements CaseDataPatcher { @Override public DataPatchResponse patch(CaseDataPatchRequest request) { - logger.debug("patch: [{}]", request); + logger.info("patch: [{}]", request); CaseDataDto caseData = getCaseDataDto(request); - // TODO: only fetch person when needed. Supplier person = Suppliers.memoize(() -> getPersonDto(caseData)); Map actualDictionary = computeActualDictionary(request); List results = actualDictionary.entrySet().stream().map(entry -> { - String fieldName = entry.getKey(); - SinglePatchResult singlePatchResult = new SinglePatchResult().setFieldName(fieldName); + String fullFieldName = entry.getKey(); + SinglePatchResult singlePatchResult = new SinglePatchResult().setFieldName(fullFieldName); - Object target = findAppropriateTarget(fieldName, caseData, person); + Object target = findAppropriateTarget(fullFieldName, caseData, person); try { // TODO: patch the same field twice ? - if (forbiddenFields.contains(fieldName)) { + if (forbiddenFields.contains(fullFieldName)) { return singlePatchResult.setFailure(new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.FORBIDDEN_FIELD)); } - Optional mapper = fieldCustomMapperRegistry.getMapper(fieldName); + Optional mapper = fieldCustomMapperRegistry.getMapper(fullFieldName); Object untypedTargetValue = entry.getValue(); if (mapper.isPresent()) { Optional dataPatchFailureOpt = mapper.orElseThrow() .map( - new FieldPatchRequest().setFieldName(fieldName) - .setReplacementType(request.getReplacementType()) + new FieldPatchRequest().setFieldName(fullFieldName) + .setReplacementType(request.getReplacementStrategy()) .setTarget(target) .setValue(untypedTargetValue)); @@ -98,9 +100,11 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { return singlePatchResult.setValue(untypedTargetValue); } - Optional> nestedPropertyType = PropertyAccessor.getNestedPropertyType(target, fieldName); + String relativeFieldName = fullFieldName.substring(fullFieldName.indexOf('.') + 1); + Optional> nestedPropertyType = PropertyAccessor.getNestedPropertyType(target, relativeFieldName); if (nestedPropertyType.isEmpty()) { + logger.info("Missing field: [{}] on target: [{}]", relativeFieldName, target); return singlePatchResult.setFailure(new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.FIELD_DOES_NOT_EXIST)); } Class targetType = nestedPropertyType.orElseThrow(); @@ -109,8 +113,8 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { Object typedValue = valueMapperRegistry.map(untypedTargetValue, targetType); - if (request.getReplacementType() == DataReplacementType.IF_NOT_ALREADY_PRESENT) { - Optional nestedPropertyValue = PropertyAccessor.getNestedProperty(target, fieldName); + if (request.getReplacementStrategy() == DataReplacementStrategy.IF_NOT_ALREADY_PRESENT) { + Optional nestedPropertyValue = PropertyAccessor.getNestedProperty(target, relativeFieldName); if (nestedPropertyValue.isPresent()) { Object currentValue = nestedPropertyValue.orElseThrow(); @@ -125,7 +129,7 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { } // TODO: taint the DTO to mark it as dirty - Optional exception = PropertyAccessor.setNestedProperty(target, fieldName, typedValue); + Optional exception = PropertyAccessor.setNestedProperty(target, relativeFieldName, typedValue); if (exception.isPresent()) { return singlePatchResult.setFailure( new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.TECHNICAL) @@ -151,11 +155,19 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { DataPatchResponse dataPatchResponse = new DataPatchResponse().setPatchDictionary(patchedValuesDictionary).setFailures(failuresDictionary); - logger.debug("patch results: [{}]", results); + logger.info("patch results: [{}]", results); // TODO: not necessarly both to be saved - // TODO: + // TODO: + if (logger.isErrorEnabled()) { + logger.error("CaseData: \n{}", ObjectMapperProvider.writeValueAsStringFailSafe(caseData)); + System.out.println(ObjectMapperProvider.writeValueAsStringFailSafe(caseData)); + } caseFacade.save(caseData); + + if (logger.isErrorEnabled()) { + logger.error("Person: \n{}", ObjectMapperProvider.writeValueAsStringFailSafe(person.get())); + } personFacade.save(person.get()); return dataPatchResponse; diff --git a/sormas-backend/src/main/java/de/symeda/sormas/patch/PropertyAccessor.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessor.java similarity index 70% rename from sormas-backend/src/main/java/de/symeda/sormas/patch/PropertyAccessor.java rename to sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessor.java index 90b56e45f1d..d2321c0354d 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/patch/PropertyAccessor.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessor.java @@ -1,4 +1,4 @@ -package de.symeda.sormas.patch; +package de.symeda.sormas.backend.patch; import java.lang.reflect.InvocationTargetException; import java.util.Optional; @@ -15,19 +15,38 @@ public class PropertyAccessor { private static final Logger logger = LoggerFactory.getLogger(PropertyAccessor.class); private static final PropertyUtilsBean propertyUtils = BeanUtilsBean.getInstance().getPropertyUtils(); + public static final char PATH_SEPARATOR = '.'; private PropertyAccessor() { } - public static Optional> getNestedPropertyType(final Object bean, final String name) { - if (bean == null || name == null || name.isEmpty()) { + public static Optional> getNestedPropertyType(final Object bean, final String fieldName) { + if (bean == null || fieldName == null || fieldName.isEmpty()) { return Optional.empty(); } try { - return Optional.of(getPropertyTypeRecursive(bean.getClass(), name)); + boolean notNestedPath = fieldName.indexOf(PATH_SEPARATOR) == fieldName.lastIndexOf(PATH_SEPARATOR); + + if (notNestedPath) { + return Optional.ofNullable(PropertyUtils.getPropertyType(bean, fieldName)); + } + + String leafPath = fieldName.substring(fieldName.lastIndexOf('.') + 1); + + return Optional.ofNullable(getNestedProperty(bean, fieldName)).flatMap(leafParent -> getPropertyType(leafParent, leafPath)); + + } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) { + logger.info("Could not get property type for [{}], [{}]", fieldName, bean.getClass().getSimpleName(), e); + return Optional.empty(); + } + } + + public static Optional> getPropertyType(final Object bean, final String fieldName) { + try { + return Optional.ofNullable(PropertyUtils.getPropertyType(bean, fieldName)); } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) { - logger.info("Could not get property type for [{}], [{}]", name, bean.getClass().getSimpleName(), e); + logger.info("Could not get property type for [{}], [{}]", fieldName, bean.getClass().getSimpleName(), e); return Optional.empty(); } } @@ -52,13 +71,13 @@ private static Class getPropertyTypeRecursive(Class beanClass, String prop Class currentType = PropertyUtils.getPropertyType(beanClass, property); if (currentType == null) { - throw new IllegalArgumentException("No such property: " + property); + throw new IllegalArgumentException(String.format("No such property: [%s] on type: [%s]", property, beanClass)); } if (resolver.isIndexed(next)) { currentType = getIndexedPropertyType(currentType); } else if (resolver.isMapped(next)) { - throw new UnsupportedOperationException("Not supported yet."); + throw new UnsupportedOperationException("Maps are not supported yet."); } String remaining = resolver.remove(propertyName); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/patch/SinglePatchResult.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/SinglePatchResult.java similarity index 95% rename from sormas-backend/src/main/java/de/symeda/sormas/patch/SinglePatchResult.java rename to sormas-backend/src/main/java/de/symeda/sormas/backend/patch/SinglePatchResult.java index 8d92e4309b9..66fbfb86005 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/patch/SinglePatchResult.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/SinglePatchResult.java @@ -1,4 +1,4 @@ -package de.symeda.sormas.patch; +package de.symeda.sormas.backend.patch; import javax.annotation.Nullable; import javax.validation.constraints.NotNull; diff --git a/sormas-backend/src/main/java/de/symeda/sormas/patch/fields.js b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/fields.js similarity index 100% rename from sormas-backend/src/main/java/de/symeda/sormas/patch/fields.js rename to sormas-backend/src/main/java/de/symeda/sormas/backend/patch/fields.js diff --git a/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/FieldCustomMapperRegistry.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/FieldCustomMapperRegistry.java similarity index 95% rename from sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/FieldCustomMapperRegistry.java rename to sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/FieldCustomMapperRegistry.java index 080f86e11cf..8c096b20bde 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/FieldCustomMapperRegistry.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/FieldCustomMapperRegistry.java @@ -1,4 +1,4 @@ -package de.symeda.sormas.patch.mapping; +package de.symeda.sormas.backend.patch.mapping; import java.util.Map; import java.util.Optional; diff --git a/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/ValueMapperRegistry.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/ValueMapperRegistry.java similarity index 84% rename from sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/ValueMapperRegistry.java rename to sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/ValueMapperRegistry.java index cf189c5d3f9..51e1ade0f2a 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/ValueMapperRegistry.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/ValueMapperRegistry.java @@ -1,4 +1,4 @@ -package de.symeda.sormas.patch.mapping; +package de.symeda.sormas.backend.patch.mapping; import java.util.List; import java.util.stream.Collectors; @@ -7,6 +7,7 @@ import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Instance; import javax.inject.Inject; +import javax.validation.constraints.NotNull; import de.symeda.sormas.api.patch.mapping.ValueMapper; @@ -24,7 +25,8 @@ void init() { orderedInstances = instances.stream().sorted().collect(Collectors.toList()); } - public T map(Object value, Class targetType) { + @NotNull + public T map(Object value, @NotNull Class targetType) { if (value == null) { return null; } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/exceptions/ErrorDescriptionMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/exceptions/ErrorDescriptionMapper.java similarity index 96% rename from sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/exceptions/ErrorDescriptionMapper.java rename to sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/exceptions/ErrorDescriptionMapper.java index a59a867ac73..e51d47ae13a 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/exceptions/ErrorDescriptionMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/exceptions/ErrorDescriptionMapper.java @@ -1,4 +1,4 @@ -package de.symeda.sormas.patch.mapping.exceptions; +package de.symeda.sormas.backend.patch.mapping.exceptions; import java.text.ParseException; import java.util.Map; diff --git a/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/fieldmapper/PersonBirthDateFieldMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonBirthDateFieldMapper.java similarity index 84% rename from sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/fieldmapper/PersonBirthDateFieldMapper.java rename to sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonBirthDateFieldMapper.java index b9353990f8e..f557a838387 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/fieldmapper/PersonBirthDateFieldMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonBirthDateFieldMapper.java @@ -1,4 +1,4 @@ -package de.symeda.sormas.patch.mapping.impl.fieldmapper; +package de.symeda.sormas.backend.patch.mapping.impl.fieldmapper; import java.util.Calendar; import java.util.Date; @@ -10,12 +10,15 @@ import de.symeda.sormas.api.patch.DataPatchFailure; import de.symeda.sormas.api.patch.DataPatchFailureCause; -import de.symeda.sormas.api.patch.DataReplacementType; +import de.symeda.sormas.api.patch.DataReplacementStrategy; import de.symeda.sormas.api.patch.mapping.FieldCustomMapper; import de.symeda.sormas.api.patch.mapping.FieldPatchRequest; import de.symeda.sormas.api.person.PersonDto; -import de.symeda.sormas.patch.mapping.impl.valuemapper.DateMapper; +import de.symeda.sormas.backend.patch.mapping.impl.valuemapper.DateMapper; +/** + * For now this FieldMapper will not be allowed and "deactivated" through the list of forbidden fields. + */ @ApplicationScoped public class PersonBirthDateFieldMapper implements FieldCustomMapper { @@ -43,7 +46,7 @@ public Optional map(FieldPatchRequest request) { int birthdateMonth = calendar.get(Calendar.MONTH) + 1; int year = calendar.get(Calendar.YEAR); - if (request.getReplacementType() == DataReplacementType.IF_NOT_ALREADY_PRESENT) { + if (request.getReplacementType() == DataReplacementStrategy.IF_NOT_ALREADY_PRESENT) { Integer currentDayOfMonth = person.getBirthdateDD(); Integer currentBirthdateMonth = person.getBirthdateMM(); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapper.java new file mode 100644 index 00000000000..f9983e39064 --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapper.java @@ -0,0 +1,100 @@ +package de.symeda.sormas.backend.patch.mapping.impl.fieldmapper; + +import java.util.Optional; +import java.util.Set; +import java.util.function.Predicate; +import java.util.function.Supplier; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import javax.enterprise.context.ApplicationScoped; + +import org.jetbrains.annotations.NotNull; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import de.symeda.sormas.api.patch.DataPatchFailure; +import de.symeda.sormas.api.patch.DataPatchFailureCause; +import de.symeda.sormas.api.patch.mapping.FieldCustomMapper; +import de.symeda.sormas.api.patch.mapping.FieldPatchRequest; +import de.symeda.sormas.api.person.PersonContactDetailDto; +import de.symeda.sormas.api.person.PersonContactDetailType; +import de.symeda.sormas.api.person.PersonDto; +import de.symeda.sormas.api.person.PhoneNumberType; + +@ApplicationScoped +public class PersonContactDetailsFieldMapper implements FieldCustomMapper { + + private static final Logger logger = LoggerFactory.getLogger(PersonContactDetailsFieldMapper.class); + + @Override + public Optional map(FieldPatchRequest request) { + Object untypedTarget = request.getTarget(); + if (!(untypedTarget instanceof PersonDto)) { + return Optional.of(new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.TECHNICAL)); + } + PersonDto personDto = (PersonDto) untypedTarget; + + Supplier appropriateSupplier; + Predicate appropriatePredicate; + + if (request.getFieldName().contains(PersonContactDetailDto.PHONE_NUMBER_TYPE)) { + appropriatePredicate = buildPredicateFor(PersonContactDetailType.PHONE); + appropriateSupplier = () -> buildPhoneContactDetail(request); + + } else { + appropriatePredicate = buildPredicateFor(PersonContactDetailType.EMAIL); + appropriateSupplier = () -> buildEmailContactDetail(request); + } + + Optional alreadyPresentContactDetail = personDto.getPersonContactDetails() + .stream() + .filter(appropriatePredicate) + .filter(contactDetail -> contactDetail.getDetails().equals(request.getValue())) + .findAny(); + + if (alreadyPresentContactDetail.isPresent()) { + logger.debug("Person contact details already present nothing to do: [{}]", alreadyPresentContactDetail.get()); + } else { + PersonContactDetailDto contactDetail = appropriateSupplier.get(); + logger.debug("Person contact details not already present, therefore added: [{}]", contactDetail); + personDto.getPersonContactDetails().add(contactDetail); + } + + return Optional.empty(); + } + + private static @NotNull Predicate buildPredicateFor(PersonContactDetailType email) { + return contactDetail -> contactDetail.getPersonContactDetailType().equals(email); + } + + private PersonContactDetailDto buildGenericContactDetail(FieldPatchRequest request) { + PersonContactDetailDto detail = new PersonContactDetailDto(); + detail.setDetails((String) request.getValue()); + detail.setAdditionalInformation(request.getOrigin()); + + return detail; + } + + private PersonContactDetailDto buildPhoneContactDetail(FieldPatchRequest request) { + PersonContactDetailDto detail = buildGenericContactDetail(request); + detail.setPersonContactDetailType(PersonContactDetailType.PHONE); + detail.setPhoneNumberType(PhoneNumberType.OTHER); + + return detail; + } + + private PersonContactDetailDto buildEmailContactDetail(FieldPatchRequest request) { + PersonContactDetailDto detail = buildGenericContactDetail(request); + detail.setPersonContactDetailType(PersonContactDetailType.EMAIL); + + return detail; + } + + @Override + public Set supportedFields() { + return Stream.of(PersonContactDetailDto.PHONE_NUMBER_TYPE, PersonContactDetailDto.DETAILS) + .map(suffix -> PersonDto.I18N_PREFIX + "." + PersonContactDetailDto.I18N_PREFIX + "." + suffix) + .collect(Collectors.toSet()); + } +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/valuemapper/DateMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/DateMapper.java similarity index 85% rename from sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/valuemapper/DateMapper.java rename to sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/DateMapper.java index 08a258b316b..4c007a44202 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/valuemapper/DateMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/DateMapper.java @@ -1,4 +1,4 @@ -package de.symeda.sormas.patch.mapping.impl.valuemapper; +package de.symeda.sormas.backend.patch.mapping.impl.valuemapper; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -23,7 +23,7 @@ public Set> getSupportedTypes() { @Override @SuppressWarnings("unchecked") - public T map(Object value, Class targetType) { + public T map(Object value, Class targetType, Set inputLanguageCodes) { try { SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMAT); sdf.setLenient(false); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/valuemapper/EnumMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumMapper.java similarity index 86% rename from sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/valuemapper/EnumMapper.java rename to sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumMapper.java index 9d2678e5204..5871bbec125 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/valuemapper/EnumMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumMapper.java @@ -1,4 +1,4 @@ -package de.symeda.sormas.patch.mapping.impl.valuemapper; +package de.symeda.sormas.backend.patch.mapping.impl.valuemapper; import java.lang.reflect.Field; import java.util.Set; @@ -24,7 +24,8 @@ public Set> getSupportedTypes() { @SuppressWarnings({ "unchecked", "rawtypes" }) - public T map(Object value, Class targetType) { + public T map(Object value, Class targetType, Set inputLanguageCodes) { + // TODO: check if inputLanguageCodes can be used to use I18N. Class enumType = (Class) targetType; String memberNameCandidate = value.toString().trim().toUpperCase(); @@ -36,6 +37,7 @@ public T map(Object value, Class targetType) { } } + // TODO: check if fallback mechanism is wanted. for (Enum constant : constants) { if (FALLBACK_NAME.equals(constant.name())) { return (T) constant; diff --git a/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/valuemapper/PrimitiveMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/PrimitiveMapper.java similarity index 86% rename from sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/valuemapper/PrimitiveMapper.java rename to sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/PrimitiveMapper.java index 2c49745ca00..b5f9f24e9c3 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/valuemapper/PrimitiveMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/PrimitiveMapper.java @@ -1,4 +1,4 @@ -package de.symeda.sormas.patch.mapping.impl.valuemapper; +package de.symeda.sormas.backend.patch.mapping.impl.valuemapper; import java.util.Set; @@ -18,7 +18,7 @@ public Set> getSupportedTypes() { @Override @SuppressWarnings("unchecked") - public T map(Object value, Class targetType) { + public T map(Object value, Class targetType, Set inputLanguageCodes) { String str = value.toString().trim(); if (targetType == String.class) diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/ReferenceDtoMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/ReferenceDtoMapper.java new file mode 100644 index 00000000000..b36704dee7b --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/ReferenceDtoMapper.java @@ -0,0 +1,44 @@ +package de.symeda.sormas.backend.patch.mapping.impl.valuemapper; + +import java.util.Set; + +import javax.enterprise.context.ApplicationScoped; +import javax.inject.Inject; + +import de.symeda.sormas.api.ReferenceDto; +import de.symeda.sormas.api.patch.mapping.ValueMapper; +import de.symeda.sormas.api.referencedata.ReferenceDataValueInstanceProvider; + +@ApplicationScoped +public class ReferenceDtoMapper implements ValueMapper { + + @Inject + private ReferenceDataValueInstanceProvider referenceDataValueInstanceProvider; + + @Override + public T map(Object value, Class targetType, Set inputLanguageCodes) { + String captionCandidate = value.toString(); + + if (!targetType.isAssignableFrom(ReferenceDto.class)) { + throw new IllegalArgumentException(String.format("[%s] is not assignable from [%s].", value, targetType.getName())); + } + + Class referenceType = targetType.asSubclass(ReferenceDto.class); + + // TODO: could be nice to produce the error directly here + return (T) referenceDataValueInstanceProvider.getOne(captionCandidate, referenceType) + .orElseThrow( + () -> new IllegalStateException( + String.format("Could not match value: [%s] to referenceType: [%s]", captionCandidate, referenceType))); + } + + @Override + public Set> getSupportedTypes() { + return Set.of(ReferenceDto.class); + } + + @Override + public int getOrder() { + return LOW_PRECEDENCE - (ORDER_CHUNK * 2); + } +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/sample/SampleService.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/sample/SampleService.java index 458059e7624..d651385dcff 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/sample/SampleService.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/sample/SampleService.java @@ -35,7 +35,6 @@ import java.util.stream.Collectors; import javax.ejb.EJB; -import javax.ejb.LocalBean; import javax.ejb.Stateless; import javax.ejb.TransactionAttribute; import javax.ejb.TransactionAttributeType; @@ -124,7 +123,6 @@ import de.symeda.sormas.backend.util.QueryHelper; @Stateless -@LocalBean public class SampleService extends AbstractDeletableAdoService implements JurisdictionFlagsService { diff --git a/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/valuemapper/ReferenceDtoMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/valuemapper/ReferenceDtoMapper.java deleted file mode 100644 index 7752c97db10..00000000000 --- a/sormas-backend/src/main/java/de/symeda/sormas/patch/mapping/impl/valuemapper/ReferenceDtoMapper.java +++ /dev/null @@ -1,34 +0,0 @@ -package de.symeda.sormas.patch.mapping.impl.valuemapper; - -import java.util.Set; - -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - -import de.symeda.sormas.api.ReferenceDto; -import de.symeda.sormas.api.patch.mapping.ValueMapper; -import de.symeda.sormas.api.referencedata.ReferenceDataValueInstanceProvider; - -@ApplicationScoped -public class ReferenceDtoMapper implements ValueMapper { - - @Inject - private ReferenceDataValueInstanceProvider referenceDataValueInstanceProvider; - - @Override - public T map(Object value, Class targetType) { - String captionCandidate = value.toString(); - - return null; - } - - @Override - public Set> getSupportedTypes() { - return Set.of(ReferenceDto.class); - } - - @Override - public int getOrder() { - return LOW_PRECEDENCE - (ORDER_CHUNK * 2); - } -} diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/AbstractBeanTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/AbstractBeanTest.java index 13e479b053d..b51b5bbaed9 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/backend/AbstractBeanTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/AbstractBeanTest.java @@ -42,6 +42,8 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.mockito.junit.jupiter.MockitoSettings; import org.mockito.quality.Strictness; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import de.hilling.junit.cdi.CdiTestJunitExtension; import de.hilling.junit.cdi.ContextControlWrapper; @@ -96,6 +98,7 @@ import de.symeda.sormas.api.infrastructure.subcontinent.SubcontinentFacade; import de.symeda.sormas.api.manualmessagelog.ManualMessageLogFacade; import de.symeda.sormas.api.outbreak.OutbreakFacade; +import de.symeda.sormas.api.patch.CaseDataPatcher; import de.symeda.sormas.api.person.notifier.NotifierFacade; import de.symeda.sormas.api.report.AggregateReportFacade; import de.symeda.sormas.api.report.WeeklyReportFacade; @@ -216,6 +219,7 @@ import de.symeda.sormas.backend.manualmessagelog.ManualMessageLogFacadeEjb.ManualMessageLogFacadeEjbLocal; import de.symeda.sormas.backend.manualmessagelog.ManualMessageLogService; import de.symeda.sormas.backend.outbreak.OutbreakFacadeEjb.OutbreakFacadeEjbLocal; +import de.symeda.sormas.backend.patch.CaseDataPatcherImpl; import de.symeda.sormas.backend.person.PersonFacadeEjb.PersonFacadeEjbLocal; import de.symeda.sormas.backend.person.PersonService; import de.symeda.sormas.backend.person.notifier.NotifierEjb; @@ -296,6 +300,8 @@ @MockitoSettings(strictness = Strictness.LENIENT) public abstract class AbstractBeanTest { + protected final Logger logger = LoggerFactory.getLogger(getClass()); + protected final TestDataCreator creator = new TestDataCreator(this); protected UserDto nationalAdmin; @@ -1147,4 +1153,8 @@ public NotifierFacade getNotifierFacade() { public NotifierService getNotifierService() { return getBean(NotifierService.class); } + + public CaseDataPatcher getCaseDataPatcher() { + return getBean(CaseDataPatcherImpl.class); + } } diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/AbstractUnitTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/AbstractUnitTest.java new file mode 100644 index 00000000000..dd7f506060c --- /dev/null +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/AbstractUnitTest.java @@ -0,0 +1,15 @@ +package de.symeda.sormas.backend; + +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Can be used to write UNIT tests to test a class in an isolated manner. + */ +@ExtendWith(MockitoExtension.class) +public class AbstractUnitTest { + + protected final Logger logger = LoggerFactory.getLogger(getClass()); +} diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapperTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapperTest.java new file mode 100644 index 00000000000..a2980239260 --- /dev/null +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapperTest.java @@ -0,0 +1,248 @@ +package de.symeda.sormas.backend.patch.mapping.impl.fieldmapper; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import java.util.Set; + +import org.junit.jupiter.api.Test; +import org.mockito.InjectMocks; + +import de.symeda.sormas.api.patch.DataPatchFailure; +import de.symeda.sormas.api.patch.DataPatchFailureCause; +import de.symeda.sormas.api.patch.mapping.FieldPatchRequest; +import de.symeda.sormas.api.person.PersonContactDetailDto; +import de.symeda.sormas.api.person.PersonContactDetailType; +import de.symeda.sormas.api.person.PersonDto; +import de.symeda.sormas.api.person.PhoneNumberType; +import de.symeda.sormas.backend.AbstractUnitTest; + +class PersonContactDetailsFieldMapperTest extends AbstractUnitTest { + + @InjectMocks + private PersonContactDetailsFieldMapper victim; + + @Test + void supportedFields_containsPhoneNumberTypeAndDetails() { + // PREPARE + Set expected = Set.of("Person.PersonContactDetail.phoneNumberType", "Person.PersonContactDetail.details"); + + // EXECUTE + Set actual = victim.supportedFields(); + + // CHECK + assertEquals(expected, actual); + } + + // map - wrong target type + + @Test + void map_targetNotPersonDto_returnsTechnicalFailure() { + // PREPARE + FieldPatchRequest request = mock(FieldPatchRequest.class); + when(request.getTarget()).thenReturn(new Object()); + + // EXECUTE + Optional actual = victim.map(request); + + // CHECK + assertTrue(actual.isPresent()); + assertEquals(DataPatchFailureCause.TECHNICAL, actual.get().getDataPatchFailureCause()); + } + + @Test + void map_phoneField_contactDetailNotPresent_addsPhoneContactDetail() { + // PREPARE + PersonDto personDto = new PersonDto(); + personDto.setPersonContactDetails(new ArrayList<>()); + + FieldPatchRequest request = mock(FieldPatchRequest.class); + when(request.getTarget()).thenReturn(personDto); + when(request.getFieldName()).thenReturn("Person.PersonContactDetail.phoneNumberType"); + when(request.getValue()).thenReturn("0123456789"); + when(request.getOrigin()).thenReturn("someOrigin"); + + // EXECUTE + Optional actual = victim.map(request); + + // CHECK + assertTrue(actual.isEmpty()); + assertEquals(1, personDto.getPersonContactDetails().size()); + PersonContactDetailDto added = personDto.getPersonContactDetails().get(0); + assertEquals(PersonContactDetailType.PHONE, added.getPersonContactDetailType()); + assertEquals("0123456789", added.getDetails()); + assertEquals(PhoneNumberType.OTHER, added.getPhoneNumberType()); + assertEquals("someOrigin", added.getAdditionalInformation()); + } + + @Test + void map_phoneField_contactDetailAlreadyPresent_doesNotAddDuplicate() { + // PREPARE + PersonContactDetailDto existing = new PersonContactDetailDto(); + existing.setPersonContactDetailType(PersonContactDetailType.PHONE); + existing.setDetails("0123456789"); + + PersonDto personDto = new PersonDto(); + personDto.setPersonContactDetails(new ArrayList<>(List.of(existing))); + + FieldPatchRequest request = mock(FieldPatchRequest.class); + when(request.getTarget()).thenReturn(personDto); + when(request.getFieldName()).thenReturn("Person.PersonContactDetail.phoneNumberType"); + when(request.getValue()).thenReturn("0123456789"); + + // EXECUTE + Optional actual = victim.map(request); + + // CHECK + assertTrue(actual.isEmpty()); + assertEquals(1, personDto.getPersonContactDetails().size()); + } + + @Test + void map_phoneField_differentValueAlreadyPresent_addsNewEntry() { + // PREPARE + PersonContactDetailDto existing = new PersonContactDetailDto(); + existing.setPersonContactDetailType(PersonContactDetailType.PHONE); + existing.setDetails("0000000000"); + + PersonDto personDto = new PersonDto(); + personDto.setPersonContactDetails(new ArrayList<>(List.of(existing))); + + FieldPatchRequest request = mock(FieldPatchRequest.class); + when(request.getTarget()).thenReturn(personDto); + when(request.getFieldName()).thenReturn("Person.PersonContactDetail.phoneNumberType"); + when(request.getValue()).thenReturn("0123456789"); + when(request.getOrigin()).thenReturn("someOrigin"); + + // EXECUTE + Optional actual = victim.map(request); + + // CHECK + assertTrue(actual.isEmpty()); + assertEquals(2, personDto.getPersonContactDetails().size()); + } + + @Test + void map_emailField_contactDetailNotPresent_addsEmailContactDetail() { + // PREPARE + PersonDto personDto = new PersonDto(); + personDto.setPersonContactDetails(new ArrayList<>()); + + FieldPatchRequest request = mock(FieldPatchRequest.class); + when(request.getTarget()).thenReturn(personDto); + when(request.getFieldName()).thenReturn("Person.PersonContactDetail.details"); + when(request.getValue()).thenReturn("test@example.com"); + when(request.getOrigin()).thenReturn("someOrigin"); + + // EXECUTE + Optional actual = victim.map(request); + + // CHECK + assertTrue(actual.isEmpty()); + assertEquals(1, personDto.getPersonContactDetails().size()); + PersonContactDetailDto added = personDto.getPersonContactDetails().get(0); + assertEquals(PersonContactDetailType.EMAIL, added.getPersonContactDetailType()); + assertEquals("test@example.com", added.getDetails()); + assertEquals("someOrigin", added.getAdditionalInformation()); + } + + @Test + void map_emailField_contactDetailAlreadyPresent_doesNotAddDuplicate() { + // PREPARE + PersonContactDetailDto existing = new PersonContactDetailDto(); + existing.setPersonContactDetailType(PersonContactDetailType.EMAIL); + existing.setDetails("test@example.com"); + + PersonDto personDto = new PersonDto(); + personDto.setPersonContactDetails(new ArrayList<>(List.of(existing))); + + FieldPatchRequest request = mock(FieldPatchRequest.class); + when(request.getTarget()).thenReturn(personDto); + when(request.getFieldName()).thenReturn("Person.PersonContactDetail.details"); + when(request.getValue()).thenReturn("test@example.com"); + + // EXECUTE + Optional actual = victim.map(request); + + // CHECK + assertTrue(actual.isEmpty()); + assertEquals(1, personDto.getPersonContactDetails().size()); + } + + @Test + void map_emailField_differentValueAlreadyPresent_addsNewEntry() { + // PREPARE + PersonContactDetailDto existing = new PersonContactDetailDto(); + existing.setPersonContactDetailType(PersonContactDetailType.EMAIL); + existing.setDetails("other@example.com"); + + PersonDto personDto = new PersonDto(); + personDto.setPersonContactDetails(new ArrayList<>(List.of(existing))); + + FieldPatchRequest request = mock(FieldPatchRequest.class); + when(request.getTarget()).thenReturn(personDto); + when(request.getFieldName()).thenReturn("Person.PersonContactDetail.details"); + when(request.getValue()).thenReturn("test@example.com"); + when(request.getOrigin()).thenReturn("someOrigin"); + + // EXECUTE + Optional actual = victim.map(request); + + // CHECK + assertTrue(actual.isEmpty()); + assertEquals(2, personDto.getPersonContactDetails().size()); + } + + @Test + void map_phoneField_existingEmailWithSameValue_addsPhoneContactDetail() { + // PREPARE + PersonContactDetailDto existingEmail = new PersonContactDetailDto(); + existingEmail.setPersonContactDetailType(PersonContactDetailType.EMAIL); + existingEmail.setDetails("0123456789"); + + PersonDto personDto = new PersonDto(); + personDto.setPersonContactDetails(new ArrayList<>(List.of(existingEmail))); + + FieldPatchRequest request = mock(FieldPatchRequest.class); + when(request.getTarget()).thenReturn(personDto); + when(request.getFieldName()).thenReturn("Person.PersonContactDetail.phoneNumberType"); + when(request.getValue()).thenReturn("0123456789"); + when(request.getOrigin()).thenReturn("someOrigin"); + + // EXECUTE + Optional actual = victim.map(request); + + // CHECK + assertTrue(actual.isEmpty()); + assertEquals(2, personDto.getPersonContactDetails().size()); + } + + @Test + void map_emailField_existingPhoneWithSameValue_addsEmailContactDetail() { + // PREPARE + PersonContactDetailDto existingPhone = new PersonContactDetailDto(); + existingPhone.setPersonContactDetailType(PersonContactDetailType.PHONE); + existingPhone.setDetails("test@example.com"); + + PersonDto personDto = new PersonDto(); + personDto.setPersonContactDetails(new ArrayList<>(List.of(existingPhone))); + + FieldPatchRequest request = mock(FieldPatchRequest.class); + when(request.getTarget()).thenReturn(personDto); + when(request.getFieldName()).thenReturn("Person.PersonContactDetail.details"); + when(request.getValue()).thenReturn("test@example.com"); + when(request.getOrigin()).thenReturn("someOrigin"); + + // EXECUTE + Optional actual = victim.map(request); + + // CHECK + assertTrue(actual.isEmpty()); + assertEquals(2, personDto.getPersonContactDetails().size()); + } +} diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/DateMapperTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/DateMapperTest.java new file mode 100644 index 00000000000..62dec1e7b0f --- /dev/null +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/DateMapperTest.java @@ -0,0 +1,126 @@ +package de.symeda.sormas.backend.patch.mapping.impl.valuemapper; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Set; + +import org.junit.jupiter.api.Test; +import org.mockito.InjectMocks; + +import de.symeda.sormas.backend.AbstractUnitTest; + +class DateMapperTest extends AbstractUnitTest { + + @InjectMocks + private DateMapper victim; + + // getSupportedTypes + + @Test + void getSupportedTypes_containsDateClass() { + // PREPARE + Set> expected = Set.of(Date.class); + + // EXECUTE + Set> actual = victim.getSupportedTypes(); + + // CHECK + assertEquals(expected, actual); + } + + // map - happy paths + + @Test + void map_validDate() throws Exception { + // PREPARE + String input = "2024-06-15"; + Date expected = new SimpleDateFormat("yyyy-MM-dd").parse(input); + + // EXECUTE + Date actual = victim.map(input, Date.class); + + // CHECK + assertEquals(expected, actual); + } + + @Test + void map_firstDayOfYear() throws Exception { + // PREPARE + String input = "2024-01-01"; + Date expected = new SimpleDateFormat("yyyy-MM-dd").parse(input); + + // EXECUTE + Date actual = victim.map(input, Date.class); + + // CHECK + assertEquals(expected, actual); + } + + @Test + void map_lastDayOfYear() throws Exception { + // PREPARE + String input = "2024-12-31"; + Date expected = new SimpleDateFormat("yyyy-MM-dd").parse(input); + + // EXECUTE + Date actual = victim.map(input, Date.class); + + // CHECK + assertEquals(expected, actual); + } + + // map - edge cases + + @Test + void map_valueAsNonStringObject_usesToString() throws Exception { + // PREPARE + Date expected = new SimpleDateFormat("yyyy-MM-dd").parse("2024-06-15"); + + // EXECUTE + Date actual = victim.map(new StringBuilder("2024-06-15"), Date.class); + + // CHECK + assertEquals(expected, actual); + } + + // map - error cases + + @Test + void map_invalidFormat_throwsIllegalArgumentException() { + // EXECUTE & CHECK + assertThrows(IllegalArgumentException.class, () -> victim.map("15/06/2024", Date.class)); + } + + @Test + void map_lenientOff_invalidDay_throwsIllegalArgumentException() { + // EXECUTE & CHECK + assertThrows(IllegalArgumentException.class, () -> victim.map("2024-02-30", Date.class)); + } + + @Test + void map_lenientOff_invalidMonth_throwsIllegalArgumentException() { + // EXECUTE & CHECK + assertThrows(IllegalArgumentException.class, () -> victim.map("2024-13-01", Date.class)); + } + + @Test + void map_emptyString_throwsIllegalArgumentException() { + // EXECUTE & CHECK + assertThrows(IllegalArgumentException.class, () -> victim.map("", Date.class)); + } + + @Test + void map_randomString_throwsIllegalArgumentException() { + // EXECUTE & CHECK + assertThrows(IllegalArgumentException.class, () -> victim.map("notADate", Date.class)); + } + + @Test + void map_nullValue_throwsNullPointerException() { + // EXECUTE & CHECK + assertThrows(NullPointerException.class, () -> victim.map(null, Date.class)); + } +} diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumMapperTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumMapperTest.java new file mode 100644 index 00000000000..42eaebf6d99 --- /dev/null +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumMapperTest.java @@ -0,0 +1,152 @@ +package de.symeda.sormas.backend.patch.mapping.impl.valuemapper; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + +import java.util.Set; + +import org.junit.jupiter.api.Test; +import org.mockito.InjectMocks; + +import de.symeda.sormas.api.caze.InfectionSetting; +import de.symeda.sormas.api.caze.Trimester; +import de.symeda.sormas.api.person.Sex; +import de.symeda.sormas.backend.AbstractUnitTest; + +class EnumMapperTest extends AbstractUnitTest { + + @InjectMocks + private EnumMapper victim; + + // getSupportedTypes + + @Test + void getSupportedTypes_containsEnumClass() { + // PREPARE + Set> expected = Set.of(Enum.class); + + // EXECUTE + Set> actual = victim.getSupportedTypes(); + + // CHECK + assertEquals(expected, actual); + } + + // map - exact match (Sex enum, no OTHER/fallback ambiguity) + + @Test + void map_sex_exactMatch_male() { + // EXECUTE & CHECK + assertEquals(Sex.MALE, victim.map("MALE", Sex.class)); + } + + @Test + void map_sex_exactMatch_female() { + // EXECUTE & CHECK + assertEquals(Sex.FEMALE, victim.map("FEMALE", Sex.class)); + } + + @Test + void map_sex_exactMatch_unknown() { + // EXECUTE & CHECK + assertEquals(Sex.UNKNOWN, victim.map("UNKNOWN", Sex.class)); + } + + @Test + void map_sex_caseInsensitive_lowercase() { + // EXECUTE & CHECK + assertEquals(Sex.MALE, victim.map("male", Sex.class)); + } + + @Test + void map_sex_caseInsensitive_mixedCase() { + // EXECUTE & CHECK + assertEquals(Sex.FEMALE, victim.map("fEmAlE", Sex.class)); + } + + @Test + void map_sex_trimsWhitespace() { + // EXECUTE & CHECK + assertEquals(Sex.MALE, victim.map(" MALE ", Sex.class)); + } + + // map - OTHER fallback (Sex has OTHER constant) + + @Test + void map_sex_unknownValue_fallsBackToOther() { + // EXECUTE & CHECK + assertEquals(Sex.OTHER, victim.map("SOMETHING_UNKNOWN", Sex.class)); + } + + // map - @ValueMapperDefault fallback (InfectionSetting, no OTHER constant) + + @Test + void map_infectionSetting_exactMatch_ambulatory() { + // EXECUTE & CHECK + assertEquals(InfectionSetting.AMBULATORY, victim.map("AMBULATORY", InfectionSetting.class)); + } + + @Test + void map_infectionSetting_exactMatch_normalWard() { + // EXECUTE & CHECK + assertEquals(InfectionSetting.NORMAL_WARD, victim.map("NORMAL_WARD", InfectionSetting.class)); + } + + @Test + void map_infectionSetting_unknownValue_fallsBackToAnnotatedDefault() { + // EXECUTE & CHECK + assertEquals(InfectionSetting.UNKNOWN, victim.map("SOMETHING_UNKNOWN", InfectionSetting.class)); + } + + // map - @ValueMapperDefault fallback (Trimester, no OTHER constant) + + @Test + void map_trimester_exactMatch_first() { + // EXECUTE & CHECK + assertEquals(Trimester.FIRST, victim.map("FIRST", Trimester.class)); + } + + @Test + void map_trimester_exactMatch_second() { + // EXECUTE & CHECK + assertEquals(Trimester.SECOND, victim.map("SECOND", Trimester.class)); + } + + @Test + void map_trimester_exactMatch_third() { + // EXECUTE & CHECK + assertEquals(Trimester.THIRD, victim.map("THIRD", Trimester.class)); + } + + @Test + void map_trimester_unknownValue_fallsBackToAnnotatedDefault() { + // EXECUTE & CHECK + assertEquals(Trimester.UNKNOWN, victim.map("SOMETHING_UNKNOWN", Trimester.class)); + } + + // map - no match, no OTHER, no @ValueMapperDefault → exception + + @Test + void map_noFallback_throwsEnumConstantNotPresentException() { + // PREPARE + // Direction has no OTHER constant and no @ValueMapperDefault annotation + + // EXECUTE & CHECK + assertThrows(EnumConstantNotPresentException.class, () -> victim.map("SOMETHING_UNKNOWN", NoFallbackEnum.class)); + } + + // map - null input + + @Test + void map_nullValue_throwsNullPointerException() { + // EXECUTE & CHECK + assertThrows(NullPointerException.class, () -> victim.map(null, Sex.class)); + } + + private enum NoFallbackEnum { + NORTH, + SOUTH, + EAST, + WEST + } +} diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/PrimitiveMapperTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/PrimitiveMapperTest.java new file mode 100644 index 00000000000..c7b2281154b --- /dev/null +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/PrimitiveMapperTest.java @@ -0,0 +1,180 @@ +package de.symeda.sormas.backend.patch.mapping.impl.valuemapper; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.Set; + +import org.junit.jupiter.api.Test; +import org.mockito.InjectMocks; + +import de.symeda.sormas.backend.AbstractUnitTest; + +class PrimitiveMapperTest extends AbstractUnitTest { + + @InjectMocks + private PrimitiveMapper victim; + + @Test + void map_string() { + // PREPARE + String expected = "toto"; + // EXECUTE & CHECK + assertEquals(expected, victim.map(expected, String.class)); + } + + @Test + void map_Integer() { + // PREPARE + String input = "50"; + + // EXECUTE + Integer actual = victim.map(input, Integer.class); + + // CHECK + assertEquals(50, actual); + } + + @Test + void getSupportedTypes_containsAllExpectedTypes() { + // PREPARE + Set> expected = Set.of(String.class, Integer.class, Double.class, Float.class, Boolean.class, boolean.class); + + // EXECUTE + Set> actual = victim.getSupportedTypes(); + + // CHECK + assertEquals(expected, actual); + } + + // map - happy paths + + @Test + void map_string_trimsWhitespace() { + // EXECUTE & CHECK + assertEquals("hello", victim.map(" hello ", String.class)); + } + + @Test + void map_integer() { + // PREPARE + String input = "42"; + + // EXECUTE + Integer actual = victim.map(input, Integer.class); + + // CHECK + assertEquals(42, actual); + } + + @Test + void map_double() { + // PREPARE + String input = "3.14"; + + // EXECUTE + Double actual = victim.map(input, Double.class); + + // CHECK + assertEquals(3.14, actual); + } + + @Test + void map_float() { + // PREPARE + String input = "1.5"; + + // EXECUTE + Float actual = victim.map(input, Float.class); + + // CHECK + assertEquals(1.5f, actual); + } + + @Test + void map_boolean_true() { + // PREPARE + String input = "true"; + + // EXECUTE + Boolean actual = victim.map(input, Boolean.class); + + // CHECK + assertTrue(actual); + } + + @Test + void map_boolean_false() { + // PREPARE + String input = "false"; + + // EXECUTE + Boolean actual = victim.map(input, Boolean.class); + + // CHECK + assertFalse(actual); + } + + @Test + void map_primitiveBooleanClass_true() { + // PREPARE + String input = "true"; + + // EXECUTE + Boolean actual = victim.map(input, boolean.class); + + // CHECK + assertTrue(actual); + } + + // map - edge cases + + @Test + void map_integer_withSurroundingWhitespace() { + // EXECUTE & CHECK + assertEquals(99, victim.map(" 99 ", Integer.class)); + } + + @Test + void map_boolean_invalidString_returnsFalse() { + // EXECUTE & CHECK + assertFalse(victim.map("notABoolean", Boolean.class)); + } + + // map - error cases + + @Test + void map_unsupportedType_throwsIllegalArgumentException() { + // PREPARE + String input = "value"; + + // EXECUTE & CHECK + assertThrows(IllegalArgumentException.class, () -> victim.map(input, Long.class)); + } + + @Test + void map_nullValue_throwsNullPointerException() { + // EXECUTE & CHECK + assertThrows(NullPointerException.class, () -> victim.map(null, String.class)); + } + + @Test + void map_invalidIntegerFormat_throwsNumberFormatException() { + // EXECUTE & CHECK + assertThrows(NumberFormatException.class, () -> victim.map("notAnInt", Integer.class)); + } + + @Test + void map_invalidDoubleFormat_throwsNumberFormatException() { + // EXECUTE & CHECK + assertThrows(NumberFormatException.class, () -> victim.map("notADouble", Double.class)); + } + + @Test + void map_invalidFloatFormat_throwsNumberFormatException() { + // EXECUTE & CHECK + assertThrows(NumberFormatException.class, () -> victim.map("notAFloat", Float.class)); + } +} diff --git a/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java new file mode 100644 index 00000000000..89b7a773ad5 --- /dev/null +++ b/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java @@ -0,0 +1,37 @@ +package de.symeda.sormas.patch; + +import java.util.Map; + +import org.junit.jupiter.api.Test; + +import de.symeda.sormas.api.Disease; +import de.symeda.sormas.api.caze.CaseDataDto; +import de.symeda.sormas.api.patch.CaseDataPatchRequest; +import de.symeda.sormas.api.patch.DataPatchResponse; +import de.symeda.sormas.api.patch.DataReplacementStrategy; +import de.symeda.sormas.api.person.Sex; +import de.symeda.sormas.backend.AbstractBeanTest; + +class CaseDataPatcherImplTest extends AbstractBeanTest { + + @Test + void patch_no_errors() { + CaseDataDto caze = creator.createUnclassifiedCase(Disease.PERTUSSIS); + + CaseDataPatchRequest request = new CaseDataPatchRequest().setCaseUuid(caze.getUuid()) + .setReplacementStrategy(DataReplacementStrategy.ALWAYS) + .setPatchDictionary( + Map.of( + "Person.lastName", + "toto", + "Person.sex", + Sex.FEMALE.getName(), + "CaseData.sequelaeDetails", + "Some very interesting sequelaeDetails" + + )); + DataPatchResponse result = getCaseDataPatcher().patch(request); + + logger.info("result: [{}]", result); + } +} diff --git a/sormas-backend/src/test/java/de/symeda/sormas/patch/PropertyAccessorTest.java b/sormas-backend/src/test/java/de/symeda/sormas/patch/PropertyAccessorTest.java index 36174f3ef0c..c622f305525 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/patch/PropertyAccessorTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/patch/PropertyAccessorTest.java @@ -16,6 +16,8 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; +import de.symeda.sormas.backend.patch.PropertyAccessor; + @ExtendWith(MockitoExtension.class) class PropertyAccessorTest { @@ -27,7 +29,6 @@ private static class TestBean { private String[] array; private Map map; - // Getters/setters public String getName() { return name; } @@ -226,7 +227,6 @@ void getNestedPropertyType_mappedProperty_throwsUnsupported() { assertThrows(UnsupportedOperationException.class, () -> PropertyAccessor.getNestedPropertyType(bean, "map[key]")); } - // Integration test with real reflection errors @Test void getNestedPropertyType_exception_returnsEmpty() { class PrivateBean { diff --git a/sormas-backend/src/test/resources/logback-test.xml b/sormas-backend/src/test/resources/logback-test.xml index 16b3c8e2134..fd72b627179 100644 --- a/sormas-backend/src/test/resources/logback-test.xml +++ b/sormas-backend/src/test/resources/logback-test.xml @@ -6,43 +6,43 @@ - - - %date %-5level \(%C.java:%L\) - %msg%n + + + %date %-5level \(%C.java:%L\) - %msg%n - - + + - + - + - - + + - + - + - + - + - + - - + + - + - - + + From 7fcc124f8073c7b35db109c768e34c7f788e3ebb Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Mon, 23 Feb 2026 14:55:58 +0100 Subject: [PATCH 013/134] Minor enhancements for tests. --- .../PersonContactDetailsFieldMapper.java | 2 +- .../sormas/patch/CaseDataPatcherImplTest.java | 45 ++++++++++++++++--- 2 files changed, 40 insertions(+), 7 deletions(-) diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapper.java index f9983e39064..0371a41ce8a 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapper.java @@ -94,7 +94,7 @@ private PersonContactDetailDto buildEmailContactDetail(FieldPatchRequest request @Override public Set supportedFields() { return Stream.of(PersonContactDetailDto.PHONE_NUMBER_TYPE, PersonContactDetailDto.DETAILS) - .map(suffix -> PersonDto.I18N_PREFIX + "." + PersonContactDetailDto.I18N_PREFIX + "." + suffix) + .map(suffix -> PersonDto.I18N_PREFIX + "." + PersonDto.PERSON_CONTACT_DETAILS + "." + suffix) .collect(Collectors.toSet()); } } diff --git a/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java index 89b7a773ad5..13db668604b 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java @@ -2,6 +2,8 @@ import java.util.Map; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import de.symeda.sormas.api.Disease; @@ -9,29 +11,60 @@ import de.symeda.sormas.api.patch.CaseDataPatchRequest; import de.symeda.sormas.api.patch.DataPatchResponse; import de.symeda.sormas.api.patch.DataReplacementStrategy; +import de.symeda.sormas.api.person.PersonDto; import de.symeda.sormas.api.person.Sex; import de.symeda.sormas.backend.AbstractBeanTest; class CaseDataPatcherImplTest extends AbstractBeanTest { + @BeforeEach + void setUp() { + // TODO: create reference data: country. + // TODO: try to change language to use the languages names / with without accent and stuff: Pérou + } + @Test - void patch_no_errors() { - CaseDataDto caze = creator.createUnclassifiedCase(Disease.PERTUSSIS); + void patch_no_errors_alwas_replacement() { + // PREPARE + CaseDataDto originalCase = creator.createUnclassifiedCase(Disease.PERTUSSIS); - CaseDataPatchRequest request = new CaseDataPatchRequest().setCaseUuid(caze.getUuid()) + String newLastname = "toto"; + String newSequelaeDetails = "Some very interesting sequelaeDetails"; + CaseDataPatchRequest request = new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()) .setReplacementStrategy(DataReplacementStrategy.ALWAYS) .setPatchDictionary( Map.of( "Person.lastName", - "toto", + newLastname, + "Person.sex", Sex.FEMALE.getName(), + + "Person.personContactDetails.details", + "name@email.de", + + "Person.personContactDetails.phoneNumberType", + "123654687", + "CaseData.sequelaeDetails", - "Some very interesting sequelaeDetails" + newSequelaeDetails)); - )); + // EXECUTE DataPatchResponse result = getCaseDataPatcher().patch(request); + // CHECK logger.info("result: [{}]", result); + + CaseDataDto actualCase = getCaseFacade().getByUuid(originalCase.getUuid()); + PersonDto actualPerson = getPersonFacade().getByUuid(originalCase.getPerson().getUuid()); + + Assertions.assertAll( + () -> Assertions.assertTrue(result.getFailures().isEmpty(), () -> "Failure found, but should be empty"), + // PERSON + () -> Assertions.assertEquals(newLastname, actualPerson.getLastName()), + () -> Assertions.assertEquals(Sex.FEMALE, actualPerson.getSex()), + // CASE + () -> Assertions.assertEquals(newSequelaeDetails, actualCase.getSequelaeDetails())); + } } From 44d500591654caa462508a01ceab79addb732a19 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Mon, 23 Feb 2026 14:57:36 +0100 Subject: [PATCH 014/134] Minor enhancements for tests. --- .../de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java | 2 ++ .../java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java index 64ee16c791a..ea67e70b4a9 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java @@ -69,6 +69,8 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { Map actualDictionary = computeActualDictionary(request); + // TODO: refactor this to create smaller units + // TODO: duplicate field patching mechanism List results = actualDictionary.entrySet().stream().map(entry -> { String fullFieldName = entry.getKey(); SinglePatchResult singlePatchResult = new SinglePatchResult().setFieldName(fullFieldName); diff --git a/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java index 13db668604b..79e580730c9 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java @@ -23,6 +23,9 @@ void setUp() { // TODO: try to change language to use the languages names / with without accent and stuff: Pérou } + // TODO: test different replacement strategy: with/without failure + // TODO: test forbidden fields + @Test void patch_no_errors_alwas_replacement() { // PREPARE @@ -65,6 +68,6 @@ void patch_no_errors_alwas_replacement() { () -> Assertions.assertEquals(Sex.FEMALE, actualPerson.getSex()), // CASE () -> Assertions.assertEquals(newSequelaeDetails, actualCase.getSequelaeDetails())); - } + } From c0318581a2e393a00aa8a2b473cfe80791e7da39 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Tue, 24 Feb 2026 07:45:31 +0100 Subject: [PATCH 015/134] added checks --- .../sormas/api/patch/DataPatchFailure.java | 18 +++ .../api/patch/DataPatchFailureCause.java | 11 ++ .../java/de/symeda/sormas/api/patch/TODO.md | 2 - .../de/symeda/sormas/api/utils/Tuple.java | 8 +- .../backend/patch/CaseDataPatcherImpl.java | 137 +++++++++++++++++- .../backend/patch/PatchFieldHelper.java | 5 + .../backend/patch/PropertyAccessor.java | 53 +------ .../sormas/patch/CaseDataPatcherImplTest.java | 59 +++++++- 8 files changed, 227 insertions(+), 66 deletions(-) delete mode 100644 sormas-api/src/main/java/de/symeda/sormas/api/patch/TODO.md create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailure.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailure.java index f58f52d252a..c70b70b7f07 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailure.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailure.java @@ -1,5 +1,7 @@ package de.symeda.sormas.api.patch; +import java.util.Objects; + import javax.annotation.Nullable; import javax.validation.constraints.NotNull; @@ -58,4 +60,20 @@ public String toString() { return "DataPatchFailure{" + "dataPatchFailureCause=" + dataPatchFailureCause + ", existingFieldValue=" + existingFieldValue + ", providedFieldValue=" + providedFieldValue + ", description='" + description + '\'' + '}'; } + + @Override + public boolean equals(Object o) { + if (o == null || getClass() != o.getClass()) + return false; + DataPatchFailure that = (DataPatchFailure) o; + return dataPatchFailureCause == that.dataPatchFailureCause + && Objects.equals(existingFieldValue, that.existingFieldValue) + && Objects.equals(providedFieldValue, that.providedFieldValue) + && Objects.equals(description, that.description); + } + + @Override + public int hashCode() { + return Objects.hash(dataPatchFailureCause, existingFieldValue, providedFieldValue, description); + } } diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java index 0117326fae4..cbcddd6fd4a 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java @@ -1,6 +1,17 @@ package de.symeda.sormas.api.patch; public enum DataPatchFailureCause { + + /** + * Occurs if input tries to use multiple fields approach: CaseData.(symptoms.onsetDate|hospitalization.admissionDate). + */ + INVALID_MULTIPLE_FIELDS_FORMAT, + + /** + * Path does not start with the allowed prefixes: example: CaseData or Person. + */ + UNSUPPORTED_PREFIX, + /** * Invalid field name was provided that cannot be matched with an existing field. */ diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/TODO.md b/sormas-api/src/main/java/de/symeda/sormas/api/patch/TODO.md deleted file mode 100644 index 8f1cece1cff..00000000000 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/TODO.md +++ /dev/null @@ -1,2 +0,0 @@ -# TODO: - diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/utils/Tuple.java b/sormas-api/src/main/java/de/symeda/sormas/api/utils/Tuple.java index 55f669cf163..ff15c55b064 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/utils/Tuple.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/utils/Tuple.java @@ -2,20 +2,26 @@ import java.util.Objects; +import javax.annotation.Nullable; + public class Tuple { + @Nullable private final F first; + @Nullable private final S second; - public Tuple(final F first, final S second) { + public Tuple(@Nullable final F first, @Nullable final S second) { this.first = first; this.second = second; } + @Nullable public F getFirst() { return first; } + @Nullable public S getSecond() { return second; } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java index ea67e70b4a9..d6b1ab94ac9 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java @@ -1,5 +1,6 @@ package de.symeda.sormas.backend.patch; +import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.Optional; @@ -7,12 +8,15 @@ import java.util.function.Predicate; import java.util.function.Supplier; import java.util.stream.Collectors; +import java.util.stream.Stream; +import javax.annotation.Nullable; import javax.ejb.EJB; import javax.ejb.LocalBean; import javax.ejb.Stateless; import javax.inject.Inject; +import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,22 +34,29 @@ import de.symeda.sormas.api.patch.mapping.FieldCustomMapper; import de.symeda.sormas.api.patch.mapping.FieldPatchRequest; import de.symeda.sormas.api.person.PersonDto; +import de.symeda.sormas.api.utils.Tuple; import de.symeda.sormas.backend.caze.CaseFacadeEjb; import de.symeda.sormas.backend.json.ObjectMapperProvider; import de.symeda.sormas.backend.patch.mapping.FieldCustomMapperRegistry; import de.symeda.sormas.backend.patch.mapping.ValueMapperRegistry; import de.symeda.sormas.backend.person.PersonFacadeEjb; +// TODO: test integration vaccines @Stateless @LocalBean public class CaseDataPatcherImpl implements CaseDataPatcher { public static final String PERSON_FIELD_NAME_PREFIX = "Person."; private final static Logger logger = LoggerFactory.getLogger(CaseDataPatcherImpl.class); + public static final String OPENING_PARENTHESIS = "("; + public static final String CLOSING_PARENTHESIS = ")"; + public static final String PIPE = "|"; // might be more subtle: person.toto but also *.uuid (or uuid). includes approach ? // TODO: must be twofold: enforced default fields : technical: uuid, user ... + custom config by admin - private Set forbiddenFields = Set.of(); + private Set forbiddenFields = Set.of("Person.birthdate"); + + private Set allowedPrefixes = Set.of("Person.", "CaseData"); @Inject private ValueMapperRegistry valueMapperRegistry; @@ -67,20 +78,21 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { Supplier person = Suppliers.memoize(() -> getPersonDto(caseData)); - Map actualDictionary = computeActualDictionary(request); + Map, Object> actualDictionary = computeActualDictionary(request); // TODO: refactor this to create smaller units // TODO: duplicate field patching mechanism List results = actualDictionary.entrySet().stream().map(entry -> { - String fullFieldName = entry.getKey(); + Tuple tuple = entry.getKey(); + String fullFieldName = tuple.getFirst(); SinglePatchResult singlePatchResult = new SinglePatchResult().setFieldName(fullFieldName); Object target = findAppropriateTarget(fullFieldName, caseData, person); - try { // TODO: patch the same field twice ? - - if (forbiddenFields.contains(fullFieldName)) { - return singlePatchResult.setFailure(new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.FORBIDDEN_FIELD)); + try { + DataPatchFailureCause fieldFailureCause = tuple.getSecond(); + if (fieldFailureCause != null) { + return singlePatchResult.setFailure(new DataPatchFailure().setDataPatchFailureCause(fieldFailureCause)); } Optional mapper = fieldCustomMapperRegistry.getMapper(fullFieldName); @@ -191,16 +203,125 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { */ } - private @NotNull Map computeActualDictionary(CaseDataPatchRequest request) { + private Map, Object> computeActualDictionary(CaseDataPatchRequest request) { Predicate> filterPredicate = buildAdequateDictionaryValuePredicate(request); return request.getPatchDictionary() .entrySet() .stream() + .filter(entry -> StringUtils.isNotBlank(entry.getKey())) .filter(filterPredicate) + .flatMap(entry -> { + String path = entry.getKey(); + + DataPatchFailureCause dataPatchFailureCause = checkIfPathIsInvalid(path); + + if (dataPatchFailureCause != null) { + return Stream.of(buildMapTupleEntryFrom(entry, dataPatchFailureCause)); + } + + if (isNotMultipleFieldFormat(path)) { + return Stream.of(buildMapTupleEntryFrom(entry)); + } + + return splitMultipleFieldsPath(entry); + }) .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); } + @NotNull + private Stream, Object>> splitMultipleFieldsPath(Map.Entry entry) { + String path = entry.getKey(); + int openingParenthesisIndex = path.indexOf("("); + String prefix = path.substring(0, openingParenthesisIndex); + + int closeParen = path.indexOf(')'); + + String restPath = path.substring(openingParenthesisIndex + 1, closeParen); + + return Arrays.stream(restPath.split("\\|")).map(suffix -> Map.entry(new Tuple<>(prefix + suffix, null), entry.getValue())); + } + + private boolean isNotMultipleFieldFormat(String path) { + return !(path.contains(OPENING_PARENTHESIS) || path.contains(CLOSING_PARENTHESIS) || path.contains(PIPE)); + } + + // TODO: could be extracted into another class + @Nullable + private DataPatchFailureCause checkIfPathIsInvalid(String path) { + DataPatchFailureCause dataPatchFailureCause = null; + + if (!startsWithAllowedPrefix(path)) { + dataPatchFailureCause = DataPatchFailureCause.UNSUPPORTED_PREFIX; + } else if (fieldIsForbidden(path)) { + dataPatchFailureCause = DataPatchFailureCause.FORBIDDEN_FIELD; + } else if (fieldIsInvalidMultiField(path)) { + dataPatchFailureCause = DataPatchFailureCause.INVALID_MULTIPLE_FIELDS_FORMAT; + } + return dataPatchFailureCause; + } + + private boolean fieldIsInvalidMultiField(String path) { + if (isNotMultipleFieldFormat(path)) { + return false; + } + + long openCount = path.chars().filter(c -> c == '(').count(); + long closeCount = path.chars().filter(c -> c == ')').count(); + int openIndex = path.indexOf('('); + int closeIndex = path.lastIndexOf(')'); + + if (openCount != 1 || closeCount != 1) { + logger.debug("Path must contain exactly one pair of parentheses: [" + path + "]"); + return false; + } + + if (openIndex > closeIndex) { + logger.debug("Closing parenthesis appears before opening parenthesis: [" + path + "]"); + return false; + } + + if (closeIndex != path.length() - 1) { + logger.debug("Closing parenthesis must be at the end of the path: [" + path + "]"); + return false; + } + + String alternatives = path.substring(openIndex + 1, closeIndex); + + if (alternatives.isBlank()) { + logger.debug("Empty parentheses — nothing between '(' and ')': [" + path + "]"); + return false; + } + + String[] parts = alternatives.split("\\|"); + for (String part : parts) { + if (part.isBlank()) { + logger.debug("Empty alternative found — consecutive or leading/trailing pipes: [" + path + "]"); + return false; + } + } + + return true; + } + + private Map.Entry, Object> buildMapTupleEntryFrom( + Map.Entry entry, + @Nullable DataPatchFailureCause dataPatchFailureCause) { + return Map.entry(new Tuple<>(entry.getKey(), dataPatchFailureCause), entry.getValue()); + } + + private Map.Entry, Object> buildMapTupleEntryFrom(Map.Entry entry) { + return Map.entry(new Tuple<>(entry.getKey(), null), entry.getValue()); + } + + private boolean startsWithAllowedPrefix(String path) { + return allowedPrefixes.stream().anyMatch(path::startsWith); + } + + private boolean fieldIsForbidden(String path) { + return forbiddenFields.contains(path); + } + private @NotNull Predicate> buildAdequateDictionaryValuePredicate(CaseDataPatchRequest request) { return request.getEmptyValueBehavior() == EmptyValueBehavior.REPLACE ? ignored -> true : buildEmptyValuePredicate(); } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java new file mode 100644 index 00000000000..2e1703b372a --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java @@ -0,0 +1,5 @@ +package de.symeda.sormas.backend.patch; + +public class PatchFieldHelper { + +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessor.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessor.java index d2321c0354d..451906ad621 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessor.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessor.java @@ -3,10 +3,7 @@ import java.lang.reflect.InvocationTargetException; import java.util.Optional; -import org.apache.commons.beanutils.BeanUtilsBean; import org.apache.commons.beanutils.PropertyUtils; -import org.apache.commons.beanutils.PropertyUtilsBean; -import org.apache.commons.beanutils.expression.Resolver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -14,7 +11,7 @@ public class PropertyAccessor { // TODO: perform some caching of the fields private static final Logger logger = LoggerFactory.getLogger(PropertyAccessor.class); - private static final PropertyUtilsBean propertyUtils = BeanUtilsBean.getInstance().getPropertyUtils(); + public static final char PATH_SEPARATOR = '.'; private PropertyAccessor() { @@ -32,7 +29,7 @@ public static Optional> getNestedPropertyType(final Object bean, final return Optional.ofNullable(PropertyUtils.getPropertyType(bean, fieldName)); } - String leafPath = fieldName.substring(fieldName.lastIndexOf('.') + 1); + String leafPath = fieldName.substring(fieldName.lastIndexOf(PATH_SEPARATOR) + 1); return Optional.ofNullable(getNestedProperty(bean, fieldName)).flatMap(leafParent -> getPropertyType(leafParent, leafPath)); @@ -51,52 +48,6 @@ public static Optional> getPropertyType(final Object bean, final String } } - /** - * Resolves the type of a nested property using BeanUtils' internal resolver. - * Supports: `user.address.city`, `items[0].name`, `map[key].value` - */ - private static Class getPropertyTypeRecursive(Class beanClass, String propertyName) - throws InvocationTargetException, IllegalAccessException, NoSuchMethodException { - if (!propertyName.contains(".") && !propertyName.contains("[") && !propertyName.contains("(")) { - return PropertyUtils.getPropertyType(beanClass, propertyName); - } - - Resolver resolver = propertyUtils.getResolver(); - if (!resolver.hasNested(propertyName)) { - return PropertyUtils.getPropertyType(beanClass, propertyName); - } - - String next = resolver.next(propertyName); - String property = resolver.getProperty(next); - Class currentType = PropertyUtils.getPropertyType(beanClass, property); - - if (currentType == null) { - throw new IllegalArgumentException(String.format("No such property: [%s] on type: [%s]", property, beanClass)); - } - - if (resolver.isIndexed(next)) { - currentType = getIndexedPropertyType(currentType); - } else if (resolver.isMapped(next)) { - throw new UnsupportedOperationException("Maps are not supported yet."); - } - - String remaining = resolver.remove(propertyName); - if (remaining.isEmpty()) { - return currentType; - } - return getPropertyTypeRecursive(currentType, remaining); - } - - private static Class getIndexedPropertyType(Class collectionType) { - if (Iterable.class.isAssignableFrom(collectionType) || collectionType.isArray()) { - if (collectionType.isArray()) { - return collectionType.getComponentType(); - } - return Object.class; - } - return collectionType; - } - public static Optional getNestedProperty(final Object bean, final String name) { try { return Optional.ofNullable(PropertyUtils.getNestedProperty(bean, name)); diff --git a/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java index 79e580730c9..f99cbdc0065 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java @@ -1,6 +1,7 @@ package de.symeda.sormas.patch; import java.util.Map; +import java.util.stream.Collectors; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; @@ -9,6 +10,9 @@ import de.symeda.sormas.api.Disease; import de.symeda.sormas.api.caze.CaseDataDto; import de.symeda.sormas.api.patch.CaseDataPatchRequest; +import de.symeda.sormas.api.patch.CaseDataPatcher; +import de.symeda.sormas.api.patch.DataPatchFailure; +import de.symeda.sormas.api.patch.DataPatchFailureCause; import de.symeda.sormas.api.patch.DataPatchResponse; import de.symeda.sormas.api.patch.DataReplacementStrategy; import de.symeda.sormas.api.person.PersonDto; @@ -27,7 +31,7 @@ void setUp() { // TODO: test forbidden fields @Test - void patch_no_errors_alwas_replacement() { + void patch_noErrorsReplaceAlways() { // PREPARE CaseDataDto originalCase = creator.createUnclassifiedCase(Disease.PERTUSSIS); @@ -53,16 +57,16 @@ void patch_no_errors_alwas_replacement() { newSequelaeDetails)); // EXECUTE - DataPatchResponse result = getCaseDataPatcher().patch(request); + DataPatchResponse response = victim().patch(request); // CHECK - logger.info("result: [{}]", result); + logger.info("response: [{}]", response); CaseDataDto actualCase = getCaseFacade().getByUuid(originalCase.getUuid()); PersonDto actualPerson = getPersonFacade().getByUuid(originalCase.getPerson().getUuid()); Assertions.assertAll( - () -> Assertions.assertTrue(result.getFailures().isEmpty(), () -> "Failure found, but should be empty"), + () -> Assertions.assertTrue(response.getFailures().isEmpty(), "Failure found, but should be empty"), // PERSON () -> Assertions.assertEquals(newLastname, actualPerson.getLastName()), () -> Assertions.assertEquals(Sex.FEMALE, actualPerson.getSex()), @@ -70,4 +74,51 @@ void patch_no_errors_alwas_replacement() { () -> Assertions.assertEquals(newSequelaeDetails, actualCase.getSequelaeDetails())); } + private CaseDataPatcher victim() { + return getCaseDataPatcher(); + } + + @Test + void patch_invalidPrefix() { + // PREPARE + CaseDataDto originalCase = creator.createUnclassifiedCase(Disease.RESPIRATORY_SYNCYTIAL_VIRUS); + + String ignoredValue = "ignoredValue"; + + Map patchDictionary = Map.of( + "ActivityAsCase.reportingUser", + ignoredValue, + "PreviousHospitalization.region", + ignoredValue, + "Symptoms.bedridden", + ignoredValue, + "EpiData.exposureDetailsKnown", + ignoredValue + + ); + // EXECUTE + DataPatchResponse response = + victim().patch(new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()).setPatchDictionary(patchDictionary)); + + // CHECK + Map expectedFailures = patchDictionary.keySet() + .stream() + .map(path -> Map.entry(path, new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.UNSUPPORTED_PREFIX))) + .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); + + Assertions.assertAll( + () -> Assertions.assertTrue(response.getPatchDictionary().isEmpty(), "Nothing should have been patched, should be empty"), + // FAILURES + () -> Assertions.assertEquals(expectedFailures, response.getFailures())); + } + + @Test + void patch_referenceDataInsertion() { + throw new IllegalStateException("toImplement"); + } + + @Test + void patch_addVaccine() { + throw new IllegalStateException("toImplement"); + } } From 262016fe4306f9547adeb1788e4ee0b34ace9a01 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Tue, 24 Feb 2026 10:41:31 +0100 Subject: [PATCH 016/134] after discussion with xavier --- .../api/patch/mapping/ValueMapperDefault.java | 2 +- ...ValueMapper.java => ValuePatchMapper.java} | 4 +- .../backend/patch/CaseDataPatcherImpl.java | 105 +-------- .../backend/patch/PatchFieldHelper.java | 97 ++++++++ .../patch/mapping/ValueMapperRegistry.java | 8 +- .../PersonBirthDateFieldMapper.java | 4 +- .../PersonContactDetailsFieldMapper.java | 17 +- .../CustomizableEnumPatchMapper.java | 75 ++++++ .../{DateMapper.java => DatePatchMapper.java} | 4 +- .../{EnumMapper.java => EnumPatchMapper.java} | 4 +- ...eMapper.java => PrimitivePatchMapper.java} | 4 +- ...pper.java => ReferenceDtoPatchMapper.java} | 4 +- .../sormas/backend/user/KeycloakService.java | 1 + .../sormas/backend/AbstractBeanTest.java | 5 + .../impl/valuemapper/DateMapperTest.java | 2 +- .../impl/valuemapper/EnumMapperTest.java | 2 +- .../impl/valuemapper/PrimitiveMapperTest.java | 2 +- .../sormas/patch/CaseDataPatcherImplTest.java | 218 +++++++++++++++++- 18 files changed, 426 insertions(+), 132 deletions(-) rename sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/{ValueMapper.java => ValuePatchMapper.java} (94%) create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapper.java rename sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/{DateMapper.java => DatePatchMapper.java} (88%) rename sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/{EnumMapper.java => EnumPatchMapper.java} (94%) rename sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/{PrimitiveMapper.java => PrimitivePatchMapper.java} (89%) rename sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/{ReferenceDtoMapper.java => ReferenceDtoPatchMapper.java} (91%) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValueMapperDefault.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValueMapperDefault.java index 35d7b052dec..d60d0f58123 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValueMapperDefault.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValueMapperDefault.java @@ -7,7 +7,7 @@ import java.lang.annotation.Target; /** - * Marks an enum constant as the default fallback value for {@link ValueMapper} for enums. + * Marks an enum constant as the default fallback value for {@link ValuePatchMapper} for enums. * Takes precedence over the conventional "OTHER" fallback. */ @Target(ElementType.FIELD) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValueMapper.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValuePatchMapper.java similarity index 94% rename from sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValueMapper.java rename to sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValuePatchMapper.java index a74a906beac..e10c30a0a29 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValueMapper.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValuePatchMapper.java @@ -5,7 +5,7 @@ import javax.validation.constraints.NotNull; // TODO: check if "in-value-type" must be checked: add self check ? -public interface ValueMapper extends Comparable { +public interface ValuePatchMapper extends Comparable { int HIGH_PRECEDENCE = Integer.MIN_VALUE; int LOW_PRECEDENCE = Integer.MAX_VALUE; @@ -83,7 +83,7 @@ default int getOrder() { } @Override - default int compareTo(ValueMapper o) { + default int compareTo(ValuePatchMapper o) { return Integer.compare(this.getOrder(), o.getOrder()); } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java index d6b1ab94ac9..2a2616845df 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java @@ -4,7 +4,6 @@ import java.util.List; import java.util.Map; import java.util.Optional; -import java.util.Set; import java.util.function.Predicate; import java.util.function.Supplier; import java.util.stream.Collectors; @@ -48,15 +47,6 @@ public class CaseDataPatcherImpl implements CaseDataPatcher { public static final String PERSON_FIELD_NAME_PREFIX = "Person."; private final static Logger logger = LoggerFactory.getLogger(CaseDataPatcherImpl.class); - public static final String OPENING_PARENTHESIS = "("; - public static final String CLOSING_PARENTHESIS = ")"; - public static final String PIPE = "|"; - - // might be more subtle: person.toto but also *.uuid (or uuid). includes approach ? - // TODO: must be twofold: enforced default fields : technical: uuid, user ... + custom config by admin - private Set forbiddenFields = Set.of("Person.birthdate"); - - private Set allowedPrefixes = Set.of("Person.", "CaseData"); @Inject private ValueMapperRegistry valueMapperRegistry; @@ -64,6 +54,9 @@ public class CaseDataPatcherImpl implements CaseDataPatcher { @Inject private FieldCustomMapperRegistry fieldCustomMapperRegistry; + @Inject + private PatchFieldHelper patchFieldHelper; + @EJB private CaseFacadeEjb.CaseFacadeEjbLocal caseFacade; @@ -92,7 +85,8 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { try { DataPatchFailureCause fieldFailureCause = tuple.getSecond(); if (fieldFailureCause != null) { - return singlePatchResult.setFailure(new DataPatchFailure().setDataPatchFailureCause(fieldFailureCause)); + return singlePatchResult + .setFailure(new DataPatchFailure().setDataPatchFailureCause(fieldFailureCause).setProvidedFieldValue(entry.getValue())); } Optional mapper = fieldCustomMapperRegistry.getMapper(fullFieldName); @@ -103,6 +97,7 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { .map( new FieldPatchRequest().setFieldName(fullFieldName) .setReplacementType(request.getReplacementStrategy()) + .setOrigin(request.getOrigin()) .setTarget(target) .setValue(untypedTargetValue)); @@ -169,21 +164,19 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { DataPatchResponse dataPatchResponse = new DataPatchResponse().setPatchDictionary(patchedValuesDictionary).setFailures(failuresDictionary); - logger.info("patch results: [{}]", results); - - // TODO: not necessarly both to be saved // TODO: if (logger.isErrorEnabled()) { logger.error("CaseData: \n{}", ObjectMapperProvider.writeValueAsStringFailSafe(caseData)); - System.out.println(ObjectMapperProvider.writeValueAsStringFailSafe(caseData)); } caseFacade.save(caseData); - if (logger.isErrorEnabled()) { + if (logger.isDebugEnabled()) { logger.error("Person: \n{}", ObjectMapperProvider.writeValueAsStringFailSafe(person.get())); } personFacade.save(person.get()); + logger.debug("dataPatchResponse: [{}]", dataPatchResponse); + return dataPatchResponse; /* @@ -195,7 +188,6 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { * - OK: Check for FieldCustomMapper to use custom mapping strategy * - OK: Check if field exists. * - Go to the appropriate (sub) field - * - TODO: if appropriate: multiple patching into same field strategy!! *

* WARN: Root will be either: (breaks trivial check if exists approach). * - CaseData @@ -214,13 +206,13 @@ private Map, Object> computeActualDictionar .flatMap(entry -> { String path = entry.getKey(); - DataPatchFailureCause dataPatchFailureCause = checkIfPathIsInvalid(path); + DataPatchFailureCause dataPatchFailureCause = patchFieldHelper.checkIfPathIsInvalid(path); if (dataPatchFailureCause != null) { return Stream.of(buildMapTupleEntryFrom(entry, dataPatchFailureCause)); } - if (isNotMultipleFieldFormat(path)) { + if (!patchFieldHelper.isMultipleFieldFormat(path)) { return Stream.of(buildMapTupleEntryFrom(entry)); } @@ -237,73 +229,12 @@ private Stream, Object>> splitMul int closeParen = path.indexOf(')'); + logger.error(path); String restPath = path.substring(openingParenthesisIndex + 1, closeParen); return Arrays.stream(restPath.split("\\|")).map(suffix -> Map.entry(new Tuple<>(prefix + suffix, null), entry.getValue())); } - private boolean isNotMultipleFieldFormat(String path) { - return !(path.contains(OPENING_PARENTHESIS) || path.contains(CLOSING_PARENTHESIS) || path.contains(PIPE)); - } - - // TODO: could be extracted into another class - @Nullable - private DataPatchFailureCause checkIfPathIsInvalid(String path) { - DataPatchFailureCause dataPatchFailureCause = null; - - if (!startsWithAllowedPrefix(path)) { - dataPatchFailureCause = DataPatchFailureCause.UNSUPPORTED_PREFIX; - } else if (fieldIsForbidden(path)) { - dataPatchFailureCause = DataPatchFailureCause.FORBIDDEN_FIELD; - } else if (fieldIsInvalidMultiField(path)) { - dataPatchFailureCause = DataPatchFailureCause.INVALID_MULTIPLE_FIELDS_FORMAT; - } - return dataPatchFailureCause; - } - - private boolean fieldIsInvalidMultiField(String path) { - if (isNotMultipleFieldFormat(path)) { - return false; - } - - long openCount = path.chars().filter(c -> c == '(').count(); - long closeCount = path.chars().filter(c -> c == ')').count(); - int openIndex = path.indexOf('('); - int closeIndex = path.lastIndexOf(')'); - - if (openCount != 1 || closeCount != 1) { - logger.debug("Path must contain exactly one pair of parentheses: [" + path + "]"); - return false; - } - - if (openIndex > closeIndex) { - logger.debug("Closing parenthesis appears before opening parenthesis: [" + path + "]"); - return false; - } - - if (closeIndex != path.length() - 1) { - logger.debug("Closing parenthesis must be at the end of the path: [" + path + "]"); - return false; - } - - String alternatives = path.substring(openIndex + 1, closeIndex); - - if (alternatives.isBlank()) { - logger.debug("Empty parentheses — nothing between '(' and ')': [" + path + "]"); - return false; - } - - String[] parts = alternatives.split("\\|"); - for (String part : parts) { - if (part.isBlank()) { - logger.debug("Empty alternative found — consecutive or leading/trailing pipes: [" + path + "]"); - return false; - } - } - - return true; - } - private Map.Entry, Object> buildMapTupleEntryFrom( Map.Entry entry, @Nullable DataPatchFailureCause dataPatchFailureCause) { @@ -314,14 +245,6 @@ private Map.Entry, Object> buildMapTupleEnt return Map.entry(new Tuple<>(entry.getKey(), null), entry.getValue()); } - private boolean startsWithAllowedPrefix(String path) { - return allowedPrefixes.stream().anyMatch(path::startsWith); - } - - private boolean fieldIsForbidden(String path) { - return forbiddenFields.contains(path); - } - private @NotNull Predicate> buildAdequateDictionaryValuePredicate(CaseDataPatchRequest request) { return request.getEmptyValueBehavior() == EmptyValueBehavior.REPLACE ? ignored -> true : buildEmptyValuePredicate(); } @@ -371,10 +294,6 @@ private Predicate> buildEmptyValuePredicate() { }; } - public void setForbiddenFields(Set forbiddenFields) { - this.forbiddenFields = forbiddenFields; - } - public void setValueMapperRegistry(ValueMapperRegistry valueMapperRegistry) { this.valueMapperRegistry = valueMapperRegistry; } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java index 2e1703b372a..58a6b0de0af 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java @@ -1,5 +1,102 @@ package de.symeda.sormas.backend.patch; +import java.util.Set; + +import javax.annotation.Nullable; +import javax.enterprise.context.ApplicationScoped; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import de.symeda.sormas.api.patch.DataPatchFailureCause; + +@ApplicationScoped public class PatchFieldHelper { + private final static Logger logger = LoggerFactory.getLogger(PatchFieldHelper.class); + + public static final String OPENING_PARENTHESIS = "("; + public static final String CLOSING_PARENTHESIS = ")"; + public static final String PIPE = "|"; + + // might be more subtle: person.toto but also *.uuid (or uuid). includes approach ? + // TODO: must be twofold: enforced default fields : technical: uuid, user ... + custom config by admin + private Set forbiddenFields = Set.of("Person.birthdate", "Person.birthdateDD", "Person.birthdateMM", "Person.birthdateYYYY"); + + private Set allowedPrefixes = Set.of("Person.", "CaseData"); + + @Nullable + public DataPatchFailureCause checkIfPathIsInvalid(String path) { + DataPatchFailureCause dataPatchFailureCause = null; + + if (!startsWithAllowedPrefix(path)) { + dataPatchFailureCause = DataPatchFailureCause.UNSUPPORTED_PREFIX; + } else if (fieldIsForbidden(path)) { + dataPatchFailureCause = DataPatchFailureCause.FORBIDDEN_FIELD; + } else if (fieldIsInvalidMultiField(path)) { + dataPatchFailureCause = DataPatchFailureCause.INVALID_MULTIPLE_FIELDS_FORMAT; + } + return dataPatchFailureCause; + } + + private boolean fieldIsForbidden(String path) { + return forbiddenFields.contains(path); + } + + private boolean startsWithAllowedPrefix(String path) { + return allowedPrefixes.stream().anyMatch(path::startsWith); + } + + public boolean isMultipleFieldFormat(String path) { + return path.contains(OPENING_PARENTHESIS) || path.contains(CLOSING_PARENTHESIS) || path.contains(PIPE); + } + + private boolean fieldIsInvalidMultiField(String path) { + if (!isMultipleFieldFormat(path)) { + return false; + } + + long openCount = path.chars().filter(c -> c == '(').count(); + long closeCount = path.chars().filter(c -> c == ')').count(); + long pipeCount = path.chars().filter(c -> c == '|').count(); + int openIndex = path.indexOf('('); + int closeIndex = path.lastIndexOf(')'); + + if (openCount != 1 || closeCount != 1) { + logger.debug("Path must contain exactly one pair of parentheses: [" + path + "]"); + return true; + } + + if (pipeCount == 0) { + logger.debug("No pipe found [" + path + "]"); + return true; + } + + if (openIndex > closeIndex) { + logger.debug("Closing parenthesis appears before opening parenthesis: [" + path + "]"); + return true; + } + + if (closeIndex != path.length() - 1) { + logger.debug("Closing parenthesis must be at the end of the path: [" + path + "]"); + return true; + } + + String alternatives = path.substring(openIndex + 1, closeIndex); + + if (alternatives.isBlank()) { + logger.debug("Empty parentheses — nothing between '(' and ')': [" + path + "]"); + return true; + } + + String[] parts = alternatives.split("\\|"); + for (String part : parts) { + if (part.isBlank()) { + logger.debug("Empty alternative found — consecutive or leading/trailing pipes: [" + path + "]"); + return true; + } + } + + return false; + } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/ValueMapperRegistry.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/ValueMapperRegistry.java index 51e1ade0f2a..b5dfc11a1d3 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/ValueMapperRegistry.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/ValueMapperRegistry.java @@ -9,15 +9,15 @@ import javax.inject.Inject; import javax.validation.constraints.NotNull; -import de.symeda.sormas.api.patch.mapping.ValueMapper; +import de.symeda.sormas.api.patch.mapping.ValuePatchMapper; @ApplicationScoped public class ValueMapperRegistry { - private List orderedInstances; + private List orderedInstances; @Inject - private Instance instances; + private Instance instances; @PostConstruct void init() { @@ -35,7 +35,7 @@ public T map(Object value, @NotNull Class targetType) { return targetType.cast(value); } - for (ValueMapper mapper : orderedInstances) { + for (ValuePatchMapper mapper : orderedInstances) { if (mapper.supports(targetType)) { return mapper.map(value, targetType); } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonBirthDateFieldMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonBirthDateFieldMapper.java index f557a838387..ff2f7798d33 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonBirthDateFieldMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonBirthDateFieldMapper.java @@ -14,7 +14,7 @@ import de.symeda.sormas.api.patch.mapping.FieldCustomMapper; import de.symeda.sormas.api.patch.mapping.FieldPatchRequest; import de.symeda.sormas.api.person.PersonDto; -import de.symeda.sormas.backend.patch.mapping.impl.valuemapper.DateMapper; +import de.symeda.sormas.backend.patch.mapping.impl.valuemapper.DatePatchMapper; /** * For now this FieldMapper will not be allowed and "deactivated" through the list of forbidden fields. @@ -23,7 +23,7 @@ public class PersonBirthDateFieldMapper implements FieldCustomMapper { @Inject - private DateMapper dateMapper; + private DatePatchMapper dateMapper; @Override public Optional map(FieldPatchRequest request) { diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapper.java index 0371a41ce8a..ca1ecd0463e 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapper.java @@ -21,6 +21,7 @@ import de.symeda.sormas.api.person.PersonContactDetailType; import de.symeda.sormas.api.person.PersonDto; import de.symeda.sormas.api.person.PhoneNumberType; +import de.symeda.sormas.api.utils.DataHelper; @ApplicationScoped public class PersonContactDetailsFieldMapper implements FieldCustomMapper { @@ -40,11 +41,11 @@ public Optional map(FieldPatchRequest request) { if (request.getFieldName().contains(PersonContactDetailDto.PHONE_NUMBER_TYPE)) { appropriatePredicate = buildPredicateFor(PersonContactDetailType.PHONE); - appropriateSupplier = () -> buildPhoneContactDetail(request); + appropriateSupplier = () -> buildPhoneContactDetail(request, personDto); } else { appropriatePredicate = buildPredicateFor(PersonContactDetailType.EMAIL); - appropriateSupplier = () -> buildEmailContactDetail(request); + appropriateSupplier = () -> buildEmailContactDetail(request, personDto); } Optional alreadyPresentContactDetail = personDto.getPersonContactDetails() @@ -68,24 +69,26 @@ public Optional map(FieldPatchRequest request) { return contactDetail -> contactDetail.getPersonContactDetailType().equals(email); } - private PersonContactDetailDto buildGenericContactDetail(FieldPatchRequest request) { + private PersonContactDetailDto buildGenericContactDetail(FieldPatchRequest request, PersonDto personDto) { PersonContactDetailDto detail = new PersonContactDetailDto(); + detail.setUuid(DataHelper.createUuid()); + detail.setPerson(personDto.toReference()); detail.setDetails((String) request.getValue()); detail.setAdditionalInformation(request.getOrigin()); return detail; } - private PersonContactDetailDto buildPhoneContactDetail(FieldPatchRequest request) { - PersonContactDetailDto detail = buildGenericContactDetail(request); + private PersonContactDetailDto buildPhoneContactDetail(FieldPatchRequest request, PersonDto personDto) { + PersonContactDetailDto detail = buildGenericContactDetail(request, personDto); detail.setPersonContactDetailType(PersonContactDetailType.PHONE); detail.setPhoneNumberType(PhoneNumberType.OTHER); return detail; } - private PersonContactDetailDto buildEmailContactDetail(FieldPatchRequest request) { - PersonContactDetailDto detail = buildGenericContactDetail(request); + private PersonContactDetailDto buildEmailContactDetail(FieldPatchRequest request, PersonDto personDto) { + PersonContactDetailDto detail = buildGenericContactDetail(request, personDto); detail.setPersonContactDetailType(PersonContactDetailType.EMAIL); return detail; diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapper.java new file mode 100644 index 00000000000..0257f713baa --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapper.java @@ -0,0 +1,75 @@ +package de.symeda.sormas.backend.patch.mapping.impl.valuemapper; + +import java.util.List; +import java.util.Set; + +import javax.ejb.EJB; +import javax.enterprise.context.ApplicationScoped; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import de.symeda.sormas.api.ReferenceDto; +import de.symeda.sormas.api.customizableenum.CustomizableEnum; +import de.symeda.sormas.api.customizableenum.CustomizableEnumType; +import de.symeda.sormas.api.patch.mapping.ValuePatchMapper; +import de.symeda.sormas.backend.customizableenum.CustomizableEnumFacadeEjb; + +@ApplicationScoped +public class CustomizableEnumPatchMapper implements ValuePatchMapper { + + private final static Logger logger = LoggerFactory.getLogger(CustomizableEnumPatchMapper.class); + + public static final String FALLBACK_NAME = "OTHER"; + + @EJB + private CustomizableEnumFacadeEjb.CustomizableEnumFacadeEjbLocal customizableEnumFacade; + + @Override + public T map(Object value, Class targetType, Set inputLanguageCodes) { + String captionCandidate = value.toString(); + + if (!targetType.isAssignableFrom(CustomizableEnum.class)) { + throw new IllegalArgumentException(String.format("[%s] is not assignable from [%s].", value, targetType.getName())); + } + + CustomizableEnumType enumType = CustomizableEnumType.getByEnumClass((Class) targetType); + + if (enumType == null) { + throw new IllegalArgumentException(String.format("No CustomizableEnumType could be found for [%s]", targetType.getName())); + } + + Class referenceType = targetType.asSubclass(ReferenceDto.class); + + logger.warn("For now only disease-agnostic enum values are retrieved"); + List enumValues = customizableEnumFacade.getEnumValues(enumType, null); + + return (T) findCustomizableEnum(enumValues, captionCandidate, referenceType); + } + + private static CustomizableEnum findCustomizableEnum( + List enumValues, + String captionCandidate, + Class referenceType) { + String normalizedCandidate = captionCandidate.trim().replace(" ", "_").toUpperCase(); + + // TODO: check if we want to check also i18n translations or captions. + return enumValues.stream() + .filter(customizableEnum -> customizableEnum.getValue().equals(normalizedCandidate)) + .findAny() + .or(() -> enumValues.stream().filter(customizableEnum -> customizableEnum.getValue().equals(FALLBACK_NAME)).findAny()) + .orElseThrow( + () -> new IllegalStateException( + String.format("Could not match value: [%s] to referenceType: [%s]", captionCandidate, referenceType))); + } + + @Override + public Set> getSupportedTypes() { + return Set.of(CustomizableEnum.class); + } + + @Override + public int getOrder() { + return LOW_PRECEDENCE - (ORDER_CHUNK * 2); + } +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/DateMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/DatePatchMapper.java similarity index 88% rename from sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/DateMapper.java rename to sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/DatePatchMapper.java index 4c007a44202..a88d6105d1f 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/DateMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/DatePatchMapper.java @@ -7,10 +7,10 @@ import javax.enterprise.context.ApplicationScoped; -import de.symeda.sormas.api.patch.mapping.ValueMapper; +import de.symeda.sormas.api.patch.mapping.ValuePatchMapper; @ApplicationScoped -public class DateMapper implements ValueMapper { +public class DatePatchMapper implements ValuePatchMapper { private static final Set> SUPPORTED_TYPES = Set.of(Date.class); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumPatchMapper.java similarity index 94% rename from sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumMapper.java rename to sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumPatchMapper.java index 5871bbec125..a9e6deed9be 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumPatchMapper.java @@ -5,11 +5,11 @@ import javax.enterprise.context.ApplicationScoped; -import de.symeda.sormas.api.patch.mapping.ValueMapper; import de.symeda.sormas.api.patch.mapping.ValueMapperDefault; +import de.symeda.sormas.api.patch.mapping.ValuePatchMapper; @ApplicationScoped -public class EnumMapper implements ValueMapper { +public class EnumPatchMapper implements ValuePatchMapper { private static final Set> SUPPORTED_TYPES = Set.of(Enum.class); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/PrimitiveMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/PrimitivePatchMapper.java similarity index 89% rename from sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/PrimitiveMapper.java rename to sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/PrimitivePatchMapper.java index b5f9f24e9c3..f7bc7b92236 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/PrimitiveMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/PrimitivePatchMapper.java @@ -4,10 +4,10 @@ import javax.enterprise.context.ApplicationScoped; -import de.symeda.sormas.api.patch.mapping.ValueMapper; +import de.symeda.sormas.api.patch.mapping.ValuePatchMapper; @ApplicationScoped -public class PrimitiveMapper implements ValueMapper { +public class PrimitivePatchMapper implements ValuePatchMapper { private static final Set> SUPPORTED_TYPES = Set.of(String.class, Integer.class, Double.class, Float.class, Boolean.class, boolean.class); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/ReferenceDtoMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/ReferenceDtoPatchMapper.java similarity index 91% rename from sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/ReferenceDtoMapper.java rename to sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/ReferenceDtoPatchMapper.java index b36704dee7b..c0f9597fdc5 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/ReferenceDtoMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/ReferenceDtoPatchMapper.java @@ -6,11 +6,11 @@ import javax.inject.Inject; import de.symeda.sormas.api.ReferenceDto; -import de.symeda.sormas.api.patch.mapping.ValueMapper; +import de.symeda.sormas.api.patch.mapping.ValuePatchMapper; import de.symeda.sormas.api.referencedata.ReferenceDataValueInstanceProvider; @ApplicationScoped -public class ReferenceDtoMapper implements ValueMapper { +public class ReferenceDtoPatchMapper implements ValuePatchMapper { @Inject private ReferenceDataValueInstanceProvider referenceDataValueInstanceProvider; diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/user/KeycloakService.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/user/KeycloakService.java index 80cc8aa939d..f4ebbe1bb86 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/user/KeycloakService.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/user/KeycloakService.java @@ -252,6 +252,7 @@ public void handleSyncUsersFromProviderEvent(@Observes SyncUsersFromProviderEven sormasUser = existingUsers.stream().filter(u -> u.getUserName().equals(userRepresentation.getUsername())).findFirst().orElse(new User()); } + logger.error("{}", userRepresentation); updateUser(sormasUser, userRepresentation); return sormasUser; diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/AbstractBeanTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/AbstractBeanTest.java index b51b5bbaed9..90998f579c6 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/backend/AbstractBeanTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/AbstractBeanTest.java @@ -100,6 +100,7 @@ import de.symeda.sormas.api.outbreak.OutbreakFacade; import de.symeda.sormas.api.patch.CaseDataPatcher; import de.symeda.sormas.api.person.notifier.NotifierFacade; +import de.symeda.sormas.api.referencedata.ReferenceDataValueInstanceProvider; import de.symeda.sormas.api.report.AggregateReportFacade; import de.symeda.sormas.api.report.WeeklyReportFacade; import de.symeda.sormas.api.sample.AdditionalTestFacade; @@ -1157,4 +1158,8 @@ public NotifierService getNotifierService() { public CaseDataPatcher getCaseDataPatcher() { return getBean(CaseDataPatcherImpl.class); } + + public ReferenceDataValueInstanceProvider getReferenceDataValueInstanceProvider() { + return getBean(ReferenceDataValueInstanceProviderImpl.class); + } } diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/DateMapperTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/DateMapperTest.java index 62dec1e7b0f..3f938b277d8 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/DateMapperTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/DateMapperTest.java @@ -15,7 +15,7 @@ class DateMapperTest extends AbstractUnitTest { @InjectMocks - private DateMapper victim; + private DatePatchMapper victim; // getSupportedTypes diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumMapperTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumMapperTest.java index 42eaebf6d99..31406d6586a 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumMapperTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumMapperTest.java @@ -16,7 +16,7 @@ class EnumMapperTest extends AbstractUnitTest { @InjectMocks - private EnumMapper victim; + private EnumPatchMapper victim; // getSupportedTypes diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/PrimitiveMapperTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/PrimitiveMapperTest.java index c7b2281154b..4d0d497ae01 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/PrimitiveMapperTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/PrimitiveMapperTest.java @@ -15,7 +15,7 @@ class PrimitiveMapperTest extends AbstractUnitTest { @InjectMocks - private PrimitiveMapper victim; + private PrimitivePatchMapper victim; @Test void map_string() { diff --git a/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java index f99cbdc0065..ee8d90e8135 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java @@ -1,7 +1,12 @@ package de.symeda.sormas.patch; +import java.sql.Date; +import java.time.LocalDate; +import java.time.ZoneId; import java.util.Map; +import java.util.function.Supplier; import java.util.stream.Collectors; +import java.util.stream.Stream; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; @@ -15,7 +20,10 @@ import de.symeda.sormas.api.patch.DataPatchFailureCause; import de.symeda.sormas.api.patch.DataPatchResponse; import de.symeda.sormas.api.patch.DataReplacementStrategy; +import de.symeda.sormas.api.person.PersonContactDetailDto; +import de.symeda.sormas.api.person.PersonContactDetailType; import de.symeda.sormas.api.person.PersonDto; +import de.symeda.sormas.api.person.PhoneNumberType; import de.symeda.sormas.api.person.Sex; import de.symeda.sormas.backend.AbstractBeanTest; @@ -28,7 +36,6 @@ void setUp() { } // TODO: test different replacement strategy: with/without failure - // TODO: test forbidden fields @Test void patch_noErrorsReplaceAlways() { @@ -37,6 +44,7 @@ void patch_noErrorsReplaceAlways() { String newLastname = "toto"; String newSequelaeDetails = "Some very interesting sequelaeDetails"; + String classificationDate = "2030-02-01"; CaseDataPatchRequest request = new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()) .setReplacementStrategy(DataReplacementStrategy.ALWAYS) .setPatchDictionary( @@ -47,11 +55,8 @@ void patch_noErrorsReplaceAlways() { "Person.sex", Sex.FEMALE.getName(), - "Person.personContactDetails.details", - "name@email.de", - - "Person.personContactDetails.phoneNumberType", - "123654687", + "CaseData.classificationDate", + classificationDate, "CaseData.sequelaeDetails", newSequelaeDetails)); @@ -71,11 +76,58 @@ void patch_noErrorsReplaceAlways() { () -> Assertions.assertEquals(newLastname, actualPerson.getLastName()), () -> Assertions.assertEquals(Sex.FEMALE, actualPerson.getSex()), // CASE + () -> Assertions.assertEquals( + Date.from(LocalDate.parse(classificationDate).atStartOfDay(ZoneId.systemDefault()).toInstant()), + actualCase.getClassificationDate()), () -> Assertions.assertEquals(newSequelaeDetails, actualCase.getSequelaeDetails())); } - private CaseDataPatcher victim() { - return getCaseDataPatcher(); + @Test + void patch_noErrorsReplaceAlwaysPersonContactDetails() { + // PREPARE + CaseDataDto originalCase = creator.createUnclassifiedCase(Disease.PERTUSSIS); + + String newPhoneNumber = "123654687"; + String newEmail = "name@email.de"; + String origin = "ngSurvey"; + CaseDataPatchRequest request = new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()) + .setReplacementStrategy(DataReplacementStrategy.ALWAYS) + .setPatchDictionary( + Map.of( + "Person.personContactDetails.details", + newEmail, + + "Person.personContactDetails.phoneNumberType", + newPhoneNumber)) + .setOrigin(origin); + + // EXECUTE + DataPatchResponse response = victim().patch(request); + + // CHECK + logger.info("response: [{}]", response); + + PersonDto actualPerson = getPersonFacade().getByUuid(originalCase.getPerson().getUuid()); + + Supplier> contactDetailsStreamProvider = () -> actualPerson.getPersonContactDetails().stream(); + Assertions.assertAll( + () -> Assertions.assertTrue(response.getFailures().isEmpty(), "Failure found, but should be empty"), + // PERSON + () -> Assertions + .assertTrue(contactDetailsStreamProvider.get().allMatch(contactDetail -> origin.equals(contactDetail.getAdditionalInformation()))), + + () -> Assertions.assertTrue( + contactDetailsStreamProvider.get() + .anyMatch( + contactDetail -> contactDetail.getPersonContactDetailType() == PersonContactDetailType.PHONE + && newPhoneNumber.equals(contactDetail.getDetails()) + && contactDetail.getPhoneNumberType() == PhoneNumberType.OTHER)), + + () -> Assertions.assertTrue( + contactDetailsStreamProvider.get() + .anyMatch( + contactDetail -> contactDetail.getPersonContactDetailType() == PersonContactDetailType.EMAIL + && newEmail.equals(contactDetail.getDetails())))); } @Test @@ -101,9 +153,13 @@ void patch_invalidPrefix() { victim().patch(new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()).setPatchDictionary(patchDictionary)); // CHECK - Map expectedFailures = patchDictionary.keySet() + Map expectedFailures = patchDictionary.entrySet() .stream() - .map(path -> Map.entry(path, new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.UNSUPPORTED_PREFIX))) + .map( + entry -> Map.entry( + entry.getKey(), + new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.UNSUPPORTED_PREFIX) + .setProvidedFieldValue(entry.getValue()))) .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); Assertions.assertAll( @@ -113,12 +169,150 @@ void patch_invalidPrefix() { } @Test - void patch_referenceDataInsertion() { - throw new IllegalStateException("toImplement"); + void patch_forbiddenField() { + // PREPARE + CaseDataDto originalCase = creator.createUnclassifiedCase(Disease.RESPIRATORY_SYNCYTIAL_VIRUS); + + String ignoredValue = "ignoredValue"; + + Map patchDictionary = Map.of( + "Person.birthdate", + ignoredValue, + + "Person.birthdateDD", + ignoredValue, + "Person.birthdateMM", + ignoredValue, + "Person.birthdateYYYY", + ignoredValue); + // EXECUTE + DataPatchResponse response = + victim().patch(new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()).setPatchDictionary(patchDictionary)); + + // CHECK + Map expectedFailures = patchDictionary.entrySet() + .stream() + .map( + entry -> Map.entry( + entry.getKey(), + new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.FORBIDDEN_FIELD).setProvidedFieldValue(entry.getValue()))) + .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); + + Assertions.assertAll( + () -> Assertions.assertTrue(response.getPatchDictionary().isEmpty(), "Nothing should have been patched, should be empty"), + // FAILURES + () -> Assertions.assertEquals(expectedFailures, response.getFailures())); + } + + @Test + void patch_invalidMultiFieldFormat() { + // PREPARE + CaseDataDto originalCase = creator.createUnclassifiedCase(Disease.RESPIRATORY_SYNCYTIAL_VIRUS); + + String ignoredValue = "ignoredValue"; + + Map patchDictionary = Map.of( + "Person.(deathDate", + ignoredValue, + + "Person.((deathDate))", + ignoredValue, + + "Person.(deathDate)", + ignoredValue, + + "Person.(deathDate|)", + ignoredValue, + + "Person.(deathDate|wefuiohjwerf", + ignoredValue, + + "Person.(deathDate))", + ignoredValue, + + "Person.()", + ignoredValue, + + "Person.)deathDate(", + ignoredValue); + // EXECUTE + DataPatchResponse response = + victim().patch(new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()).setPatchDictionary(patchDictionary)); + + // CHECK + Map expectedFailures = patchDictionary.entrySet() + .stream() + .map( + entry -> Map.entry( + entry.getKey(), + new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.INVALID_MULTIPLE_FIELDS_FORMAT) + .setProvidedFieldValue(entry.getValue()))) + .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); + + Assertions.assertAll( + () -> Assertions.assertTrue(response.getPatchDictionary().isEmpty(), "Nothing should have been patched, should be empty"), + // FAILURES + () -> Assertions.assertEquals(expectedFailures, response.getFailures())); + } + + @Test + void patch_customizableEnumExist() { + // PREPARE + CaseDataDto originalCase = creator.createUnclassifiedCase(Disease.PERTUSSIS); + + String newLastname = "toto"; + String newSequelaeDetails = "Some very interesting sequelaeDetails"; + String classificationDate = "2030-02-01"; + CaseDataPatchRequest request = new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()) + .setReplacementStrategy(DataReplacementStrategy.ALWAYS) + .setPatchDictionary( + Map.of( + "Person.lastName", + newLastname, + + "Person.sex", + Sex.FEMALE.getName(), + + "Person.personContactDetails.details", + "name@email.de", + + "CaseData.classificationDate", + classificationDate, + + "Person.personContactDetails.phoneNumberType", + "123654687", + + "CaseData.sequelaeDetails", + newSequelaeDetails)); + + // EXECUTE + DataPatchResponse response = victim().patch(request); + + // CHECK + logger.info("response: [{}]", response); + + CaseDataDto actualCase = getCaseFacade().getByUuid(originalCase.getUuid()); + PersonDto actualPerson = getPersonFacade().getByUuid(originalCase.getPerson().getUuid()); + + // TODO: contact info. + Assertions.assertAll( + () -> Assertions.assertTrue(response.getFailures().isEmpty(), "Failure found, but should be empty"), + // PERSON + () -> Assertions.assertEquals(newLastname, actualPerson.getLastName()), + () -> Assertions.assertEquals(Sex.FEMALE, actualPerson.getSex()), + // CASE + () -> Assertions.assertEquals( + Date.from(LocalDate.parse(classificationDate).atStartOfDay(ZoneId.systemDefault()).toInstant()), + actualCase.getClassificationDate()), + () -> Assertions.assertEquals(newSequelaeDetails, actualCase.getSequelaeDetails())); } @Test void patch_addVaccine() { throw new IllegalStateException("toImplement"); } + + private CaseDataPatcher victim() { + return getCaseDataPatcher(); + } } From 97e68cbb67ba5a7748159a890102857a7a325b1f Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Wed, 25 Feb 2026 16:19:11 +0100 Subject: [PATCH 017/134] Added disease handling on patching. --- .../java/de/symeda/sormas/api/Disease.java | 7 ++ .../de/symeda/sormas/api/ResourceBundle.java | 4 + .../sormas/api/i18n/I18nProperties.java | 41 ++++++++++ .../api/i18n/I18nPropertiesRequest.java | 78 +++++++++++++++++++ .../api/patch/DataPatchFailureCause.java | 5 ++ .../api/patch/mapping/FieldCustomMapper.java | 10 +++ .../sormas/backend/common/CronService.java | 2 +- .../backend/patch/CaseDataPatcherImpl.java | 6 +- .../backend/patch/PropertyAccessor.java | 45 +++++++---- .../mapping/FieldCustomMapperRegistry.java | 5 +- 10 files changed, 183 insertions(+), 20 deletions(-) create mode 100644 sormas-api/src/main/java/de/symeda/sormas/api/i18n/I18nPropertiesRequest.java diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/Disease.java b/sormas-api/src/main/java/de/symeda/sormas/api/Disease.java index dc0418e0fa2..0fad227f003 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/Disease.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/Disease.java @@ -17,6 +17,10 @@ import java.util.Arrays; import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +import com.google.common.collect.ImmutableSet; import de.symeda.sormas.api.i18n.I18nProperties; import de.symeda.sormas.api.statistics.StatisticsGroupingKey; @@ -93,6 +97,9 @@ public enum Disease OTHER(true, true, true, false, true, 21, false, false, false), UNDEFINED(true, true, true, false, true, 0, false, false, false); + public static final Set ALL_DISEASES = + Arrays.stream(Disease.values()).collect(Collectors.collectingAndThen(Collectors.toSet(), ImmutableSet::copyOf)); + private final boolean defaultActive; private final boolean defaultPrimary; private final boolean defaultCaseSurveillanceEnabled; diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/ResourceBundle.java b/sormas-api/src/main/java/de/symeda/sormas/api/ResourceBundle.java index ad0bb0dfd4a..245bf50031d 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/ResourceBundle.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/ResourceBundle.java @@ -26,4 +26,8 @@ public String getString(String key, String defaultValue) { public String getString(String key) { return getString(key, null); } + + public java.util.ResourceBundle getResourceBundle() { + return resourceBundle; + } } diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/I18nProperties.java b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/I18nProperties.java index d117ce5dc41..1febe91ff11 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/I18nProperties.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/I18nProperties.java @@ -26,8 +26,12 @@ import java.util.HashMap; import java.util.Locale; import java.util.Map; +import java.util.Optional; import java.util.PropertyResourceBundle; import java.util.ResourceBundle.Control; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.StreamSupport; import org.apache.commons.lang3.StringUtils; import org.apache.commons.text.StringSubstitutor; @@ -54,6 +58,8 @@ public final class I18nProperties { private final ResourceBundle continentProperties; private final ResourceBundle subcontinentProperties; + private final Map resourceBundlesDictionary; + private static I18nProperties getInstance(Language language) { if (language == null) { @@ -372,6 +378,24 @@ private I18nProperties(Language language) { this.countryProperties = loadProperties("countries", language.getLocale()); this.continentProperties = loadProperties("continents", language.getLocale()); this.subcontinentProperties = loadProperties("subcontinents", language.getLocale()); + + resourceBundlesDictionary = Map.of( + I18nPropertiesRequest.ResourceBundleType.CAPTION, + captionProperties, + I18nPropertiesRequest.ResourceBundleType.DESCRIPTION, + descriptionProperties, + I18nPropertiesRequest.ResourceBundleType.ENUMS, + enumProperties, + I18nPropertiesRequest.ResourceBundleType.VALIDATION, + validationProperties, + I18nPropertiesRequest.ResourceBundleType.STRING, + stringProperties, + I18nPropertiesRequest.ResourceBundleType.COUNTRY, + countryProperties, + I18nPropertiesRequest.ResourceBundleType.CONTINENT, + continentProperties, + I18nPropertiesRequest.ResourceBundleType.SUBCONTINENT, + subcontinentProperties); } private I18nProperties() { @@ -407,6 +431,23 @@ public static ResourceBundle loadProperties(String propertiesGroup, Locale local return new ResourceBundle(java.util.ResourceBundle.getBundle(propertiesGroup, locale, new UTF8Control())); } + public static Map buildPropertiesMap(I18nPropertiesRequest request) { + + Language language = request.getLanguage() != null ? request.getLanguage() : Language.EN; + I18nProperties instance = getInstance(language); + + I18nPropertiesRequest.ResourceBundleType resourceBundleType = request.getResourceBundleType(); + ResourceBundle resourceBundle = Optional.of(instance.resourceBundlesDictionary.get(resourceBundleType)) + .orElseThrow(() -> new IllegalStateException(String.format("Resource bundle type %s not found", resourceBundleType))); + + Map propertiesMap = + StreamSupport.stream(((Iterable) () -> resourceBundle.getResourceBundle().getKeys().asIterator()).spliterator(), false) + .filter(key -> StringUtils.startsWith(key, request.getPrefix())) + .collect(Collectors.toMap(Function.identity(), resourceBundle::getString)); + + return propertiesMap; + } + public static class UTF8Control extends Control { private static final char LOCALE_SEP = '-'; diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/I18nPropertiesRequest.java b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/I18nPropertiesRequest.java new file mode 100644 index 00000000000..897e2280df2 --- /dev/null +++ b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/I18nPropertiesRequest.java @@ -0,0 +1,78 @@ +package de.symeda.sormas.api.i18n; + +import java.util.Objects; + +import javax.annotation.Nullable; +import javax.validation.constraints.NotNull; + +import de.symeda.sormas.api.Language; + +public class I18nPropertiesRequest { + + @Nullable + private Language language; + + @NotNull + private ResourceBundleType resourceBundleType; + + @Nullable + private String prefix; + + @Nullable + public Language getLanguage() { + return language; + } + + public I18nPropertiesRequest setLanguage(@Nullable Language language) { + this.language = language; + return this; + } + + public ResourceBundleType getResourceBundleType() { + return resourceBundleType; + } + + public I18nPropertiesRequest setResourceBundleType(ResourceBundleType resourceBundleType) { + this.resourceBundleType = resourceBundleType; + return this; + } + + @Nullable + public String getPrefix() { + return prefix; + } + + @Override + public boolean equals(Object o) { + if (o == null || getClass() != o.getClass()) + return false; + I18nPropertiesRequest that = (I18nPropertiesRequest) o; + return language == that.language && resourceBundleType == that.resourceBundleType && Objects.equals(prefix, that.prefix); + } + + @Override + public int hashCode() { + return Objects.hash(language, resourceBundleType, prefix); + } + + public I18nPropertiesRequest setPrefix(@Nullable String prefix) { + this.prefix = prefix; + return this; + } + + @Override + public String toString() { + return "I18nPropertiesRequest{" + "language=" + language + ", resourceBundleType=" + resourceBundleType + ", prefix='" + prefix + '\'' + '}'; + } + + public enum ResourceBundleType { + CAPTION, + DESCRIPTION, + ENUMS, + VALIDATION, + STRING, + COUNTRY, + CONTINENT, + SUBCONTINENT + } +} diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java index cbcddd6fd4a..86c8636237d 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java @@ -7,6 +7,11 @@ public enum DataPatchFailureCause { */ INVALID_MULTIPLE_FIELDS_FORMAT, + /** + * Occurs the field is not supported by the disease. + */ + UNSUPPORTED_FIELD_FOR_DISEASE, + /** * Path does not start with the allowed prefixes: example: CaseData or Person. */ diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldCustomMapper.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldCustomMapper.java index 913947eca5e..568f9143e5f 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldCustomMapper.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldCustomMapper.java @@ -3,6 +3,7 @@ import java.util.Optional; import java.util.Set; +import de.symeda.sormas.api.Disease; import de.symeda.sormas.api.patch.DataPatchFailure; /** @@ -25,4 +26,13 @@ public interface FieldCustomMapper { */ Set supportedFields(); + /** + * Some fields are specific to some diseases. + * + * @return set of supported diseases. + */ + default Set supportedDisease() { + return Disease.ALL_DISEASES; + } + } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/common/CronService.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/common/CronService.java index 14223739d9f..8322f593574 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/common/CronService.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/common/CronService.java @@ -222,7 +222,7 @@ public void deleteSystemEvents() { } } - @Schedule(hour = "*", minute = "0", second = "0", persistent = false) + @Schedule(hour = "*", minute = "*/30", persistent = false) public void fetchExternalMessages() { if (featureConfigurationFacade.isFeatureEnabled(FeatureType.EXTERNAL_MESSAGES)) { externalMessageFacade.fetchAndSaveExternalMessages(null); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java index 2a2616845df..830678f1b59 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java @@ -22,6 +22,7 @@ import com.google.common.base.Suppliers; +import de.symeda.sormas.api.Disease; import de.symeda.sormas.api.caze.CaseDataDto; import de.symeda.sormas.api.patch.CaseDataPatchRequest; import de.symeda.sormas.api.patch.CaseDataPatcher; @@ -69,6 +70,9 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { CaseDataDto caseData = getCaseDataDto(request); + // TODO: implement disease check for fields + Disease disease = caseData.getDisease(); + Supplier person = Suppliers.memoize(() -> getPersonDto(caseData)); Map, Object> actualDictionary = computeActualDictionary(request); @@ -89,7 +93,7 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { .setFailure(new DataPatchFailure().setDataPatchFailureCause(fieldFailureCause).setProvidedFieldValue(entry.getValue())); } - Optional mapper = fieldCustomMapperRegistry.getMapper(fullFieldName); + Optional mapper = fieldCustomMapperRegistry.getMapper(fullFieldName, disease); Object untypedTargetValue = entry.getValue(); if (mapper.isPresent()) { diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessor.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessor.java index 451906ad621..c7ed09722a0 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessor.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessor.java @@ -1,12 +1,20 @@ package de.symeda.sormas.backend.patch; +import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; +import java.util.Arrays; import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; import org.apache.commons.beanutils.PropertyUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import de.symeda.sormas.api.Disease; +import de.symeda.sormas.api.utils.Diseases; +import de.symeda.sormas.api.utils.Tuple; + public class PropertyAccessor { // TODO: perform some caching of the fields @@ -17,32 +25,37 @@ public class PropertyAccessor { private PropertyAccessor() { } - public static Optional> getNestedPropertyType(final Object bean, final String fieldName) { + public static Optional, Set>> getNestedPropertyType(final Object bean, final String fieldName) { if (bean == null || fieldName == null || fieldName.isEmpty()) { return Optional.empty(); } - try { - boolean notNestedPath = fieldName.indexOf(PATH_SEPARATOR) == fieldName.lastIndexOf(PATH_SEPARATOR); - - if (notNestedPath) { - return Optional.ofNullable(PropertyUtils.getPropertyType(bean, fieldName)); - } + boolean notNestedPath = fieldName.indexOf(PATH_SEPARATOR) == fieldName.lastIndexOf(PATH_SEPARATOR); - String leafPath = fieldName.substring(fieldName.lastIndexOf(PATH_SEPARATOR) + 1); + if (notNestedPath) { + return getPropertyType(bean, fieldName); + } - return Optional.ofNullable(getNestedProperty(bean, fieldName)).flatMap(leafParent -> getPropertyType(leafParent, leafPath)); + String leafPath = fieldName.substring(fieldName.lastIndexOf(PATH_SEPARATOR) + 1); - } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) { - logger.info("Could not get property type for [{}], [{}]", fieldName, bean.getClass().getSimpleName(), e); - return Optional.empty(); - } + return Optional.ofNullable(getNestedProperty(bean, fieldName)).flatMap(leafParent -> getPropertyType(leafParent, leafPath)); } - public static Optional> getPropertyType(final Object bean, final String fieldName) { + public static Optional, Set>> getPropertyType(final Object bean, final String fieldName) { try { - return Optional.ofNullable(PropertyUtils.getPropertyType(bean, fieldName)); - } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) { + Field declaredField = bean.getClass().getDeclaredField(fieldName); + Set supportedDiseases = Optional.ofNullable(declaredField.getAnnotation(Diseases.class)).map(a -> { + boolean invert = a.hide(); + + Set annotatedDiseases = Arrays.stream(a.value()).collect(Collectors.toSet()); + if (invert) { + return Disease.ALL_DISEASES.stream().filter(disease -> !annotatedDiseases.contains(disease)).collect(Collectors.toSet()); + } + + return annotatedDiseases; + }).orElse(Disease.ALL_DISEASES); + return Optional.of(new Tuple<>(PropertyUtils.getPropertyType(bean, fieldName), supportedDiseases)); + } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException | NoSuchFieldException e) { logger.info("Could not get property type for [{}], [{}]", fieldName, bean.getClass().getSimpleName(), e); return Optional.empty(); } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/FieldCustomMapperRegistry.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/FieldCustomMapperRegistry.java index 8c096b20bde..fd173fca96e 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/FieldCustomMapperRegistry.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/FieldCustomMapperRegistry.java @@ -9,6 +9,7 @@ import javax.enterprise.inject.Instance; import javax.inject.Inject; +import de.symeda.sormas.api.Disease; import de.symeda.sormas.api.patch.mapping.FieldCustomMapper; import de.symeda.sormas.api.utils.Tuple; @@ -27,7 +28,7 @@ void init() { .collect(Collectors.toMap(Tuple::getFirst, Tuple::getSecond)); } - public Optional getMapper(final String fieldName) { - return Optional.ofNullable(dictionary.get(fieldName)); + public Optional getMapper(final String fieldName, Disease disease) { + return Optional.ofNullable(dictionary.get(fieldName)).filter(mapper -> mapper.supportedDisease().contains(disease)); } } From ac35c96fefc0ab35e37a28f957d77a66e694457d Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Wed, 25 Feb 2026 16:53:22 +0100 Subject: [PATCH 018/134] Integrated visibility checkers logic --- .../api/patch/DataPatchFailureCause.java | 2 +- .../backend/patch/CaseDataPatcherImpl.java | 28 +++- .../backend/patch/PropertyAccessor.java | 38 ++---- .../backend/patch/PropertyAccessorTest.java | 115 ++++++++++++++++ .../sormas/patch/CaseDataPatcherImplTest.java | 92 +++++++++---- .../sormas/patch/PropertyAccessorTest.java | 129 +++++++++--------- 6 files changed, 290 insertions(+), 114 deletions(-) create mode 100644 sormas-backend/src/test/java/de/symeda/sormas/backend/patch/PropertyAccessorTest.java diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java index 86c8636237d..6bb54dc8a28 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java @@ -10,7 +10,7 @@ public enum DataPatchFailureCause { /** * Occurs the field is not supported by the disease. */ - UNSUPPORTED_FIELD_FOR_DISEASE, + UNSUPPORTED_FIELD_FOR_DISEASE_OR_COUNTRY, /** * Path does not start with the allowed prefixes: example: CaseData or Person. diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java index 830678f1b59..3f1c54a263d 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java @@ -35,7 +35,10 @@ import de.symeda.sormas.api.patch.mapping.FieldPatchRequest; import de.symeda.sormas.api.person.PersonDto; import de.symeda.sormas.api.utils.Tuple; +import de.symeda.sormas.api.utils.fieldvisibility.FieldVisibilityCheckers; import de.symeda.sormas.backend.caze.CaseFacadeEjb; +import de.symeda.sormas.backend.common.ConfigFacadeEjb; +import de.symeda.sormas.backend.feature.FeatureConfigurationFacadeEjb; import de.symeda.sormas.backend.json.ObjectMapperProvider; import de.symeda.sormas.backend.patch.mapping.FieldCustomMapperRegistry; import de.symeda.sormas.backend.patch.mapping.ValueMapperRegistry; @@ -64,6 +67,14 @@ public class CaseDataPatcherImpl implements CaseDataPatcher { @EJB private PersonFacadeEjb.PersonFacadeEjbLocal personFacade; + @EJB + private FeatureConfigurationFacadeEjb.FeatureConfigurationFacadeEjbLocal featureConfigurationFacade; + + @EJB + private ConfigFacadeEjb.ConfigFacadeEjbLocal configFacade; + + private FieldVisibilityCheckers fieldVisibilityCheckers; + @Override public DataPatchResponse patch(CaseDataPatchRequest request) { logger.info("patch: [{}]", request); @@ -114,13 +125,22 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { } String relativeFieldName = fullFieldName.substring(fullFieldName.indexOf('.') + 1); - Optional> nestedPropertyType = PropertyAccessor.getNestedPropertyType(target, relativeFieldName); + Optional, Boolean>> nestedPropertyType = + PropertyAccessor.getNestedPropertyType(target, relativeFieldName, getFieldVisibilityCheckers(disease)); if (nestedPropertyType.isEmpty()) { logger.info("Missing field: [{}] on target: [{}]", relativeFieldName, target); return singlePatchResult.setFailure(new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.FIELD_DOES_NOT_EXIST)); } - Class targetType = nestedPropertyType.orElseThrow(); + Tuple, Boolean> classSetTuple = nestedPropertyType.orElseThrow(); + Class targetType = classSetTuple.getFirst(); + + if (!Boolean.TRUE.equals(classSetTuple.getSecond())) { + logger.info("Field: [{}] on object [{}] cannot be patched for disease: [{}]", relativeFieldName, target, disease); + return singlePatchResult.setFailure( + new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.UNSUPPORTED_FIELD_FOR_DISEASE_OR_COUNTRY) + .setProvidedFieldValue(untypedTargetValue)); + } // TODO: handle targetType being a list. TO-Check with business: add / replace @@ -199,6 +219,10 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { */ } + private FieldVisibilityCheckers getFieldVisibilityCheckers(Disease disease) { + return FieldVisibilityCheckers.withCountry(configFacade.getCountryLocale()).andWithDisease(disease); + } + private Map, Object> computeActualDictionary(CaseDataPatchRequest request) { Predicate> filterPredicate = buildAdequateDictionaryValuePredicate(request); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessor.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessor.java index c7ed09722a0..4848cd10b74 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessor.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessor.java @@ -1,19 +1,14 @@ package de.symeda.sormas.backend.patch; -import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; -import java.util.Arrays; import java.util.Optional; -import java.util.Set; -import java.util.stream.Collectors; import org.apache.commons.beanutils.PropertyUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.symeda.sormas.api.Disease; -import de.symeda.sormas.api.utils.Diseases; import de.symeda.sormas.api.utils.Tuple; +import de.symeda.sormas.api.utils.fieldvisibility.FieldVisibilityCheckers; public class PropertyAccessor { // TODO: perform some caching of the fields @@ -25,7 +20,10 @@ public class PropertyAccessor { private PropertyAccessor() { } - public static Optional, Set>> getNestedPropertyType(final Object bean, final String fieldName) { + public static Optional, Boolean>> getNestedPropertyType( + final Object bean, + final String fieldName, + FieldVisibilityCheckers fieldVisibilityCheckers) { if (bean == null || fieldName == null || fieldName.isEmpty()) { return Optional.empty(); } @@ -33,29 +31,23 @@ public static Optional, Set>> getNestedPropertyType(fina boolean notNestedPath = fieldName.indexOf(PATH_SEPARATOR) == fieldName.lastIndexOf(PATH_SEPARATOR); if (notNestedPath) { - return getPropertyType(bean, fieldName); + return getPropertyType(bean, fieldName, fieldVisibilityCheckers); } String leafPath = fieldName.substring(fieldName.lastIndexOf(PATH_SEPARATOR) + 1); - return Optional.ofNullable(getNestedProperty(bean, fieldName)).flatMap(leafParent -> getPropertyType(leafParent, leafPath)); + return Optional.ofNullable(getNestedProperty(bean, fieldName)) + .flatMap(leafParent -> getPropertyType(leafParent, leafPath, fieldVisibilityCheckers)); } - public static Optional, Set>> getPropertyType(final Object bean, final String fieldName) { + public static Optional, Boolean>> getPropertyType( + final Object bean, + final String fieldName, + FieldVisibilityCheckers fieldVisibilityCheckers) { try { - Field declaredField = bean.getClass().getDeclaredField(fieldName); - Set supportedDiseases = Optional.ofNullable(declaredField.getAnnotation(Diseases.class)).map(a -> { - boolean invert = a.hide(); - - Set annotatedDiseases = Arrays.stream(a.value()).collect(Collectors.toSet()); - if (invert) { - return Disease.ALL_DISEASES.stream().filter(disease -> !annotatedDiseases.contains(disease)).collect(Collectors.toSet()); - } - - return annotatedDiseases; - }).orElse(Disease.ALL_DISEASES); - return Optional.of(new Tuple<>(PropertyUtils.getPropertyType(bean, fieldName), supportedDiseases)); - } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException | NoSuchFieldException e) { + boolean visible = fieldVisibilityCheckers.isVisible(bean.getClass(), fieldName); + return Optional.of(new Tuple<>(PropertyUtils.getPropertyType(bean, fieldName), visible)); + } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) { logger.info("Could not get property type for [{}], [{}]", fieldName, bean.getClass().getSimpleName(), e); return Optional.empty(); } diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/PropertyAccessorTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/PropertyAccessorTest.java new file mode 100644 index 00000000000..bf4130bffc9 --- /dev/null +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/PropertyAccessorTest.java @@ -0,0 +1,115 @@ +package de.symeda.sormas.backend.patch; + +import java.util.Date; + +import org.junit.jupiter.api.BeforeEach; + +import de.symeda.sormas.api.caze.CaseDataDto; +import de.symeda.sormas.api.caze.DengueFeverType; +import de.symeda.sormas.api.caze.RabiesType; +import de.symeda.sormas.backend.AbstractUnitTest; + +class PropertyAccessorTest extends AbstractUnitTest { + + private CaseDataDto caseDataDto; + + @BeforeEach + void setUp() { + caseDataDto = new CaseDataDto(); + caseDataDto.setDengueFeverType(DengueFeverType.DENGUE_FEVER); + caseDataDto.setRabiesType(RabiesType.FURIOUS_RABIES); + caseDataDto.setClassificationComment("test comment"); + caseDataDto.setDistrictLevelDate(new Date()); + } + + // getNestedPropertyType - simple field + +// @Test +// void getNestedPropertyType_simpleField_dengueFeverType() { +// // EXECUTE +// Optional, Set>> result = PropertyAccessor.getNestedPropertyType(caseDataDto, "dengueFeverType"); +// +// // CHECK +// assertTrue(result.isPresent()); +// assertEquals(DengueFeverType.class, result.get().getFirst()); +// assertEquals(Set.of(Disease.DENGUE), result.get().getSecond()); +// } +// +// @Test +// void getNestedPropertyType_simpleField_rabiesType() { +// // EXECUTE +// Optional, Set>> result = PropertyAccessor.getNestedPropertyType(caseDataDto, "rabiesType"); +// +// // CHECK +// assertTrue(result.isPresent()); +// assertEquals(RabiesType.class, result.get().getFirst()); +// assertEquals(Set.of(Disease.RABIES), result.get().getSecond()); +// } +// +// @Test +// void getNestedPropertyType_simpleField_allDiseases() { +// // EXECUTE +// Optional, Set>> result = PropertyAccessor.getNestedPropertyType(caseDataDto, "districtLevelDate"); +// +// // CHECK +// assertTrue(result.isPresent()); +// assertEquals(Date.class, result.get().getFirst()); +// assertTrue(result.get().getSecond().contains(Disease.DENGUE)); +// } +// +// @Test +// void getNestedPropertyType_simpleField_hideDiseases() { +// // EXECUTE +// Optional, Set>> result = PropertyAccessor.getNestedPropertyType(caseDataDto, "classificationComment"); +// +// // CHECK +// assertTrue(result.isPresent()); +// assertEquals(String.class, result.get().getFirst()); +// assertFalse(result.get().getSecond().contains(Disease.RESPIRATORY_SYNCYTIAL_VIRUS)); +// assertFalse(result.get().getSecond().contains(Disease.PLAGUE)); +// assertTrue(result.get().getSecond().contains(Disease.DENGUE)); +// } +// +// // getPropertyType +// +// @Test +// void getPropertyType_fieldNotFound_returnsEmpty() { +// // EXECUTE +// Optional, Set>> result = PropertyAccessor.getPropertyType(caseDataDto, "nonExistentField"); +// +// // CHECK +// assertTrue(result.isEmpty()); +// } +// +// @Test +// void getNestedProperty_nullPath_returnsEmpty() { +// // EXECUTE & CHECK +// assertTrue(PropertyAccessor.getNestedProperty(caseDataDto, null).isEmpty()); +// } +// +// // edge cases +// +// @Test +// void getNestedPropertyType_nullBean_returnsEmpty() { +// // EXECUTE & CHECK +// assertTrue(PropertyAccessor.getNestedPropertyType(null, "field").isEmpty()); +// } +// +// @Test +// void getNestedPropertyType_emptyFieldName_returnsEmpty() { +// // EXECUTE & CHECK +// assertTrue(PropertyAccessor.getNestedPropertyType(caseDataDto, "").isEmpty()); +// } +// +// @Test +// void getNestedPropertyType_nullFieldName_returnsEmpty() { +// // EXECUTE & CHECK +// assertTrue(PropertyAccessor.getNestedPropertyType(caseDataDto, null).isEmpty()); +// } +// +// @Test +// void getNestedProperty_emptyPath_returnsEmpty() { +// // EXECUTE & CHECK +// assertTrue(PropertyAccessor.getNestedProperty(caseDataDto, "").isEmpty()); +// } +} diff --git a/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java index ee8d90e8135..d4403e2916f 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java @@ -8,6 +8,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -153,14 +154,7 @@ void patch_invalidPrefix() { victim().patch(new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()).setPatchDictionary(patchDictionary)); // CHECK - Map expectedFailures = patchDictionary.entrySet() - .stream() - .map( - entry -> Map.entry( - entry.getKey(), - new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.UNSUPPORTED_PREFIX) - .setProvidedFieldValue(entry.getValue()))) - .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); + Map expectedFailures = buildDictionaryOfFailureType(patchDictionary, DataPatchFailureCause.UNSUPPORTED_PREFIX); Assertions.assertAll( () -> Assertions.assertTrue(response.getPatchDictionary().isEmpty(), "Nothing should have been patched, should be empty"), @@ -190,13 +184,7 @@ void patch_forbiddenField() { victim().patch(new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()).setPatchDictionary(patchDictionary)); // CHECK - Map expectedFailures = patchDictionary.entrySet() - .stream() - .map( - entry -> Map.entry( - entry.getKey(), - new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.FORBIDDEN_FIELD).setProvidedFieldValue(entry.getValue()))) - .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); + Map expectedFailures = buildDictionaryOfFailureType(patchDictionary, DataPatchFailureCause.FORBIDDEN_FIELD); Assertions.assertAll( () -> Assertions.assertTrue(response.getPatchDictionary().isEmpty(), "Nothing should have been patched, should be empty"), @@ -240,14 +228,8 @@ void patch_invalidMultiFieldFormat() { victim().patch(new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()).setPatchDictionary(patchDictionary)); // CHECK - Map expectedFailures = patchDictionary.entrySet() - .stream() - .map( - entry -> Map.entry( - entry.getKey(), - new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.INVALID_MULTIPLE_FIELDS_FORMAT) - .setProvidedFieldValue(entry.getValue()))) - .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); + Map expectedFailures = + buildDictionaryOfFailureType(patchDictionary, DataPatchFailureCause.INVALID_MULTIPLE_FIELDS_FORMAT); Assertions.assertAll( () -> Assertions.assertTrue(response.getPatchDictionary().isEmpty(), "Nothing should have been patched, should be empty"), @@ -307,6 +289,70 @@ void patch_customizableEnumExist() { () -> Assertions.assertEquals(newSequelaeDetails, actualCase.getSequelaeDetails())); } + @Test + void patch_notSupportedForDisease() { + // PREPARE + CaseDataDto originalCase = creator.createUnclassifiedCase(Disease.RESPIRATORY_SYNCYTIAL_VIRUS); + + String ignoredValue = "ignoredValue"; + + Map patchDictionary = Map.of("CaseData.plagueType", ignoredValue); + + // EXECUTE + DataPatchResponse response = + victim().patch(new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()).setPatchDictionary(patchDictionary)); + + // CHECK + Map expectedFailures = + buildDictionaryOfFailureType(patchDictionary, DataPatchFailureCause.UNSUPPORTED_FIELD_FOR_DISEASE_OR_COUNTRY); + + Assertions.assertAll( + () -> Assertions.assertTrue(response.getPatchDictionary().isEmpty(), "Nothing should have been patched, should be empty"), + // FAILURES + () -> Assertions.assertEquals(expectedFailures, response.getFailures())); + } + + @Test + void patch_notSupportedForCountry() { + // PREPARE + + String countryLocale = getConfigFacade().getCountryLocale(); + + System.out.println("countryLocale = " + countryLocale); + + CaseDataDto originalCase = creator.createUnclassifiedCase(Disease.RESPIRATORY_SYNCYTIAL_VIRUS); + + String ignoredValue = "ignoredValue"; + + Map patchDictionary = Map.of("CaseData.quarantineOrderedOfficialDocumentDate", ignoredValue); + + // EXECUTE + DataPatchResponse response = + victim().patch(new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()).setPatchDictionary(patchDictionary)); + + // CHECK + Map expectedFailures = + buildDictionaryOfFailureType(patchDictionary, DataPatchFailureCause.UNSUPPORTED_FIELD_FOR_DISEASE_OR_COUNTRY); + + Assertions.assertAll( + () -> Assertions.assertTrue(response.getPatchDictionary().isEmpty(), "Nothing should have been patched, should be empty"), + // FAILURES + () -> Assertions.assertEquals(expectedFailures, response.getFailures())); + } + + private static @NotNull Map buildDictionaryOfFailureType( + Map patchDictionary, + DataPatchFailureCause unsupportedFieldForDisease) { + Map expectedFailures = patchDictionary.entrySet() + .stream() + .map( + entry -> Map.entry( + entry.getKey(), + new DataPatchFailure().setDataPatchFailureCause(unsupportedFieldForDisease).setProvidedFieldValue(entry.getValue()))) + .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); + return expectedFailures; + } + @Test void patch_addVaccine() { throw new IllegalStateException("toImplement"); diff --git a/sormas-backend/src/test/java/de/symeda/sormas/patch/PropertyAccessorTest.java b/sormas-backend/src/test/java/de/symeda/sormas/patch/PropertyAccessorTest.java index c622f305525..517f87a70ad 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/patch/PropertyAccessorTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/patch/PropertyAccessorTest.java @@ -3,7 +3,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertInstanceOf; -import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import java.lang.reflect.InvocationTargetException; @@ -111,54 +110,54 @@ void setUp() { "b" }; bean.map = Map.of("key", "value"); } - - @Test - void getNestedPropertyType_simpleProperty_returnsCorrectType() { - Optional> type = PropertyAccessor.getNestedPropertyType(bean, "name"); - assertTrue(type.isPresent()); - assertEquals(String.class, type.get()); - } - - @Test - void getNestedPropertyType_nestedProperty_returnsCorrectType() { - Optional> type = PropertyAccessor.getNestedPropertyType(bean, "address.city"); - assertTrue(type.isPresent()); - assertEquals(String.class, type.get()); - } - - @Test - void getNestedPropertyType_indexedProperty_returnsElementType() { - Optional> type = PropertyAccessor.getNestedPropertyType(bean, "items[0].name"); - assertTrue(type.isPresent()); - assertEquals(String.class, type.get()); - } - - @Test - void getNestedPropertyType_array_returnsComponentType() { - Optional> type = PropertyAccessor.getNestedPropertyType(bean, "array[0]"); - assertTrue(type.isPresent()); - assertEquals(String.class, type.get()); - } - - @Test - void getNestedPropertyType_iterable_returnsObjectClass() { - Optional> type = PropertyAccessor.getNestedPropertyType(bean, "items[0]"); - assertTrue(type.isPresent()); - assertEquals(Object.class, type.get()); - } - - @Test - void getNestedPropertyType_invalidProperty_returnsEmpty() { - Optional> type = PropertyAccessor.getNestedPropertyType(bean, "nonexistent"); - assertFalse(type.isPresent()); - } - - @Test - void getNestedPropertyType_nullInputs_returnsEmpty() { - assertFalse(PropertyAccessor.getNestedPropertyType(null, "name").isPresent()); - assertFalse(PropertyAccessor.getNestedPropertyType(bean, null).isPresent()); - assertFalse(PropertyAccessor.getNestedPropertyType(bean, "").isPresent()); - } +// +// @Test +// void getNestedPropertyType_simpleProperty_returnsCorrectType() { +// Optional, Set>> type = PropertyAccessor.getNestedPropertyType(bean, "name"); +// assertTrue(type.isPresent()); +// assertEquals(String.class, type.get()); +// } +// +// @Test +// void getNestedPropertyType_nestedProperty_returnsCorrectType() { +// Optional, Set>> type = PropertyAccessor.getNestedPropertyType(bean, "address.city"); +// assertTrue(type.isPresent()); +// assertEquals(String.class, type.get()); +// } +// +// @Test +// void getNestedPropertyType_indexedProperty_returnsElementType() { +// Optional, Set>> type = PropertyAccessor.getNestedPropertyType(bean, "items[0].name"); +// assertTrue(type.isPresent()); +// assertEquals(String.class, type.get()); +// } +// +// @Test +// void getNestedPropertyType_array_returnsComponentType() { +// Optional, Set>> type = PropertyAccessor.getNestedPropertyType(bean, "array[0]"); +// assertTrue(type.isPresent()); +// assertEquals(String.class, type.get()); +// } +// +// @Test +// void getNestedPropertyType_iterable_returnsObjectClass() { +// Optional, Set>> type = PropertyAccessor.getNestedPropertyType(bean, "items[0]"); +// assertTrue(type.isPresent()); +// assertEquals(Object.class, type.get()); +// } +// +// @Test +// void getNestedPropertyType_invalidProperty_returnsEmpty() { +// Optional, Set>> type = PropertyAccessor.getNestedPropertyType(bean, "nonexistent"); +// assertFalse(type.isPresent()); +// } +// +// @Test +// void getNestedPropertyType_nullInputs_returnsEmpty() { +// assertFalse(PropertyAccessor.getNestedPropertyType(null, "name").isPresent()); +// assertFalse(PropertyAccessor.getNestedPropertyType(bean, null).isPresent()); +// assertFalse(PropertyAccessor.getNestedPropertyType(bean, "").isPresent()); +// } @Test void getNestedProperty_readsSimpleProperty() { @@ -222,20 +221,20 @@ void setNestedProperty_invalidPath_returnsException() { assertInstanceOf(InvocationTargetException.class, result.get()); // or other expected types } - @Test - void getNestedPropertyType_mappedProperty_throwsUnsupported() { - assertThrows(UnsupportedOperationException.class, () -> PropertyAccessor.getNestedPropertyType(bean, "map[key]")); - } - - @Test - void getNestedPropertyType_exception_returnsEmpty() { - class PrivateBean { - - private String secret; // private field - } - PrivateBean privateBean = new PrivateBean(); - - Optional> type = PropertyAccessor.getNestedPropertyType(privateBean, "secret"); - assertFalse(type.isPresent()); - } +// @Test +// void getNestedPropertyType_mappedProperty_throwsUnsupported() { +// assertThrows(UnsupportedOperationException.class, () -> PropertyAccessor.getNestedPropertyType(bean, "map[key]")); +// } +// +// @Test +// void getNestedPropertyType_exception_returnsEmpty() { +// class PrivateBean { +// +// private String secret; // private field +// } +// PrivateBean privateBean = new PrivateBean(); +// +// Optional, Set>> type = PropertyAccessor.getNestedPropertyType(privateBean, "secret"); +// assertFalse(type.isPresent()); +// } } From f126bd50df96d1f1c51df7c3d68c65f924f82b14 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Thu, 26 Feb 2026 07:14:26 +0100 Subject: [PATCH 019/134] Added feature checker to be complete --- .../api/patch/DataPatchFailureCause.java | 5 ++-- .../backend/patch/CaseDataPatcherImpl.java | 8 +++--- .../sormas/patch/CaseDataPatcherImplTest.java | 28 +++++++++++++++---- 3 files changed, 30 insertions(+), 11 deletions(-) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java index 6bb54dc8a28..9eeefb5c93e 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java @@ -8,9 +8,10 @@ public enum DataPatchFailureCause { INVALID_MULTIPLE_FIELDS_FORMAT, /** - * Occurs the field is not supported by the disease. + * Occurs the field is not supported by the disease / country / feature. + * Error message must be somewhat generic to specify the Data Dictionary should be checked. */ - UNSUPPORTED_FIELD_FOR_DISEASE_OR_COUNTRY, + UNSUPPORTED_FIELD_FOR_DISEASE_OR_COUNTRY_OR_FEATURE, /** * Path does not start with the allowed prefixes: example: CaseData or Person. diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java index 3f1c54a263d..3799df5df81 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java @@ -73,8 +73,6 @@ public class CaseDataPatcherImpl implements CaseDataPatcher { @EJB private ConfigFacadeEjb.ConfigFacadeEjbLocal configFacade; - private FieldVisibilityCheckers fieldVisibilityCheckers; - @Override public DataPatchResponse patch(CaseDataPatchRequest request) { logger.info("patch: [{}]", request); @@ -138,7 +136,7 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { if (!Boolean.TRUE.equals(classSetTuple.getSecond())) { logger.info("Field: [{}] on object [{}] cannot be patched for disease: [{}]", relativeFieldName, target, disease); return singlePatchResult.setFailure( - new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.UNSUPPORTED_FIELD_FOR_DISEASE_OR_COUNTRY) + new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.UNSUPPORTED_FIELD_FOR_DISEASE_OR_COUNTRY_OR_FEATURE) .setProvidedFieldValue(untypedTargetValue)); } @@ -220,7 +218,9 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { } private FieldVisibilityCheckers getFieldVisibilityCheckers(Disease disease) { - return FieldVisibilityCheckers.withCountry(configFacade.getCountryLocale()).andWithDisease(disease); + return FieldVisibilityCheckers.withCountry(configFacade.getCountryLocale()) + .andWithDisease(disease) + .andWithFeatureType(featureConfigurationFacade.getActiveServerFeatureConfigurations()); } private Map, Object> computeActualDictionary(CaseDataPatchRequest request) { diff --git a/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java index d4403e2916f..4a6981d7088 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java @@ -304,7 +304,7 @@ void patch_notSupportedForDisease() { // CHECK Map expectedFailures = - buildDictionaryOfFailureType(patchDictionary, DataPatchFailureCause.UNSUPPORTED_FIELD_FOR_DISEASE_OR_COUNTRY); + buildDictionaryOfFailureType(patchDictionary, DataPatchFailureCause.UNSUPPORTED_FIELD_FOR_DISEASE_OR_COUNTRY_OR_FEATURE); Assertions.assertAll( () -> Assertions.assertTrue(response.getPatchDictionary().isEmpty(), "Nothing should have been patched, should be empty"), @@ -315,16 +315,34 @@ void patch_notSupportedForDisease() { @Test void patch_notSupportedForCountry() { // PREPARE + CaseDataDto originalCase = creator.createUnclassifiedCase(Disease.RESPIRATORY_SYNCYTIAL_VIRUS); + + String ignoredValue = "ignoredValue"; + + Map patchDictionary = Map.of("CaseData.quarantineOrderedOfficialDocumentDate", ignoredValue); - String countryLocale = getConfigFacade().getCountryLocale(); + // EXECUTE + DataPatchResponse response = + victim().patch(new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()).setPatchDictionary(patchDictionary)); - System.out.println("countryLocale = " + countryLocale); + // CHECK + Map expectedFailures = + buildDictionaryOfFailureType(patchDictionary, DataPatchFailureCause.UNSUPPORTED_FIELD_FOR_DISEASE_OR_COUNTRY_OR_FEATURE); + Assertions.assertAll( + () -> Assertions.assertTrue(response.getPatchDictionary().isEmpty(), "Nothing should have been patched, should be empty"), + // FAILURES + () -> Assertions.assertEquals(expectedFailures, response.getFailures())); + } + + @Test + void patch_notSupportedFeature() { + // PREPARE CaseDataDto originalCase = creator.createUnclassifiedCase(Disease.RESPIRATORY_SYNCYTIAL_VIRUS); String ignoredValue = "ignoredValue"; - Map patchDictionary = Map.of("CaseData.quarantineOrderedOfficialDocumentDate", ignoredValue); + Map patchDictionary = Map.of("CaseData.caseReferenceNumber", ignoredValue); // EXECUTE DataPatchResponse response = @@ -332,7 +350,7 @@ void patch_notSupportedForCountry() { // CHECK Map expectedFailures = - buildDictionaryOfFailureType(patchDictionary, DataPatchFailureCause.UNSUPPORTED_FIELD_FOR_DISEASE_OR_COUNTRY); + buildDictionaryOfFailureType(patchDictionary, DataPatchFailureCause.UNSUPPORTED_FIELD_FOR_DISEASE_OR_COUNTRY_OR_FEATURE); Assertions.assertAll( () -> Assertions.assertTrue(response.getPatchDictionary().isEmpty(), "Nothing should have been patched, should be empty"), From 8a9455a931d7d8e22c8cebd2be2735c93b72d61d Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Thu, 26 Feb 2026 09:19:52 +0100 Subject: [PATCH 020/134] java enums can be patched --- .../sormas/api/i18n/I18nProperties.java | 4 +- .../api/i18n/I18nPropertiesRequest.java | 24 +++-- ...eferenceDataValueInstanceProviderImpl.java | 19 ++-- .../backend/patch/CaseDataPatcherImpl.java | 5 +- .../backend/patch/PropertyAccessor.java | 6 +- .../impl/valuemapper/EnumPatchMapper.java | 64 +++++++++++-- .../valuemapper/ReferenceDtoPatchMapper.java | 4 +- .../sormas/backend/util/StringNormalizer.java | 28 ++++++ .../sormas/backend/AbstractBeanTest.java | 17 ++++ .../symeda/sormas/backend/MockProducer.java | 2 +- .../sormas/patch/CaseDataPatcherImplTest.java | 91 +++++++++++-------- 11 files changed, 188 insertions(+), 76 deletions(-) create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/backend/util/StringNormalizer.java diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/I18nProperties.java b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/I18nProperties.java index 1febe91ff11..7bf751736c3 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/I18nProperties.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/I18nProperties.java @@ -440,9 +440,11 @@ public static Map buildPropertiesMap(I18nPropertiesRequest reque ResourceBundle resourceBundle = Optional.of(instance.resourceBundlesDictionary.get(resourceBundleType)) .orElseThrow(() -> new IllegalStateException(String.format("Resource bundle type %s not found", resourceBundleType))); + Class targetType = request.getTargetType(); + Map propertiesMap = StreamSupport.stream(((Iterable) () -> resourceBundle.getResourceBundle().getKeys().asIterator()).spliterator(), false) - .filter(key -> StringUtils.startsWith(key, request.getPrefix())) + .filter(key -> StringUtils.startsWith(key, targetType.getSimpleName())) .collect(Collectors.toMap(Function.identity(), resourceBundle::getString)); return propertiesMap; diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/I18nPropertiesRequest.java b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/I18nPropertiesRequest.java index 897e2280df2..8f7ec0ef145 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/I18nPropertiesRequest.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/I18nPropertiesRequest.java @@ -9,14 +9,17 @@ public class I18nPropertiesRequest { + /** + * If not provided will fallback to default language. + */ @Nullable private Language language; @NotNull private ResourceBundleType resourceBundleType; - @Nullable - private String prefix; + @NotNull + private Class targetType; @Nullable public Language getLanguage() { @@ -37,9 +40,9 @@ public I18nPropertiesRequest setResourceBundleType(ResourceBundleType resourceBu return this; } - @Nullable - public String getPrefix() { - return prefix; + @NotNull + public Class getTargetType() { + return targetType; } @Override @@ -47,22 +50,23 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) return false; I18nPropertiesRequest that = (I18nPropertiesRequest) o; - return language == that.language && resourceBundleType == that.resourceBundleType && Objects.equals(prefix, that.prefix); + return language == that.language && resourceBundleType == that.resourceBundleType && Objects.equals(targetType, that.targetType); } @Override public int hashCode() { - return Objects.hash(language, resourceBundleType, prefix); + return Objects.hash(language, resourceBundleType, targetType); } - public I18nPropertiesRequest setPrefix(@Nullable String prefix) { - this.prefix = prefix; + public I18nPropertiesRequest setTargetType(@NotNull Class targetType) { + this.targetType = targetType; return this; } @Override public String toString() { - return "I18nPropertiesRequest{" + "language=" + language + ", resourceBundleType=" + resourceBundleType + ", prefix='" + prefix + '\'' + '}'; + return "I18nPropertiesRequest{" + "language=" + language + ", resourceBundleType=" + resourceBundleType + ", prefix='" + targetType + '\'' + + '}'; } public enum ResourceBundleType { diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/ReferenceDataValueInstanceProviderImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/ReferenceDataValueInstanceProviderImpl.java index d9a9d05005d..222da767295 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/ReferenceDataValueInstanceProviderImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/ReferenceDataValueInstanceProviderImpl.java @@ -10,14 +10,15 @@ import javax.enterprise.context.ApplicationScoped; import de.symeda.sormas.api.ReferenceDto; +import de.symeda.sormas.api.infrastructure.country.CountryFacade; import de.symeda.sormas.api.infrastructure.country.CountryReferenceDto; +import de.symeda.sormas.api.infrastructure.district.DistrictFacade; import de.symeda.sormas.api.infrastructure.district.DistrictReferenceDto; +import de.symeda.sormas.api.infrastructure.region.RegionFacade; import de.symeda.sormas.api.infrastructure.region.RegionReferenceDto; import de.symeda.sormas.api.referencedata.ReferenceDataValueInstanceProvider; -import de.symeda.sormas.backend.infrastructure.country.CountryFacadeEjb; -import de.symeda.sormas.backend.infrastructure.district.DistrictFacadeEjb; -import de.symeda.sormas.backend.infrastructure.region.RegionFacadeEjb; import de.symeda.sormas.backend.util.InstanceProvider; +import de.symeda.sormas.backend.util.StringNormalizer; @ApplicationScoped public class ReferenceDataValueInstanceProviderImpl implements ReferenceDataValueInstanceProvider { @@ -27,9 +28,9 @@ public class ReferenceDataValueInstanceProviderImpl implements ReferenceDataValu @PostConstruct public void init() { dictionary = Map.ofEntries( - Map.entry(CountryReferenceDto.class, () -> getInstance(CountryFacadeEjb.class).getAllActiveAsReference()), - Map.entry(RegionReferenceDto.class, () -> getInstance(RegionFacadeEjb.class).getAllActiveAsReference()), - Map.entry(DistrictReferenceDto.class, () -> getInstance(DistrictFacadeEjb.class).getAllActiveAsReference()) + Map.entry(CountryReferenceDto.class, () -> getInstance(CountryFacade.class).getAllActiveAsReference()), + Map.entry(RegionReferenceDto.class, () -> getInstance(RegionFacade.class).getAllActiveAsReference()), + Map.entry(DistrictReferenceDto.class, () -> getInstance(DistrictFacade.class).getAllActiveAsReference()) // Map.entry(CommunityReferenceDto.class, (Supplier) () -> getInstance(CommunityFacadeEjb.class).getAllAfter(new Date())) // TODO: check number of values that are loaded with those calls, otherwise you search by name @@ -50,7 +51,9 @@ public List getAll(Class referenceType) { @Override public Optional getOne(String caption, Class referenceType) { - // TODO: load properties files of a few language: - return getAll(referenceType).stream().filter(referenceDto -> referenceDto.getCaption().equalsIgnoreCase(caption)).findAny(); + return getAll(referenceType).stream() + .filter(referenceDto -> StringNormalizer.normalize(referenceDto.getCaption()).equals(StringNormalizer.normalize(caption))) + .findAny(); } + } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java index 3799df5df81..8c0ee47caf0 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java @@ -79,7 +79,6 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { CaseDataDto caseData = getCaseDataDto(request); - // TODO: implement disease check for fields Disease disease = caseData.getDisease(); Supplier person = Suppliers.memoize(() -> getPersonDto(caseData)); @@ -154,7 +153,7 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { return singlePatchResult.setFailure( new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.FORBIDDEN_VALUE_OVERRIDE) .setExistingFieldValue(currentValue) - .setProvidedFieldValue(typedValue)); + .setProvidedFieldValue(untypedTargetValue)); } } } @@ -166,7 +165,7 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.TECHNICAL) .setDescription(exception.orElseThrow().getMessage())); } else { - return singlePatchResult.setValue(typedValue); + return singlePatchResult.setValue(untypedTargetValue); } } catch (RuntimeException e) { logger.error("Failure during patch operation", e); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessor.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessor.java index 4848cd10b74..2198d3c3fb6 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessor.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessor.java @@ -45,8 +45,10 @@ public static Optional, Boolean>> getPropertyType( final String fieldName, FieldVisibilityCheckers fieldVisibilityCheckers) { try { - boolean visible = fieldVisibilityCheckers.isVisible(bean.getClass(), fieldName); - return Optional.of(new Tuple<>(PropertyUtils.getPropertyType(bean, fieldName), visible)); + return Optional.ofNullable(PropertyUtils.getPropertyType(bean, fieldName)).map(propertyType -> { + boolean visible = fieldVisibilityCheckers.isVisible(bean.getClass(), fieldName); + return new Tuple<>(propertyType, visible); + }); } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) { logger.info("Could not get property type for [{}], [{}]", fieldName, bean.getClass().getSimpleName(), e); return Optional.empty(); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumPatchMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumPatchMapper.java index a9e6deed9be..1fb757fb220 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumPatchMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumPatchMapper.java @@ -1,12 +1,22 @@ package de.symeda.sormas.backend.patch.mapping.impl.valuemapper; import java.lang.reflect.Field; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Optional; import java.util.Set; import javax.enterprise.context.ApplicationScoped; +import org.jetbrains.annotations.Nullable; + +import de.symeda.sormas.api.Language; +import de.symeda.sormas.api.i18n.I18nProperties; +import de.symeda.sormas.api.i18n.I18nPropertiesRequest; import de.symeda.sormas.api.patch.mapping.ValueMapperDefault; import de.symeda.sormas.api.patch.mapping.ValuePatchMapper; +import de.symeda.sormas.backend.util.StringNormalizer; @ApplicationScoped public class EnumPatchMapper implements ValuePatchMapper { @@ -15,6 +25,9 @@ public class EnumPatchMapper implements ValuePatchMapper { private static final String FALLBACK_NAME = "OTHER"; + // TODO: make configurable. + private static final List LANGUAGES = Arrays.asList(Language.EN, Language.FR, Language.DE); + @Override public Set> getSupportedTypes() { return SUPPORTED_TYPES; @@ -28,28 +41,59 @@ public T map(Object value, Class targetType, Set inputLanguageCod // TODO: check if inputLanguageCodes can be used to use I18N. Class enumType = (Class) targetType; - String memberNameCandidate = value.toString().trim().toUpperCase(); + String normalizedInput = StringNormalizer.normalize(value.toString()); Enum[] constants = enumType.getEnumConstants(); - for (Enum constant : constants) { - if (constant.name().equalsIgnoreCase(memberNameCandidate)) { - return (T) constant; - } + // default naive search + T matchedMember = searchEnumMemberIgnoringCase(constants, normalizedInput); + if (matchedMember != null) { + return matchedMember; } - // TODO: check if fallback mechanism is wanted. - for (Enum constant : constants) { - if (FALLBACK_NAME.equals(constant.name())) { - return (T) constant; + for (Language language : LANGUAGES) { + I18nPropertiesRequest request = new I18nPropertiesRequest().setLanguage(language) + .setTargetType(enumType) + .setResourceBundleType(I18nPropertiesRequest.ResourceBundleType.ENUMS); + Map stringStringMap = I18nProperties.buildPropertiesMap(request); + + Optional o = stringStringMap.entrySet() + .stream() + .filter(entry -> StringNormalizer.normalize(entry.getValue()).equals(normalizedInput)) + .findAny() + .map(Map.Entry::getKey) + .map(a -> a.replace(enumType.getSimpleName() + ".", "")) + .map(a -> searchEnumMemberIgnoringCase(constants, a)); + + if (o.isPresent()) { + return o.get(); } } + // matching through enum-values + + // overridden fallback Enum annotatedDefault = findAnnotatedDefault((Class>) enumType, constants); if (annotatedDefault != null) { return (T) annotatedDefault; } - throw new EnumConstantNotPresentException(enumType, memberNameCandidate); + // default fallback + for (Enum constant : constants) { + if (FALLBACK_NAME.equals(constant.name())) { + return (T) constant; + } + } + + throw new EnumConstantNotPresentException(enumType, normalizedInput); + } + + private @Nullable T searchEnumMemberIgnoringCase(Enum[] constants, String normalizedInput) { + for (Enum constant : constants) { + if (constant.name().equalsIgnoreCase(normalizedInput)) { + return (T) constant; + } + } + return null; } private Enum findAnnotatedDefault(Class> enumType, Enum[] constants) { diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/ReferenceDtoPatchMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/ReferenceDtoPatchMapper.java index c0f9597fdc5..958f27a5ef4 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/ReferenceDtoPatchMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/ReferenceDtoPatchMapper.java @@ -19,8 +19,8 @@ public class ReferenceDtoPatchMapper implements ValuePatchMapper { public T map(Object value, Class targetType, Set inputLanguageCodes) { String captionCandidate = value.toString(); - if (!targetType.isAssignableFrom(ReferenceDto.class)) { - throw new IllegalArgumentException(String.format("[%s] is not assignable from [%s].", value, targetType.getName())); + if (!ReferenceDto.class.isAssignableFrom(targetType)) { + throw new IllegalArgumentException(String.format("[%s] is not assignable from [%s].", targetType, targetType.getName())); } Class referenceType = targetType.asSubclass(ReferenceDto.class); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/util/StringNormalizer.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/util/StringNormalizer.java new file mode 100644 index 00000000000..664ea762a00 --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/util/StringNormalizer.java @@ -0,0 +1,28 @@ +package de.symeda.sormas.backend.util; + +import javax.annotation.Nullable; + +import org.apache.commons.lang3.StringUtils; + +public class StringNormalizer { + + private StringNormalizer() { + } + + /** + * Meant to allow 'loose'-matching between strings, by unifying/removing: + * - case (to lower) + * - leading and trailing whitespaces + * - removing accents. + * + * @param value + * that must be normalized + * @return null if value is null otherwise normalized string. + */ + public static String normalize(@Nullable String value) { + if (null == value) { + return null; + } + return StringUtils.stripAccents(StringUtils.normalizeSpace(value.toLowerCase())); + } +} diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/AbstractBeanTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/AbstractBeanTest.java index 90998f579c6..fca58c0b52d 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/backend/AbstractBeanTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/AbstractBeanTest.java @@ -1162,4 +1162,21 @@ public CaseDataPatcher getCaseDataPatcher() { public ReferenceDataValueInstanceProvider getReferenceDataValueInstanceProvider() { return getBean(ReferenceDataValueInstanceProviderImpl.class); } + + /** + * The context of the {@link AbstractBeanTest} does not possess a proper (Initial)Context, therefore if you want to ma + * + * @param beanClass + * must be used with the exact class to work. + * @param instance + * actual instance that will be returned by the context. + */ + public void registerBeanForLookup(Class beanClass, S instance) { + String classSimpleName = beanClass.getSimpleName(); + try { + when(MockProducer.initialContext.lookup("java:module/" + classSimpleName)).thenReturn(instance); + } catch (NamingException e) { + throw new RuntimeException(e); + } + } } diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/MockProducer.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/MockProducer.java index c53190ba024..4cf846e5fd5 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/backend/MockProducer.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/MockProducer.java @@ -66,7 +66,7 @@ public class MockProducer implements InitialContextFactory { public static final String TMP_PATH = "target/tmp"; - private static InitialContext initialContext = mock(InitialContext.class); + static InitialContext initialContext = mock(InitialContext.class); private static SessionContext sessionContext = mock(SessionContext.class, withSettings().lenient()); private static Principal principal = mock(Principal.class, withSettings().lenient()); private static Topic topic = mock(Topic.class); diff --git a/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java index 4a6981d7088..876e43fa297 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java @@ -12,9 +12,13 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; import de.symeda.sormas.api.Disease; import de.symeda.sormas.api.caze.CaseDataDto; +import de.symeda.sormas.api.infrastructure.facility.FacilityDto; +import de.symeda.sormas.api.infrastructure.region.RegionFacade; import de.symeda.sormas.api.patch.CaseDataPatchRequest; import de.symeda.sormas.api.patch.CaseDataPatcher; import de.symeda.sormas.api.patch.DataPatchFailure; @@ -53,9 +57,6 @@ void patch_noErrorsReplaceAlways() { "Person.lastName", newLastname, - "Person.sex", - Sex.FEMALE.getName(), - "CaseData.classificationDate", classificationDate, @@ -192,6 +193,42 @@ void patch_forbiddenField() { () -> Assertions.assertEquals(expectedFailures, response.getFailures())); } + @ParameterizedTest + @ValueSource(strings = { + // DE + " weibLiCH ", + // exact match + "Weiblich", + "WEIblïch", + // FR + "Féminin ", + // EN, + // ENUM exact match + "FEMALE", + " femaLe " }) + void patch_enum(String femaleValue) { + // PREPARE + CaseDataDto originalCase = creator.createUnclassifiedCase(Disease.PERTUSSIS); + + CaseDataPatchRequest request = new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()) + .setReplacementStrategy(DataReplacementStrategy.ALWAYS) + .setPatchDictionary(Map.of("Person.sex", femaleValue)); + + // EXECUTE + DataPatchResponse response = victim().patch(request); + + // CHECK + logger.info("response: [{}]", response); + + PersonDto actualPerson = getPersonFacade().getByUuid(originalCase.getPerson().getUuid()); + + Assertions.assertAll( + () -> Assertions.assertTrue(response.getFailures().isEmpty(), "Failure found, but should be empty"), + // PERSON + + () -> Assertions.assertEquals(Sex.FEMALE, actualPerson.getSex())); + } + @Test void patch_invalidMultiFieldFormat() { // PREPARE @@ -238,55 +275,31 @@ void patch_invalidMultiFieldFormat() { } @Test - void patch_customizableEnumExist() { + void patch_referenceData() { // PREPARE + registerBeanForLookup(RegionFacade.class, getRegionFacade()); + CaseDataDto originalCase = creator.createUnclassifiedCase(Disease.PERTUSSIS); - String newLastname = "toto"; - String newSequelaeDetails = "Some very interesting sequelaeDetails"; - String classificationDate = "2030-02-01"; + FacilityDto healthFacility = getFacilityFacade().getByUuid(originalCase.getHealthFacility().getUuid()); + originalCase.setDistrict(healthFacility.getDistrict()); + getCaseFacade().save(originalCase); + + // must be able to ignore accents - whitespaces - case + Map patchDictionary = Map.of("CaseData.region", " régIoN "); CaseDataPatchRequest request = new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()) .setReplacementStrategy(DataReplacementStrategy.ALWAYS) - .setPatchDictionary( - Map.of( - "Person.lastName", - newLastname, - - "Person.sex", - Sex.FEMALE.getName(), - - "Person.personContactDetails.details", - "name@email.de", - - "CaseData.classificationDate", - classificationDate, - - "Person.personContactDetails.phoneNumberType", - "123654687", - - "CaseData.sequelaeDetails", - newSequelaeDetails)); + .setPatchDictionary(patchDictionary); // EXECUTE DataPatchResponse response = victim().patch(request); // CHECK logger.info("response: [{}]", response); - - CaseDataDto actualCase = getCaseFacade().getByUuid(originalCase.getUuid()); - PersonDto actualPerson = getPersonFacade().getByUuid(originalCase.getPerson().getUuid()); - - // TODO: contact info. Assertions.assertAll( () -> Assertions.assertTrue(response.getFailures().isEmpty(), "Failure found, but should be empty"), - // PERSON - () -> Assertions.assertEquals(newLastname, actualPerson.getLastName()), - () -> Assertions.assertEquals(Sex.FEMALE, actualPerson.getSex()), - // CASE - () -> Assertions.assertEquals( - Date.from(LocalDate.parse(classificationDate).atStartOfDay(ZoneId.systemDefault()).toInstant()), - actualCase.getClassificationDate()), - () -> Assertions.assertEquals(newSequelaeDetails, actualCase.getSequelaeDetails())); + + () -> Assertions.assertEquals(patchDictionary, response.getPatchDictionary())); } @Test From c937ab416ec240b127494d212f53f022401d1f56 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Thu, 26 Feb 2026 12:24:37 +0100 Subject: [PATCH 021/134] CustomEnums a hack Check at the entity converter that performs lookups which are mocked in tests. --- .../sormas/api/i18n/I18nProperties.java | 11 +-- .../api/patch/DataPatchFailureCause.java | 8 ++ .../CustomizableEnumPatchMapper.java | 75 ++++++++++++++----- .../impl/valuemapper/EnumPatchMapper.java | 19 ++--- .../sormas/patch/CaseDataPatcherImplTest.java | 62 +++++++++++++++ 5 files changed, 140 insertions(+), 35 deletions(-) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/I18nProperties.java b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/I18nProperties.java index 7bf751736c3..b50f27f642d 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/I18nProperties.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/I18nProperties.java @@ -442,12 +442,13 @@ public static Map buildPropertiesMap(I18nPropertiesRequest reque Class targetType = request.getTargetType(); - Map propertiesMap = - StreamSupport.stream(((Iterable) () -> resourceBundle.getResourceBundle().getKeys().asIterator()).spliterator(), false) - .filter(key -> StringUtils.startsWith(key, targetType.getSimpleName())) - .collect(Collectors.toMap(Function.identity(), resourceBundle::getString)); + return StreamSupport.stream(((Iterable) () -> resourceBundle.getResourceBundle().getKeys().asIterator()).spliterator(), false) + .filter(key -> StringUtils.startsWith(key, buildPrefix(targetType))) + .collect(Collectors.toMap(Function.identity(), resourceBundle::getString)); + } - return propertiesMap; + public static String buildPrefix(Class targetType) { + return targetType.getSimpleName() + "."; } public static class UTF8Control extends Control { diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java index 9eeefb5c93e..3b7540254bc 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java @@ -7,6 +7,14 @@ public enum DataPatchFailureCause { */ INVALID_MULTIPLE_FIELDS_FORMAT, + /** + * Some fields have only a specific list of allowed values, if not present and no fallback then fails. Examples: + * - {@link de.symeda.sormas.api.customizableenum.CustomizableEnum} + * - {@link Enum} + * - {@link de.symeda.sormas.api.ReferenceDto} + */ + NOT_PRESENT_IN_REFERENCE_DATA_LIST, + /** * Occurs the field is not supported by the disease / country / feature. * Error message must be somewhat generic to specify the Data Dictionary should be checked. diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapper.java index 0257f713baa..e271aa9ac7c 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapper.java @@ -1,6 +1,9 @@ package de.symeda.sormas.backend.patch.mapping.impl.valuemapper; +import java.util.Arrays; import java.util.List; +import java.util.Map; +import java.util.Optional; import java.util.Set; import javax.ejb.EJB; @@ -9,11 +12,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.symeda.sormas.api.ReferenceDto; +import de.symeda.sormas.api.Language; import de.symeda.sormas.api.customizableenum.CustomizableEnum; import de.symeda.sormas.api.customizableenum.CustomizableEnumType; +import de.symeda.sormas.api.i18n.I18nProperties; +import de.symeda.sormas.api.i18n.I18nPropertiesRequest; import de.symeda.sormas.api.patch.mapping.ValuePatchMapper; import de.symeda.sormas.backend.customizableenum.CustomizableEnumFacadeEjb; +import de.symeda.sormas.backend.util.StringNormalizer; @ApplicationScoped public class CustomizableEnumPatchMapper implements ValuePatchMapper { @@ -22,6 +28,9 @@ public class CustomizableEnumPatchMapper implements ValuePatchMapper { public static final String FALLBACK_NAME = "OTHER"; + // TODO: make configurable. + private static final List LANGUAGES = Arrays.asList(Language.EN, Language.FR, Language.DE); + @EJB private CustomizableEnumFacadeEjb.CustomizableEnumFacadeEjbLocal customizableEnumFacade; @@ -29,7 +38,7 @@ public class CustomizableEnumPatchMapper implements ValuePatchMapper { public T map(Object value, Class targetType, Set inputLanguageCodes) { String captionCandidate = value.toString(); - if (!targetType.isAssignableFrom(CustomizableEnum.class)) { + if (!CustomizableEnum.class.isAssignableFrom(targetType)) { throw new IllegalArgumentException(String.format("[%s] is not assignable from [%s].", value, targetType.getName())); } @@ -39,28 +48,56 @@ public T map(Object value, Class targetType, Set inputLanguageCod throw new IllegalArgumentException(String.format("No CustomizableEnumType could be found for [%s]", targetType.getName())); } - Class referenceType = targetType.asSubclass(ReferenceDto.class); - logger.warn("For now only disease-agnostic enum values are retrieved"); - List enumValues = customizableEnumFacade.getEnumValues(enumType, null); - return (T) findCustomizableEnum(enumValues, captionCandidate, referenceType); + return (T) findCustomizableEnum(captionCandidate, enumType); } - private static CustomizableEnum findCustomizableEnum( - List enumValues, - String captionCandidate, - Class referenceType) { - String normalizedCandidate = captionCandidate.trim().replace(" ", "_").toUpperCase(); - - // TODO: check if we want to check also i18n translations or captions. - return enumValues.stream() - .filter(customizableEnum -> customizableEnum.getValue().equals(normalizedCandidate)) - .findAny() - .or(() -> enumValues.stream().filter(customizableEnum -> customizableEnum.getValue().equals(FALLBACK_NAME)).findAny()) + private CustomizableEnum findCustomizableEnum(String captionCandidate, CustomizableEnumType type) { + String normalizedInput = StringNormalizer.normalize(captionCandidate); + + return searchByDefaultLanguage(type, normalizedInput).or(() -> searchByLanguages(normalizedInput, type)) + .or( + () -> customizableEnumFacade.getEnumValues(type, null) + .stream() + .filter(customizableEnum -> matchByValueOrCaption(customizableEnum, FALLBACK_NAME)) + .findAny()) .orElseThrow( - () -> new IllegalStateException( - String.format("Could not match value: [%s] to referenceType: [%s]", captionCandidate, referenceType))); + () -> new IllegalStateException(String.format("Could not match value: [%s] to customizableEnumType: [%s]", captionCandidate, type))); + } + + private Optional searchByDefaultLanguage(CustomizableEnumType type, String normalizedInput) { + List enumValues = customizableEnumFacade.getEnumValues(type, null); + + return enumValues.stream().filter(enumMember -> matchByValueOrCaption(enumMember, normalizedInput)).findFirst(); + } + + public Optional searchByLanguages(String normalizedInput, CustomizableEnumType type) { + for (Language language : LANGUAGES) { + Class targetType = type.getEnumClass(); + I18nPropertiesRequest request = new I18nPropertiesRequest().setTargetType(targetType) + .setResourceBundleType(I18nPropertiesRequest.ResourceBundleType.ENUMS) + .setLanguage(language); + Map resultingMap = I18nProperties.buildPropertiesMap(request); + + Optional customizableEnumOpt = resultingMap.entrySet() + .stream() + .filter(entry -> StringNormalizer.normalize(entry.getValue()).equals(normalizedInput)) + .findAny() + .map(Map.Entry::getKey) + .map(key -> key.replace(I18nProperties.buildPrefix(targetType), "")) + .map(key -> customizableEnumFacade.getEnumValue(type, null, key)); + + if (customizableEnumOpt.isPresent()) { + return customizableEnumOpt; + } + } + return Optional.empty(); + } + + private static boolean matchByValueOrCaption(CustomizableEnum customizableEnum, String normalizedInput) { + return StringNormalizer.normalize(customizableEnum.getValue()).equals(normalizedInput) + || StringNormalizer.normalize(customizableEnum.getCaption()).equals(normalizedInput); } @Override diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumPatchMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumPatchMapper.java index 1fb757fb220..d22b5990196 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumPatchMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumPatchMapper.java @@ -38,16 +38,15 @@ public Set> getSupportedTypes() { "unchecked", "rawtypes" }) public T map(Object value, Class targetType, Set inputLanguageCodes) { - // TODO: check if inputLanguageCodes can be used to use I18N. Class enumType = (Class) targetType; String normalizedInput = StringNormalizer.normalize(value.toString()); Enum[] constants = enumType.getEnumConstants(); // default naive search - T matchedMember = searchEnumMemberIgnoringCase(constants, normalizedInput); - if (matchedMember != null) { - return matchedMember; + T enumMember = searchEnumMemberIgnoringCase(constants, normalizedInput); + if (enumMember != null) { + return enumMember; } for (Language language : LANGUAGES) { @@ -56,21 +55,19 @@ public T map(Object value, Class targetType, Set inputLanguageCod .setResourceBundleType(I18nPropertiesRequest.ResourceBundleType.ENUMS); Map stringStringMap = I18nProperties.buildPropertiesMap(request); - Optional o = stringStringMap.entrySet() + Optional enumMemberOpt = stringStringMap.entrySet() .stream() .filter(entry -> StringNormalizer.normalize(entry.getValue()).equals(normalizedInput)) .findAny() .map(Map.Entry::getKey) - .map(a -> a.replace(enumType.getSimpleName() + ".", "")) - .map(a -> searchEnumMemberIgnoringCase(constants, a)); + .map(key -> key.replace(I18nProperties.buildPrefix(enumType), "")) + .map(key -> searchEnumMemberIgnoringCase(constants, key)); - if (o.isPresent()) { - return o.get(); + if (enumMemberOpt.isPresent()) { + return enumMemberOpt.get(); } } - // matching through enum-values - // overridden fallback Enum annotatedDefault = findAnnotatedDefault((Class>) enumType, constants); if (annotatedDefault != null) { diff --git a/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java index 876e43fa297..c5600d1995e 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java @@ -14,9 +14,11 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; +import org.mockito.Mockito; import de.symeda.sormas.api.Disease; import de.symeda.sormas.api.caze.CaseDataDto; +import de.symeda.sormas.api.customizableenum.CustomizableEnumType; import de.symeda.sormas.api.infrastructure.facility.FacilityDto; import de.symeda.sormas.api.infrastructure.region.RegionFacade; import de.symeda.sormas.api.patch.CaseDataPatchRequest; @@ -25,12 +27,15 @@ import de.symeda.sormas.api.patch.DataPatchFailureCause; import de.symeda.sormas.api.patch.DataPatchResponse; import de.symeda.sormas.api.patch.DataReplacementStrategy; +import de.symeda.sormas.api.person.OccupationType; import de.symeda.sormas.api.person.PersonContactDetailDto; import de.symeda.sormas.api.person.PersonContactDetailType; import de.symeda.sormas.api.person.PersonDto; import de.symeda.sormas.api.person.PhoneNumberType; import de.symeda.sormas.api.person.Sex; import de.symeda.sormas.backend.AbstractBeanTest; +import de.symeda.sormas.backend.MockProducer; +import de.symeda.sormas.backend.customizableenum.CustomizableEnumValue; class CaseDataPatcherImplTest extends AbstractBeanTest { @@ -274,6 +279,63 @@ void patch_invalidMultiFieldFormat() { () -> Assertions.assertEquals(expectedFailures, response.getFailures())); } + // TODO: This one fails even though it should not + // the value is properly resolved and set into the person, but when fetching it again it's not there anymore. + @Test + void patch_customizableEnum() { + // PREPARE + OccupationType.getDefaultValues().forEach((k, v) -> { + CustomizableEnumValue entry = new CustomizableEnumValue(); + entry.setDataType(CustomizableEnumType.OCCUPATION_TYPE); + entry.setValue(k); + entry.setCaption(k); + entry.setProperties(v); + entry.setDefaultValue(true); + getCustomizableEnumValueService().ensurePersisted(entry); + }); + + getCustomizableEnumFacade().loadData(); + + String healthcareWorker = "HEALTHCARE_WORKER"; + OccupationType expectedOccupationType = + getCustomizableEnumFacade().getEnumValue(CustomizableEnumType.OCCUPATION_TYPE, null, healthcareWorker); + + CustomizableEnumValue customizableEnumValue = getCustomizableEnumValueService().getAll() + .stream() + .filter(enumMember -> healthcareWorker.equals(enumMember.getValue())) + .findAny() + .orElseThrow(); + + CaseDataDto originalCase = creator.createUnclassifiedCase(Disease.PERTUSSIS); + + FacilityDto healthFacility = getFacilityFacade().getByUuid(originalCase.getHealthFacility().getUuid()); + originalCase.setDistrict(healthFacility.getDistrict()); + getCaseFacade().save(originalCase); + + // must be able to ignore accents - whitespaces - case + Map patchDictionary = Map.of("Person.occupationType", "Im Gesundheitswesen tätig"); + CaseDataPatchRequest request = new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()) + .setReplacementStrategy(DataReplacementStrategy.ALWAYS) + .setPatchDictionary(patchDictionary); + + Mockito.when(MockProducer.getCustomizableEnumFacadeForConverter().getEnumValue(CustomizableEnumType.OCCUPATION_TYPE, null, healthcareWorker)) + .thenReturn(expectedOccupationType); + + // EXECUTE + DataPatchResponse response = victim().patch(request); + + PersonDto person = getPersonFacade().getByUuid(originalCase.getPerson().getUuid()); + + // CHECK + logger.info("response: [{}]", response); + Assertions.assertAll( + () -> Assertions.assertTrue(response.getFailures().isEmpty(), "Failure found, but should be empty"), + + () -> Assertions.assertEquals(expectedOccupationType, person.getOccupationType()), + + () -> Assertions.assertEquals(patchDictionary, response.getPatchDictionary())); + } + @Test void patch_referenceData() { // PREPARE From 43792f2a7e9591fb56f3bb60750b423e8c71a0e7 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Thu, 26 Feb 2026 13:28:58 +0100 Subject: [PATCH 022/134] Added naive implementation of reference search --- ...eferenceDataValueInstanceProviderImpl.java | 15 +++- .../sormas/patch/CaseDataPatcherImplTest.java | 69 +++++++++++++++++-- 2 files changed, 76 insertions(+), 8 deletions(-) diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/ReferenceDataValueInstanceProviderImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/ReferenceDataValueInstanceProviderImpl.java index 222da767295..0112a7726b3 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/ReferenceDataValueInstanceProviderImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/ReferenceDataValueInstanceProviderImpl.java @@ -1,6 +1,7 @@ package de.symeda.sormas.backend; import java.util.Collections; +import java.util.Date; import java.util.List; import java.util.Map; import java.util.Optional; @@ -10,19 +11,26 @@ import javax.enterprise.context.ApplicationScoped; import de.symeda.sormas.api.ReferenceDto; +import de.symeda.sormas.api.infrastructure.community.CommunityReferenceDto; import de.symeda.sormas.api.infrastructure.country.CountryFacade; import de.symeda.sormas.api.infrastructure.country.CountryReferenceDto; import de.symeda.sormas.api.infrastructure.district.DistrictFacade; import de.symeda.sormas.api.infrastructure.district.DistrictReferenceDto; +import de.symeda.sormas.api.infrastructure.facility.FacilityReferenceDto; +import de.symeda.sormas.api.infrastructure.pointofentry.PointOfEntryFacade; +import de.symeda.sormas.api.infrastructure.pointofentry.PointOfEntryReferenceDto; import de.symeda.sormas.api.infrastructure.region.RegionFacade; import de.symeda.sormas.api.infrastructure.region.RegionReferenceDto; import de.symeda.sormas.api.referencedata.ReferenceDataValueInstanceProvider; +import de.symeda.sormas.backend.infrastructure.community.CommunityFacadeEjb; +import de.symeda.sormas.backend.infrastructure.facility.FacilityFacadeEjb; import de.symeda.sormas.backend.util.InstanceProvider; import de.symeda.sormas.backend.util.StringNormalizer; @ApplicationScoped public class ReferenceDataValueInstanceProviderImpl implements ReferenceDataValueInstanceProvider { + public static final Date DATE_ALL_VALUES = new Date(0); private Map, Supplier>> dictionary; @PostConstruct @@ -30,12 +38,13 @@ public void init() { dictionary = Map.ofEntries( Map.entry(CountryReferenceDto.class, () -> getInstance(CountryFacade.class).getAllActiveAsReference()), Map.entry(RegionReferenceDto.class, () -> getInstance(RegionFacade.class).getAllActiveAsReference()), - Map.entry(DistrictReferenceDto.class, () -> getInstance(DistrictFacade.class).getAllActiveAsReference()) -// Map.entry(CommunityReferenceDto.class, (Supplier) () -> getInstance(CommunityFacadeEjb.class).getAllAfter(new Date())) + Map.entry(DistrictReferenceDto.class, () -> getInstance(DistrictFacade.class).getAllActiveAsReference()), + Map.entry(CommunityReferenceDto.class, (Supplier) () -> getInstance(CommunityFacadeEjb.class).getAllAfter(DATE_ALL_VALUES)), + Map.entry(FacilityReferenceDto.class, (Supplier) () -> getInstance(FacilityFacadeEjb.class).getAllWithoutRegionAfter(DATE_ALL_VALUES)), + Map.entry(PointOfEntryReferenceDto.class, (Supplier) () -> getInstance(PointOfEntryFacade.class).getAllAfter(DATE_ALL_VALUES)) // TODO: check number of values that are loaded with those calls, otherwise you search by name // TODO: cannot fetch all: FacilityReferenceDto - // Map.entry(FacilityReferenceDto.class, () -> getInstance(FacilityFacadeEjb.class).getAllWithoutRegionAfter(new Date())) ); } diff --git a/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java index c5600d1995e..1339c6d387e 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java @@ -3,6 +3,7 @@ import java.sql.Date; import java.time.LocalDate; import java.time.ZoneId; +import java.util.List; import java.util.Map; import java.util.function.Supplier; import java.util.stream.Collectors; @@ -18,6 +19,7 @@ import de.symeda.sormas.api.Disease; import de.symeda.sormas.api.caze.CaseDataDto; +import de.symeda.sormas.api.customizableenum.CustomizableEnumTranslation; import de.symeda.sormas.api.customizableenum.CustomizableEnumType; import de.symeda.sormas.api.infrastructure.facility.FacilityDto; import de.symeda.sormas.api.infrastructure.region.RegionFacade; @@ -81,7 +83,6 @@ void patch_noErrorsReplaceAlways() { () -> Assertions.assertTrue(response.getFailures().isEmpty(), "Failure found, but should be empty"), // PERSON () -> Assertions.assertEquals(newLastname, actualPerson.getLastName()), - () -> Assertions.assertEquals(Sex.FEMALE, actualPerson.getSex()), // CASE () -> Assertions.assertEquals( Date.from(LocalDate.parse(classificationDate).atStartOfDay(ZoneId.systemDefault()).toInstant()), @@ -251,9 +252,6 @@ void patch_invalidMultiFieldFormat() { "Person.(deathDate)", ignoredValue, - "Person.(deathDate|)", - ignoredValue, - "Person.(deathDate|wefuiohjwerf", ignoredValue, @@ -282,7 +280,7 @@ void patch_invalidMultiFieldFormat() { // TODO: This one fails even though it should not // the value is properly resolved and set into the person, but when fetching it again it's not there anymore. @Test - void patch_customizableEnum() { + void patch_customizableEnu_default_enum() { // PREPARE OccupationType.getDefaultValues().forEach((k, v) -> { CustomizableEnumValue entry = new CustomizableEnumValue(); @@ -336,6 +334,67 @@ void patch_customizableEnum() { () -> Assertions.assertEquals(patchDictionary, response.getPatchDictionary())); } + // TODO: this should work + @Test + void patch_customizableEnu_non_default_enum() { + // PREPARE + CustomizableEnumValue entry = new CustomizableEnumValue(); + entry.setDataType(CustomizableEnumType.OCCUPATION_TYPE); + String customValue = "A custom value"; + + String translation = "expectedTranslation"; + entry.setValue(customValue); + entry.setCaption(""); + entry.setTranslations( + List.of( + buildTranslation("en", translation), + buildTranslation("fr", "irrelated"), + buildTranslation("de", "irrelated"), + buildTranslation("lu", "irrelated"))); + entry.setDefaultValue(false); + getCustomizableEnumValueService().ensurePersisted(entry); + + getCustomizableEnumFacade().loadData(); + + OccupationType expectedOccupationType = getCustomizableEnumFacade().getEnumValue(CustomizableEnumType.OCCUPATION_TYPE, null, customValue); + + CaseDataDto originalCase = creator.createUnclassifiedCase(Disease.PERTUSSIS); + + FacilityDto healthFacility = getFacilityFacade().getByUuid(originalCase.getHealthFacility().getUuid()); + originalCase.setDistrict(healthFacility.getDistrict()); + getCaseFacade().save(originalCase); + + // must be able to ignore accents - whitespaces - case + Map patchDictionary = Map.of("Person.occupationType", " " + customValue.toUpperCase() + " "); + CaseDataPatchRequest request = new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()) + .setReplacementStrategy(DataReplacementStrategy.ALWAYS) + .setPatchDictionary(patchDictionary); + + Mockito.when(MockProducer.getCustomizableEnumFacadeForConverter().getEnumValue(CustomizableEnumType.OCCUPATION_TYPE, null, customValue)) + .thenReturn(expectedOccupationType); + + // EXECUTE + DataPatchResponse response = victim().patch(request); + + PersonDto person = getPersonFacade().getByUuid(originalCase.getPerson().getUuid()); + + // CHECK + logger.info("response: [{}]", response); + Assertions.assertAll( + () -> Assertions.assertTrue(response.getFailures().isEmpty(), "Failure found, but should be empty"), + + () -> Assertions.assertEquals(expectedOccupationType, person.getOccupationType()), + + () -> Assertions.assertEquals(patchDictionary, response.getPatchDictionary())); + } + + private static @NotNull CustomizableEnumTranslation buildTranslation(String en, String irrelated) { + CustomizableEnumTranslation e1 = new CustomizableEnumTranslation(); + e1.setLanguageCode(en); + e1.setValue(irrelated); + return e1; + } + @Test void patch_referenceData() { // PREPARE From 2cddd50db101db1466314ff6c973f43e12d771fb Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Thu, 26 Feb 2026 14:22:02 +0100 Subject: [PATCH 023/134] now all tests except non-defautl custom enum works. Starting refactoring --- .../sormas/api/i18n/I18nProperties.java | 20 +++++--- ...eferenceDataValueInstanceProviderImpl.java | 30 ++++++++---- .../CustomizableEnumPatchMapper.java | 3 +- .../impl/valuemapper/EnumPatchMapper.java | 3 +- .../valuemapper/ReferenceDtoPatchMapper.java | 48 ++++++++++++++++++- .../sormas/patch/CaseDataPatcherImplTest.java | 39 +++++++++++++++ 6 files changed, 122 insertions(+), 21 deletions(-) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/I18nProperties.java b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/I18nProperties.java index b50f27f642d..065e72719e9 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/I18nProperties.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/I18nProperties.java @@ -29,7 +29,6 @@ import java.util.Optional; import java.util.PropertyResourceBundle; import java.util.ResourceBundle.Control; -import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.StreamSupport; @@ -431,7 +430,7 @@ public static ResourceBundle loadProperties(String propertiesGroup, Locale local return new ResourceBundle(java.util.ResourceBundle.getBundle(propertiesGroup, locale, new UTF8Control())); } - public static Map buildPropertiesMap(I18nPropertiesRequest request) { + public static Map buildKeyValueDictionary(I18nPropertiesRequest request) { Language language = request.getLanguage() != null ? request.getLanguage() : Language.EN; I18nProperties instance = getInstance(language); @@ -443,11 +442,18 @@ public static Map buildPropertiesMap(I18nPropertiesRequest reque Class targetType = request.getTargetType(); return StreamSupport.stream(((Iterable) () -> resourceBundle.getResourceBundle().getKeys().asIterator()).spliterator(), false) - .filter(key -> StringUtils.startsWith(key, buildPrefix(targetType))) - .collect(Collectors.toMap(Function.identity(), resourceBundle::getString)); + .filter(key -> StringUtils.startsWith(key, buildEnumPrefix(targetType, resourceBundleType))) + .collect( + Collectors.toMap( + key -> key.replace(I18nProperties.buildEnumPrefix(targetType, resourceBundleType), "").replace(".name", ""), + resourceBundle::getString)); } - public static String buildPrefix(Class targetType) { + private static String buildEnumPrefix(Class targetType, I18nPropertiesRequest.ResourceBundleType resourceBundleType) { + if (resourceBundleType == I18nPropertiesRequest.ResourceBundleType.COUNTRY) { + return "country."; + } + return targetType.getSimpleName() + "."; } @@ -475,8 +481,8 @@ public java.util.ResourceBundle newBundle(String baseName, Locale locale, String * Converts the given baseName and locale * to the bundle name. This method is called from the default * implementation of the {@link #newBundle(String, Locale, String, - * ClassLoader, boolean) newBundle} and {@link #needsReload(String, - * Locale, String, ClassLoader, ResourceBundle, long) needsReload} + * ClassLoader, boolean) newBundle} and {@link java.util.ResourceBundle}#needsReload(String, Locale, String, ClassLoader, + * ResourceBundle, long) needsReload} * methods. * *

diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/ReferenceDataValueInstanceProviderImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/ReferenceDataValueInstanceProviderImpl.java index 0112a7726b3..50e75148a60 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/ReferenceDataValueInstanceProviderImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/ReferenceDataValueInstanceProviderImpl.java @@ -6,17 +6,21 @@ import java.util.Map; import java.util.Optional; import java.util.function.Supplier; +import java.util.stream.Collectors; import javax.annotation.PostConstruct; import javax.enterprise.context.ApplicationScoped; import de.symeda.sormas.api.ReferenceDto; +import de.symeda.sormas.api.infrastructure.community.CommunityDto; import de.symeda.sormas.api.infrastructure.community.CommunityReferenceDto; import de.symeda.sormas.api.infrastructure.country.CountryFacade; import de.symeda.sormas.api.infrastructure.country.CountryReferenceDto; import de.symeda.sormas.api.infrastructure.district.DistrictFacade; import de.symeda.sormas.api.infrastructure.district.DistrictReferenceDto; +import de.symeda.sormas.api.infrastructure.facility.FacilityDto; import de.symeda.sormas.api.infrastructure.facility.FacilityReferenceDto; +import de.symeda.sormas.api.infrastructure.pointofentry.PointOfEntryDto; import de.symeda.sormas.api.infrastructure.pointofentry.PointOfEntryFacade; import de.symeda.sormas.api.infrastructure.pointofentry.PointOfEntryReferenceDto; import de.symeda.sormas.api.infrastructure.region.RegionFacade; @@ -39,14 +43,24 @@ public void init() { Map.entry(CountryReferenceDto.class, () -> getInstance(CountryFacade.class).getAllActiveAsReference()), Map.entry(RegionReferenceDto.class, () -> getInstance(RegionFacade.class).getAllActiveAsReference()), Map.entry(DistrictReferenceDto.class, () -> getInstance(DistrictFacade.class).getAllActiveAsReference()), - Map.entry(CommunityReferenceDto.class, (Supplier) () -> getInstance(CommunityFacadeEjb.class).getAllAfter(DATE_ALL_VALUES)), - Map.entry(FacilityReferenceDto.class, (Supplier) () -> getInstance(FacilityFacadeEjb.class).getAllWithoutRegionAfter(DATE_ALL_VALUES)), - Map.entry(PointOfEntryReferenceDto.class, (Supplier) () -> getInstance(PointOfEntryFacade.class).getAllAfter(DATE_ALL_VALUES)) - - // TODO: check number of values that are loaded with those calls, otherwise you search by name - // TODO: cannot fetch all: FacilityReferenceDto - - ); + Map.entry( + CommunityReferenceDto.class, + () -> getInstance(CommunityFacadeEjb.class).getAllAfter(DATE_ALL_VALUES) + .stream() + .map(CommunityDto::toReference) + .collect(Collectors.toList())), + Map.entry( + FacilityReferenceDto.class, + () -> getInstance(FacilityFacadeEjb.class).getAllWithoutRegionAfter(DATE_ALL_VALUES) + .stream() + .map(FacilityDto::toReference) + .collect(Collectors.toList())), + Map.entry( + PointOfEntryReferenceDto.class, + () -> getInstance(PointOfEntryFacade.class).getAllAfter(DATE_ALL_VALUES) + .stream() + .map(PointOfEntryDto::toReference) + .collect(Collectors.toList()))); } private T getInstance(Class ejb) { diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapper.java index e271aa9ac7c..dbd8abaa7a4 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapper.java @@ -78,14 +78,13 @@ public Optional searchByLanguages(String normalizedInput, Cust I18nPropertiesRequest request = new I18nPropertiesRequest().setTargetType(targetType) .setResourceBundleType(I18nPropertiesRequest.ResourceBundleType.ENUMS) .setLanguage(language); - Map resultingMap = I18nProperties.buildPropertiesMap(request); + Map resultingMap = I18nProperties.buildKeyValueDictionary(request); Optional customizableEnumOpt = resultingMap.entrySet() .stream() .filter(entry -> StringNormalizer.normalize(entry.getValue()).equals(normalizedInput)) .findAny() .map(Map.Entry::getKey) - .map(key -> key.replace(I18nProperties.buildPrefix(targetType), "")) .map(key -> customizableEnumFacade.getEnumValue(type, null, key)); if (customizableEnumOpt.isPresent()) { diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumPatchMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumPatchMapper.java index d22b5990196..5881187274c 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumPatchMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumPatchMapper.java @@ -53,14 +53,13 @@ public T map(Object value, Class targetType, Set inputLanguageCod I18nPropertiesRequest request = new I18nPropertiesRequest().setLanguage(language) .setTargetType(enumType) .setResourceBundleType(I18nPropertiesRequest.ResourceBundleType.ENUMS); - Map stringStringMap = I18nProperties.buildPropertiesMap(request); + Map stringStringMap = I18nProperties.buildKeyValueDictionary(request); Optional enumMemberOpt = stringStringMap.entrySet() .stream() .filter(entry -> StringNormalizer.normalize(entry.getValue()).equals(normalizedInput)) .findAny() .map(Map.Entry::getKey) - .map(key -> key.replace(I18nProperties.buildPrefix(enumType), "")) .map(key -> searchEnumMemberIgnoringCase(constants, key)); if (enumMemberOpt.isPresent()) { diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/ReferenceDtoPatchMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/ReferenceDtoPatchMapper.java index 958f27a5ef4..b630dbd9df9 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/ReferenceDtoPatchMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/ReferenceDtoPatchMapper.java @@ -1,13 +1,24 @@ package de.symeda.sormas.backend.patch.mapping.impl.valuemapper; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Optional; import java.util.Set; +import javax.ejb.EJB; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; +import de.symeda.sormas.api.Language; import de.symeda.sormas.api.ReferenceDto; +import de.symeda.sormas.api.i18n.I18nProperties; +import de.symeda.sormas.api.i18n.I18nPropertiesRequest; +import de.symeda.sormas.api.infrastructure.country.CountryReferenceDto; import de.symeda.sormas.api.patch.mapping.ValuePatchMapper; import de.symeda.sormas.api.referencedata.ReferenceDataValueInstanceProvider; +import de.symeda.sormas.backend.infrastructure.country.CountryFacadeEjb; +import de.symeda.sormas.backend.util.StringNormalizer; @ApplicationScoped public class ReferenceDtoPatchMapper implements ValuePatchMapper { @@ -15,6 +26,11 @@ public class ReferenceDtoPatchMapper implements ValuePatchMapper { @Inject private ReferenceDataValueInstanceProvider referenceDataValueInstanceProvider; + @EJB + private CountryFacadeEjb.CountryFacadeEjbLocal countryFacade; + + private static final List LANGUAGES = Arrays.asList(Language.EN, Language.FR, Language.DE); + @Override public T map(Object value, Class targetType, Set inputLanguageCodes) { String captionCandidate = value.toString(); @@ -25,13 +41,41 @@ public T map(Object value, Class targetType, Set inputLanguageCod Class referenceType = targetType.asSubclass(ReferenceDto.class); - // TODO: could be nice to produce the error directly here - return (T) referenceDataValueInstanceProvider.getOne(captionCandidate, referenceType) + return (T) findByTranslationKey(value, targetType).or(() -> referenceDataValueInstanceProvider.getOne(captionCandidate, referenceType)) .orElseThrow( () -> new IllegalStateException( String.format("Could not match value: [%s] to referenceType: [%s]", captionCandidate, referenceType))); } + private Optional findByTranslationKey(Object value, Class referenceType) { + + if (!referenceType.equals(CountryReferenceDto.class)) { + return Optional.empty(); + } + + String normalizedInput = StringNormalizer.normalize(value.toString()); + + for (Language language : LANGUAGES) { + I18nPropertiesRequest request = new I18nPropertiesRequest().setResourceBundleType(I18nPropertiesRequest.ResourceBundleType.COUNTRY) + .setTargetType(referenceType) + .setLanguage(language); + Map stringStringMap = I18nProperties.buildKeyValueDictionary(request); + + Optional enumMemberOpt = stringStringMap.entrySet() + .stream() + .filter(entry -> StringNormalizer.normalize(entry.getValue()).equals(normalizedInput)) + .findAny() + .map(Map.Entry::getKey) + .map(key -> (T) countryFacade.getCountryByIsoCode(key)); + + if (enumMemberOpt.isPresent()) { + return enumMemberOpt; + } + } + + return Optional.empty(); + } + @Override public Set> getSupportedTypes() { return Set.of(ReferenceDto.class); diff --git a/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java index 1339c6d387e..68aba3f61cc 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java @@ -21,6 +21,8 @@ import de.symeda.sormas.api.caze.CaseDataDto; import de.symeda.sormas.api.customizableenum.CustomizableEnumTranslation; import de.symeda.sormas.api.customizableenum.CustomizableEnumType; +import de.symeda.sormas.api.infrastructure.country.CountryDto; +import de.symeda.sormas.api.infrastructure.country.CountryReferenceDto; import de.symeda.sormas.api.infrastructure.facility.FacilityDto; import de.symeda.sormas.api.infrastructure.region.RegionFacade; import de.symeda.sormas.api.patch.CaseDataPatchRequest; @@ -37,6 +39,7 @@ import de.symeda.sormas.api.person.Sex; import de.symeda.sormas.backend.AbstractBeanTest; import de.symeda.sormas.backend.MockProducer; +import de.symeda.sormas.backend.common.ConfigFacadeEjb; import de.symeda.sormas.backend.customizableenum.CustomizableEnumValue; class CaseDataPatcherImplTest extends AbstractBeanTest { @@ -423,6 +426,42 @@ void patch_referenceData() { () -> Assertions.assertEquals(patchDictionary, response.getPatchDictionary())); } + @Test + void patch_referenceData_country() { + // PREPARE + MockProducer.getProperties().setProperty(ConfigFacadeEjb.COUNTRY_LOCALE, "lu"); + + CountryDto dto = new CountryDto(); + dto.setIsoCode("DEU"); + dto.setDefaultName("Germany"); + CountryDto germanyReferenceDto = getCountryFacade().save(dto); + + List allActiveAsReference = getCountryFacade().getAllActiveAsReference(); + System.out.println("allActiveAsReference = " + allActiveAsReference); + + CaseDataDto originalCase = creator.createUnclassifiedCase(Disease.PERTUSSIS); + + // must be able to ignore accents - whitespaces - case + Map patchDictionary = Map.of("Person.birthCountry", " Deutschländ "); + CaseDataPatchRequest request = new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()) + .setReplacementStrategy(DataReplacementStrategy.ALWAYS) + .setPatchDictionary(patchDictionary); + + // EXECUTE + DataPatchResponse response = victim().patch(request); + + PersonDto actualPerson = getPersonFacade().getByUuid(originalCase.getPerson().getUuid()); + + // CHECK + logger.info("response: [{}]", response); + Assertions.assertAll( + () -> Assertions.assertTrue(response.getFailures().isEmpty(), "Failure found, but should be empty"), + + () -> Assertions.assertEquals( + new CountryReferenceDto(germanyReferenceDto.getUuid(), germanyReferenceDto.getIsoCode()), + actualPerson.getBirthCountry())); + } + @Test void patch_notSupportedForDisease() { // PREPARE From 7a8b67841677e75894c57efc5bac6318453b9362 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Thu, 26 Feb 2026 15:01:50 +0100 Subject: [PATCH 024/134] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20enhanced=20error?= =?UTF-8?q?=20messages?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/patch/CaseDataPatchRequest.java | 24 +++++++- .../api/patch/DataPatchFailureCause.java | 5 ++ .../api/patch/mapping/ValueMappingResult.java | 59 ++++++++++++++++++ .../api/patch/mapping/ValuePatchMapper.java | 4 +- .../api/patch/mapping/ValuePatchRequest.java | 61 +++++++++++++++++++ .../backend/patch/CaseDataPatcherImpl.java | 11 +++- .../patch/mapping/ValueMapperRegistry.java | 15 ++++- .../PersonBirthDateFieldMapper.java | 10 ++- .../CustomizableEnumPatchMapper.java | 5 +- .../impl/valuemapper/DatePatchMapper.java | 15 ++++- .../impl/valuemapper/EnumPatchMapper.java | 19 ++++-- .../valuemapper/PrimitivePatchMapper.java | 54 +++++++++++----- .../valuemapper/ReferenceDtoPatchMapper.java | 24 ++++++-- .../impl/valuemapper/DateMapperTest.java | 8 +-- .../impl/valuemapper/EnumMapperTest.java | 26 ++++---- .../impl/valuemapper/PrimitiveMapperTest.java | 22 +++---- .../sormas/patch/CaseDataPatcherImplTest.java | 7 --- 17 files changed, 292 insertions(+), 77 deletions(-) create mode 100644 sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValueMappingResult.java create mode 100644 sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValuePatchRequest.java diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/CaseDataPatchRequest.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/CaseDataPatchRequest.java index 1561ed43994..9a0961a85d9 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/CaseDataPatchRequest.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/CaseDataPatchRequest.java @@ -1,11 +1,13 @@ package de.symeda.sormas.api.patch; +import java.util.List; import java.util.Map; import java.util.Objects; import javax.annotation.Nullable; import javax.validation.constraints.NotNull; +import de.symeda.sormas.api.Language; import de.symeda.sormas.api.info.InfoFacade; // TODO: must following be supported: MULTIPLE - FIELD patching ? HOW to behave for that @@ -32,6 +34,12 @@ public class CaseDataPatchRequest { @Nullable private String origin; + /** + * To be able to support I18n inputs the input languages can be passed, system locale by default. + */ + @Nullable + private List inputLanguages; + public String getCaseUuid() { return caseUuid; } @@ -78,6 +86,15 @@ public CaseDataPatchRequest setOrigin(@Nullable String origin) { return this; } + public List getInputLanguages() { + return inputLanguages; + } + + public CaseDataPatchRequest setInputLanguages(List inputLanguages) { + this.inputLanguages = inputLanguages; + return this; + } + @Override public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) @@ -87,17 +104,18 @@ public boolean equals(Object o) { && replacementStrategy == that.replacementStrategy && emptyValueBehavior == that.emptyValueBehavior && Objects.equals(patchDictionary, that.patchDictionary) - && Objects.equals(origin, that.origin); + && Objects.equals(origin, that.origin) + && Objects.equals(inputLanguages, that.inputLanguages); } @Override public int hashCode() { - return Objects.hash(caseUuid, replacementStrategy, emptyValueBehavior, patchDictionary, origin); + return Objects.hash(caseUuid, replacementStrategy, emptyValueBehavior, patchDictionary, origin, inputLanguages); } @Override public String toString() { return "CaseDataPatchRequest{" + "caseUuid='" + caseUuid + '\'' + ", replacementStrategy=" + replacementStrategy + ", emptyValueBehavior=" - + emptyValueBehavior + ", patchDictionary=" + patchDictionary + ", origin='" + origin + '\'' + '}'; + + emptyValueBehavior + ", patchDictionary=" + patchDictionary + ", origin='" + origin + '\'' + ", inputLanguages=" + inputLanguages + '}'; } } diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java index 3b7540254bc..1bc091448cd 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java @@ -47,6 +47,11 @@ public enum DataPatchFailureCause { */ INVALID_VALUE_TYPE, + /** + * A mapper is missing and must be implemented. + */ + UNSUPPORTED_TARGET_TYPE, + /** * This means there is a hole in the implementation. */ diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValueMappingResult.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValueMappingResult.java new file mode 100644 index 00000000000..31f82903c4d --- /dev/null +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValueMappingResult.java @@ -0,0 +1,59 @@ +package de.symeda.sormas.api.patch.mapping; + +import java.util.Objects; + +import de.symeda.sormas.api.patch.DataPatchFailureCause; + +public class ValueMappingResult { + + private T data; + private DataPatchFailureCause dataPatchFailureCause; + + public static ValueMappingResult withData(T data) { + ValueMappingResult result = new ValueMappingResult<>(); + result.setData(data); + return result; + } + + public static ValueMappingResult withCause(DataPatchFailureCause dataPatchFailureCause) { + ValueMappingResult result = new ValueMappingResult<>(); + result.setDataPatchFailureCause(dataPatchFailureCause); + return result; + } + + public T getData() { + return data; + } + + public ValueMappingResult setData(T data) { + this.data = data; + return this; + } + + public DataPatchFailureCause getDataPatchFailureCause() { + return dataPatchFailureCause; + } + + public ValueMappingResult setDataPatchFailureCause(DataPatchFailureCause dataPatchFailureCause) { + this.dataPatchFailureCause = dataPatchFailureCause; + return this; + } + + @Override + public boolean equals(Object o) { + if (o == null || getClass() != o.getClass()) + return false; + ValueMappingResult that = (ValueMappingResult) o; + return Objects.equals(data, that.data) && dataPatchFailureCause == that.dataPatchFailureCause; + } + + @Override + public int hashCode() { + return Objects.hash(data, dataPatchFailureCause); + } + + @Override + public String toString() { + return "ValueMappingResult{" + "data=" + data + ", dataPatchFailureCause=" + dataPatchFailureCause + '}'; + } +} diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValuePatchMapper.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValuePatchMapper.java index e10c30a0a29..2b2bf4e61bf 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValuePatchMapper.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValuePatchMapper.java @@ -30,7 +30,7 @@ public interface ValuePatchMapper extends Comparable { // TODO: CHECK if error handling should be done here already. | Multiple return types. // TODO: CHECK shouldn't be string ? @NotNull - default T map(Object value, @NotNull Class targetType) { + default ValueMappingResult map(Object value, @NotNull Class targetType) { return map(value, targetType, Set.of()); } @@ -44,7 +44,7 @@ default T map(Object value, @NotNull Class targetType) { * @param */ @NotNull - T map(Object value, @NotNull Class targetType, Set inputLanguageCodes); + ValueMappingResult map(Object value, @NotNull Class targetType, Set inputLanguageCodes); @NotNull Set> getSupportedTypes(); diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValuePatchRequest.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValuePatchRequest.java new file mode 100644 index 00000000000..0f7021b2796 --- /dev/null +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValuePatchRequest.java @@ -0,0 +1,61 @@ +package de.symeda.sormas.api.patch.mapping; + +import java.util.List; +import java.util.Objects; + +import javax.validation.constraints.NotNull; + +import de.symeda.sormas.api.Language; + +public class ValuePatchRequest { + + @NotNull + private Object value; + + @NotNull + private Class targetType; + + private List inputLanguages; + + public Object getValue() { + return value; + } + + public ValuePatchRequest setValue(Object value) { + this.value = value; + return this; + } + + public Class getTargetType() { + return targetType; + } + + public ValuePatchRequest setTargetType(Class targetType) { + this.targetType = targetType; + return this; + } + + public List getInputLanguages() { + return inputLanguages; + } + + public ValuePatchRequest setInputLanguages(List inputLanguages) { + this.inputLanguages = inputLanguages; + return this; + } + + @Override + public boolean equals(Object o) { + if (o == null || getClass() != o.getClass()) + return false; + ValuePatchRequest that = (ValuePatchRequest) o; + return Objects.equals(value, that.value) + && Objects.equals(targetType, that.targetType) + && Objects.equals(inputLanguages, that.inputLanguages); + } + + @Override + public int hashCode() { + return Objects.hash(value, targetType, inputLanguages); + } +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java index 8c0ee47caf0..432d1005200 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java @@ -33,6 +33,7 @@ import de.symeda.sormas.api.patch.EmptyValueBehavior; import de.symeda.sormas.api.patch.mapping.FieldCustomMapper; import de.symeda.sormas.api.patch.mapping.FieldPatchRequest; +import de.symeda.sormas.api.patch.mapping.ValueMappingResult; import de.symeda.sormas.api.person.PersonDto; import de.symeda.sormas.api.utils.Tuple; import de.symeda.sormas.api.utils.fieldvisibility.FieldVisibilityCheckers; @@ -141,7 +142,15 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { // TODO: handle targetType being a list. TO-Check with business: add / replace - Object typedValue = valueMapperRegistry.map(untypedTargetValue, targetType); + ValueMappingResult result = valueMapperRegistry.map(untypedTargetValue, targetType); + + DataPatchFailureCause dataPatchFailureCause = result.getDataPatchFailureCause(); + if (dataPatchFailureCause != null) { + return singlePatchResult + .setFailure(new DataPatchFailure().setDataPatchFailureCause(dataPatchFailureCause).setProvidedFieldValue(untypedTargetValue)); + } + + Object typedValue = result.getData(); if (request.getReplacementStrategy() == DataReplacementStrategy.IF_NOT_ALREADY_PRESENT) { Optional nestedPropertyValue = PropertyAccessor.getNestedProperty(target, relativeFieldName); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/ValueMapperRegistry.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/ValueMapperRegistry.java index b5dfc11a1d3..e2775a63219 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/ValueMapperRegistry.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/ValueMapperRegistry.java @@ -9,11 +9,17 @@ import javax.inject.Inject; import javax.validation.constraints.NotNull; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import de.symeda.sormas.api.patch.DataPatchFailureCause; +import de.symeda.sormas.api.patch.mapping.ValueMappingResult; import de.symeda.sormas.api.patch.mapping.ValuePatchMapper; @ApplicationScoped public class ValueMapperRegistry { + private final static Logger logger = LoggerFactory.getLogger(ValueMapperRegistry.class); private List orderedInstances; @Inject @@ -26,13 +32,13 @@ void init() { } @NotNull - public T map(Object value, @NotNull Class targetType) { + public ValueMappingResult map(Object value, @NotNull Class targetType) { if (value == null) { return null; } if (targetType.isInstance(value)) { - return targetType.cast(value); + return ValueMappingResult.withData(targetType.cast(value)); } for (ValuePatchMapper mapper : orderedInstances) { @@ -40,6 +46,9 @@ public T map(Object value, @NotNull Class targetType) { return mapper.map(value, targetType); } } - throw new IllegalArgumentException(String.format("No mapper found for: [%s]", targetType)); + + logger.error("No mapper found for: [{}]", targetType); + + return ValueMappingResult.withCause(DataPatchFailureCause.UNSUPPORTED_TARGET_TYPE); } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonBirthDateFieldMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonBirthDateFieldMapper.java index ff2f7798d33..87e9c858ade 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonBirthDateFieldMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonBirthDateFieldMapper.java @@ -13,6 +13,7 @@ import de.symeda.sormas.api.patch.DataReplacementStrategy; import de.symeda.sormas.api.patch.mapping.FieldCustomMapper; import de.symeda.sormas.api.patch.mapping.FieldPatchRequest; +import de.symeda.sormas.api.patch.mapping.ValueMappingResult; import de.symeda.sormas.api.person.PersonDto; import de.symeda.sormas.backend.patch.mapping.impl.valuemapper.DatePatchMapper; @@ -36,7 +37,14 @@ public Optional map(FieldPatchRequest request) { PersonDto person = (PersonDto) untypedTarget; Object untypedValue = request.getValue(); - Date birthDate = dateMapper.map(untypedValue, Date.class); + ValueMappingResult result = dateMapper.map(untypedValue, Date.class); + + DataPatchFailureCause dataPatchFailureCause = result.getDataPatchFailureCause(); + if (dataPatchFailureCause != null) { + return Optional.of(new DataPatchFailure().setDataPatchFailureCause(dataPatchFailureCause)); + } + + Date birthDate = result.getData(); // TODO: remove duplication. Calendar calendar = Calendar.getInstance(); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapper.java index dbd8abaa7a4..064ed8a6b90 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapper.java @@ -17,6 +17,7 @@ import de.symeda.sormas.api.customizableenum.CustomizableEnumType; import de.symeda.sormas.api.i18n.I18nProperties; import de.symeda.sormas.api.i18n.I18nPropertiesRequest; +import de.symeda.sormas.api.patch.mapping.ValueMappingResult; import de.symeda.sormas.api.patch.mapping.ValuePatchMapper; import de.symeda.sormas.backend.customizableenum.CustomizableEnumFacadeEjb; import de.symeda.sormas.backend.util.StringNormalizer; @@ -35,7 +36,7 @@ public class CustomizableEnumPatchMapper implements ValuePatchMapper { private CustomizableEnumFacadeEjb.CustomizableEnumFacadeEjbLocal customizableEnumFacade; @Override - public T map(Object value, Class targetType, Set inputLanguageCodes) { + public ValueMappingResult map(Object value, Class targetType, Set inputLanguageCodes) { String captionCandidate = value.toString(); if (!CustomizableEnum.class.isAssignableFrom(targetType)) { @@ -50,7 +51,7 @@ public T map(Object value, Class targetType, Set inputLanguageCod logger.warn("For now only disease-agnostic enum values are retrieved"); - return (T) findCustomizableEnum(captionCandidate, enumType); + return ValueMappingResult.withData((T) findCustomizableEnum(captionCandidate, enumType)); } private CustomizableEnum findCustomizableEnum(String captionCandidate, CustomizableEnumType type) { diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/DatePatchMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/DatePatchMapper.java index a88d6105d1f..953feecfdfe 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/DatePatchMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/DatePatchMapper.java @@ -7,11 +7,18 @@ import javax.enterprise.context.ApplicationScoped; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import de.symeda.sormas.api.patch.DataPatchFailureCause; +import de.symeda.sormas.api.patch.mapping.ValueMappingResult; import de.symeda.sormas.api.patch.mapping.ValuePatchMapper; @ApplicationScoped public class DatePatchMapper implements ValuePatchMapper { + private final static Logger logger = LoggerFactory.getLogger(DatePatchMapper.class); + private static final Set> SUPPORTED_TYPES = Set.of(Date.class); private static final String DATE_FORMAT = "yyyy-MM-dd"; @@ -23,13 +30,15 @@ public Set> getSupportedTypes() { @Override @SuppressWarnings("unchecked") - public T map(Object value, Class targetType, Set inputLanguageCodes) { + public ValueMappingResult map(Object value, Class targetType, Set inputLanguageCodes) { try { SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMAT); sdf.setLenient(false); - return (T) sdf.parse(value.toString()); + return ValueMappingResult.withData((T) sdf.parse(value.toString())); } catch (ParseException e) { - throw new IllegalArgumentException("DateMapper: cannot parse date value '" + value + "', expected format: " + DATE_FORMAT, e); + logger.info("DateMapper: cannot parse date value [{}], expected format: [{}]", value, DATE_FORMAT, e); + + return ValueMappingResult.withCause(DataPatchFailureCause.INVALID_VALUE_TYPE); } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumPatchMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumPatchMapper.java index 5881187274c..04f824d9816 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumPatchMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumPatchMapper.java @@ -10,17 +10,23 @@ import javax.enterprise.context.ApplicationScoped; import org.jetbrains.annotations.Nullable; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import de.symeda.sormas.api.Language; import de.symeda.sormas.api.i18n.I18nProperties; import de.symeda.sormas.api.i18n.I18nPropertiesRequest; +import de.symeda.sormas.api.patch.DataPatchFailureCause; import de.symeda.sormas.api.patch.mapping.ValueMapperDefault; +import de.symeda.sormas.api.patch.mapping.ValueMappingResult; import de.symeda.sormas.api.patch.mapping.ValuePatchMapper; import de.symeda.sormas.backend.util.StringNormalizer; @ApplicationScoped public class EnumPatchMapper implements ValuePatchMapper { + private final static Logger logger = LoggerFactory.getLogger(EnumPatchMapper.class); + private static final Set> SUPPORTED_TYPES = Set.of(Enum.class); private static final String FALLBACK_NAME = "OTHER"; @@ -37,7 +43,7 @@ public Set> getSupportedTypes() { @SuppressWarnings({ "unchecked", "rawtypes" }) - public T map(Object value, Class targetType, Set inputLanguageCodes) { + public ValueMappingResult map(Object value, Class targetType, Set inputLanguageCodes) { Class enumType = (Class) targetType; String normalizedInput = StringNormalizer.normalize(value.toString()); @@ -46,7 +52,7 @@ public T map(Object value, Class targetType, Set inputLanguageCod // default naive search T enumMember = searchEnumMemberIgnoringCase(constants, normalizedInput); if (enumMember != null) { - return enumMember; + return ValueMappingResult.withData(enumMember); } for (Language language : LANGUAGES) { @@ -63,24 +69,25 @@ public T map(Object value, Class targetType, Set inputLanguageCod .map(key -> searchEnumMemberIgnoringCase(constants, key)); if (enumMemberOpt.isPresent()) { - return enumMemberOpt.get(); + return ValueMappingResult.withData(enumMemberOpt.get()); } } // overridden fallback Enum annotatedDefault = findAnnotatedDefault((Class>) enumType, constants); if (annotatedDefault != null) { - return (T) annotatedDefault; + return ValueMappingResult.withData((T) annotatedDefault); } // default fallback for (Enum constant : constants) { if (FALLBACK_NAME.equals(constant.name())) { - return (T) constant; + return ValueMappingResult.withData((T) constant); } } - throw new EnumConstantNotPresentException(enumType, normalizedInput); + logger.info("Could not match value: [{}] to referenceType: [{}]", normalizedInput, targetType); + return ValueMappingResult.withCause(DataPatchFailureCause.NOT_PRESENT_IN_REFERENCE_DATA_LIST); } private @Nullable T searchEnumMemberIgnoringCase(Enum[] constants, String normalizedInput) { diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/PrimitivePatchMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/PrimitivePatchMapper.java index f7bc7b92236..b511754dd15 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/PrimitivePatchMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/PrimitivePatchMapper.java @@ -4,34 +4,56 @@ import javax.enterprise.context.ApplicationScoped; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import de.symeda.sormas.api.patch.DataPatchFailureCause; +import de.symeda.sormas.api.patch.mapping.ValueMappingResult; import de.symeda.sormas.api.patch.mapping.ValuePatchMapper; @ApplicationScoped public class PrimitivePatchMapper implements ValuePatchMapper { - private static final Set> SUPPORTED_TYPES = Set.of(String.class, Integer.class, Double.class, Float.class, Boolean.class, boolean.class); + private final static Logger logger = LoggerFactory.getLogger(PrimitivePatchMapper.class); - @Override - public Set> getSupportedTypes() { - return SUPPORTED_TYPES; - } + private static final Set> SUPPORTED_TYPES = Set.of(String.class, Integer.class, Double.class, Float.class, Boolean.class, boolean.class); @Override @SuppressWarnings("unchecked") - public T map(Object value, Class targetType, Set inputLanguageCodes) { + public ValueMappingResult map(Object value, Class targetType, Set inputLanguageCodes) { String str = value.toString().trim(); - if (targetType == String.class) - return (T) str; - if (targetType == Integer.class) - return (T) Integer.valueOf(str); - if (targetType == Double.class) - return (T) Double.valueOf(str); - if (targetType == Float.class) - return (T) Float.valueOf(str); - if (targetType == Boolean.class || targetType == boolean.class) - return (T) Boolean.valueOf(str); + T result = null; + try { + if (targetType == String.class) { + result = (T) str; + } + if (targetType == Integer.class) { + result = (T) Integer.valueOf(str); + } + if (targetType == Double.class) { + result = (T) Double.valueOf(str); + } + if (targetType == Float.class) { + result = (T) Float.valueOf(str); + } + if (targetType == Boolean.class || targetType == boolean.class) { + result = (T) Boolean.valueOf(str); + } + } catch (NumberFormatException e) { + logger.info("Cannot parse value [{}], expected format: [{}]", value, str, e); + return ValueMappingResult.withCause(DataPatchFailureCause.INVALID_VALUE_TYPE); + } + + if (result != null) { + return ValueMappingResult.withData(result); + } throw new IllegalArgumentException("PrimitiveWrapperMapper: unsupported type " + targetType.getName()); } + + @Override + public Set> getSupportedTypes() { + return SUPPORTED_TYPES; + } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/ReferenceDtoPatchMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/ReferenceDtoPatchMapper.java index b630dbd9df9..43e68b781e1 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/ReferenceDtoPatchMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/ReferenceDtoPatchMapper.java @@ -10,11 +10,16 @@ import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import de.symeda.sormas.api.Language; import de.symeda.sormas.api.ReferenceDto; import de.symeda.sormas.api.i18n.I18nProperties; import de.symeda.sormas.api.i18n.I18nPropertiesRequest; import de.symeda.sormas.api.infrastructure.country.CountryReferenceDto; +import de.symeda.sormas.api.patch.DataPatchFailureCause; +import de.symeda.sormas.api.patch.mapping.ValueMappingResult; import de.symeda.sormas.api.patch.mapping.ValuePatchMapper; import de.symeda.sormas.api.referencedata.ReferenceDataValueInstanceProvider; import de.symeda.sormas.backend.infrastructure.country.CountryFacadeEjb; @@ -23,6 +28,8 @@ @ApplicationScoped public class ReferenceDtoPatchMapper implements ValuePatchMapper { + private final static Logger logger = LoggerFactory.getLogger(ReferenceDtoPatchMapper.class); + @Inject private ReferenceDataValueInstanceProvider referenceDataValueInstanceProvider; @@ -32,7 +39,7 @@ public class ReferenceDtoPatchMapper implements ValuePatchMapper { private static final List LANGUAGES = Arrays.asList(Language.EN, Language.FR, Language.DE); @Override - public T map(Object value, Class targetType, Set inputLanguageCodes) { + public ValueMappingResult map(Object value, Class targetType, Set inputLanguageCodes) { String captionCandidate = value.toString(); if (!ReferenceDto.class.isAssignableFrom(targetType)) { @@ -41,10 +48,17 @@ public T map(Object value, Class targetType, Set inputLanguageCod Class referenceType = targetType.asSubclass(ReferenceDto.class); - return (T) findByTranslationKey(value, targetType).or(() -> referenceDataValueInstanceProvider.getOne(captionCandidate, referenceType)) - .orElseThrow( - () -> new IllegalStateException( - String.format("Could not match value: [%s] to referenceType: [%s]", captionCandidate, referenceType))); + return this. findByTranslationKey(value, targetType) + .or(() -> (Optional) findByCaptionMatch(captionCandidate, referenceType)) + .map(ValueMappingResult::withData) + .orElseGet(() -> { + logger.info("Could not match value: [{}] to referenceType: [{}]", captionCandidate, referenceType); + return ValueMappingResult.withCause(DataPatchFailureCause.NOT_PRESENT_IN_REFERENCE_DATA_LIST); + }); + } + + private Optional findByCaptionMatch(String captionCandidate, Class referenceType) { + return referenceDataValueInstanceProvider.getOne(captionCandidate, referenceType); } private Optional findByTranslationKey(Object value, Class referenceType) { diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/DateMapperTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/DateMapperTest.java index 3f938b277d8..a9cb67f0c79 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/DateMapperTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/DateMapperTest.java @@ -40,7 +40,7 @@ void map_validDate() throws Exception { Date expected = new SimpleDateFormat("yyyy-MM-dd").parse(input); // EXECUTE - Date actual = victim.map(input, Date.class); + Date actual = victim.map(input, Date.class).getData(); // CHECK assertEquals(expected, actual); @@ -53,7 +53,7 @@ void map_firstDayOfYear() throws Exception { Date expected = new SimpleDateFormat("yyyy-MM-dd").parse(input); // EXECUTE - Date actual = victim.map(input, Date.class); + Date actual = victim.map(input, Date.class).getData(); // CHECK assertEquals(expected, actual); @@ -66,7 +66,7 @@ void map_lastDayOfYear() throws Exception { Date expected = new SimpleDateFormat("yyyy-MM-dd").parse(input); // EXECUTE - Date actual = victim.map(input, Date.class); + Date actual = victim.map(input, Date.class).getData(); // CHECK assertEquals(expected, actual); @@ -80,7 +80,7 @@ void map_valueAsNonStringObject_usesToString() throws Exception { Date expected = new SimpleDateFormat("yyyy-MM-dd").parse("2024-06-15"); // EXECUTE - Date actual = victim.map(new StringBuilder("2024-06-15"), Date.class); + Date actual = victim.map(new StringBuilder("2024-06-15"), Date.class).getData(); // CHECK assertEquals(expected, actual); diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumMapperTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumMapperTest.java index 31406d6586a..dcfaec7f73a 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumMapperTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumMapperTest.java @@ -37,13 +37,13 @@ void getSupportedTypes_containsEnumClass() { @Test void map_sex_exactMatch_male() { // EXECUTE & CHECK - assertEquals(Sex.MALE, victim.map("MALE", Sex.class)); + assertEquals(Sex.MALE, victim.map("MALE", Sex.class).getData()); } @Test void map_sex_exactMatch_female() { // EXECUTE & CHECK - assertEquals(Sex.FEMALE, victim.map("FEMALE", Sex.class)); + assertEquals(Sex.FEMALE, victim.map("FEMALE", Sex.class).getData()); } @Test @@ -55,19 +55,19 @@ void map_sex_exactMatch_unknown() { @Test void map_sex_caseInsensitive_lowercase() { // EXECUTE & CHECK - assertEquals(Sex.MALE, victim.map("male", Sex.class)); + assertEquals(Sex.MALE, victim.map("male", Sex.class).getData()); } @Test void map_sex_caseInsensitive_mixedCase() { // EXECUTE & CHECK - assertEquals(Sex.FEMALE, victim.map("fEmAlE", Sex.class)); + assertEquals(Sex.FEMALE, victim.map("fEmAlE", Sex.class).getData()); } @Test void map_sex_trimsWhitespace() { // EXECUTE & CHECK - assertEquals(Sex.MALE, victim.map(" MALE ", Sex.class)); + assertEquals(Sex.MALE, victim.map(" MALE ", Sex.class).getData()); } // map - OTHER fallback (Sex has OTHER constant) @@ -75,7 +75,7 @@ void map_sex_trimsWhitespace() { @Test void map_sex_unknownValue_fallsBackToOther() { // EXECUTE & CHECK - assertEquals(Sex.OTHER, victim.map("SOMETHING_UNKNOWN", Sex.class)); + assertEquals(Sex.OTHER, victim.map("SOMETHING_UNKNOWN", Sex.class).getData()); } // map - @ValueMapperDefault fallback (InfectionSetting, no OTHER constant) @@ -83,19 +83,19 @@ void map_sex_unknownValue_fallsBackToOther() { @Test void map_infectionSetting_exactMatch_ambulatory() { // EXECUTE & CHECK - assertEquals(InfectionSetting.AMBULATORY, victim.map("AMBULATORY", InfectionSetting.class)); + assertEquals(InfectionSetting.AMBULATORY, victim.map("AMBULATORY", InfectionSetting.class).getData()); } @Test void map_infectionSetting_exactMatch_normalWard() { // EXECUTE & CHECK - assertEquals(InfectionSetting.NORMAL_WARD, victim.map("NORMAL_WARD", InfectionSetting.class)); + assertEquals(InfectionSetting.NORMAL_WARD, victim.map("NORMAL_WARD", InfectionSetting.class).getData()); } @Test void map_infectionSetting_unknownValue_fallsBackToAnnotatedDefault() { // EXECUTE & CHECK - assertEquals(InfectionSetting.UNKNOWN, victim.map("SOMETHING_UNKNOWN", InfectionSetting.class)); + assertEquals(InfectionSetting.UNKNOWN, victim.map("SOMETHING_UNKNOWN", InfectionSetting.class).getData()); } // map - @ValueMapperDefault fallback (Trimester, no OTHER constant) @@ -103,25 +103,25 @@ void map_infectionSetting_unknownValue_fallsBackToAnnotatedDefault() { @Test void map_trimester_exactMatch_first() { // EXECUTE & CHECK - assertEquals(Trimester.FIRST, victim.map("FIRST", Trimester.class)); + assertEquals(Trimester.FIRST, victim.map("FIRST", Trimester.class).getData()); } @Test void map_trimester_exactMatch_second() { // EXECUTE & CHECK - assertEquals(Trimester.SECOND, victim.map("SECOND", Trimester.class)); + assertEquals(Trimester.SECOND, victim.map("SECOND", Trimester.class).getData()); } @Test void map_trimester_exactMatch_third() { // EXECUTE & CHECK - assertEquals(Trimester.THIRD, victim.map("THIRD", Trimester.class)); + assertEquals(Trimester.THIRD, victim.map("THIRD", Trimester.class).getData()); } @Test void map_trimester_unknownValue_fallsBackToAnnotatedDefault() { // EXECUTE & CHECK - assertEquals(Trimester.UNKNOWN, victim.map("SOMETHING_UNKNOWN", Trimester.class)); + assertEquals(Trimester.UNKNOWN, victim.map("SOMETHING_UNKNOWN", Trimester.class).getData()); } // map - no match, no OTHER, no @ValueMapperDefault → exception diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/PrimitiveMapperTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/PrimitiveMapperTest.java index 4d0d497ae01..fd44ec4c4c1 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/PrimitiveMapperTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/PrimitiveMapperTest.java @@ -22,7 +22,7 @@ void map_string() { // PREPARE String expected = "toto"; // EXECUTE & CHECK - assertEquals(expected, victim.map(expected, String.class)); + assertEquals(expected, victim.map(expected, String.class).getData()); } @Test @@ -31,7 +31,7 @@ void map_Integer() { String input = "50"; // EXECUTE - Integer actual = victim.map(input, Integer.class); + Integer actual = victim.map(input, Integer.class).getData(); // CHECK assertEquals(50, actual); @@ -54,7 +54,7 @@ void getSupportedTypes_containsAllExpectedTypes() { @Test void map_string_trimsWhitespace() { // EXECUTE & CHECK - assertEquals("hello", victim.map(" hello ", String.class)); + assertEquals("hello", victim.map(" hello ", String.class).getData()); } @Test @@ -63,7 +63,7 @@ void map_integer() { String input = "42"; // EXECUTE - Integer actual = victim.map(input, Integer.class); + Integer actual = victim.map(input, Integer.class).getData(); // CHECK assertEquals(42, actual); @@ -75,7 +75,7 @@ void map_double() { String input = "3.14"; // EXECUTE - Double actual = victim.map(input, Double.class); + Double actual = victim.map(input, Double.class).getData(); // CHECK assertEquals(3.14, actual); @@ -87,7 +87,7 @@ void map_float() { String input = "1.5"; // EXECUTE - Float actual = victim.map(input, Float.class); + Float actual = victim.map(input, Float.class).getData(); // CHECK assertEquals(1.5f, actual); @@ -99,7 +99,7 @@ void map_boolean_true() { String input = "true"; // EXECUTE - Boolean actual = victim.map(input, Boolean.class); + Boolean actual = victim.map(input, Boolean.class).getData(); // CHECK assertTrue(actual); @@ -111,7 +111,7 @@ void map_boolean_false() { String input = "false"; // EXECUTE - Boolean actual = victim.map(input, Boolean.class); + Boolean actual = victim.map(input, Boolean.class).getData(); // CHECK assertFalse(actual); @@ -123,7 +123,7 @@ void map_primitiveBooleanClass_true() { String input = "true"; // EXECUTE - Boolean actual = victim.map(input, boolean.class); + Boolean actual = victim.map(input, boolean.class).getData(); // CHECK assertTrue(actual); @@ -134,13 +134,13 @@ void map_primitiveBooleanClass_true() { @Test void map_integer_withSurroundingWhitespace() { // EXECUTE & CHECK - assertEquals(99, victim.map(" 99 ", Integer.class)); + assertEquals(99, victim.map(" 99 ", Integer.class).getData()); } @Test void map_boolean_invalidString_returnsFalse() { // EXECUTE & CHECK - assertFalse(victim.map("notABoolean", Boolean.class)); + assertFalse(victim.map("notABoolean", Boolean.class).getData()); } // map - error cases diff --git a/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java index 68aba3f61cc..ab867a56a4b 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java @@ -11,7 +11,6 @@ import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; @@ -44,12 +43,6 @@ class CaseDataPatcherImplTest extends AbstractBeanTest { - @BeforeEach - void setUp() { - // TODO: create reference data: country. - // TODO: try to change language to use the languages names / with without accent and stuff: Pérou - } - // TODO: test different replacement strategy: with/without failure @Test From 17e829c6d8422d29447c1eb6eaf8a97fdc4e77b1 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Thu, 26 Feb 2026 15:31:25 +0100 Subject: [PATCH 025/134] Supporting multiple fields + custom enum defaults --- .../api/patch/CaseDataPatchRequest.java | 1 - .../CustomizableEnumPatchMapper.java | 6 +- .../impl/valuemapper/EnumPatchMapper.java | 5 ++ .../impl/valuemapper/DateMapperTest.java | 18 ++---- .../impl/valuemapper/EnumMapperTest.java | 18 ++---- .../sormas/patch/CaseDataPatcherImplTest.java | 64 +++++++++++++++++-- 6 files changed, 78 insertions(+), 34 deletions(-) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/CaseDataPatchRequest.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/CaseDataPatchRequest.java index 9a0961a85d9..a4fa7bf1f39 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/CaseDataPatchRequest.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/CaseDataPatchRequest.java @@ -10,7 +10,6 @@ import de.symeda.sormas.api.Language; import de.symeda.sormas.api.info.InfoFacade; -// TODO: must following be supported: MULTIPLE - FIELD patching ? HOW to behave for that public class CaseDataPatchRequest { @NotNull diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapper.java index 064ed8a6b90..7c014cb7181 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapper.java @@ -58,11 +58,7 @@ private CustomizableEnum findCustomizableEnum(String captionCandidate, Customiza String normalizedInput = StringNormalizer.normalize(captionCandidate); return searchByDefaultLanguage(type, normalizedInput).or(() -> searchByLanguages(normalizedInput, type)) - .or( - () -> customizableEnumFacade.getEnumValues(type, null) - .stream() - .filter(customizableEnum -> matchByValueOrCaption(customizableEnum, FALLBACK_NAME)) - .findAny()) + .or(() -> Optional.ofNullable(customizableEnumFacade.getEnumValue(type, null, FALLBACK_NAME))) .orElseThrow( () -> new IllegalStateException(String.format("Could not match value: [%s] to customizableEnumType: [%s]", captionCandidate, type))); } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumPatchMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumPatchMapper.java index 04f824d9816..3251bccf3da 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumPatchMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumPatchMapper.java @@ -44,6 +44,11 @@ public Set> getSupportedTypes() { "unchecked", "rawtypes" }) public ValueMappingResult map(Object value, Class targetType, Set inputLanguageCodes) { + + if (!Enum.class.isAssignableFrom(targetType)) { + return ValueMappingResult.withCause(DataPatchFailureCause.TECHNICAL); + } + Class enumType = (Class) targetType; String normalizedInput = StringNormalizer.normalize(value.toString()); diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/DateMapperTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/DateMapperTest.java index a9cb67f0c79..2b3e57753a5 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/DateMapperTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/DateMapperTest.java @@ -1,7 +1,6 @@ package de.symeda.sormas.backend.patch.mapping.impl.valuemapper; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; import java.text.SimpleDateFormat; import java.util.Date; @@ -10,6 +9,7 @@ import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; +import de.symeda.sormas.api.patch.DataPatchFailureCause; import de.symeda.sormas.backend.AbstractUnitTest; class DateMapperTest extends AbstractUnitTest { @@ -91,36 +91,30 @@ void map_valueAsNonStringObject_usesToString() throws Exception { @Test void map_invalidFormat_throwsIllegalArgumentException() { // EXECUTE & CHECK - assertThrows(IllegalArgumentException.class, () -> victim.map("15/06/2024", Date.class)); + assertEquals(DataPatchFailureCause.INVALID_VALUE_TYPE, victim.map("15/06/2024", Date.class).getDataPatchFailureCause()); } @Test void map_lenientOff_invalidDay_throwsIllegalArgumentException() { // EXECUTE & CHECK - assertThrows(IllegalArgumentException.class, () -> victim.map("2024-02-30", Date.class)); + assertEquals(DataPatchFailureCause.INVALID_VALUE_TYPE, victim.map("2024-02-30", Date.class).getDataPatchFailureCause()); } @Test void map_lenientOff_invalidMonth_throwsIllegalArgumentException() { // EXECUTE & CHECK - assertThrows(IllegalArgumentException.class, () -> victim.map("2024-13-01", Date.class)); + assertEquals(DataPatchFailureCause.INVALID_VALUE_TYPE, victim.map("2024-13-01", Date.class).getDataPatchFailureCause()); } @Test void map_emptyString_throwsIllegalArgumentException() { // EXECUTE & CHECK - assertThrows(IllegalArgumentException.class, () -> victim.map("", Date.class)); + assertEquals(DataPatchFailureCause.INVALID_VALUE_TYPE, victim.map("", Date.class).getDataPatchFailureCause()); } @Test void map_randomString_throwsIllegalArgumentException() { // EXECUTE & CHECK - assertThrows(IllegalArgumentException.class, () -> victim.map("notADate", Date.class)); - } - - @Test - void map_nullValue_throwsNullPointerException() { - // EXECUTE & CHECK - assertThrows(NullPointerException.class, () -> victim.map(null, Date.class)); + assertEquals(DataPatchFailureCause.INVALID_VALUE_TYPE, victim.map("notADate", Date.class).getDataPatchFailureCause()); } } diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumMapperTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumMapperTest.java index dcfaec7f73a..86d1a20d87d 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumMapperTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumMapperTest.java @@ -1,7 +1,6 @@ package de.symeda.sormas.backend.patch.mapping.impl.valuemapper; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; import java.util.Set; @@ -10,6 +9,7 @@ import de.symeda.sormas.api.caze.InfectionSetting; import de.symeda.sormas.api.caze.Trimester; +import de.symeda.sormas.api.patch.DataPatchFailureCause; import de.symeda.sormas.api.person.Sex; import de.symeda.sormas.backend.AbstractUnitTest; @@ -49,7 +49,7 @@ void map_sex_exactMatch_female() { @Test void map_sex_exactMatch_unknown() { // EXECUTE & CHECK - assertEquals(Sex.UNKNOWN, victim.map("UNKNOWN", Sex.class)); + assertEquals(Sex.UNKNOWN, victim.map("UNKNOWN", Sex.class).getData()); } @Test @@ -78,8 +78,6 @@ void map_sex_unknownValue_fallsBackToOther() { assertEquals(Sex.OTHER, victim.map("SOMETHING_UNKNOWN", Sex.class).getData()); } - // map - @ValueMapperDefault fallback (InfectionSetting, no OTHER constant) - @Test void map_infectionSetting_exactMatch_ambulatory() { // EXECUTE & CHECK @@ -124,23 +122,21 @@ void map_trimester_unknownValue_fallsBackToAnnotatedDefault() { assertEquals(Trimester.UNKNOWN, victim.map("SOMETHING_UNKNOWN", Trimester.class).getData()); } - // map - no match, no OTHER, no @ValueMapperDefault → exception - @Test void map_noFallback_throwsEnumConstantNotPresentException() { // PREPARE // Direction has no OTHER constant and no @ValueMapperDefault annotation // EXECUTE & CHECK - assertThrows(EnumConstantNotPresentException.class, () -> victim.map("SOMETHING_UNKNOWN", NoFallbackEnum.class)); + assertEquals( + DataPatchFailureCause.NOT_PRESENT_IN_REFERENCE_DATA_LIST, + victim.map("SOMETHING_UNKNOWN", NoFallbackEnum.class).getDataPatchFailureCause()); } - // map - null input - @Test - void map_nullValue_throwsNullPointerException() { + void map_noFallback_notAnEnum() { // EXECUTE & CHECK - assertThrows(NullPointerException.class, () -> victim.map(null, Sex.class)); + assertEquals(DataPatchFailureCause.TECHNICAL, victim.map("SOMETHING_UNKNOWN", Long.class).getDataPatchFailureCause()); } private enum NoFallbackEnum { diff --git a/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java index ab867a56a4b..8ebf9472282 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java @@ -273,7 +273,6 @@ void patch_invalidMultiFieldFormat() { () -> Assertions.assertEquals(expectedFailures, response.getFailures())); } - // TODO: This one fails even though it should not // the value is properly resolved and set into the person, but when fetching it again it's not there anymore. @Test void patch_customizableEnu_default_enum() { @@ -294,9 +293,59 @@ void patch_customizableEnu_default_enum() { OccupationType expectedOccupationType = getCustomizableEnumFacade().getEnumValue(CustomizableEnumType.OCCUPATION_TYPE, null, healthcareWorker); + CaseDataDto originalCase = creator.createUnclassifiedCase(Disease.PERTUSSIS); + + FacilityDto healthFacility = getFacilityFacade().getByUuid(originalCase.getHealthFacility().getUuid()); + originalCase.setDistrict(healthFacility.getDistrict()); + getCaseFacade().save(originalCase); + + // must be able to ignore accents - whitespaces - case + String input = "Im Gesundheitswesen tätig"; + Map patchDictionary = Map.of("Person.occupationType", input); + CaseDataPatchRequest request = new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()) + .setReplacementStrategy(DataReplacementStrategy.ALWAYS) + .setPatchDictionary(patchDictionary); + + Mockito.when(MockProducer.getCustomizableEnumFacadeForConverter().getEnumValue(CustomizableEnumType.OCCUPATION_TYPE, null, healthcareWorker)) + .thenReturn(expectedOccupationType); + + // EXECUTE + DataPatchResponse response = victim().patch(request); + + PersonDto person = getPersonFacade().getByUuid(originalCase.getPerson().getUuid()); + + // CHECK + logger.info("response: [{}]", response); + Assertions.assertAll( + () -> Assertions.assertTrue(response.getFailures().isEmpty(), "Failure found, but should be empty"), + + () -> Assertions.assertEquals(input, person.getOccupationDetails()), + + () -> Assertions.assertEquals(patchDictionary, response.getPatchDictionary())); + } + + @Test + void patch_customizableEnu_default_enum_other() { + // PREPARE + OccupationType.getDefaultValues().forEach((k, v) -> { + CustomizableEnumValue entry = new CustomizableEnumValue(); + entry.setDataType(CustomizableEnumType.OCCUPATION_TYPE); + entry.setValue(k); + entry.setCaption(k); + entry.setProperties(v); + entry.setDefaultValue(true); + getCustomizableEnumValueService().ensurePersisted(entry); + }); + + getCustomizableEnumFacade().loadData(); + + String otherOccupationType = "OTHER"; + OccupationType expectedOccupationType = + getCustomizableEnumFacade().getEnumValue(CustomizableEnumType.OCCUPATION_TYPE, null, otherOccupationType); + CustomizableEnumValue customizableEnumValue = getCustomizableEnumValueService().getAll() .stream() - .filter(enumMember -> healthcareWorker.equals(enumMember.getValue())) + .filter(enumMember -> otherOccupationType.equals(enumMember.getValue())) .findAny() .orElseThrow(); @@ -307,12 +356,14 @@ void patch_customizableEnu_default_enum() { getCaseFacade().save(originalCase); // must be able to ignore accents - whitespaces - case - Map patchDictionary = Map.of("Person.occupationType", "Im Gesundheitswesen tätig"); + String input = "DOES NOT MATCH TO Anythign"; + Map patchDictionary = Map.of("Person.(occupationType|occupationDetails|additionalDetails)", input); CaseDataPatchRequest request = new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()) .setReplacementStrategy(DataReplacementStrategy.ALWAYS) .setPatchDictionary(patchDictionary); - Mockito.when(MockProducer.getCustomizableEnumFacadeForConverter().getEnumValue(CustomizableEnumType.OCCUPATION_TYPE, null, healthcareWorker)) + Mockito + .when(MockProducer.getCustomizableEnumFacadeForConverter().getEnumValue(CustomizableEnumType.OCCUPATION_TYPE, null, otherOccupationType)) .thenReturn(expectedOccupationType); // EXECUTE @@ -326,8 +377,11 @@ void patch_customizableEnu_default_enum() { () -> Assertions.assertTrue(response.getFailures().isEmpty(), "Failure found, but should be empty"), () -> Assertions.assertEquals(expectedOccupationType, person.getOccupationType()), + () -> Assertions.assertEquals(input, person.getOccupationDetails()), - () -> Assertions.assertEquals(patchDictionary, response.getPatchDictionary())); + () -> Assertions.assertEquals( + Map.of("Person.occupationType", input, "Person.occupationDetails", input, "Person.additionalDetails", input), + response.getPatchDictionary())); } // TODO: this should work From 41db2954caf1f0edfd56eba8a98a5586371bb84c Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Thu, 26 Feb 2026 15:44:51 +0100 Subject: [PATCH 026/134] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20added=20request=20?= =?UTF-8?q?to=20patcher=20to=20allow=20more=20config?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/patch/CaseDataPatchRequest.java | 19 ++++++++++-- .../api/patch/mapping/ValuePatchMapper.java | 15 ++------- .../api/patch/mapping/ValuePatchRequest.java | 31 +++++++++++++++++-- .../backend/patch/CaseDataPatcherImpl.java | 7 ++++- .../patch/mapping/ValueMapperRegistry.java | 10 ++++-- .../CustomizableEnumPatchMapper.java | 5 ++- .../impl/valuemapper/DatePatchMapper.java | 4 ++- .../impl/valuemapper/EnumPatchMapper.java | 9 ++++-- .../valuemapper/PrimitivePatchMapper.java | 5 ++- .../valuemapper/ReferenceDtoPatchMapper.java | 5 ++- .../sormas/patch/CaseDataPatcherImplTest.java | 2 +- 11 files changed, 82 insertions(+), 30 deletions(-) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/CaseDataPatchRequest.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/CaseDataPatchRequest.java index a4fa7bf1f39..9e2c6b2f4d6 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/CaseDataPatchRequest.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/CaseDataPatchRequest.java @@ -39,6 +39,8 @@ public class CaseDataPatchRequest { @Nullable private List inputLanguages; + private boolean allowDefaultValues = true; + public String getCaseUuid() { return caseUuid; } @@ -94,12 +96,22 @@ public CaseDataPatchRequest setInputLanguages(List inputLanguages) { return this; } + public boolean isAllowDefaultValues() { + return allowDefaultValues; + } + + public CaseDataPatchRequest setAllowDefaultValues(boolean allowDefaultValues) { + this.allowDefaultValues = allowDefaultValues; + return this; + } + @Override public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) return false; CaseDataPatchRequest that = (CaseDataPatchRequest) o; - return Objects.equals(caseUuid, that.caseUuid) + return allowDefaultValues == that.allowDefaultValues + && Objects.equals(caseUuid, that.caseUuid) && replacementStrategy == that.replacementStrategy && emptyValueBehavior == that.emptyValueBehavior && Objects.equals(patchDictionary, that.patchDictionary) @@ -109,12 +121,13 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(caseUuid, replacementStrategy, emptyValueBehavior, patchDictionary, origin, inputLanguages); + return Objects.hash(caseUuid, replacementStrategy, emptyValueBehavior, patchDictionary, origin, inputLanguages, allowDefaultValues); } @Override public String toString() { return "CaseDataPatchRequest{" + "caseUuid='" + caseUuid + '\'' + ", replacementStrategy=" + replacementStrategy + ", emptyValueBehavior=" - + emptyValueBehavior + ", patchDictionary=" + patchDictionary + ", origin='" + origin + '\'' + ", inputLanguages=" + inputLanguages + '}'; + + emptyValueBehavior + ", patchDictionary=" + patchDictionary + ", origin='" + origin + '\'' + ", inputLanguages=" + inputLanguages + + ", allowDefaultValues=" + allowDefaultValues + '}'; } } diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValuePatchMapper.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValuePatchMapper.java index 2b2bf4e61bf..75c2259daeb 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValuePatchMapper.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValuePatchMapper.java @@ -27,24 +27,13 @@ public interface ValuePatchMapper extends Comparable { * @throws RuntimeException * in case of the value couldn't be mapped. */ - // TODO: CHECK if error handling should be done here already. | Multiple return types. - // TODO: CHECK shouldn't be string ? @NotNull default ValueMappingResult map(Object value, @NotNull Class targetType) { - return map(value, targetType, Set.of()); + return map(new ValuePatchRequest().setValue(value).setTargetType(targetType)); } - /** - * - * @param value - * @param targetType - * @param inputLanguageCodes - * useful if you input language is not only 'en' for some mappers that - * @return - * @param - */ @NotNull - ValueMappingResult map(Object value, @NotNull Class targetType, Set inputLanguageCodes); + ValueMappingResult map(ValuePatchRequest request); @NotNull Set> getSupportedTypes(); diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValuePatchRequest.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValuePatchRequest.java index 0f7021b2796..041d62ab3b0 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValuePatchRequest.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValuePatchRequest.java @@ -3,6 +3,7 @@ import java.util.List; import java.util.Objects; +import javax.annotation.Nullable; import javax.validation.constraints.NotNull; import de.symeda.sormas.api.Language; @@ -15,8 +16,18 @@ public class ValuePatchRequest { @NotNull private Class targetType; + /** + * Languages translations will be fetched in that order, so can have minor performance impact. + */ + @Nullable private List inputLanguages; + /** + * If true, for enumeration-like targetTypes the default value will be used. + * Mostly "OTHER". + */ + private boolean allowDefaultValues = true; + public Object getValue() { return value; } @@ -44,18 +55,34 @@ public ValuePatchRequest setInputLanguages(List inputLanguages) { return this; } + public boolean isAllowDefaultValues() { + return allowDefaultValues; + } + + public ValuePatchRequest setAllowDefaultValues(boolean allowDefaultValues) { + this.allowDefaultValues = allowDefaultValues; + return this; + } + @Override public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) return false; ValuePatchRequest that = (ValuePatchRequest) o; - return Objects.equals(value, that.value) + return allowDefaultValues == that.allowDefaultValues + && Objects.equals(value, that.value) && Objects.equals(targetType, that.targetType) && Objects.equals(inputLanguages, that.inputLanguages); } @Override public int hashCode() { - return Objects.hash(value, targetType, inputLanguages); + return Objects.hash(value, targetType, inputLanguages, allowDefaultValues); + } + + @Override + public String toString() { + return "ValuePatchRequest{" + "value=" + value + ", targetType=" + targetType + ", inputLanguages=" + inputLanguages + ", allowDefaultValues=" + + allowDefaultValues + '}'; } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java index 432d1005200..dede4658b1a 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java @@ -34,6 +34,7 @@ import de.symeda.sormas.api.patch.mapping.FieldCustomMapper; import de.symeda.sormas.api.patch.mapping.FieldPatchRequest; import de.symeda.sormas.api.patch.mapping.ValueMappingResult; +import de.symeda.sormas.api.patch.mapping.ValuePatchRequest; import de.symeda.sormas.api.person.PersonDto; import de.symeda.sormas.api.utils.Tuple; import de.symeda.sormas.api.utils.fieldvisibility.FieldVisibilityCheckers; @@ -142,7 +143,11 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { // TODO: handle targetType being a list. TO-Check with business: add / replace - ValueMappingResult result = valueMapperRegistry.map(untypedTargetValue, targetType); + ValueMappingResult result = valueMapperRegistry.map( + new ValuePatchRequest().setValue(untypedTargetValue) + .setTargetType(targetType) + .setInputLanguages(request.getInputLanguages()) + .setAllowDefaultValues(request.isAllowDefaultValues())); DataPatchFailureCause dataPatchFailureCause = result.getDataPatchFailureCause(); if (dataPatchFailureCause != null) { diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/ValueMapperRegistry.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/ValueMapperRegistry.java index e2775a63219..6c70c089413 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/ValueMapperRegistry.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/ValueMapperRegistry.java @@ -15,6 +15,7 @@ import de.symeda.sormas.api.patch.DataPatchFailureCause; import de.symeda.sormas.api.patch.mapping.ValueMappingResult; import de.symeda.sormas.api.patch.mapping.ValuePatchMapper; +import de.symeda.sormas.api.patch.mapping.ValuePatchRequest; @ApplicationScoped public class ValueMapperRegistry { @@ -32,18 +33,21 @@ void init() { } @NotNull - public ValueMappingResult map(Object value, @NotNull Class targetType) { + public ValueMappingResult map(ValuePatchRequest request) { + Object value = request.getValue(); if (value == null) { return null; } + Class targetType = request.getTargetType(); + if (targetType.isInstance(value)) { - return ValueMappingResult.withData(targetType.cast(value)); + return ValueMappingResult.withData((T) targetType.cast(value)); } for (ValuePatchMapper mapper : orderedInstances) { if (mapper.supports(targetType)) { - return mapper.map(value, targetType); + return mapper.map(request); } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapper.java index 7c014cb7181..47ed9fab154 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapper.java @@ -19,6 +19,7 @@ import de.symeda.sormas.api.i18n.I18nPropertiesRequest; import de.symeda.sormas.api.patch.mapping.ValueMappingResult; import de.symeda.sormas.api.patch.mapping.ValuePatchMapper; +import de.symeda.sormas.api.patch.mapping.ValuePatchRequest; import de.symeda.sormas.backend.customizableenum.CustomizableEnumFacadeEjb; import de.symeda.sormas.backend.util.StringNormalizer; @@ -36,7 +37,9 @@ public class CustomizableEnumPatchMapper implements ValuePatchMapper { private CustomizableEnumFacadeEjb.CustomizableEnumFacadeEjbLocal customizableEnumFacade; @Override - public ValueMappingResult map(Object value, Class targetType, Set inputLanguageCodes) { + public ValueMappingResult map(ValuePatchRequest request) { + Object value = request.getValue(); + Class targetType = request.getTargetType(); String captionCandidate = value.toString(); if (!CustomizableEnum.class.isAssignableFrom(targetType)) { diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/DatePatchMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/DatePatchMapper.java index 953feecfdfe..2ade1a6a078 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/DatePatchMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/DatePatchMapper.java @@ -13,6 +13,7 @@ import de.symeda.sormas.api.patch.DataPatchFailureCause; import de.symeda.sormas.api.patch.mapping.ValueMappingResult; import de.symeda.sormas.api.patch.mapping.ValuePatchMapper; +import de.symeda.sormas.api.patch.mapping.ValuePatchRequest; @ApplicationScoped public class DatePatchMapper implements ValuePatchMapper { @@ -30,7 +31,8 @@ public Set> getSupportedTypes() { @Override @SuppressWarnings("unchecked") - public ValueMappingResult map(Object value, Class targetType, Set inputLanguageCodes) { + public ValueMappingResult map(ValuePatchRequest request) { + Object value = request.getValue(); try { SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMAT); sdf.setLenient(false); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumPatchMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumPatchMapper.java index 3251bccf3da..ce68d6344ef 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumPatchMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumPatchMapper.java @@ -20,6 +20,7 @@ import de.symeda.sormas.api.patch.mapping.ValueMapperDefault; import de.symeda.sormas.api.patch.mapping.ValueMappingResult; import de.symeda.sormas.api.patch.mapping.ValuePatchMapper; +import de.symeda.sormas.api.patch.mapping.ValuePatchRequest; import de.symeda.sormas.backend.util.StringNormalizer; @ApplicationScoped @@ -43,7 +44,9 @@ public Set> getSupportedTypes() { @SuppressWarnings({ "unchecked", "rawtypes" }) - public ValueMappingResult map(Object value, Class targetType, Set inputLanguageCodes) { + public ValueMappingResult map(ValuePatchRequest request) { + Object value = request.getValue(); + Class targetType = request.getTargetType(); if (!Enum.class.isAssignableFrom(targetType)) { return ValueMappingResult.withCause(DataPatchFailureCause.TECHNICAL); @@ -61,10 +64,10 @@ public ValueMappingResult map(Object value, Class targetType, Set stringStringMap = I18nProperties.buildKeyValueDictionary(request); + Map stringStringMap = I18nProperties.buildKeyValueDictionary(i18nPropertiesRequest); Optional enumMemberOpt = stringStringMap.entrySet() .stream() diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/PrimitivePatchMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/PrimitivePatchMapper.java index b511754dd15..2bd72247fc4 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/PrimitivePatchMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/PrimitivePatchMapper.java @@ -10,6 +10,7 @@ import de.symeda.sormas.api.patch.DataPatchFailureCause; import de.symeda.sormas.api.patch.mapping.ValueMappingResult; import de.symeda.sormas.api.patch.mapping.ValuePatchMapper; +import de.symeda.sormas.api.patch.mapping.ValuePatchRequest; @ApplicationScoped public class PrimitivePatchMapper implements ValuePatchMapper { @@ -20,7 +21,9 @@ public class PrimitivePatchMapper implements ValuePatchMapper { @Override @SuppressWarnings("unchecked") - public ValueMappingResult map(Object value, Class targetType, Set inputLanguageCodes) { + public ValueMappingResult map(ValuePatchRequest request) { + Object value = request.getValue(); + Class targetType = request.getTargetType(); String str = value.toString().trim(); T result = null; diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/ReferenceDtoPatchMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/ReferenceDtoPatchMapper.java index 43e68b781e1..bb211346aa5 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/ReferenceDtoPatchMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/ReferenceDtoPatchMapper.java @@ -21,6 +21,7 @@ import de.symeda.sormas.api.patch.DataPatchFailureCause; import de.symeda.sormas.api.patch.mapping.ValueMappingResult; import de.symeda.sormas.api.patch.mapping.ValuePatchMapper; +import de.symeda.sormas.api.patch.mapping.ValuePatchRequest; import de.symeda.sormas.api.referencedata.ReferenceDataValueInstanceProvider; import de.symeda.sormas.backend.infrastructure.country.CountryFacadeEjb; import de.symeda.sormas.backend.util.StringNormalizer; @@ -39,7 +40,9 @@ public class ReferenceDtoPatchMapper implements ValuePatchMapper { private static final List LANGUAGES = Arrays.asList(Language.EN, Language.FR, Language.DE); @Override - public ValueMappingResult map(Object value, Class targetType, Set inputLanguageCodes) { + public ValueMappingResult map(ValuePatchRequest request) { + Object value = request.getValue(); + Class targetType = request.getTargetType(); String captionCandidate = value.toString(); if (!ReferenceDto.class.isAssignableFrom(targetType)) { diff --git a/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java index 8ebf9472282..61ec90f792f 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java @@ -319,7 +319,7 @@ void patch_customizableEnu_default_enum() { Assertions.assertAll( () -> Assertions.assertTrue(response.getFailures().isEmpty(), "Failure found, but should be empty"), - () -> Assertions.assertEquals(input, person.getOccupationDetails()), + () -> Assertions.assertEquals(expectedOccupationType, person.getOccupationType()), () -> Assertions.assertEquals(patchDictionary, response.getPatchDictionary())); } From c184c3a4aea708caf8e326613b5b754e540fdde9 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Thu, 26 Feb 2026 15:58:18 +0100 Subject: [PATCH 027/134] languages are now taken into account from input --- .../CustomizableEnumPatchMapper.java | 26 +++++++++++-------- .../impl/valuemapper/EnumPatchMapper.java | 12 ++++++--- .../valuemapper/ReferenceDtoPatchMapper.java | 25 +++++++++++------- .../sormas/patch/CaseDataPatcherImplTest.java | 10 ++++--- 4 files changed, 45 insertions(+), 28 deletions(-) diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapper.java index 47ed9fab154..9e5f93c17df 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapper.java @@ -1,6 +1,5 @@ package de.symeda.sormas.backend.patch.mapping.impl.valuemapper; -import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.Optional; @@ -9,6 +8,7 @@ import javax.ejb.EJB; import javax.enterprise.context.ApplicationScoped; +import org.apache.commons.collections4.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,9 +30,6 @@ public class CustomizableEnumPatchMapper implements ValuePatchMapper { public static final String FALLBACK_NAME = "OTHER"; - // TODO: make configurable. - private static final List LANGUAGES = Arrays.asList(Language.EN, Language.FR, Language.DE); - @EJB private CustomizableEnumFacadeEjb.CustomizableEnumFacadeEjbLocal customizableEnumFacade; @@ -54,13 +51,13 @@ public ValueMappingResult map(ValuePatchRequest request) { logger.warn("For now only disease-agnostic enum values are retrieved"); - return ValueMappingResult.withData((T) findCustomizableEnum(captionCandidate, enumType)); + return ValueMappingResult.withData((T) findCustomizableEnum(captionCandidate, enumType, request)); } - private CustomizableEnum findCustomizableEnum(String captionCandidate, CustomizableEnumType type) { + private CustomizableEnum findCustomizableEnum(String captionCandidate, CustomizableEnumType type, ValuePatchRequest request) { String normalizedInput = StringNormalizer.normalize(captionCandidate); - return searchByDefaultLanguage(type, normalizedInput).or(() -> searchByLanguages(normalizedInput, type)) + return searchByDefaultLanguage(type, normalizedInput).or(() -> searchByLanguages(normalizedInput, type, request)) .or(() -> Optional.ofNullable(customizableEnumFacade.getEnumValue(type, null, FALLBACK_NAME))) .orElseThrow( () -> new IllegalStateException(String.format("Could not match value: [%s] to customizableEnumType: [%s]", captionCandidate, type))); @@ -72,13 +69,20 @@ private Optional searchByDefaultLanguage(CustomizableEnumType return enumValues.stream().filter(enumMember -> matchByValueOrCaption(enumMember, normalizedInput)).findFirst(); } - public Optional searchByLanguages(String normalizedInput, CustomizableEnumType type) { - for (Language language : LANGUAGES) { + public Optional searchByLanguages(String normalizedInput, CustomizableEnumType type, ValuePatchRequest request) { + + List inputLanguages = request.getInputLanguages(); + + if (CollectionUtils.isEmpty(inputLanguages)) { + inputLanguages = List.of(I18nProperties.getUserLanguage()); + } + + for (Language language : inputLanguages) { Class targetType = type.getEnumClass(); - I18nPropertiesRequest request = new I18nPropertiesRequest().setTargetType(targetType) + I18nPropertiesRequest i18nPropertiesRequest = new I18nPropertiesRequest().setTargetType(targetType) .setResourceBundleType(I18nPropertiesRequest.ResourceBundleType.ENUMS) .setLanguage(language); - Map resultingMap = I18nProperties.buildKeyValueDictionary(request); + Map resultingMap = I18nProperties.buildKeyValueDictionary(i18nPropertiesRequest); Optional customizableEnumOpt = resultingMap.entrySet() .stream() diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumPatchMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumPatchMapper.java index ce68d6344ef..40586b33a6d 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumPatchMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumPatchMapper.java @@ -1,7 +1,6 @@ package de.symeda.sormas.backend.patch.mapping.impl.valuemapper; import java.lang.reflect.Field; -import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.Optional; @@ -9,6 +8,7 @@ import javax.enterprise.context.ApplicationScoped; +import org.apache.commons.collections4.CollectionUtils; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,8 +33,6 @@ public class EnumPatchMapper implements ValuePatchMapper { private static final String FALLBACK_NAME = "OTHER"; // TODO: make configurable. - private static final List LANGUAGES = Arrays.asList(Language.EN, Language.FR, Language.DE); - @Override public Set> getSupportedTypes() { return SUPPORTED_TYPES; @@ -63,7 +61,13 @@ public ValueMappingResult map(ValuePatchRequest request) { return ValueMappingResult.withData(enumMember); } - for (Language language : LANGUAGES) { + List inputLanguages = request.getInputLanguages(); + + if (CollectionUtils.isEmpty(inputLanguages)) { + inputLanguages = List.of(I18nProperties.getUserLanguage()); + } + + for (Language language : inputLanguages) { I18nPropertiesRequest i18nPropertiesRequest = new I18nPropertiesRequest().setLanguage(language) .setTargetType(enumType) .setResourceBundleType(I18nPropertiesRequest.ResourceBundleType.ENUMS); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/ReferenceDtoPatchMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/ReferenceDtoPatchMapper.java index bb211346aa5..03166fba619 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/ReferenceDtoPatchMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/ReferenceDtoPatchMapper.java @@ -1,6 +1,5 @@ package de.symeda.sormas.backend.patch.mapping.impl.valuemapper; -import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.Optional; @@ -10,6 +9,7 @@ import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; +import org.apache.commons.collections4.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,8 +37,6 @@ public class ReferenceDtoPatchMapper implements ValuePatchMapper { @EJB private CountryFacadeEjb.CountryFacadeEjbLocal countryFacade; - private static final List LANGUAGES = Arrays.asList(Language.EN, Language.FR, Language.DE); - @Override public ValueMappingResult map(ValuePatchRequest request) { Object value = request.getValue(); @@ -51,7 +49,7 @@ public ValueMappingResult map(ValuePatchRequest request) { Class referenceType = targetType.asSubclass(ReferenceDto.class); - return this. findByTranslationKey(value, targetType) + return this. findByTranslationKey(value, targetType, request) .or(() -> (Optional) findByCaptionMatch(captionCandidate, referenceType)) .map(ValueMappingResult::withData) .orElseGet(() -> { @@ -64,7 +62,7 @@ private Optional findByCaptionMatch(String captionCa return referenceDataValueInstanceProvider.getOne(captionCandidate, referenceType); } - private Optional findByTranslationKey(Object value, Class referenceType) { + private Optional findByTranslationKey(Object value, Class referenceType, ValuePatchRequest request) { if (!referenceType.equals(CountryReferenceDto.class)) { return Optional.empty(); @@ -72,11 +70,18 @@ private Optional findByTranslationKey(Object value, Class referenceTyp String normalizedInput = StringNormalizer.normalize(value.toString()); - for (Language language : LANGUAGES) { - I18nPropertiesRequest request = new I18nPropertiesRequest().setResourceBundleType(I18nPropertiesRequest.ResourceBundleType.COUNTRY) - .setTargetType(referenceType) - .setLanguage(language); - Map stringStringMap = I18nProperties.buildKeyValueDictionary(request); + List inputLanguages = request.getInputLanguages(); + + if (CollectionUtils.isEmpty(inputLanguages)) { + inputLanguages = List.of(I18nProperties.getUserLanguage()); + } + + for (Language language : inputLanguages) { + I18nPropertiesRequest i18nPropertiesRequest = + new I18nPropertiesRequest().setResourceBundleType(I18nPropertiesRequest.ResourceBundleType.COUNTRY) + .setTargetType(referenceType) + .setLanguage(language); + Map stringStringMap = I18nProperties.buildKeyValueDictionary(i18nPropertiesRequest); Optional enumMemberOpt = stringStringMap.entrySet() .stream() diff --git a/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java index 61ec90f792f..6d9aaaaeb35 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java @@ -17,6 +17,7 @@ import org.mockito.Mockito; import de.symeda.sormas.api.Disease; +import de.symeda.sormas.api.Language; import de.symeda.sormas.api.caze.CaseDataDto; import de.symeda.sormas.api.customizableenum.CustomizableEnumTranslation; import de.symeda.sormas.api.customizableenum.CustomizableEnumType; @@ -214,7 +215,8 @@ void patch_enum(String femaleValue) { CaseDataPatchRequest request = new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()) .setReplacementStrategy(DataReplacementStrategy.ALWAYS) - .setPatchDictionary(Map.of("Person.sex", femaleValue)); + .setPatchDictionary(Map.of("Person.sex", femaleValue)) + .setInputLanguages(List.of(Language.DE, Language.EN, Language.FR)); // EXECUTE DataPatchResponse response = victim().patch(request); @@ -304,7 +306,8 @@ void patch_customizableEnu_default_enum() { Map patchDictionary = Map.of("Person.occupationType", input); CaseDataPatchRequest request = new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()) .setReplacementStrategy(DataReplacementStrategy.ALWAYS) - .setPatchDictionary(patchDictionary); + .setPatchDictionary(patchDictionary) + .setInputLanguages(List.of(Language.DE, Language.EN, Language.FR));; Mockito.when(MockProducer.getCustomizableEnumFacadeForConverter().getEnumValue(CustomizableEnumType.OCCUPATION_TYPE, null, healthcareWorker)) .thenReturn(expectedOccupationType); @@ -492,7 +495,8 @@ void patch_referenceData_country() { Map patchDictionary = Map.of("Person.birthCountry", " Deutschländ "); CaseDataPatchRequest request = new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()) .setReplacementStrategy(DataReplacementStrategy.ALWAYS) - .setPatchDictionary(patchDictionary); + .setPatchDictionary(patchDictionary) + .setInputLanguages(List.of(Language.DE, Language.EN, Language.FR)); // EXECUTE DataPatchResponse response = victim().patch(request); From 7d8fdd868ede260b1da904a630c8cd7f61ce3b85 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Fri, 27 Feb 2026 08:15:05 +0100 Subject: [PATCH 028/134] minor enhancements: code coverage / javaDoc etc. --- .../api/patch/CaseDataPatchRequest.java | 27 +++-- .../sormas/api/patch/CaseDataPatcher.java | 3 + .../sormas/api/patch/DataPatchResponse.java | 2 +- .../api/patch/mapping/FieldCustomMapper.java | 1 - .../api/patch/mapping/FieldPatchRequest.java | 3 + .../api/patch/mapping/ValueMappingResult.java | 5 + .../api/patch/mapping/ValuePatchMapper.java | 8 +- .../api/patch/mapping/ValuePatchRequest.java | 31 ++--- .../backend/patch/CaseDataPatcherImpl.java | 2 +- .../CustomizableEnumPatchMapper.java | 2 +- .../impl/valuemapper/DatePatchMapper.java | 45 +++++-- .../impl/valuemapper/EnumPatchMapper.java | 3 +- .../valuemapper/PrimitivePatchMapper.java | 111 ++++++++++++++---- .../valuemapper/ReferenceDtoPatchMapper.java | 2 +- .../PersonContactDetailsFieldMapperTest.java | 2 +- .../impl/valuemapper/DateMapperTest.java | 8 -- .../impl/valuemapper/PrimitiveMapperTest.java | 62 ++++++++-- 17 files changed, 231 insertions(+), 86 deletions(-) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/CaseDataPatchRequest.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/CaseDataPatchRequest.java index 9e2c6b2f4d6..8c168ddfc0e 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/CaseDataPatchRequest.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/CaseDataPatchRequest.java @@ -10,6 +10,9 @@ import de.symeda.sormas.api.Language; import de.symeda.sormas.api.info.InfoFacade; +/** + * Specifies how the patch operation must be performed. + */ public class CaseDataPatchRequest { @NotNull @@ -18,6 +21,7 @@ public class CaseDataPatchRequest { @NotNull private DataReplacementStrategy replacementStrategy = DataReplacementStrategy.IF_NOT_ALREADY_PRESENT; + @NotNull private EmptyValueBehavior emptyValueBehavior = EmptyValueBehavior.IGNORE; /** @@ -28,7 +32,8 @@ public class CaseDataPatchRequest { private Map patchDictionary; /** - * Can be used to add some custom descriptions in some fields. + * Origin that wants the patch operation. + * Can be used within {@link de.symeda.sormas.api.patch.mapping.FieldCustomMapper}. */ @Nullable private String origin; @@ -39,7 +44,11 @@ public class CaseDataPatchRequest { @Nullable private List inputLanguages; - private boolean allowDefaultValues = true; + /** + * If true, for enumeration-like targetTypes the default value will be used. + * Mostly "OTHER". + */ + private boolean allowFallbackValues = true; public String getCaseUuid() { return caseUuid; @@ -96,12 +105,12 @@ public CaseDataPatchRequest setInputLanguages(List inputLanguages) { return this; } - public boolean isAllowDefaultValues() { - return allowDefaultValues; + public boolean isAllowFallbackValues() { + return allowFallbackValues; } - public CaseDataPatchRequest setAllowDefaultValues(boolean allowDefaultValues) { - this.allowDefaultValues = allowDefaultValues; + public CaseDataPatchRequest setAllowFallbackValues(boolean allowFallbackValues) { + this.allowFallbackValues = allowFallbackValues; return this; } @@ -110,7 +119,7 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) return false; CaseDataPatchRequest that = (CaseDataPatchRequest) o; - return allowDefaultValues == that.allowDefaultValues + return allowFallbackValues == that.allowFallbackValues && Objects.equals(caseUuid, that.caseUuid) && replacementStrategy == that.replacementStrategy && emptyValueBehavior == that.emptyValueBehavior @@ -121,13 +130,13 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(caseUuid, replacementStrategy, emptyValueBehavior, patchDictionary, origin, inputLanguages, allowDefaultValues); + return Objects.hash(caseUuid, replacementStrategy, emptyValueBehavior, patchDictionary, origin, inputLanguages, allowFallbackValues); } @Override public String toString() { return "CaseDataPatchRequest{" + "caseUuid='" + caseUuid + '\'' + ", replacementStrategy=" + replacementStrategy + ", emptyValueBehavior=" + emptyValueBehavior + ", patchDictionary=" + patchDictionary + ", origin='" + origin + '\'' + ", inputLanguages=" + inputLanguages - + ", allowDefaultValues=" + allowDefaultValues + '}'; + + ", allowDefaultValues=" + allowFallbackValues + '}'; } } diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/CaseDataPatcher.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/CaseDataPatcher.java index f1c5d27d839..067d936f9c6 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/CaseDataPatcher.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/CaseDataPatcher.java @@ -1,5 +1,8 @@ package de.symeda.sormas.api.patch; +/** + * Allows to partially patch data from a case. + */ public interface CaseDataPatcher { /** diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchResponse.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchResponse.java index 8a9368fa492..f7f77ab1a2a 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchResponse.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchResponse.java @@ -6,7 +6,7 @@ import org.apache.commons.collections4.MapUtils; /** - * + * Response to a patch request. */ public class DataPatchResponse { diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldCustomMapper.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldCustomMapper.java index 568f9143e5f..b70f76e48d0 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldCustomMapper.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldCustomMapper.java @@ -16,7 +16,6 @@ public interface FieldCustomMapper { * - Phone number - email * - BirthDate */ - // TODO: missing 'current value' logic: if already exist do nothing. Optional map(FieldPatchRequest request); /** diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldPatchRequest.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldPatchRequest.java index 475ca848478..904c894f9c9 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldPatchRequest.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldPatchRequest.java @@ -7,6 +7,9 @@ import de.symeda.sormas.api.patch.DataReplacementStrategy; +/** + * Patching request for a specific field, target type is known by the {@link FieldCustomMapper}. + */ public final class FieldPatchRequest { @NotNull diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValueMappingResult.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValueMappingResult.java index 31f82903c4d..84318d1a2cc 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValueMappingResult.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValueMappingResult.java @@ -4,6 +4,11 @@ import de.symeda.sormas.api.patch.DataPatchFailureCause; +/** + * Result of attempting to patch a value into some target. + * + * @param + */ public class ValueMappingResult { private T data; diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValuePatchMapper.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValuePatchMapper.java index 75c2259daeb..d34e53526bb 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValuePatchMapper.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValuePatchMapper.java @@ -5,6 +5,10 @@ import javax.validation.constraints.NotNull; // TODO: check if "in-value-type" must be checked: add self check ? + +/** + * Contract to specify how a type must be mapped into a value, NOT field specific. + */ public interface ValuePatchMapper extends Comparable { int HIGH_PRECEDENCE = Integer.MIN_VALUE; @@ -29,11 +33,11 @@ public interface ValuePatchMapper extends Comparable { */ @NotNull default ValueMappingResult map(Object value, @NotNull Class targetType) { - return map(new ValuePatchRequest().setValue(value).setTargetType(targetType)); + return this.map(new ValuePatchRequest().setValue(value).setTargetType(targetType)); } @NotNull - ValueMappingResult map(ValuePatchRequest request); + ValueMappingResult map(ValuePatchRequest request); @NotNull Set> getSupportedTypes(); diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValuePatchRequest.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValuePatchRequest.java index 041d62ab3b0..3491ceea57c 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValuePatchRequest.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValuePatchRequest.java @@ -8,13 +8,16 @@ import de.symeda.sormas.api.Language; -public class ValuePatchRequest { +/** + * Specifies how to patch a single value into a targetType. + */ +public class ValuePatchRequest { @NotNull private Object value; @NotNull - private Class targetType; + private Class targetType; /** * Languages translations will be fetched in that order, so can have minor performance impact. @@ -26,13 +29,13 @@ public class ValuePatchRequest { * If true, for enumeration-like targetTypes the default value will be used. * Mostly "OTHER". */ - private boolean allowDefaultValues = true; + private boolean allowFallbackValues = true; public Object getValue() { return value; } - public ValuePatchRequest setValue(Object value) { + public ValuePatchRequest setValue(Object value) { this.value = value; return this; } @@ -41,7 +44,7 @@ public Class getTargetType() { return targetType; } - public ValuePatchRequest setTargetType(Class targetType) { + public ValuePatchRequest setTargetType(Class targetType) { this.targetType = targetType; return this; } @@ -50,17 +53,17 @@ public List getInputLanguages() { return inputLanguages; } - public ValuePatchRequest setInputLanguages(List inputLanguages) { + public ValuePatchRequest setInputLanguages(List inputLanguages) { this.inputLanguages = inputLanguages; return this; } - public boolean isAllowDefaultValues() { - return allowDefaultValues; + public boolean isAllowFallbackValues() { + return allowFallbackValues; } - public ValuePatchRequest setAllowDefaultValues(boolean allowDefaultValues) { - this.allowDefaultValues = allowDefaultValues; + public ValuePatchRequest setAllowFallbackValues(boolean allowDefaultValues) { + this.allowFallbackValues = allowDefaultValues; return this; } @@ -68,8 +71,8 @@ public ValuePatchRequest setAllowDefaultValues(boolean allowDefaultValues) { public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) return false; - ValuePatchRequest that = (ValuePatchRequest) o; - return allowDefaultValues == that.allowDefaultValues + ValuePatchRequest that = (ValuePatchRequest) o; + return allowFallbackValues == that.allowFallbackValues && Objects.equals(value, that.value) && Objects.equals(targetType, that.targetType) && Objects.equals(inputLanguages, that.inputLanguages); @@ -77,12 +80,12 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(value, targetType, inputLanguages, allowDefaultValues); + return Objects.hash(value, targetType, inputLanguages, allowFallbackValues); } @Override public String toString() { return "ValuePatchRequest{" + "value=" + value + ", targetType=" + targetType + ", inputLanguages=" + inputLanguages + ", allowDefaultValues=" - + allowDefaultValues + '}'; + + allowFallbackValues + '}'; } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java index dede4658b1a..caf2983e517 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java @@ -147,7 +147,7 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { new ValuePatchRequest().setValue(untypedTargetValue) .setTargetType(targetType) .setInputLanguages(request.getInputLanguages()) - .setAllowDefaultValues(request.isAllowDefaultValues())); + .setAllowFallbackValues(request.isAllowFallbackValues())); DataPatchFailureCause dataPatchFailureCause = result.getDataPatchFailureCause(); if (dataPatchFailureCause != null) { diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapper.java index 9e5f93c17df..fb2bbbe3408 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapper.java @@ -34,7 +34,7 @@ public class CustomizableEnumPatchMapper implements ValuePatchMapper { private CustomizableEnumFacadeEjb.CustomizableEnumFacadeEjbLocal customizableEnumFacade; @Override - public ValueMappingResult map(ValuePatchRequest request) { + public ValueMappingResult map(ValuePatchRequest request) { Object value = request.getValue(); Class targetType = request.getTargetType(); String captionCandidate = value.toString(); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/DatePatchMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/DatePatchMapper.java index 2ade1a6a078..3650b435f60 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/DatePatchMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/DatePatchMapper.java @@ -2,7 +2,9 @@ import java.text.ParseException; import java.text.SimpleDateFormat; +import java.util.Arrays; import java.util.Date; +import java.util.List; import java.util.Set; import javax.enterprise.context.ApplicationScoped; @@ -18,11 +20,20 @@ @ApplicationScoped public class DatePatchMapper implements ValuePatchMapper { - private final static Logger logger = LoggerFactory.getLogger(DatePatchMapper.class); + private static final Logger logger = LoggerFactory.getLogger(DatePatchMapper.class); private static final Set> SUPPORTED_TYPES = Set.of(Date.class); - private static final String DATE_FORMAT = "yyyy-MM-dd"; + private static final List DATE_FORMATS = Arrays.asList( + "yyyy-MM-dd", // 2025-12-17 + "yyyy/MM/dd", // 2025/12/17 + "yyyy-MM-dd'T'HH:mm:ssZ", // 2025-12-17T14:30:00+0100 + "yyyy-MM-dd'T'HH:mm:ssXXX", // 2025-12-17T14:30:00+01:00 + "yyyy-MM-dd'T'HH:mm:ss", // 2025-12-17T14:30:00 + "yyyy-MM-dd'T'HH:mm", // 2025-12-17T14:30 + "yyyy/MM/dd'T'HH:mm:ss", // 2025/12/17T14:30:00 + "yyyy/MM/dd'T'HH:mm:ssXXX" // 2025/12/17T14:30:00+01:00 + ); @Override public Set> getSupportedTypes() { @@ -31,17 +42,27 @@ public Set> getSupportedTypes() { @Override @SuppressWarnings("unchecked") - public ValueMappingResult map(ValuePatchRequest request) { + public ValueMappingResult map(ValuePatchRequest request) { Object value = request.getValue(); - try { - SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMAT); - sdf.setLenient(false); - return ValueMappingResult.withData((T) sdf.parse(value.toString())); - } catch (ParseException e) { - logger.info("DateMapper: cannot parse date value [{}], expected format: [{}]", value, DATE_FORMAT, e); - - return ValueMappingResult.withCause(DataPatchFailureCause.INVALID_VALUE_TYPE); + if (value == null) { + return ValueMappingResult.withData(null); } - } + String str = value.toString().trim(); + + for (String format : DATE_FORMATS) { + try { + SimpleDateFormat sdf = new SimpleDateFormat(format); + sdf.setLenient(false); + Date parsed = sdf.parse(str); + return ValueMappingResult.withData((T) parsed); + } catch (ParseException e) { + // try next format + } + } + + logger.info("DatePatchMapper: cannot parse date value [{}], expected one of formats: [{}]", str, DATE_FORMATS); + + return ValueMappingResult.withCause(DataPatchFailureCause.INVALID_VALUE_TYPE); + } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumPatchMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumPatchMapper.java index 40586b33a6d..f12201f0678 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumPatchMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumPatchMapper.java @@ -32,7 +32,6 @@ public class EnumPatchMapper implements ValuePatchMapper { private static final String FALLBACK_NAME = "OTHER"; - // TODO: make configurable. @Override public Set> getSupportedTypes() { return SUPPORTED_TYPES; @@ -42,7 +41,7 @@ public Set> getSupportedTypes() { @SuppressWarnings({ "unchecked", "rawtypes" }) - public ValueMappingResult map(ValuePatchRequest request) { + public ValueMappingResult map(ValuePatchRequest request) { Object value = request.getValue(); Class targetType = request.getTargetType(); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/PrimitivePatchMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/PrimitivePatchMapper.java index 2bd72247fc4..6e6f2073bc2 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/PrimitivePatchMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/PrimitivePatchMapper.java @@ -1,51 +1,103 @@ package de.symeda.sormas.backend.patch.mapping.impl.valuemapper; +import java.math.BigDecimal; +import java.util.List; +import java.util.Map; import java.util.Set; +import java.util.function.Function; import javax.enterprise.context.ApplicationScoped; +import org.apache.commons.collections4.CollectionUtils; +import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import de.symeda.sormas.api.Language; +import de.symeda.sormas.api.i18n.I18nProperties; import de.symeda.sormas.api.patch.DataPatchFailureCause; import de.symeda.sormas.api.patch.mapping.ValueMappingResult; import de.symeda.sormas.api.patch.mapping.ValuePatchMapper; import de.symeda.sormas.api.patch.mapping.ValuePatchRequest; +import de.symeda.sormas.backend.util.StringNormalizer; @ApplicationScoped public class PrimitivePatchMapper implements ValuePatchMapper { private final static Logger logger = LoggerFactory.getLogger(PrimitivePatchMapper.class); - private static final Set> SUPPORTED_TYPES = Set.of(String.class, Integer.class, Double.class, Float.class, Boolean.class, boolean.class); + private static final Set> SUPPORTED_TYPES = Set.of( + String.class, + int.class, + Integer.class, + long.class, + Long.class, + BigDecimal.class, + double.class, + Double.class, + float.class, + Float.class, + Boolean.class, + boolean.class); + + private final Map, Function> NUMBER_TYPES_DICTIONARY = Map.of( + String.class, + Function.identity(), + + Integer.class, + Integer::valueOf, + + int.class, + Integer::parseInt, + + Long.class, + Long::valueOf, + + long.class, + Long::parseLong, + + BigDecimal.class, + BigDecimal::new, + + double.class, + Double::parseDouble, + + Double.class, + Double::valueOf, + + float.class, + Float::parseFloat, + + Float.class, + Float::valueOf); + + public static final String YES_I18N_KEY = "yes"; @Override @SuppressWarnings("unchecked") - public ValueMappingResult map(ValuePatchRequest request) { + public ValueMappingResult map(ValuePatchRequest request) { Object value = request.getValue(); Class targetType = request.getTargetType(); String str = value.toString().trim(); T result = null; - try { - if (targetType == String.class) { - result = (T) str; - } - if (targetType == Integer.class) { - result = (T) Integer.valueOf(str); - } - if (targetType == Double.class) { - result = (T) Double.valueOf(str); - } - if (targetType == Float.class) { - result = (T) Float.valueOf(str); - } - if (targetType == Boolean.class || targetType == boolean.class) { - result = (T) Boolean.valueOf(str); + + if (targetType.equals(String.class)) { + result = (T) str; + } + + Function numberTypeFct = NUMBER_TYPES_DICTIONARY.get(targetType); + if (numberTypeFct != null) { + try { + result = (T) numberTypeFct.apply(str); + } catch (NumberFormatException e) { + logger.info("Cannot parse value [{}], expected format: [{}]", value, str, e); + return ValueMappingResult.withCause(DataPatchFailureCause.INVALID_VALUE_TYPE); } - } catch (NumberFormatException e) { - logger.info("Cannot parse value [{}], expected format: [{}]", value, str, e); - return ValueMappingResult.withCause(DataPatchFailureCause.INVALID_VALUE_TYPE); + } + + if (targetType == Boolean.class || targetType == boolean.class) { + result = parseBoolean(request, str); } if (result != null) { @@ -55,6 +107,25 @@ public ValueMappingResult map(ValuePatchRequest request) { throw new IllegalArgumentException("PrimitiveWrapperMapper: unsupported type " + targetType.getName()); } + private static @NotNull T parseBoolean(ValuePatchRequest request, String str) { + T result; + List inputLanguages = request.getInputLanguages(); + + if (CollectionUtils.isEmpty(inputLanguages)) { + inputLanguages = List.of(I18nProperties.getUserLanguage()); + } + + String normalizedStr = StringNormalizer.normalize(str); + + result = (T) inputLanguages.stream() + .map(language -> I18nProperties.getString(language, YES_I18N_KEY)) + .filter(translation -> StringNormalizer.normalize(translation).equalsIgnoreCase(normalizedStr)) + .findAny() + .map(ignored -> true) + .orElseGet(() -> Boolean.valueOf(str)); + return result; + } + @Override public Set> getSupportedTypes() { return SUPPORTED_TYPES; diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/ReferenceDtoPatchMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/ReferenceDtoPatchMapper.java index 03166fba619..52dd7bcbf2a 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/ReferenceDtoPatchMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/ReferenceDtoPatchMapper.java @@ -38,7 +38,7 @@ public class ReferenceDtoPatchMapper implements ValuePatchMapper { private CountryFacadeEjb.CountryFacadeEjbLocal countryFacade; @Override - public ValueMappingResult map(ValuePatchRequest request) { + public ValueMappingResult map(ValuePatchRequest request) { Object value = request.getValue(); Class targetType = request.getTargetType(); String captionCandidate = value.toString(); diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapperTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapperTest.java index a2980239260..85e575c8797 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapperTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapperTest.java @@ -30,7 +30,7 @@ class PersonContactDetailsFieldMapperTest extends AbstractUnitTest { @Test void supportedFields_containsPhoneNumberTypeAndDetails() { // PREPARE - Set expected = Set.of("Person.PersonContactDetail.phoneNumberType", "Person.PersonContactDetail.details"); + Set expected = Set.of("Person.personContactDetails.details, Person.personContactDetails.phoneNumberType"); // EXECUTE Set actual = victim.supportedFields(); diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/DateMapperTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/DateMapperTest.java index 2b3e57753a5..5a231232335 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/DateMapperTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/DateMapperTest.java @@ -17,8 +17,6 @@ class DateMapperTest extends AbstractUnitTest { @InjectMocks private DatePatchMapper victim; - // getSupportedTypes - @Test void getSupportedTypes_containsDateClass() { // PREPARE @@ -31,8 +29,6 @@ void getSupportedTypes_containsDateClass() { assertEquals(expected, actual); } - // map - happy paths - @Test void map_validDate() throws Exception { // PREPARE @@ -72,8 +68,6 @@ void map_lastDayOfYear() throws Exception { assertEquals(expected, actual); } - // map - edge cases - @Test void map_valueAsNonStringObject_usesToString() throws Exception { // PREPARE @@ -86,8 +80,6 @@ void map_valueAsNonStringObject_usesToString() throws Exception { assertEquals(expected, actual); } - // map - error cases - @Test void map_invalidFormat_throwsIllegalArgumentException() { // EXECUTE & CHECK diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/PrimitiveMapperTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/PrimitiveMapperTest.java index fd44ec4c4c1..f3679d843b6 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/PrimitiveMapperTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/PrimitiveMapperTest.java @@ -2,14 +2,21 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; +import java.math.BigDecimal; +import java.util.List; import java.util.Set; import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; import org.mockito.InjectMocks; +import de.symeda.sormas.api.Language; +import de.symeda.sormas.api.patch.DataPatchFailureCause; +import de.symeda.sormas.api.patch.mapping.ValueMappingResult; +import de.symeda.sormas.api.patch.mapping.ValuePatchRequest; import de.symeda.sormas.backend.AbstractUnitTest; class PrimitiveMapperTest extends AbstractUnitTest { @@ -40,7 +47,19 @@ void map_Integer() { @Test void getSupportedTypes_containsAllExpectedTypes() { // PREPARE - Set> expected = Set.of(String.class, Integer.class, Double.class, Float.class, Boolean.class, boolean.class); + Set> expected = Set.of( + String.class, + int.class, + Integer.class, + long.class, + Long.class, + BigDecimal.class, + double.class, + Double.class, + float.class, + Float.class, + Boolean.class, + boolean.class); // EXECUTE Set> actual = victim.getSupportedTypes(); @@ -143,38 +162,55 @@ void map_boolean_invalidString_returnsFalse() { assertFalse(victim.map("notABoolean", Boolean.class).getData()); } - // map - error cases + @ParameterizedTest + @ValueSource(strings = { + " yes ", + " JA", + "oUi " }) + void map_boolean_translation_true(String trueString) { + // EXECUTE & CHECK + assertTrue( + victim + .map( + new ValuePatchRequest().setInputLanguages(List.of(Language.DE, Language.FR, Language.EN)) + .setTargetType(Boolean.class) + .setValue(trueString)) + .getData()); + } @Test - void map_unsupportedType_throwsIllegalArgumentException() { - // PREPARE - String input = "value"; - + void map_boolean_translation_true_but_other_language() { // EXECUTE & CHECK - assertThrows(IllegalArgumentException.class, () -> victim.map(input, Long.class)); + assertFalse( + victim.map(new ValuePatchRequest().setInputLanguages(List.of(Language.DE)).setTargetType(Boolean.class).setValue("OUI")) + .getData()); } @Test - void map_nullValue_throwsNullPointerException() { + void map_unsupportedType_throwsIllegalArgumentException() { + // PREPARE + String input = "value"; + // EXECUTE & CHECK - assertThrows(NullPointerException.class, () -> victim.map(null, String.class)); + assertEquals(ValueMappingResult.withCause(DataPatchFailureCause.INVALID_VALUE_TYPE), victim.map(input, Long.class)); } @Test void map_invalidIntegerFormat_throwsNumberFormatException() { // EXECUTE & CHECK - assertThrows(NumberFormatException.class, () -> victim.map("notAnInt", Integer.class)); + assertEquals(ValueMappingResult.withCause(DataPatchFailureCause.INVALID_VALUE_TYPE), victim.map("notAnInt", Integer.class)); } @Test void map_invalidDoubleFormat_throwsNumberFormatException() { // EXECUTE & CHECK - assertThrows(NumberFormatException.class, () -> victim.map("notADouble", Double.class)); + assertEquals(ValueMappingResult.withCause(DataPatchFailureCause.INVALID_VALUE_TYPE), victim.map("notADouble", Double.class)); + } @Test void map_invalidFloatFormat_throwsNumberFormatException() { // EXECUTE & CHECK - assertThrows(NumberFormatException.class, () -> victim.map("notAFloat", Float.class)); + assertEquals(ValueMappingResult.withCause(DataPatchFailureCause.INVALID_VALUE_TYPE), victim.map("notAFloat", Float.class)); } } From c4f5940054232f87b436f4dc5dd9478c54cd1ffe Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Fri, 27 Feb 2026 09:19:59 +0100 Subject: [PATCH 029/134] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20reduced=20size=20o?= =?UTF-8?q?f=20methods?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/patch/CaseDataPatchRequest.java | 31 +- .../sormas/api/patch/DataPatchResponse.java | 52 +++- .../backend/patch/CaseDataPatcherImpl.java | 279 ++++++++++-------- .../sormas/backend/patch/LazySupplier.java | 35 +++ .../backend/patch/PropertyAccessor.java | 5 +- .../sormas/patch/CaseDataPatcherImplTest.java | 85 ++---- 6 files changed, 280 insertions(+), 207 deletions(-) create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/backend/patch/LazySupplier.java diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/CaseDataPatchRequest.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/CaseDataPatchRequest.java index 8c168ddfc0e..764b64153e5 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/CaseDataPatchRequest.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/CaseDataPatchRequest.java @@ -18,6 +18,8 @@ public class CaseDataPatchRequest { @NotNull private String caseUuid; + private boolean patchedInCaseOfFailures = false; + @NotNull private DataReplacementStrategy replacementStrategy = DataReplacementStrategy.IF_NOT_ALREADY_PRESENT; @@ -114,12 +116,22 @@ public CaseDataPatchRequest setAllowFallbackValues(boolean allowFallbackValues) return this; } + public boolean isPatchedInCaseOfFailures() { + return patchedInCaseOfFailures; + } + + public CaseDataPatchRequest setPatchedInCaseOfFailures(boolean patchedInCaseOfFailures) { + this.patchedInCaseOfFailures = patchedInCaseOfFailures; + return this; + } + @Override public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) return false; CaseDataPatchRequest that = (CaseDataPatchRequest) o; - return allowFallbackValues == that.allowFallbackValues + return patchedInCaseOfFailures == that.patchedInCaseOfFailures + && allowFallbackValues == that.allowFallbackValues && Objects.equals(caseUuid, that.caseUuid) && replacementStrategy == that.replacementStrategy && emptyValueBehavior == that.emptyValueBehavior @@ -130,13 +142,14 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(caseUuid, replacementStrategy, emptyValueBehavior, patchDictionary, origin, inputLanguages, allowFallbackValues); - } - - @Override - public String toString() { - return "CaseDataPatchRequest{" + "caseUuid='" + caseUuid + '\'' + ", replacementStrategy=" + replacementStrategy + ", emptyValueBehavior=" - + emptyValueBehavior + ", patchDictionary=" + patchDictionary + ", origin='" + origin + '\'' + ", inputLanguages=" + inputLanguages - + ", allowDefaultValues=" + allowFallbackValues + '}'; + return Objects.hash( + caseUuid, + patchedInCaseOfFailures, + replacementStrategy, + emptyValueBehavior, + patchDictionary, + origin, + inputLanguages, + allowFallbackValues); } } diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchResponse.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchResponse.java index f7f77ab1a2a..5ef88ed3594 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchResponse.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchResponse.java @@ -2,6 +2,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.Objects; import org.apache.commons.collections4.MapUtils; @@ -10,23 +11,31 @@ */ public class DataPatchResponse { + /** + * True if the dictionary was applied to the specified fields. + *

+ * Will be false in case of {@link CaseDataPatchRequest#isPatchedInCaseOfFailures()} is false and response contains + * {@link DataPatchResponse#failures} + */ + private boolean applied = true; + /** * Actual patched values for the specified keys. * Will NOT contain fields that were NOT patched (even though passed in original patchDictionary). */ - private Map patchDictionary = new HashMap<>(); + private Map validPatchDictionary = new HashMap<>(); /** * Provides the reason for the failure. */ private Map failures = new HashMap<>(); - public Map getPatchDictionary() { - return patchDictionary; + public Map getValidPatchDictionary() { + return validPatchDictionary; } - public DataPatchResponse setPatchDictionary(Map patchDictionary) { - this.patchDictionary = patchDictionary; + public DataPatchResponse setValidPatchDictionary(Map validPatchDictionary) { + this.validPatchDictionary = validPatchDictionary; return this; } @@ -39,26 +48,39 @@ public DataPatchResponse setFailures(Map failures) { return this; } - /** - * True means data was patched on SORMAS entities, false means nothing was changed. - * - * @return boolean to indicate if data was patched: operation was a success. - */ - public boolean patched() { - return !failed(); + public boolean isApplied() { + return applied; + } + + public DataPatchResponse setApplied(boolean applied) { + this.applied = applied; + return this; } /** * Patch are atomic operations: either fully or not at all. - * + * * @return true if operation was NOT applied, else false. */ - public boolean failed() { + public boolean hasFailures() { return MapUtils.isNotEmpty(failures); } + @Override + public boolean equals(Object o) { + if (o == null || getClass() != o.getClass()) + return false; + DataPatchResponse that = (DataPatchResponse) o; + return applied == that.applied && Objects.equals(validPatchDictionary, that.validPatchDictionary) && Objects.equals(failures, that.failures); + } + + @Override + public int hashCode() { + return Objects.hash(applied, validPatchDictionary, failures); + } + @Override public String toString() { - return "DataPatchResponse{" + "patchDictionary=" + patchDictionary + ", failures=" + failures + '}'; + return "DataPatchResponse{" + "applied=" + applied + ", validPatchDictionary=" + validPatchDictionary + ", failures=" + failures + '}'; } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java index caf2983e517..c5466c92e01 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; +import java.util.function.Function; import java.util.function.Predicate; import java.util.function.Supplier; import java.util.stream.Collectors; @@ -20,8 +21,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Suppliers; - import de.symeda.sormas.api.Disease; import de.symeda.sormas.api.caze.CaseDataDto; import de.symeda.sormas.api.patch.CaseDataPatchRequest; @@ -52,6 +51,7 @@ public class CaseDataPatcherImpl implements CaseDataPatcher { public static final String PERSON_FIELD_NAME_PREFIX = "Person."; + private final static Logger logger = LoggerFactory.getLogger(CaseDataPatcherImpl.class); @Inject @@ -75,159 +75,206 @@ public class CaseDataPatcherImpl implements CaseDataPatcher { @EJB private ConfigFacadeEjb.ConfigFacadeEjbLocal configFacade; + public CaseDataPatcherImpl() { + } + + public CaseDataPatcherImpl( + ValueMapperRegistry valueMapperRegistry, + FieldCustomMapperRegistry fieldCustomMapperRegistry, + PatchFieldHelper patchFieldHelper, + CaseFacadeEjb.CaseFacadeEjbLocal caseFacade, + PersonFacadeEjb.PersonFacadeEjbLocal personFacade, + FeatureConfigurationFacadeEjb.FeatureConfigurationFacadeEjbLocal featureConfigurationFacade, + ConfigFacadeEjb.ConfigFacadeEjbLocal configFacade) { + this.valueMapperRegistry = valueMapperRegistry; + this.fieldCustomMapperRegistry = fieldCustomMapperRegistry; + this.patchFieldHelper = patchFieldHelper; + this.caseFacade = caseFacade; + this.personFacade = personFacade; + this.featureConfigurationFacade = featureConfigurationFacade; + this.configFacade = configFacade; + } + @Override public DataPatchResponse patch(CaseDataPatchRequest request) { - logger.info("patch: [{}]", request); + logger.debug("patch: [{}]", request); CaseDataDto caseData = getCaseDataDto(request); Disease disease = caseData.getDisease(); - Supplier person = Suppliers.memoize(() -> getPersonDto(caseData)); - - Map, Object> actualDictionary = computeActualDictionary(request); + LazySupplier personSupplier = LazySupplier.of(() -> getPersonDto(caseData)); - // TODO: refactor this to create smaller units - // TODO: duplicate field patching mechanism - List results = actualDictionary.entrySet().stream().map(entry -> { + List results = computeActualDictionary(request).entrySet().stream().map(entry -> { Tuple tuple = entry.getKey(); String fullFieldName = tuple.getFirst(); SinglePatchResult singlePatchResult = new SinglePatchResult().setFieldName(fullFieldName); - Object target = findAppropriateTarget(fullFieldName, caseData, person); + Supplier target = () -> findAppropriateTarget(fullFieldName, caseData, personSupplier); try { - DataPatchFailureCause fieldFailureCause = tuple.getSecond(); - if (fieldFailureCause != null) { - return singlePatchResult - .setFailure(new DataPatchFailure().setDataPatchFailureCause(fieldFailureCause).setProvidedFieldValue(entry.getValue())); - } - Optional mapper = fieldCustomMapperRegistry.getMapper(fullFieldName, disease); + return invalidFieldResult(entry, tuple).or(() -> fieldMappingResult(entry, disease, request, target)) + .orElseGet(() -> valueMappingResult(entry, disease, request, target)); + } catch (RuntimeException e) { + logger.error("Failure during patch operation", e); + return singlePatchResult + .setFailure(new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.TECHNICAL).setDescription(e.getMessage())); + } - Object untypedTargetValue = entry.getValue(); - if (mapper.isPresent()) { - Optional dataPatchFailureOpt = mapper.orElseThrow() - .map( - new FieldPatchRequest().setFieldName(fullFieldName) - .setReplacementType(request.getReplacementStrategy()) - .setOrigin(request.getOrigin()) - .setTarget(target) - .setValue(untypedTargetValue)); + }).collect(Collectors.toList()); - if (dataPatchFailureOpt.isPresent()) { - return singlePatchResult.setFailure(dataPatchFailureOpt.get()); - } + DataPatchResponse response = new DataPatchResponse().setApplied(false) + .setFailures(buildDictionaryFor(results, SinglePatchResult::getFailure)) + .setValidPatchDictionary(buildDictionaryFor(results, SinglePatchResult::getValue)); + if (!request.isPatchedInCaseOfFailures() && response.hasFailures()) { + logger.info( + "No patch was applied as contained failures AND request doesn't allow patch in case of failures: request: [{}], response: [{}]", + request, + response); + return response; + } - // TODO: taint the DTO to mark it as dirty - return singlePatchResult.setValue(untypedTargetValue); - } + if (logger.isDebugEnabled()) { + logger.debug("CaseData: \n{}", ObjectMapperProvider.writeValueAsStringFailSafe(caseData)); + } + caseFacade.save(caseData); - String relativeFieldName = fullFieldName.substring(fullFieldName.indexOf('.') + 1); - Optional, Boolean>> nestedPropertyType = - PropertyAccessor.getNestedPropertyType(target, relativeFieldName, getFieldVisibilityCheckers(disease)); + if (logger.isDebugEnabled()) { + logger.debug("Person: \n{}", ObjectMapperProvider.writeValueAsStringFailSafe(personSupplier.get())); + } - if (nestedPropertyType.isEmpty()) { - logger.info("Missing field: [{}] on target: [{}]", relativeFieldName, target); - return singlePatchResult.setFailure(new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.FIELD_DOES_NOT_EXIST)); - } - Tuple, Boolean> classSetTuple = nestedPropertyType.orElseThrow(); - Class targetType = classSetTuple.getFirst(); + if (personSupplier.isLoaded()) { + logger.info("Person was loaded, therefore will be updated"); + personFacade.save(personSupplier.get()); + } - if (!Boolean.TRUE.equals(classSetTuple.getSecond())) { - logger.info("Field: [{}] on object [{}] cannot be patched for disease: [{}]", relativeFieldName, target, disease); - return singlePatchResult.setFailure( - new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.UNSUPPORTED_FIELD_FOR_DISEASE_OR_COUNTRY_OR_FEATURE) - .setProvidedFieldValue(untypedTargetValue)); - } + logger.debug("dataPatchResponse: [{}]", response); - // TODO: handle targetType being a list. TO-Check with business: add / replace + return response.setApplied(true); + } - ValueMappingResult result = valueMapperRegistry.map( - new ValuePatchRequest().setValue(untypedTargetValue) - .setTargetType(targetType) - .setInputLanguages(request.getInputLanguages()) - .setAllowFallbackValues(request.isAllowFallbackValues())); + private @NotNull Map buildDictionaryFor(List results, Function fct) { + return results.stream() + .filter(singlePatchResult -> fct.apply(singlePatchResult) != null) + .collect(Collectors.toMap(SinglePatchResult::getFieldName, fct)); + } - DataPatchFailureCause dataPatchFailureCause = result.getDataPatchFailureCause(); - if (dataPatchFailureCause != null) { - return singlePatchResult - .setFailure(new DataPatchFailure().setDataPatchFailureCause(dataPatchFailureCause).setProvidedFieldValue(untypedTargetValue)); - } + private @NotNull SinglePatchResult valueMappingResult( + Map.Entry, Object> entry, + Disease disease, + CaseDataPatchRequest request, + Supplier targetOpt) { - Object typedValue = result.getData(); + Tuple tuple = entry.getKey(); + String fullFieldName = tuple.getFirst(); - if (request.getReplacementStrategy() == DataReplacementStrategy.IF_NOT_ALREADY_PRESENT) { - Optional nestedPropertyValue = PropertyAccessor.getNestedProperty(target, relativeFieldName); + SinglePatchResult singlePatchResult = new SinglePatchResult().setFieldName(fullFieldName); - if (nestedPropertyValue.isPresent()) { - Object currentValue = nestedPropertyValue.orElseThrow(); + Object target = targetOpt.get(); + String relativeFieldName = fullFieldName.substring(fullFieldName.indexOf('.') + 1); + Optional, Boolean>> nestedPropertyType = + PropertyAccessor.getNestedPropertyType(target, relativeFieldName, getFieldVisibilityCheckers(disease)); - if (!currentValue.equals(typedValue)) { - return singlePatchResult.setFailure( - new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.FORBIDDEN_VALUE_OVERRIDE) - .setExistingFieldValue(currentValue) - .setProvidedFieldValue(untypedTargetValue)); - } - } - } + if (nestedPropertyType.isEmpty()) { + logger.info("Missing field: [{}] on target: [{}]", relativeFieldName, target); + return singlePatchResult.setFailure(new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.FIELD_DOES_NOT_EXIST)); + } + Tuple, Boolean> classSetTuple = nestedPropertyType.orElseThrow(); + Class targetType = classSetTuple.getFirst(); + + Object untypedTargetValue = entry.getValue(); + + if (!Boolean.TRUE.equals(classSetTuple.getSecond())) { + logger.info("Field: [{}] on object [{}] cannot be patched for disease: [{}]", relativeFieldName, target, disease); + return singlePatchResult.setFailure( + new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.UNSUPPORTED_FIELD_FOR_DISEASE_OR_COUNTRY_OR_FEATURE) + .setProvidedFieldValue(untypedTargetValue)); + } + + // TODO: handle targetType being a list. TO-Check with business: add / replace + + ValueMappingResult result = valueMapperRegistry.map( + new ValuePatchRequest().setValue(untypedTargetValue) + .setTargetType(targetType) + .setInputLanguages(request.getInputLanguages()) + .setAllowFallbackValues(request.isAllowFallbackValues())); + + DataPatchFailureCause dataPatchFailureCause = result.getDataPatchFailureCause(); + if (dataPatchFailureCause != null) { + return singlePatchResult + .setFailure(new DataPatchFailure().setDataPatchFailureCause(dataPatchFailureCause).setProvidedFieldValue(untypedTargetValue)); + } - // TODO: taint the DTO to mark it as dirty - Optional exception = PropertyAccessor.setNestedProperty(target, relativeFieldName, typedValue); - if (exception.isPresent()) { + Object typedValue = result.getData(); + + if (request.getReplacementStrategy() == DataReplacementStrategy.IF_NOT_ALREADY_PRESENT) { + Optional nestedPropertyValue = PropertyAccessor.getNestedProperty(target, relativeFieldName); + + if (nestedPropertyValue.isPresent()) { + Object currentValue = nestedPropertyValue.orElseThrow(); + + if (!currentValue.equals(typedValue)) { return singlePatchResult.setFailure( - new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.TECHNICAL) - .setDescription(exception.orElseThrow().getMessage())); - } else { - return singlePatchResult.setValue(untypedTargetValue); + new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.FORBIDDEN_VALUE_OVERRIDE) + .setExistingFieldValue(currentValue) + .setProvidedFieldValue(untypedTargetValue)); } - } catch (RuntimeException e) { - logger.error("Failure during patch operation", e); - return singlePatchResult - .setFailure(new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.TECHNICAL).setDescription(e.getMessage())); } + } - }).collect(Collectors.toList()); + Optional exception = PropertyAccessor.setNestedProperty(target, relativeFieldName, typedValue); + if (exception.isPresent()) { + return singlePatchResult.setFailure( + new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.TECHNICAL) + .setDescription(exception.orElseThrow().getMessage())); + } else { + return singlePatchResult.setValue(untypedTargetValue); + } + } - Map patchedValuesDictionary = results.stream() - .filter(singlePatchResult -> singlePatchResult.getValue() != null) - .collect(Collectors.toMap(SinglePatchResult::getFieldName, SinglePatchResult::getValue)); + private @NotNull Optional invalidFieldResult( + Map.Entry, Object> entry, + Tuple tuple) { - Map failuresDictionary = results.stream() - .filter(singlePatchResult -> singlePatchResult.getFailure() != null) - .collect(Collectors.toMap(SinglePatchResult::getFieldName, SinglePatchResult::getFailure)); + return Optional.ofNullable(tuple.getSecond()).map(invalidFieldFailureCause -> buildFailureFor(entry, tuple.getSecond())); + } - DataPatchResponse dataPatchResponse = new DataPatchResponse().setPatchDictionary(patchedValuesDictionary).setFailures(failuresDictionary); + public Optional fieldMappingResult( + Map.Entry, Object> entry, + Disease disease, + CaseDataPatchRequest request, + Supplier target) { - // TODO: - if (logger.isErrorEnabled()) { - logger.error("CaseData: \n{}", ObjectMapperProvider.writeValueAsStringFailSafe(caseData)); - } - caseFacade.save(caseData); + Tuple tuple = entry.getKey(); + String fullFieldName = tuple.getFirst(); - if (logger.isDebugEnabled()) { - logger.error("Person: \n{}", ObjectMapperProvider.writeValueAsStringFailSafe(person.get())); + Optional mapper = fieldCustomMapperRegistry.getMapper(fullFieldName, disease); + + Object untypedTargetValue = entry.getValue(); + if (mapper.isPresent()) { + SinglePatchResult singlePatchResult = new SinglePatchResult().setFieldName(fullFieldName); + + Optional dataPatchFailureOpt = mapper.orElseThrow() + .map( + new FieldPatchRequest().setFieldName(fullFieldName) + .setReplacementType(request.getReplacementStrategy()) + .setOrigin(request.getOrigin()) + .setTarget(target.get()) + .setValue(untypedTargetValue)); + + return dataPatchFailureOpt.map(singlePatchResult::setFailure).or(() -> Optional.of(singlePatchResult.setValue(untypedTargetValue))); } - personFacade.save(person.get()); - - logger.debug("dataPatchResponse: [{}]", dataPatchResponse); - - return dataPatchResponse; - - /* - * Implementation steps: - * - lazily produce list of allowed fields to avoid. - * - OK: Iterate over patch dictionary - * - OK: Filter out empty values. - * - OK: Check for forbidden fields - * - OK: Check for FieldCustomMapper to use custom mapping strategy - * - OK: Check if field exists. - * - Go to the appropriate (sub) field - *

- * WARN: Root will be either: (breaks trivial check if exists approach). - * - CaseData - * - Person - */ + + return Optional.empty(); + } + + private SinglePatchResult buildFailureFor( + Map.Entry, Object> entry, + DataPatchFailureCause fieldFailureCause) { + + return new SinglePatchResult().setFieldName(entry.getKey().getFirst()) + .setFailure(new DataPatchFailure().setDataPatchFailureCause(fieldFailureCause).setProvidedFieldValue(entry.getValue())); } private FieldVisibilityCheckers getFieldVisibilityCheckers(Disease disease) { diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/LazySupplier.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/LazySupplier.java new file mode 100644 index 00000000000..0fd279c2974 --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/LazySupplier.java @@ -0,0 +1,35 @@ +package de.symeda.sormas.backend.patch; + +import java.util.function.Supplier; + +import com.google.common.base.Suppliers; + +/** + * Simple type to check if a Lazy Loaded supplier was already loaded. + * + * @param + * supplier type. + */ +public class LazySupplier implements Supplier { + + private final com.google.common.base.Supplier supplier; + private boolean loaded = false; + + private LazySupplier(com.google.common.base.Supplier supplier) { + this.supplier = supplier; + } + + public static LazySupplier of(Supplier supplier) { + return new LazySupplier<>(Suppliers.memoize(supplier::get)); + } + + @Override + public T get() { + loaded = true; + return supplier.get(); + } + + public boolean isLoaded() { + return loaded; + } +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessor.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessor.java index 2198d3c3fb6..d508a6e3479 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessor.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessor.java @@ -10,8 +10,11 @@ import de.symeda.sormas.api.utils.Tuple; import de.symeda.sormas.api.utils.fieldvisibility.FieldVisibilityCheckers; +/** + * SORMAS-opinionated reflection accessing of fields. + * Type retrieval caching was not implement due to {@link FieldVisibilityCheckers}. + */ public class PropertyAccessor { - // TODO: perform some caching of the fields private static final Logger logger = LoggerFactory.getLogger(PropertyAccessor.class); diff --git a/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java index 6d9aaaaeb35..baf2d05bc82 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java @@ -161,7 +161,7 @@ void patch_invalidPrefix() { Map expectedFailures = buildDictionaryOfFailureType(patchDictionary, DataPatchFailureCause.UNSUPPORTED_PREFIX); Assertions.assertAll( - () -> Assertions.assertTrue(response.getPatchDictionary().isEmpty(), "Nothing should have been patched, should be empty"), + () -> Assertions.assertTrue(response.getValidPatchDictionary().isEmpty(), "Nothing should have been patched, should be empty"), // FAILURES () -> Assertions.assertEquals(expectedFailures, response.getFailures())); } @@ -191,7 +191,7 @@ void patch_forbiddenField() { Map expectedFailures = buildDictionaryOfFailureType(patchDictionary, DataPatchFailureCause.FORBIDDEN_FIELD); Assertions.assertAll( - () -> Assertions.assertTrue(response.getPatchDictionary().isEmpty(), "Nothing should have been patched, should be empty"), + () -> Assertions.assertTrue(response.getValidPatchDictionary().isEmpty(), "Nothing should have been patched, should be empty"), // FAILURES () -> Assertions.assertEquals(expectedFailures, response.getFailures())); } @@ -270,7 +270,7 @@ void patch_invalidMultiFieldFormat() { buildDictionaryOfFailureType(patchDictionary, DataPatchFailureCause.INVALID_MULTIPLE_FIELDS_FORMAT); Assertions.assertAll( - () -> Assertions.assertTrue(response.getPatchDictionary().isEmpty(), "Nothing should have been patched, should be empty"), + () -> Assertions.assertTrue(response.getValidPatchDictionary().isEmpty(), "Nothing should have been patched, should be empty"), // FAILURES () -> Assertions.assertEquals(expectedFailures, response.getFailures())); } @@ -324,7 +324,7 @@ void patch_customizableEnu_default_enum() { () -> Assertions.assertEquals(expectedOccupationType, person.getOccupationType()), - () -> Assertions.assertEquals(patchDictionary, response.getPatchDictionary())); + () -> Assertions.assertEquals(patchDictionary, response.getValidPatchDictionary())); } @Test @@ -384,61 +384,7 @@ void patch_customizableEnu_default_enum_other() { () -> Assertions.assertEquals( Map.of("Person.occupationType", input, "Person.occupationDetails", input, "Person.additionalDetails", input), - response.getPatchDictionary())); - } - - // TODO: this should work - @Test - void patch_customizableEnu_non_default_enum() { - // PREPARE - CustomizableEnumValue entry = new CustomizableEnumValue(); - entry.setDataType(CustomizableEnumType.OCCUPATION_TYPE); - String customValue = "A custom value"; - - String translation = "expectedTranslation"; - entry.setValue(customValue); - entry.setCaption(""); - entry.setTranslations( - List.of( - buildTranslation("en", translation), - buildTranslation("fr", "irrelated"), - buildTranslation("de", "irrelated"), - buildTranslation("lu", "irrelated"))); - entry.setDefaultValue(false); - getCustomizableEnumValueService().ensurePersisted(entry); - - getCustomizableEnumFacade().loadData(); - - OccupationType expectedOccupationType = getCustomizableEnumFacade().getEnumValue(CustomizableEnumType.OCCUPATION_TYPE, null, customValue); - - CaseDataDto originalCase = creator.createUnclassifiedCase(Disease.PERTUSSIS); - - FacilityDto healthFacility = getFacilityFacade().getByUuid(originalCase.getHealthFacility().getUuid()); - originalCase.setDistrict(healthFacility.getDistrict()); - getCaseFacade().save(originalCase); - - // must be able to ignore accents - whitespaces - case - Map patchDictionary = Map.of("Person.occupationType", " " + customValue.toUpperCase() + " "); - CaseDataPatchRequest request = new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()) - .setReplacementStrategy(DataReplacementStrategy.ALWAYS) - .setPatchDictionary(patchDictionary); - - Mockito.when(MockProducer.getCustomizableEnumFacadeForConverter().getEnumValue(CustomizableEnumType.OCCUPATION_TYPE, null, customValue)) - .thenReturn(expectedOccupationType); - - // EXECUTE - DataPatchResponse response = victim().patch(request); - - PersonDto person = getPersonFacade().getByUuid(originalCase.getPerson().getUuid()); - - // CHECK - logger.info("response: [{}]", response); - Assertions.assertAll( - () -> Assertions.assertTrue(response.getFailures().isEmpty(), "Failure found, but should be empty"), - - () -> Assertions.assertEquals(expectedOccupationType, person.getOccupationType()), - - () -> Assertions.assertEquals(patchDictionary, response.getPatchDictionary())); + response.getValidPatchDictionary())); } private static @NotNull CustomizableEnumTranslation buildTranslation(String en, String irrelated) { @@ -473,7 +419,7 @@ void patch_referenceData() { Assertions.assertAll( () -> Assertions.assertTrue(response.getFailures().isEmpty(), "Failure found, but should be empty"), - () -> Assertions.assertEquals(patchDictionary, response.getPatchDictionary())); + () -> Assertions.assertEquals(patchDictionary, response.getValidPatchDictionary())); } @Test @@ -486,9 +432,6 @@ void patch_referenceData_country() { dto.setDefaultName("Germany"); CountryDto germanyReferenceDto = getCountryFacade().save(dto); - List allActiveAsReference = getCountryFacade().getAllActiveAsReference(); - System.out.println("allActiveAsReference = " + allActiveAsReference); - CaseDataDto originalCase = creator.createUnclassifiedCase(Disease.PERTUSSIS); // must be able to ignore accents - whitespaces - case @@ -531,7 +474,7 @@ void patch_notSupportedForDisease() { buildDictionaryOfFailureType(patchDictionary, DataPatchFailureCause.UNSUPPORTED_FIELD_FOR_DISEASE_OR_COUNTRY_OR_FEATURE); Assertions.assertAll( - () -> Assertions.assertTrue(response.getPatchDictionary().isEmpty(), "Nothing should have been patched, should be empty"), + () -> Assertions.assertTrue(response.getValidPatchDictionary().isEmpty(), "Nothing should have been patched, should be empty"), // FAILURES () -> Assertions.assertEquals(expectedFailures, response.getFailures())); } @@ -554,7 +497,7 @@ void patch_notSupportedForCountry() { buildDictionaryOfFailureType(patchDictionary, DataPatchFailureCause.UNSUPPORTED_FIELD_FOR_DISEASE_OR_COUNTRY_OR_FEATURE); Assertions.assertAll( - () -> Assertions.assertTrue(response.getPatchDictionary().isEmpty(), "Nothing should have been patched, should be empty"), + () -> Assertions.assertTrue(response.getValidPatchDictionary().isEmpty(), "Nothing should have been patched, should be empty"), // FAILURES () -> Assertions.assertEquals(expectedFailures, response.getFailures())); } @@ -577,7 +520,7 @@ void patch_notSupportedFeature() { buildDictionaryOfFailureType(patchDictionary, DataPatchFailureCause.UNSUPPORTED_FIELD_FOR_DISEASE_OR_COUNTRY_OR_FEATURE); Assertions.assertAll( - () -> Assertions.assertTrue(response.getPatchDictionary().isEmpty(), "Nothing should have been patched, should be empty"), + () -> Assertions.assertTrue(response.getValidPatchDictionary().isEmpty(), "Nothing should have been patched, should be empty"), // FAILURES () -> Assertions.assertEquals(expectedFailures, response.getFailures())); } @@ -600,6 +543,16 @@ void patch_addVaccine() { throw new IllegalStateException("toImplement"); } + @Test + void patch_noReplacementMode() { + throw new IllegalStateException("toImplement"); + } + + @Test + void patch_emptyValueBehavior() { + throw new IllegalStateException("toImplement"); + } + private CaseDataPatcher victim() { return getCaseDataPatcher(); } From 41e0fc9a47aa0308cfb55941fcdaf439a094d7a1 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Fri, 27 Feb 2026 09:29:41 +0100 Subject: [PATCH 030/134] =?UTF-8?q?=E2=9C=A8=20add=20handling=20for=20part?= =?UTF-8?q?ial=20update?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backend/patch/CaseDataPatcherImpl.java | 48 +++++++++++++------ .../sormas/backend/patch/LazySupplier.java | 35 -------------- .../backend/patch/PatchFieldHelper.java | 11 +++-- 3 files changed, 40 insertions(+), 54 deletions(-) delete mode 100644 sormas-backend/src/main/java/de/symeda/sormas/backend/patch/LazySupplier.java diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java index c5466c92e01..b363bac4f3a 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java @@ -21,6 +21,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.base.Suppliers; + import de.symeda.sormas.api.Disease; import de.symeda.sormas.api.caze.CaseDataDto; import de.symeda.sormas.api.patch.CaseDataPatchRequest; @@ -103,7 +105,7 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { Disease disease = caseData.getDisease(); - LazySupplier personSupplier = LazySupplier.of(() -> getPersonDto(caseData)); + Supplier personSupplier = Suppliers.memoize(() -> getPersonDto(caseData)); List results = computeActualDictionary(request).entrySet().stream().map(entry -> { Tuple tuple = entry.getKey(); @@ -113,7 +115,6 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { Supplier target = () -> findAppropriateTarget(fullFieldName, caseData, personSupplier); try { - return invalidFieldResult(entry, tuple).or(() -> fieldMappingResult(entry, disease, request, target)) .orElseGet(() -> valueMappingResult(entry, disease, request, target)); } catch (RuntimeException e) { @@ -124,9 +125,11 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { }).collect(Collectors.toList()); + Map validPatchDictionary = buildDictionaryFor(results, SinglePatchResult::getValue); DataPatchResponse response = new DataPatchResponse().setApplied(false) .setFailures(buildDictionaryFor(results, SinglePatchResult::getFailure)) - .setValidPatchDictionary(buildDictionaryFor(results, SinglePatchResult::getValue)); + .setValidPatchDictionary(validPatchDictionary); + if (!request.isPatchedInCaseOfFailures() && response.hasFailures()) { logger.info( "No patch was applied as contained failures AND request doesn't allow patch in case of failures: request: [{}], response: [{}]", @@ -135,23 +138,38 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { return response; } - if (logger.isDebugEnabled()) { - logger.debug("CaseData: \n{}", ObjectMapperProvider.writeValueAsStringFailSafe(caseData)); - } - caseFacade.save(caseData); + saveDTOsIfAppropriate(validPatchDictionary, caseData, personSupplier); - if (logger.isDebugEnabled()) { - logger.debug("Person: \n{}", ObjectMapperProvider.writeValueAsStringFailSafe(personSupplier.get())); - } + logger.debug("dataPatchResponse: [{}]", response); + + return response.setApplied(true); + } + + private void saveDTOsIfAppropriate(Map validPatchDictionary, CaseDataDto caseData, Supplier personSupplier) { + if (anyFieldPatchedWithPrefix(validPatchDictionary, PatchFieldHelper.CASE_DATA_PREFIX)) { + logger.info("CaseData was modified will be applied for: [{}]. Enable debug to see fully patched object", caseData); - if (personSupplier.isLoaded()) { - logger.info("Person was loaded, therefore will be updated"); - personFacade.save(personSupplier.get()); + if (logger.isDebugEnabled()) { + logger.debug("CaseData: \n{}", ObjectMapperProvider.writeValueAsStringFailSafe(caseData)); + } + + caseFacade.save(caseData); } - logger.debug("dataPatchResponse: [{}]", response); + if (anyFieldPatchedWithPrefix(validPatchDictionary, PatchFieldHelper.PERSON_PREFIX)) { + PersonDto person = personSupplier.get(); + logger.info("Person was modified will be applied for: [{}]. Enable debug fully patched object", person); - return response.setApplied(true); + if (logger.isDebugEnabled()) { + logger.debug("Person: \n{}", ObjectMapperProvider.writeValueAsStringFailSafe(person)); + } + + personFacade.save(person); + } + } + + private boolean anyFieldPatchedWithPrefix(Map validPatchDictionary, String caseDataPrefix) { + return validPatchDictionary.keySet().stream().anyMatch(key -> key.startsWith(caseDataPrefix)); } private @NotNull Map buildDictionaryFor(List results, Function fct) { diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/LazySupplier.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/LazySupplier.java deleted file mode 100644 index 0fd279c2974..00000000000 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/LazySupplier.java +++ /dev/null @@ -1,35 +0,0 @@ -package de.symeda.sormas.backend.patch; - -import java.util.function.Supplier; - -import com.google.common.base.Suppliers; - -/** - * Simple type to check if a Lazy Loaded supplier was already loaded. - * - * @param - * supplier type. - */ -public class LazySupplier implements Supplier { - - private final com.google.common.base.Supplier supplier; - private boolean loaded = false; - - private LazySupplier(com.google.common.base.Supplier supplier) { - this.supplier = supplier; - } - - public static LazySupplier of(Supplier supplier) { - return new LazySupplier<>(Suppliers.memoize(supplier::get)); - } - - @Override - public T get() { - loaded = true; - return supplier.get(); - } - - public boolean isLoaded() { - return loaded; - } -} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java index 58a6b0de0af..f0db56c4216 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java @@ -15,15 +15,18 @@ public class PatchFieldHelper { private final static Logger logger = LoggerFactory.getLogger(PatchFieldHelper.class); - public static final String OPENING_PARENTHESIS = "("; - public static final String CLOSING_PARENTHESIS = ")"; - public static final String PIPE = "|"; + public static final String CASE_DATA_PREFIX = "CaseData."; + public static final String PERSON_PREFIX = "Person."; + + private static final String OPENING_PARENTHESIS = "("; + private static final String CLOSING_PARENTHESIS = ")"; + private static final String PIPE = "|"; // might be more subtle: person.toto but also *.uuid (or uuid). includes approach ? // TODO: must be twofold: enforced default fields : technical: uuid, user ... + custom config by admin private Set forbiddenFields = Set.of("Person.birthdate", "Person.birthdateDD", "Person.birthdateMM", "Person.birthdateYYYY"); - private Set allowedPrefixes = Set.of("Person.", "CaseData"); + private Set allowedPrefixes = Set.of(PERSON_PREFIX, CASE_DATA_PREFIX); @Nullable public DataPatchFailureCause checkIfPathIsInvalid(String path) { From d6ead1c15298bd1273f67ac9b4267b508e943de3 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Fri, 27 Feb 2026 15:27:55 +0100 Subject: [PATCH 031/134] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20before=20adding=20?= =?UTF-8?q?path=20alias=20helper.=20CaseDataPatcherImpl=20are=20(almost=20?= =?UTF-8?q?all)=20green?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/patch/DataPatchFailureCause.java | 6 + .../de/symeda/sormas/api/utils/Tuple.java | 12 +- .../backend/patch/CaseDataPatcherImpl.java | 82 +++++---- .../backend/patch/PatchFieldHelper.java | 23 ++- .../backend/patch/alias/PathAliasHelper.java | 113 ++++++++++++ .../patch/mapping/ValueMapperRegistry.java | 20 ++- .../PersonBirthDateFieldMapper.java | 3 +- .../PersonContactDetailsFieldMapper.java | 4 +- .../sormas/backend/util/CollectorUtils.java | 27 +++ .../patch/alias/PathAliasHelperTest.java | 132 ++++++++++++++ .../mapping/ValueMapperRegistryTest.java | 168 ++++++++++++++++++ .../backend/util/CollectorUtilsTest.java | 149 ++++++++++++++++ .../sormas/patch/CaseDataPatcherImplTest.java | 164 +++++++++++++++-- 13 files changed, 834 insertions(+), 69 deletions(-) create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/backend/util/CollectorUtils.java create mode 100644 sormas-backend/src/test/java/de/symeda/sormas/backend/patch/alias/PathAliasHelperTest.java create mode 100644 sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/ValueMapperRegistryTest.java create mode 100644 sormas-backend/src/test/java/de/symeda/sormas/backend/util/CollectorUtilsTest.java diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java index 1bc091448cd..902b4fccbdf 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java @@ -7,6 +7,12 @@ public enum DataPatchFailureCause { */ INVALID_MULTIPLE_FIELDS_FORMAT, + /** + * Alias cannot be mapped to a single physical path. + * Path aliases base on the "Field ID" field from the generated data dictionary can be used to shorten the physical path. + */ + FORBIDDEN_NON_UNIQUE_ALIAS, + /** * Some fields have only a specific list of allowed values, if not present and no fallback then fails. Examples: * - {@link de.symeda.sormas.api.customizableenum.CustomizableEnum} diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/utils/Tuple.java b/sormas-api/src/main/java/de/symeda/sormas/api/utils/Tuple.java index ff15c55b064..faf78241b7c 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/utils/Tuple.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/utils/Tuple.java @@ -2,26 +2,24 @@ import java.util.Objects; -import javax.annotation.Nullable; - public class Tuple { - @Nullable private final F first; - @Nullable private final S second; - public Tuple(@Nullable final F first, @Nullable final S second) { + public static Tuple of(final F first, final S second) { + return new Tuple<>(first, second); + } + + public Tuple(final F first, final S second) { this.first = first; this.second = second; } - @Nullable public F getFirst() { return first; } - @Nullable public S getSecond() { return second; } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java index b363bac4f3a..e689b11edd4 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java @@ -46,6 +46,7 @@ import de.symeda.sormas.backend.patch.mapping.FieldCustomMapperRegistry; import de.symeda.sormas.backend.patch.mapping.ValueMapperRegistry; import de.symeda.sormas.backend.person.PersonFacadeEjb; +import de.symeda.sormas.backend.util.CollectorUtils; // TODO: test integration vaccines @Stateless @@ -105,10 +106,11 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { Disease disease = caseData.getDisease(); + // make this generic for additional "root"-types Supplier personSupplier = Suppliers.memoize(() -> getPersonDto(caseData)); - List results = computeActualDictionary(request).entrySet().stream().map(entry -> { - Tuple tuple = entry.getKey(); + List results = computeActualDictionary(request).map(entry -> { + Tuple tuple = entry.getFirst(); String fullFieldName = tuple.getFirst(); SinglePatchResult singlePatchResult = new SinglePatchResult().setFieldName(fullFieldName); @@ -125,12 +127,12 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { }).collect(Collectors.toList()); - Map validPatchDictionary = buildDictionaryFor(results, SinglePatchResult::getValue); + Map validPatchDictionary = buildDictionaryFor(results, SinglePatchResult::getValue, true); DataPatchResponse response = new DataPatchResponse().setApplied(false) - .setFailures(buildDictionaryFor(results, SinglePatchResult::getFailure)) + .setFailures(buildDictionaryFor(results, SinglePatchResult::getFailure, false)) .setValidPatchDictionary(validPatchDictionary); - if (!request.isPatchedInCaseOfFailures() && response.hasFailures()) { + if (validPatchDictionary.isEmpty() || (!request.isPatchedInCaseOfFailures() && response.hasFailures())) { logger.info( "No patch was applied as contained failures AND request doesn't allow patch in case of failures: request: [{}], response: [{}]", request, @@ -172,19 +174,25 @@ private boolean anyFieldPatchedWithPrefix(Map validPatchDictiona return validPatchDictionary.keySet().stream().anyMatch(key -> key.startsWith(caseDataPrefix)); } - private @NotNull Map buildDictionaryFor(List results, Function fct) { + private @NotNull Map buildDictionaryFor( + List results, + Function fct, + boolean valueContext) { return results.stream() - .filter(singlePatchResult -> fct.apply(singlePatchResult) != null) - .collect(Collectors.toMap(SinglePatchResult::getFieldName, fct)); + // edge case were target value is null: this is allowed, which makes both fields null. + .filter( + singlePatchResult -> fct.apply(singlePatchResult) != null + || (valueContext && singlePatchResult.getFailure() == null && singlePatchResult.getValue() == null)) + .collect(CollectorUtils.toNullSafeMap(SinglePatchResult::getFieldName, fct)); } private @NotNull SinglePatchResult valueMappingResult( - Map.Entry, Object> entry, + Tuple, Object> entry, Disease disease, CaseDataPatchRequest request, Supplier targetOpt) { - Tuple tuple = entry.getKey(); + Tuple tuple = entry.getFirst(); String fullFieldName = tuple.getFirst(); SinglePatchResult singlePatchResult = new SinglePatchResult().setFieldName(fullFieldName); @@ -193,25 +201,21 @@ private boolean anyFieldPatchedWithPrefix(Map validPatchDictiona String relativeFieldName = fullFieldName.substring(fullFieldName.indexOf('.') + 1); Optional, Boolean>> nestedPropertyType = PropertyAccessor.getNestedPropertyType(target, relativeFieldName, getFieldVisibilityCheckers(disease)); + Object untypedTargetValue = entry.getSecond(); if (nestedPropertyType.isEmpty()) { logger.info("Missing field: [{}] on target: [{}]", relativeFieldName, target); - return singlePatchResult.setFailure(new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.FIELD_DOES_NOT_EXIST)); + return singlePatchResult.setFailure(buildFailure(DataPatchFailureCause.FIELD_DOES_NOT_EXIST, untypedTargetValue)); } Tuple, Boolean> classSetTuple = nestedPropertyType.orElseThrow(); Class targetType = classSetTuple.getFirst(); - Object untypedTargetValue = entry.getValue(); - if (!Boolean.TRUE.equals(classSetTuple.getSecond())) { logger.info("Field: [{}] on object [{}] cannot be patched for disease: [{}]", relativeFieldName, target, disease); - return singlePatchResult.setFailure( - new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.UNSUPPORTED_FIELD_FOR_DISEASE_OR_COUNTRY_OR_FEATURE) - .setProvidedFieldValue(untypedTargetValue)); + return singlePatchResult + .setFailure(buildFailure(DataPatchFailureCause.UNSUPPORTED_FIELD_FOR_DISEASE_OR_COUNTRY_OR_FEATURE, untypedTargetValue)); } - // TODO: handle targetType being a list. TO-Check with business: add / replace - ValueMappingResult result = valueMapperRegistry.map( new ValuePatchRequest().setValue(untypedTargetValue) .setTargetType(targetType) @@ -220,8 +224,7 @@ private boolean anyFieldPatchedWithPrefix(Map validPatchDictiona DataPatchFailureCause dataPatchFailureCause = result.getDataPatchFailureCause(); if (dataPatchFailureCause != null) { - return singlePatchResult - .setFailure(new DataPatchFailure().setDataPatchFailureCause(dataPatchFailureCause).setProvidedFieldValue(untypedTargetValue)); + return singlePatchResult.setFailure(buildFailure(dataPatchFailureCause, untypedTargetValue)); } Object typedValue = result.getData(); @@ -245,31 +248,36 @@ private boolean anyFieldPatchedWithPrefix(Map validPatchDictiona if (exception.isPresent()) { return singlePatchResult.setFailure( new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.TECHNICAL) - .setDescription(exception.orElseThrow().getMessage())); + .setDescription(exception.orElseThrow().getMessage()) + .setProvidedFieldValue(untypedTargetValue)); } else { return singlePatchResult.setValue(untypedTargetValue); } } + private DataPatchFailure buildFailure(DataPatchFailureCause fieldDoesNotExist, Object untypedTargetValue) { + return new DataPatchFailure().setDataPatchFailureCause(fieldDoesNotExist).setProvidedFieldValue(untypedTargetValue); + } + private @NotNull Optional invalidFieldResult( - Map.Entry, Object> entry, + Tuple, Object> entry, Tuple tuple) { return Optional.ofNullable(tuple.getSecond()).map(invalidFieldFailureCause -> buildFailureFor(entry, tuple.getSecond())); } public Optional fieldMappingResult( - Map.Entry, Object> entry, + Tuple, Object> entry, Disease disease, CaseDataPatchRequest request, Supplier target) { - Tuple tuple = entry.getKey(); + Tuple tuple = entry.getFirst(); String fullFieldName = tuple.getFirst(); Optional mapper = fieldCustomMapperRegistry.getMapper(fullFieldName, disease); - Object untypedTargetValue = entry.getValue(); + Object untypedTargetValue = entry.getSecond(); if (mapper.isPresent()) { SinglePatchResult singlePatchResult = new SinglePatchResult().setFieldName(fullFieldName); @@ -287,12 +295,9 @@ public Optional fieldMappingResult( return Optional.empty(); } - private SinglePatchResult buildFailureFor( - Map.Entry, Object> entry, - DataPatchFailureCause fieldFailureCause) { + private SinglePatchResult buildFailureFor(Tuple, Object> entry, DataPatchFailureCause fieldFailureCause) { - return new SinglePatchResult().setFieldName(entry.getKey().getFirst()) - .setFailure(new DataPatchFailure().setDataPatchFailureCause(fieldFailureCause).setProvidedFieldValue(entry.getValue())); + return new SinglePatchResult().setFieldName(entry.getFirst().getFirst()).setFailure(buildFailure(fieldFailureCause, entry.getSecond())); } private FieldVisibilityCheckers getFieldVisibilityCheckers(Disease disease) { @@ -301,7 +306,7 @@ private FieldVisibilityCheckers getFieldVisibilityCheckers(Disease disease) { .andWithFeatureType(featureConfigurationFacade.getActiveServerFeatureConfigurations()); } - private Map, Object> computeActualDictionary(CaseDataPatchRequest request) { + private Stream, Object>> computeActualDictionary(CaseDataPatchRequest request) { Predicate> filterPredicate = buildAdequateDictionaryValuePredicate(request); return request.getPatchDictionary() @@ -324,31 +329,30 @@ private Map, Object> computeActualDictionar return splitMultipleFieldsPath(entry); }) - .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); + .map(tuple -> Tuple.of(tuple.getFirst(), tuple.getSecond())); } @NotNull - private Stream, Object>> splitMultipleFieldsPath(Map.Entry entry) { + private Stream, Object>> splitMultipleFieldsPath(Map.Entry entry) { String path = entry.getKey(); int openingParenthesisIndex = path.indexOf("("); String prefix = path.substring(0, openingParenthesisIndex); int closeParen = path.indexOf(')'); - logger.error(path); String restPath = path.substring(openingParenthesisIndex + 1, closeParen); - return Arrays.stream(restPath.split("\\|")).map(suffix -> Map.entry(new Tuple<>(prefix + suffix, null), entry.getValue())); + return Arrays.stream(restPath.split("\\|")).map(suffix -> Tuple.of(Tuple.of(prefix + suffix, null), entry.getValue())); } - private Map.Entry, Object> buildMapTupleEntryFrom( + private Tuple, Object> buildMapTupleEntryFrom( Map.Entry entry, @Nullable DataPatchFailureCause dataPatchFailureCause) { - return Map.entry(new Tuple<>(entry.getKey(), dataPatchFailureCause), entry.getValue()); + return Tuple.of(Tuple.of(entry.getKey(), dataPatchFailureCause), entry.getValue()); } - private Map.Entry, Object> buildMapTupleEntryFrom(Map.Entry entry) { - return Map.entry(new Tuple<>(entry.getKey(), null), entry.getValue()); + private Tuple, Object> buildMapTupleEntryFrom(Map.Entry entry) { + return Tuple.of(Tuple.of(entry.getKey(), null), entry.getValue()); } private @NotNull Predicate> buildAdequateDictionaryValuePredicate(CaseDataPatchRequest request) { diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java index f0db56c4216..4bd612414ed 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java @@ -4,17 +4,23 @@ import javax.annotation.Nullable; import javax.enterprise.context.ApplicationScoped; +import javax.inject.Inject; +import javax.validation.constraints.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import de.symeda.sormas.api.patch.DataPatchFailureCause; +import de.symeda.sormas.api.utils.Tuple; +import de.symeda.sormas.backend.patch.alias.PathAliasHelper; @ApplicationScoped public class PatchFieldHelper { private final static Logger logger = LoggerFactory.getLogger(PatchFieldHelper.class); + public static final String PATH_SEPARATOR = "."; + public static final String CASE_DATA_PREFIX = "CaseData."; public static final String PERSON_PREFIX = "Person."; @@ -26,7 +32,15 @@ public class PatchFieldHelper { // TODO: must be twofold: enforced default fields : technical: uuid, user ... + custom config by admin private Set forbiddenFields = Set.of("Person.birthdate", "Person.birthdateDD", "Person.birthdateMM", "Person.birthdateYYYY"); - private Set allowedPrefixes = Set.of(PERSON_PREFIX, CASE_DATA_PREFIX); + @Inject + private PathAliasHelper pathAliasHelper; + + public PatchFieldHelper() { + } + + public PatchFieldHelper(PathAliasHelper pathAliasHelper) { + this.pathAliasHelper = pathAliasHelper; + } @Nullable public DataPatchFailureCause checkIfPathIsInvalid(String path) { @@ -42,12 +56,17 @@ public DataPatchFailureCause checkIfPathIsInvalid(String path) { return dataPatchFailureCause; } + @NotNull + public Tuple resolveAlias(String pathWithPotentialAlias) { + return pathAliasHelper.resolveAlias(pathWithPotentialAlias); + } + private boolean fieldIsForbidden(String path) { return forbiddenFields.contains(path); } private boolean startsWithAllowedPrefix(String path) { - return allowedPrefixes.stream().anyMatch(path::startsWith); + return pathAliasHelper.supportedPrefixes().stream().anyMatch(path::startsWith); } public boolean isMultipleFieldFormat(String path) { diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java new file mode 100644 index 00000000000..78737208b6d --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java @@ -0,0 +1,113 @@ +package de.symeda.sormas.backend.patch.alias; + +import static de.symeda.sormas.backend.patch.PatchFieldHelper.PATH_SEPARATOR; + +import java.util.HashMap; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import javax.enterprise.context.ApplicationScoped; +import javax.validation.constraints.NotNull; + +import org.apache.commons.collections4.CollectionUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import de.symeda.sormas.api.caze.CaseDataDto; +import de.symeda.sormas.api.patch.DataPatchFailureCause; +import de.symeda.sormas.api.person.PersonDto; +import de.symeda.sormas.api.utils.Tuple; + +/** + * Users want to be able to use multiple root objects, to avoid drilling through properties. + * Therefore, this class performs this manual conversion. + *

+ * FieldId from Data dictionary to DTO's physical path. + */ +@ApplicationScoped +public class PathAliasHelper { + + private final static Logger logger = LoggerFactory.getLogger(PathAliasHelper.class); + + // TODO: define configurable additional aliases ? + + public static final Map DEFAULT_ALIAS_DICTIONARY = buildDefaultAliasDictionary(); + + public static final Map> DEFAULT_FORBIDDEN_ALIASES_DICTIONARY = + Map.of("Location", Set.of("Person.address", "Exposure.location")); + + public static final Map REFERENCE_TO_ROOT_DICTIONARY = Map.of("CaseData.person", PersonDto.I18N_PREFIX); + + private static @NotNull HashMap buildDefaultAliasDictionary() { + HashMap dictionary = new HashMap<>(); + + dictionary.put("Symptoms", "CaseData.symptoms"); + dictionary.put("HealthConditions", "CaseData.healthConditions"); + dictionary.put("Hospitalization", "CaseData.hospitalization"); + dictionary.put("PreviousHospitalization", "CaseData.hospitalization.previousHospitalizations"); + dictionary.put("PersonContactDetail", "Person.personContactDetails"); + dictionary.put("Facility", "CaseData.healthFacility"); + dictionary.put("PointOfEntry", "CaseData.pointOfEntry"); + dictionary.put("Region", "CaseData.responsibleRegion"); + dictionary.put("District", "CaseData.responsibleDistrict"); + dictionary.put("Community", "CaseData.responsibleCommunity"); + dictionary.put("Country", "Person.birthCountry"); + dictionary.put("Subcontinent", "Person.address.subcontinent"); + dictionary.put("Continent", "Person.address.continent"); + dictionary.put("User", "CaseData.followUpStatusChangeUser"); + + return dictionary; + } + + @NotNull + public Tuple resolveAlias(String pathWithPotentialAlias) { + int firstPathSeparatorIndex = pathWithPotentialAlias.indexOf(PATH_SEPARATOR); + + if (firstPathSeparatorIndex == -1) { + return tupleWithoutFailure(pathWithPotentialAlias); + } + + String aliasCandidate = pathWithPotentialAlias.substring(0, firstPathSeparatorIndex); + + Set collisions = DEFAULT_FORBIDDEN_ALIASES_DICTIONARY.get(aliasCandidate); + if (CollectionUtils.isNotEmpty(collisions)) { + logger.info("Alias [{}] with collisions: [{}] used for path as [{}]", pathWithPotentialAlias, collisions, aliasCandidate); + return tupleWithFailure(DataPatchFailureCause.FORBIDDEN_NON_UNIQUE_ALIAS); + } + + String pathWithFixedRootObjectReferences = REFERENCE_TO_ROOT_DICTIONARY.values() + .stream() + .reduce( + pathWithPotentialAlias, + (path, replacement) -> path.replace( + REFERENCE_TO_ROOT_DICTIONARY.entrySet().stream().filter(e -> replacement.equals(e.getValue())).findFirst().get().getKey(), + replacement)); + + String physicalPathPrefix = DEFAULT_ALIAS_DICTIONARY.get(aliasCandidate); + if (physicalPathPrefix != null) { + return tupleWithoutFailure(physicalPathPrefix + pathWithFixedRootObjectReferences.substring(firstPathSeparatorIndex)); + } + + return tupleWithoutFailure(pathWithFixedRootObjectReferences); + } + + private static @NotNull Tuple tupleWithFailure(DataPatchFailureCause forbiddenNonUniqueAlias) { + return new Tuple<>(null, forbiddenNonUniqueAlias); + } + + private static @NotNull Tuple tupleWithoutFailure(String pathWithPotentialAlias) { + return new Tuple<>(pathWithPotentialAlias, null); + } + + public Set supportedPrefixes() { + return Stream + .concat( + Stream.concat(REFERENCE_TO_ROOT_DICTIONARY.values().stream(), Stream.of(CaseDataDto.I18N_PREFIX)) + .map(prefix -> prefix + PATH_SEPARATOR), + DEFAULT_ALIAS_DICTIONARY.keySet().stream()) + .collect(Collectors.toSet()); + + } +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/ValueMapperRegistry.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/ValueMapperRegistry.java index 6c70c089413..3874611d877 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/ValueMapperRegistry.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/ValueMapperRegistry.java @@ -26,6 +26,13 @@ public class ValueMapperRegistry { @Inject private Instance instances; + public ValueMapperRegistry() { + } + + public ValueMapperRegistry(Instance instances) { + this.instances = instances; + } + @PostConstruct void init() { // default sort uses CDI sort. @@ -33,14 +40,19 @@ void init() { } @NotNull - public ValueMappingResult map(ValuePatchRequest request) { + public ValueMappingResult map(ValuePatchRequest request) { + Class targetType = request.getTargetType(); + + if (targetType == Object.class) { + logger.error("Object is not a supported targetType"); + return ValueMappingResult.withCause(DataPatchFailureCause.TECHNICAL); + } + Object value = request.getValue(); if (value == null) { - return null; + return ValueMappingResult.withData(null); } - Class targetType = request.getTargetType(); - if (targetType.isInstance(value)) { return ValueMappingResult.withData((T) targetType.cast(value)); } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonBirthDateFieldMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonBirthDateFieldMapper.java index 87e9c858ade..09d642814c3 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonBirthDateFieldMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonBirthDateFieldMapper.java @@ -15,6 +15,7 @@ import de.symeda.sormas.api.patch.mapping.FieldPatchRequest; import de.symeda.sormas.api.patch.mapping.ValueMappingResult; import de.symeda.sormas.api.person.PersonDto; +import de.symeda.sormas.backend.patch.PatchFieldHelper; import de.symeda.sormas.backend.patch.mapping.impl.valuemapper.DatePatchMapper; /** @@ -77,6 +78,6 @@ public Optional map(FieldPatchRequest request) { @Override public Set supportedFields() { - return Set.of(PersonDto.I18N_PREFIX + "." + PersonDto.BIRTH_DATE); + return Set.of(PersonDto.I18N_PREFIX + PatchFieldHelper.PATH_SEPARATOR + PersonDto.BIRTH_DATE); } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapper.java index ca1ecd0463e..2df60993ee0 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapper.java @@ -1,5 +1,7 @@ package de.symeda.sormas.backend.patch.mapping.impl.fieldmapper; +import static de.symeda.sormas.backend.patch.PatchFieldHelper.PATH_SEPARATOR; + import java.util.Optional; import java.util.Set; import java.util.function.Predicate; @@ -97,7 +99,7 @@ private PersonContactDetailDto buildEmailContactDetail(FieldPatchRequest request @Override public Set supportedFields() { return Stream.of(PersonContactDetailDto.PHONE_NUMBER_TYPE, PersonContactDetailDto.DETAILS) - .map(suffix -> PersonDto.I18N_PREFIX + "." + PersonDto.PERSON_CONTACT_DETAILS + "." + suffix) + .map(suffix -> PersonDto.I18N_PREFIX + PATH_SEPARATOR + PersonDto.PERSON_CONTACT_DETAILS + PATH_SEPARATOR + suffix) .collect(Collectors.toSet()); } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/util/CollectorUtils.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/util/CollectorUtils.java new file mode 100644 index 00000000000..40c7b51bc78 --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/util/CollectorUtils.java @@ -0,0 +1,27 @@ +package de.symeda.sormas.backend.util; + +import java.util.HashMap; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collector; + +import javax.validation.constraints.NotNull; + +public class CollectorUtils { + + private CollectorUtils() { + } + + public static Collector> toNullSafeMap( + @NotNull Function keyMapper, + @NotNull Function valueMapper) { + return Collector.of( + HashMap::new, + (m, item) -> m.put(keyMapper.apply(item), valueMapper.apply(item)), // handles nulls + (map1, map2) -> { + map1.putAll(map2); + return map1; + }); + } + +} diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/alias/PathAliasHelperTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/alias/PathAliasHelperTest.java new file mode 100644 index 00000000000..e812c1efb55 --- /dev/null +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/alias/PathAliasHelperTest.java @@ -0,0 +1,132 @@ +package de.symeda.sormas.backend.patch.alias; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + +import org.junit.jupiter.api.Test; + +import de.symeda.sormas.api.patch.DataPatchFailureCause; +import de.symeda.sormas.api.utils.Tuple; +import de.symeda.sormas.backend.AbstractUnitTest; + +class PathAliasHelperTest extends AbstractUnitTest { + + private final PathAliasHelper victim = new PathAliasHelper(); + + @Test + void resolveAlias_noAlias_noDot_returnsOriginalPath() { + // PREPARE + String path = "some.field"; + + // EXECUTE + Tuple result = victim.resolveAlias(path); + + // CHECK + assertEquals(path, result.getFirst()); + assertNull(result.getSecond()); + } + + @Test + void resolveAlias_validAlias_caseDataPerson() { + // PREPARE + String aliasPath = "CaseData.person.firstName"; + + // EXECUTE + Tuple result = victim.resolveAlias(aliasPath); + + // CHECK + assertEquals("Person.firstName", result.getFirst()); + assertNull(result.getSecond()); + } + + @Test + void resolveAlias_validAlias_symptoms() { + // PREPARE + String aliasPath = "Symptoms.cough"; + + // EXECUTE + Tuple result = victim.resolveAlias(aliasPath); + + // CHECK + assertEquals("CaseData.symptoms.cough", result.getFirst()); + assertNull(result.getSecond()); + } + + @Test + void resolveAlias_validAlias_nestedPreviousHospitalization() { + // PREPARE + String aliasPath = "PreviousHospitalization.admissionDate"; + + // EXECUTE + Tuple result = victim.resolveAlias(aliasPath); + + // CHECK + assertEquals("CaseData.hospitalization.previousHospitalizations.admissionDate", result.getFirst()); + assertNull(result.getSecond()); + } + + @Test + void resolveAlias_unknownAlias_returnsOriginalPath() { + // PREPARE + String aliasPath = "UnknownAlias.field"; + + // EXECUTE + Tuple result = victim.resolveAlias(aliasPath); + + // CHECK + assertEquals(aliasPath, result.getFirst()); + assertNull(result.getSecond()); + } + + @Test + void resolveAlias_forbiddenCollision_location() { + // PREPARE + String aliasPath = "Location.region"; + + // EXECUTE + Tuple result = victim.resolveAlias(aliasPath); + + // CHECK + assertNull(result.getFirst()); + assertEquals(DataPatchFailureCause.FORBIDDEN_NON_UNIQUE_ALIAS, result.getSecond()); + } + + @Test + void resolveAlias_forbiddenCollision_address() { + // PREPARE + String aliasPath = "Location.street"; + + // EXECUTE + Tuple result = victim.resolveAlias(aliasPath); + + // CHECK + assertNull(result.getFirst()); + assertEquals(DataPatchFailureCause.FORBIDDEN_NON_UNIQUE_ALIAS, result.getSecond()); + } + + @Test + void resolveAlias_noDotInPath_returnsOriginal() { + // PREPARE + String path = "justAlias"; + + // EXECUTE + Tuple result = victim.resolveAlias(path); + + // CHECK + assertEquals(path, result.getFirst()); + assertNull(result.getSecond()); + } + + @Test + void resolveAlias_multipleDots_usesFirstDot() { + // PREPARE + String aliasPath = "Facility.name.somethingElse"; + + // EXECUTE + Tuple result = victim.resolveAlias(aliasPath); + + // CHECK + assertEquals("CaseData.healthFacility.name.somethingElse", result.getFirst()); + assertNull(result.getSecond()); + } +} diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/ValueMapperRegistryTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/ValueMapperRegistryTest.java new file mode 100644 index 00000000000..46e76dd6676 --- /dev/null +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/ValueMapperRegistryTest.java @@ -0,0 +1,168 @@ +package de.symeda.sormas.backend.patch.mapping; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import java.util.stream.Stream; + +import javax.enterprise.inject.Instance; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.testcontainers.shaded.com.fasterxml.jackson.databind.ObjectMapper; + +import de.symeda.sormas.api.patch.DataPatchFailureCause; +import de.symeda.sormas.api.patch.mapping.ValueMappingResult; +import de.symeda.sormas.api.patch.mapping.ValuePatchMapper; +import de.symeda.sormas.api.patch.mapping.ValuePatchRequest; +import de.symeda.sormas.backend.AbstractUnitTest; + +class ValueMapperRegistryTest extends AbstractUnitTest { + + @Mock + private Instance instances; + + @Mock + private ValuePatchMapper mapperA; + + @Mock + private ValuePatchMapper mapperB; + + @InjectMocks + private ValueMapperRegistry victim; + + @BeforeEach + void setUp() { + victim.init(); + Mockito.lenient().when(instances.stream()).thenAnswer(ignored -> Stream.of(mapperA, mapperB)); + } + + @Test + void map_nullValue_returnsNullResult() { + // PREPARE + ValuePatchRequest request = new ValuePatchRequest<>(); + request.setValue(null); + + // EXECUTE + ValueMappingResult result = victim.map(request); + + // CHECK + assertNull(result.getData()); + } + + @Test + void map_valueAlreadyTargetType_returnsCastValue() { + // PREPARE + ValuePatchRequest request = new ValuePatchRequest<>(); + String value = "test"; + request.setValue(value); + request.setTargetType(String.class); + + // EXECUTE + ValueMappingResult result = victim.map(request); + + // CHECK + assertSame(value, result.getData()); + } + + @Test + void map_firstSupportingMapperUsed() { + // PREPARE + ValuePatchRequest request = new ValuePatchRequest<>(); + request.setValue("42"); + request.setTargetType(Integer.class); + + when(mapperA.supports(Integer.class)).thenReturn(false); + when(mapperB.supports(Integer.class)).thenReturn(true); + ValueMappingResult mapperResult = ValueMappingResult.withData(42); + when(mapperB.map(request)).thenReturn(mapperResult); + + // EXECUTE + ValueMappingResult result = victim.map(request); + + // CHECK + assertEquals(42, result.getData()); + } + + @Test + void map_skipsNonSupportingMappers() { + // PREPARE + ValuePatchRequest request = new ValuePatchRequest<>(); + request.setValue("42"); + request.setTargetType(Integer.class); + + Mockito.lenient().when(mapperA.supports(Integer.class)).thenReturn(false); + Mockito.lenient().when(mapperB.supports(Integer.class)).thenReturn(true); + ValueMappingResult mapperResult = ValueMappingResult.withData(42); + Mockito.lenient().when(mapperB.map(request)).thenReturn(mapperResult); + + // EXECUTE + victim.map(request); + + // CHECK + verify(mapperA, never()).map(any()); + } + + @Test + void map_noSupportingMapper_returnsUnsupportedTargetType() { + // PREPARE + ValuePatchRequest request = new ValuePatchRequest<>(); + request.setValue("unsupported"); + request.setTargetType(ObjectMapper.class); + + when(mapperA.supports(Object.class)).thenReturn(false); + when(mapperB.supports(Object.class)).thenReturn(false); + + // EXECUTE + ValueMappingResult result = victim.map(request); + + // CHECK + assertEquals(DataPatchFailureCause.UNSUPPORTED_TARGET_TYPE, result.getDataPatchFailureCause()); + } + + @Test + void map_noMappers_returnsUnsupportedTargetType() { + // PREPARE + ValuePatchRequest request = new ValuePatchRequest<>(); + request.setValue("test"); + request.setTargetType(UnsupportedOperationException.class); + + victim = new ValueMapperRegistry(instances); + victim.init(); + Mockito.lenient().when(instances.stream()).thenReturn(Stream.of()); + + // EXECUTE + ValueMappingResult result = victim.map(request); + + // CHECK + assertEquals(DataPatchFailureCause.UNSUPPORTED_TARGET_TYPE, result.getDataPatchFailureCause()); + } + + @Test + void map_mapperReturnsFailure_passesThrough() { + // PREPARE + ValuePatchRequest request = new ValuePatchRequest<>(); + request.setValue("42"); + request.setTargetType(Integer.class); + + when(mapperA.supports(Integer.class)).thenReturn(true); + ValueMappingResult failureResult = ValueMappingResult.withCause(DataPatchFailureCause.INVALID_VALUE_TYPE); + when(mapperA.map(request)).thenReturn(failureResult); + + victim.init(); + + // EXECUTE + ValueMappingResult result = victim.map(request); + + // CHECK + assertEquals(DataPatchFailureCause.INVALID_VALUE_TYPE, result.getDataPatchFailureCause()); + } +} diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/util/CollectorUtilsTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/util/CollectorUtilsTest.java new file mode 100644 index 00000000000..6bd3759f998 --- /dev/null +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/util/CollectorUtilsTest.java @@ -0,0 +1,149 @@ +package de.symeda.sormas.backend.util; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import org.junit.jupiter.api.Test; + +import de.symeda.sormas.backend.AbstractUnitTest; + +class CollectorUtilsTest extends AbstractUnitTest { + + private final Item item1 = new Item("key1", "value1"); + private final Item item2 = new Item("key2", null); + private final Item item3 = new Item(null, "value3"); + private final Item item4 = new Item(null, null); + + @Test + void toNullSafeMap_normalKeysAndValues_createsCorrectMap() { + // PREPARE + List items = List.of(item1); + + // EXECUTE + Map result = items.stream().collect(CollectorUtils.toNullSafeMap(Item::getKey, Item::getValue)); + + // CHECK + assertEquals(Map.of("key1", "value1"), result); + } + + @Test + void toNullSafeMap_nullValues_preservesNulls() { + // PREPARE + List items = List.of(item2); + + // EXECUTE + Map result = items.stream().collect(CollectorUtils.toNullSafeMap(Item::getKey, Item::getValue)); + + // CHECK + assertEquals(Map.of("key2", null), result); + } + + @Test + void toNullSafeMap_nullKeys_preservesNulls() { + // PREPARE + List items = List.of(item3); + + // EXECUTE + Map result = items.stream().collect(CollectorUtils.toNullSafeMap(Item::getKey, Item::getValue)); + + // CHECK + assertEquals(Map.of(null, "value3"), result); + } + + @Test + void toNullSafeMap_nullKeyAndValue_preservesNulls() { + // PREPARE + List items = List.of(item4); + + // EXECUTE + Map result = items.stream().collect(CollectorUtils.toNullSafeMap(Item::getKey, Item::getValue)); + + // CHECK + assertEquals(Map.of(null, null), result); + } + + @Test + void toNullSafeMap_multipleItems_handlesCollisions() { + // PREPARE + List items = List.of( + new Item("key1", "value1"), + new Item("key1", "value2"), // collision + new Item("key2", null), + new Item(null, "value3")); + + // EXECUTE + Map result = items.stream().collect(CollectorUtils.toNullSafeMap(Item::getKey, Item::getValue)); + + // CHECK + assertEquals("value2", result.get("key1")); // last write wins + assertNull(result.get("key2")); + assertEquals("value3", result.get(null)); + } + + @Test + void toNullSafeMap_parallelStream_preservesNulls() { + // PREPARE + List items = List.of(item1, item2, item3, item4); + + // EXECUTE + Map result = items.parallelStream().collect(CollectorUtils.toNullSafeMap(Item::getKey, Item::getValue)); + + // CHECK + assertEquals("value1", result.get("key1")); + assertNull(result.get("key2")); + assertEquals("value3", result.get(null)); + assertNull(result.get(null)); + } + + @Test + void toNullSafeMap_emptyStream_returnsEmptyMap() { + // PREPARE + List items = List.of(); + + // EXECUTE + Map result = items.stream().collect(CollectorUtils.toNullSafeMap(Item::getKey, Item::getValue)); + + // CHECK + assertTrue(result.isEmpty()); + } + + @Test + void toNullSafeMap_handlesNullsWhereStandardFails() { + // PREPARE + List items = List.of(item2); // contains null value + + // EXECUTE + Map nullSafeResult = items.stream().collect(CollectorUtils.toNullSafeMap(Item::getKey, Item::getValue)); + + // CHECK + assertEquals(Map.of("key2", null), nullSafeResult); + + assertThrows(NullPointerException.class, () -> items.stream().collect(Collectors.toMap(Item::getKey, Item::getValue))); + } + + // Helper class for tests + static class Item { + + private final String key; + private final String value; + + Item(String key, String value) { + this.key = key; + this.value = value; + } + + String getKey() { + return key; + } + + String getValue() { + return value; + } + } +} diff --git a/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java index baf2d05bc82..8a24dab4470 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java @@ -3,6 +3,7 @@ import java.sql.Date; import java.time.LocalDate; import java.time.ZoneId; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.function.Supplier; @@ -31,12 +32,14 @@ import de.symeda.sormas.api.patch.DataPatchFailureCause; import de.symeda.sormas.api.patch.DataPatchResponse; import de.symeda.sormas.api.patch.DataReplacementStrategy; +import de.symeda.sormas.api.patch.EmptyValueBehavior; import de.symeda.sormas.api.person.OccupationType; import de.symeda.sormas.api.person.PersonContactDetailDto; import de.symeda.sormas.api.person.PersonContactDetailType; import de.symeda.sormas.api.person.PersonDto; import de.symeda.sormas.api.person.PhoneNumberType; import de.symeda.sormas.api.person.Sex; +import de.symeda.sormas.api.symptoms.SymptomState; import de.symeda.sormas.backend.AbstractBeanTest; import de.symeda.sormas.backend.MockProducer; import de.symeda.sormas.backend.common.ConfigFacadeEjb; @@ -135,22 +138,18 @@ void patch_noErrorsReplaceAlwaysPersonContactDetails() { && newEmail.equals(contactDetail.getDetails())))); } - @Test - void patch_invalidPrefix() { + @ParameterizedTest + @ValueSource(strings = { + "Task", + "Event", + "ExternalMessage" }) + void patch_invalidPrefix(String prefix) { // PREPARE CaseDataDto originalCase = creator.createUnclassifiedCase(Disease.RESPIRATORY_SYNCYTIAL_VIRUS); String ignoredValue = "ignoredValue"; - Map patchDictionary = Map.of( - "ActivityAsCase.reportingUser", - ignoredValue, - "PreviousHospitalization.region", - ignoredValue, - "Symptoms.bedridden", - ignoredValue, - "EpiData.exposureDetailsKnown", - ignoredValue + Map patchDictionary = Map.of(prefix + ".reportingUser", ignoredValue ); // EXECUTE @@ -528,14 +527,91 @@ void patch_notSupportedFeature() { private static @NotNull Map buildDictionaryOfFailureType( Map patchDictionary, DataPatchFailureCause unsupportedFieldForDisease) { - Map expectedFailures = patchDictionary.entrySet() + return patchDictionary.entrySet() .stream() .map( entry -> Map.entry( entry.getKey(), new DataPatchFailure().setDataPatchFailureCause(unsupportedFieldForDisease).setProvidedFieldValue(entry.getValue()))) .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); - return expectedFailures; + } + + @Test + void patch_patchInCaseOfFailureTrue() { + // PREPARE + CaseDataDto originalCase = creator.createUnclassifiedCase(Disease.RESPIRATORY_SYNCYTIAL_VIRUS); + + String ignoredValue = "ignoredValue"; + + String trueString = " ja "; + Map patchDictionary = + Map.of("CaseData.symptoms.cough", trueString, "CaseData.quarantineOrderedOfficialDocumentDate", ignoredValue); + + CaseDataPatchRequest request = new CaseDataPatchRequest().setPatchedInCaseOfFailures(true) + .setCaseUuid(originalCase.getUuid()) + .setPatchDictionary(patchDictionary) + .setInputLanguages(List.of(Language.DE)); + + // EXECUTE + DataPatchResponse response = victim().patch(request); + + CaseDataDto actual = getCaseFacade().getByUuid(originalCase.getUuid()); + + // CHECK + Map expectedFailures = buildDictionaryOfFailureType( + Map.of("CaseData.quarantineOrderedOfficialDocumentDate", ignoredValue), + DataPatchFailureCause.UNSUPPORTED_FIELD_FOR_DISEASE_OR_COUNTRY_OR_FEATURE); + + Assertions.assertAll( + () -> Assertions.assertTrue(response.isApplied()), + + () -> Assertions.assertEquals(Map.of("CaseData.symptoms.cough", trueString), response.getValidPatchDictionary()), + + () -> Assertions.assertEquals(SymptomState.YES, actual.getSymptoms().getCough()), + + () -> Assertions.assertNull(actual.getQuarantineOrderedOfficialDocumentDate()), + + // FAILURES + () -> Assertions.assertEquals(expectedFailures, response.getFailures())); + } + + @Test + void patch_noPatchInCaseOfFailureFalse() { + // PREPARE + CaseDataDto originalCase = creator.createUnclassifiedCase(Disease.RESPIRATORY_SYNCYTIAL_VIRUS); + + String ignoredValue = "ignoredValue"; + + String trueString = " ja "; + Map patchDictionary = + Map.of("CaseData.symptoms.cough", trueString, "CaseData.quarantineOrderedOfficialDocumentDate", ignoredValue); + + CaseDataPatchRequest request = new CaseDataPatchRequest().setPatchedInCaseOfFailures(false) + .setCaseUuid(originalCase.getUuid()) + .setPatchDictionary(patchDictionary) + .setInputLanguages(List.of(Language.DE)); + + // EXECUTE + DataPatchResponse response = victim().patch(request); + + CaseDataDto actual = getCaseFacade().getByUuid(originalCase.getUuid()); + + // CHECK + Map expectedFailures = buildDictionaryOfFailureType( + Map.of("CaseData.quarantineOrderedOfficialDocumentDate", ignoredValue), + DataPatchFailureCause.UNSUPPORTED_FIELD_FOR_DISEASE_OR_COUNTRY_OR_FEATURE); + + Assertions.assertAll( + () -> Assertions.assertFalse(response.isApplied()), + + () -> Assertions.assertEquals(Map.of("CaseData.symptoms.cough", trueString), response.getValidPatchDictionary()), + + () -> Assertions.assertNull(actual.getSymptoms().getCough()), + + () -> Assertions.assertNull(actual.getQuarantineOrderedOfficialDocumentDate()), + + // FAILURES + () -> Assertions.assertEquals(expectedFailures, response.getFailures())); } @Test @@ -544,8 +620,66 @@ void patch_addVaccine() { } @Test - void patch_noReplacementMode() { - throw new IllegalStateException("toImplement"); + void patch_replacementMode_null_value() { + // PREPARE + CaseDataDto originalCase = creator.createUnclassifiedCase(Disease.RESPIRATORY_SYNCYTIAL_VIRUS); + originalCase.setQuarantineChangeComment("some non empty value"); + + getCaseFacade().save(originalCase); + + Assertions.assertFalse(originalCase.getSymptoms().getSymptomatic()); + + String ignoredValue = "ignoredValue"; + + Map patchDictionary = new HashMap<>(); + patchDictionary.put("CaseData.quarantineChangeComment", null); + + CaseDataPatchRequest request = new CaseDataPatchRequest().setReplacementStrategy(DataReplacementStrategy.ALWAYS) + .setEmptyValueBehavior(EmptyValueBehavior.REPLACE) + .setCaseUuid(originalCase.getUuid()) + .setPatchDictionary(patchDictionary); + + // EXECUTE + DataPatchResponse response = victim().patch(request); + + CaseDataDto actual = getCaseFacade().getByUuid(originalCase.getUuid()); + + // CHECK + Assertions.assertAll( + () -> Assertions.assertTrue(response.isApplied()), + + () -> Assertions.assertEquals(patchDictionary, response.getValidPatchDictionary()), + + () -> Assertions.assertNull(actual.getQuarantineChangeComment()), + + // FAILURES + () -> Assertions.assertEquals(Map.of(), response.getFailures())); + } + + @Test + void patch_fieldDoesNoExist() { + // PREPARE + CaseDataDto originalCase = creator.createUnclassifiedCase(Disease.RESPIRATORY_SYNCYTIAL_VIRUS); + + String ignoredValue = "ignoredValue"; + + Map patchDictionary = new HashMap<>(); + patchDictionary.put("CaseData.NON_EXISTING_FIELD", "validValue"); + + CaseDataPatchRequest request = new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()).setPatchDictionary(patchDictionary); + + // EXECUTE + DataPatchResponse response = victim().patch(request); + + Map expectedFailures = buildDictionaryOfFailureType(patchDictionary, DataPatchFailureCause.FIELD_DOES_NOT_EXIST); + + // CHECK + Assertions.assertAll( + () -> Assertions.assertFalse(response.isApplied()), + + () -> Assertions.assertEquals(expectedFailures, response.getFailures()), + + () -> Assertions.assertEquals(Map.of(), response.getValidPatchDictionary())); } @Test From a7354138f89d90b282e6c91b578a2eee7494cd59 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Mon, 2 Mar 2026 07:24:10 +0100 Subject: [PATCH 032/134] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactored=20code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backend/patch/CaseDataPatcherImpl.java | 51 ++++++++++--------- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java index e689b11edd4..6a383e07e34 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java @@ -110,14 +110,13 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { Supplier personSupplier = Suppliers.memoize(() -> getPersonDto(caseData)); List results = computeActualDictionary(request).map(entry -> { - Tuple tuple = entry.getFirst(); - String fullFieldName = tuple.getFirst(); + String fullFieldName = entry.getFirst(); SinglePatchResult singlePatchResult = new SinglePatchResult().setFieldName(fullFieldName); Supplier target = () -> findAppropriateTarget(fullFieldName, caseData, personSupplier); try { - return invalidFieldResult(entry, tuple).or(() -> fieldMappingResult(entry, disease, request, target)) + return invalidFieldResult(entry).or(() -> fieldMappingResult(entry, disease, request, target)) .orElseGet(() -> valueMappingResult(entry, disease, request, target)); } catch (RuntimeException e) { logger.error("Failure during patch operation", e); @@ -187,13 +186,12 @@ private boolean anyFieldPatchedWithPrefix(Map validPatchDictiona } private @NotNull SinglePatchResult valueMappingResult( - Tuple, Object> entry, + Tuple> entry, Disease disease, CaseDataPatchRequest request, Supplier targetOpt) { - Tuple tuple = entry.getFirst(); - String fullFieldName = tuple.getFirst(); + String fullFieldName = entry.getFirst(); SinglePatchResult singlePatchResult = new SinglePatchResult().setFieldName(fullFieldName); @@ -201,7 +199,7 @@ private boolean anyFieldPatchedWithPrefix(Map validPatchDictiona String relativeFieldName = fullFieldName.substring(fullFieldName.indexOf('.') + 1); Optional, Boolean>> nestedPropertyType = PropertyAccessor.getNestedPropertyType(target, relativeFieldName, getFieldVisibilityCheckers(disease)); - Object untypedTargetValue = entry.getSecond(); + Object untypedTargetValue = extractValue(entry); if (nestedPropertyType.isEmpty()) { logger.info("Missing field: [{}] on target: [{}]", relativeFieldName, target); @@ -259,25 +257,26 @@ private DataPatchFailure buildFailure(DataPatchFailureCause fieldDoesNotExist, O return new DataPatchFailure().setDataPatchFailureCause(fieldDoesNotExist).setProvidedFieldValue(untypedTargetValue); } - private @NotNull Optional invalidFieldResult( - Tuple, Object> entry, - Tuple tuple) { + private @NotNull Optional invalidFieldResult(Tuple> entry) { - return Optional.ofNullable(tuple.getSecond()).map(invalidFieldFailureCause -> buildFailureFor(entry, tuple.getSecond())); + return Optional.ofNullable(extractFailureCause(entry)).map(invalidFieldFailureCause -> buildFailureFor(entry, invalidFieldFailureCause)); + } + + private DataPatchFailureCause extractFailureCause(Tuple> entry) { + return entry.getSecond().getFirst(); } public Optional fieldMappingResult( - Tuple, Object> entry, + Tuple> entry, Disease disease, CaseDataPatchRequest request, Supplier target) { - Tuple tuple = entry.getFirst(); - String fullFieldName = tuple.getFirst(); + String fullFieldName = entry.getFirst(); Optional mapper = fieldCustomMapperRegistry.getMapper(fullFieldName, disease); - Object untypedTargetValue = entry.getSecond(); + Object untypedTargetValue = extractValue(entry); if (mapper.isPresent()) { SinglePatchResult singlePatchResult = new SinglePatchResult().setFieldName(fullFieldName); @@ -295,9 +294,13 @@ public Optional fieldMappingResult( return Optional.empty(); } - private SinglePatchResult buildFailureFor(Tuple, Object> entry, DataPatchFailureCause fieldFailureCause) { + private SinglePatchResult buildFailureFor(Tuple> entry, DataPatchFailureCause fieldFailureCause) { + + return new SinglePatchResult().setFieldName(entry.getFirst()).setFailure(buildFailure(fieldFailureCause, extractValue(entry))); + } - return new SinglePatchResult().setFieldName(entry.getFirst().getFirst()).setFailure(buildFailure(fieldFailureCause, entry.getSecond())); + private Object extractValue(Tuple> entry) { + return entry.getSecond().getSecond(); } private FieldVisibilityCheckers getFieldVisibilityCheckers(Disease disease) { @@ -306,7 +309,7 @@ private FieldVisibilityCheckers getFieldVisibilityCheckers(Disease disease) { .andWithFeatureType(featureConfigurationFacade.getActiveServerFeatureConfigurations()); } - private Stream, Object>> computeActualDictionary(CaseDataPatchRequest request) { + private Stream>> computeActualDictionary(CaseDataPatchRequest request) { Predicate> filterPredicate = buildAdequateDictionaryValuePredicate(request); return request.getPatchDictionary() @@ -333,7 +336,7 @@ private Stream, Object>> computeActua } @NotNull - private Stream, Object>> splitMultipleFieldsPath(Map.Entry entry) { + private Stream>> splitMultipleFieldsPath(Map.Entry entry) { String path = entry.getKey(); int openingParenthesisIndex = path.indexOf("("); String prefix = path.substring(0, openingParenthesisIndex); @@ -342,17 +345,17 @@ private Stream, Object>> splitMultipl String restPath = path.substring(openingParenthesisIndex + 1, closeParen); - return Arrays.stream(restPath.split("\\|")).map(suffix -> Tuple.of(Tuple.of(prefix + suffix, null), entry.getValue())); + return Arrays.stream(restPath.split("\\|")).map(suffix -> Tuple.of(prefix + suffix, Tuple.of(null, entry.getValue()))); } - private Tuple, Object> buildMapTupleEntryFrom( + private Tuple> buildMapTupleEntryFrom( Map.Entry entry, @Nullable DataPatchFailureCause dataPatchFailureCause) { - return Tuple.of(Tuple.of(entry.getKey(), dataPatchFailureCause), entry.getValue()); + return Tuple.of(entry.getKey(), Tuple.of(dataPatchFailureCause, entry.getValue())); } - private Tuple, Object> buildMapTupleEntryFrom(Map.Entry entry) { - return Tuple.of(Tuple.of(entry.getKey(), null), entry.getValue()); + private Tuple> buildMapTupleEntryFrom(Map.Entry entry) { + return Tuple.of(entry.getKey(), Tuple.of(null, entry.getValue())); } private @NotNull Predicate> buildAdequateDictionaryValuePredicate(CaseDataPatchRequest request) { From 84434f49a7893c3f0debe1924747016a11a4c65f Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Mon, 2 Mar 2026 08:11:17 +0100 Subject: [PATCH 033/134] =?UTF-8?q?=E2=9C=A8=20integrated=20alias=20usage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backend/patch/CaseDataPatcherImpl.java | 11 ++++++--- .../backend/patch/alias/PathAliasHelper.java | 2 +- .../sormas/patch/CaseDataPatcherImplTest.java | 23 +++++++++++++++++++ 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java index 6a383e07e34..e78fde874c9 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java @@ -317,10 +317,15 @@ private Stream>> computeActua .stream() .filter(entry -> StringUtils.isNotBlank(entry.getKey())) .filter(filterPredicate) - .flatMap(entry -> { - String path = entry.getKey(); + .flatMap(originalEntry -> { + String path = originalEntry.getKey(); - DataPatchFailureCause dataPatchFailureCause = patchFieldHelper.checkIfPathIsInvalid(path); + DataPatchFailureCause pathFailureCause = patchFieldHelper.checkIfPathIsInvalid(path); + + Tuple unAliasedTuple = patchFieldHelper.resolveAlias(path); + Map.Entry entry = Map.entry(unAliasedTuple.getFirst(), originalEntry.getValue()); + + DataPatchFailureCause dataPatchFailureCause = Optional.ofNullable(pathFailureCause).orElseGet(unAliasedTuple::getSecond); if (dataPatchFailureCause != null) { return Stream.of(buildMapTupleEntryFrom(entry, dataPatchFailureCause)); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java index 78737208b6d..c0a3121780c 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java @@ -82,7 +82,7 @@ public Tuple resolveAlias(String pathWithPotentia .reduce( pathWithPotentialAlias, (path, replacement) -> path.replace( - REFERENCE_TO_ROOT_DICTIONARY.entrySet().stream().filter(e -> replacement.equals(e.getValue())).findFirst().get().getKey(), + REFERENCE_TO_ROOT_DICTIONARY.entrySet().stream().filter(entry -> replacement.equals(entry.getValue())).findFirst().get().getKey(), replacement)); String physicalPathPrefix = DEFAULT_ALIAS_DICTIONARY.get(aliasCandidate); diff --git a/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java index 8a24dab4470..30e44082ddc 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java @@ -90,6 +90,29 @@ void patch_noErrorsReplaceAlways() { () -> Assertions.assertEquals(newSequelaeDetails, actualCase.getSequelaeDetails())); } + @Test + void patch_aliasUsage() { + // PREPARE + CaseDataDto originalCase = creator.createUnclassifiedCase(Disease.PERTUSSIS); + + CaseDataPatchRequest request = new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()) + .setReplacementStrategy(DataReplacementStrategy.ALWAYS) + .setPatchDictionary(Map.of("Symptoms.cough", "YES")); + + // EXECUTE + DataPatchResponse response = victim().patch(request); + + // CHECK + logger.info("response: [{}]", response); + + CaseDataDto actual = getCaseFacade().getByUuid(originalCase.getUuid()); + + Assertions.assertAll( + () -> Assertions.assertTrue(response.getFailures().isEmpty(), "Failure found, but should be empty"), + // PERSON + () -> Assertions.assertEquals(SymptomState.YES, actual.getSymptoms().getCough())); + } + @Test void patch_noErrorsReplaceAlwaysPersonContactDetails() { // PREPARE From 8f5879477c47c746d21712150ed07e4d6002cfca Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Mon, 2 Mar 2026 10:36:22 +0100 Subject: [PATCH 034/134] =?UTF-8?q?=F0=9F=9A=A7=20PartialRetrieval=20logic?= =?UTF-8?q?=20PropertyAccessor=20must=20be=20adapted?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../patch/partial_retrieval/FieldInfo.java | 8 +++ .../PartialRetrievalFailureCause.java | 40 +++++++++++++++ .../PartialRetrievalRequest.java | 16 ++++++ .../PartialRetrievalResponse.java | 10 ++++ .../partial_retrieval/PartialRetriever.java | 16 ++++++ .../backend/patch/CaseDataPatcherImpl.java | 36 +++++++++----- .../backend/patch/PropertyAccessFailure.java | 7 +++ .../backend/patch/PropertyAccessor.java | 49 ++++++++++++++++--- .../backend/patch/alias/PathAliasHelper.java | 27 ++++++++++ .../PartialRetrieverImpl.java | 22 +++++++++ 10 files changed, 211 insertions(+), 20 deletions(-) create mode 100644 sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/FieldInfo.java create mode 100644 sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetrievalFailureCause.java create mode 100644 sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetrievalRequest.java create mode 100644 sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetrievalResponse.java create mode 100644 sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetriever.java create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessFailure.java create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/FieldInfo.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/FieldInfo.java new file mode 100644 index 00000000000..425764ab235 --- /dev/null +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/FieldInfo.java @@ -0,0 +1,8 @@ +package de.symeda.sormas.api.patch.partial_retrieval; + +public class FieldInfo { + + private String translatedFieldName; + private Class fieldType; + private Object fieldValue; +} diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetrievalFailureCause.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetrievalFailureCause.java new file mode 100644 index 00000000000..7a59a828261 --- /dev/null +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetrievalFailureCause.java @@ -0,0 +1,40 @@ +package de.symeda.sormas.api.patch.partial_retrieval; + +public enum PartialRetrievalFailureCause { + /** + * Occurs if input tries to use multiple fields approach: CaseData.(symptoms.onsetDate|hospitalization.admissionDate). + */ + INVALID_MULTIPLE_FIELDS_FORMAT, + + /** + * Alias cannot be mapped to a single physical path. + * Path aliases base on the "Field ID" field from the generated data dictionary can be used to shorten the physical path. + */ + FORBIDDEN_NON_UNIQUE_ALIAS, + + /** + * Occurs the field is not supported by the disease / country / feature. + * Error message must be somewhat generic to specify the Data Dictionary should be checked. + */ + UNSUPPORTED_FIELD_FOR_DISEASE_OR_COUNTRY_OR_FEATURE, + + /** + * Path does not start with the allowed prefixes: example: CaseData or Person. + */ + UNSUPPORTED_PREFIX, + + /** + * Invalid field name was provided that cannot be matched with an existing field. + */ + FIELD_DOES_NOT_EXIST, + + /** + * Some fields are not meant to be patched: per example technical fields like UUID. + */ + FORBIDDEN_FIELD, + + /** + * This means there is a hole in the implementation. + */ + TECHNICAL +} diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetrievalRequest.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetrievalRequest.java new file mode 100644 index 00000000000..d0a1d0df829 --- /dev/null +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetrievalRequest.java @@ -0,0 +1,16 @@ +package de.symeda.sormas.api.patch.partial_retrieval; + +import java.util.Set; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +public class PartialRetrievalRequest { + + @NotNull + private String caseUuid; + + @NotNull + @NotEmpty + private Set fieldsToRetrieve; +} diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetrievalResponse.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetrievalResponse.java new file mode 100644 index 00000000000..f64127c03b5 --- /dev/null +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetrievalResponse.java @@ -0,0 +1,10 @@ +package de.symeda.sormas.api.patch.partial_retrieval; + +import java.util.Map; + +public class PartialRetrievalResponse { + + private Map fieldInfoDictionary; + + private Map failuresDictionary; +} diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetriever.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetriever.java new file mode 100644 index 00000000000..ee37150393e --- /dev/null +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetriever.java @@ -0,0 +1,16 @@ +package de.symeda.sormas.api.patch.partial_retrieval; + +public interface PartialRetriever { + + /** + * TODO: + * - Reuse the single FieldPatcher for that purpose ? Create additional interface to retrieve the value for the supported field. + * - I18n using Field ID: must be retrieved by the + * - Field type using Property accessor: should be done in one shot to avoid too much + * + * + * @param request + * @return + */ + PartialRetrievalResponse retrievePartial(PartialRetrievalRequest request); +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java index e78fde874c9..6ddffa2bde5 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java @@ -1,5 +1,6 @@ package de.symeda.sormas.backend.patch; +import java.util.AbstractMap; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -57,6 +58,16 @@ public class CaseDataPatcherImpl implements CaseDataPatcher { private final static Logger logger = LoggerFactory.getLogger(CaseDataPatcherImpl.class); + private static final Map PROPERTY_FAILURE_TO_PATCH_FAILURE = Map.of( + PropertyAccessFailure.INVALID_INPUT, + DataPatchFailureCause.TECHNICAL, + + PropertyAccessFailure.FIELD_DOES_NOT_EXIST, + DataPatchFailureCause.FIELD_DOES_NOT_EXIST, + + PropertyAccessFailure.UNSUPPORTED_FIELD_FOR_DISEASE_OR_COUNTRY_OR_FEATURE, + DataPatchFailureCause.UNSUPPORTED_FIELD_FOR_DISEASE_OR_COUNTRY_OR_FEATURE); + @Inject private ValueMapperRegistry valueMapperRegistry; @@ -197,22 +208,19 @@ private boolean anyFieldPatchedWithPrefix(Map validPatchDictiona Object target = targetOpt.get(); String relativeFieldName = fullFieldName.substring(fullFieldName.indexOf('.') + 1); - Optional, Boolean>> nestedPropertyType = + Tuple, PropertyAccessFailure> nestedPropertyTypeTuple = PropertyAccessor.getNestedPropertyType(target, relativeFieldName, getFieldVisibilityCheckers(disease)); Object untypedTargetValue = extractValue(entry); - if (nestedPropertyType.isEmpty()) { + PropertyAccessFailure propertyAccessFailure = nestedPropertyTypeTuple.getSecond(); + if (propertyAccessFailure != null) { logger.info("Missing field: [{}] on target: [{}]", relativeFieldName, target); - return singlePatchResult.setFailure(buildFailure(DataPatchFailureCause.FIELD_DOES_NOT_EXIST, untypedTargetValue)); - } - Tuple, Boolean> classSetTuple = nestedPropertyType.orElseThrow(); - Class targetType = classSetTuple.getFirst(); - - if (!Boolean.TRUE.equals(classSetTuple.getSecond())) { - logger.info("Field: [{}] on object [{}] cannot be patched for disease: [{}]", relativeFieldName, target, disease); - return singlePatchResult - .setFailure(buildFailure(DataPatchFailureCause.UNSUPPORTED_FIELD_FOR_DISEASE_OR_COUNTRY_OR_FEATURE, untypedTargetValue)); + return singlePatchResult.setFailure( + buildFailure( + PROPERTY_FAILURE_TO_PATCH_FAILURE.getOrDefault(propertyAccessFailure, DataPatchFailureCause.TECHNICAL), + untypedTargetValue)); } + Class targetType = nestedPropertyTypeTuple.getFirst(); ValueMappingResult result = valueMapperRegistry.map( new ValuePatchRequest().setValue(untypedTargetValue) @@ -323,7 +331,7 @@ private Stream>> computeActua DataPatchFailureCause pathFailureCause = patchFieldHelper.checkIfPathIsInvalid(path); Tuple unAliasedTuple = patchFieldHelper.resolveAlias(path); - Map.Entry entry = Map.entry(unAliasedTuple.getFirst(), originalEntry.getValue()); + Map.Entry entry = toMapEntry(unAliasedTuple.getFirst(), originalEntry.getValue()); DataPatchFailureCause dataPatchFailureCause = Optional.ofNullable(pathFailureCause).orElseGet(unAliasedTuple::getSecond); @@ -340,6 +348,10 @@ private Stream>> computeActua .map(tuple -> Tuple.of(tuple.getFirst(), tuple.getSecond())); } + private AbstractMap.@NotNull SimpleEntry toMapEntry(String first, Object value) { + return new AbstractMap.SimpleEntry<>(first, value); + } + @NotNull private Stream>> splitMultipleFieldsPath(Map.Entry entry) { String path = entry.getKey(); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessFailure.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessFailure.java new file mode 100644 index 00000000000..8b0e547de4d --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessFailure.java @@ -0,0 +1,7 @@ +package de.symeda.sormas.backend.patch; + +public enum PropertyAccessFailure { + INVALID_INPUT, + FIELD_DOES_NOT_EXIST, + UNSUPPORTED_FIELD_FOR_DISEASE_OR_COUNTRY_OR_FEATURE +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessor.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessor.java index d508a6e3479..64abe0453f4 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessor.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessor.java @@ -19,16 +19,43 @@ public class PropertyAccessor { private static final Logger logger = LoggerFactory.getLogger(PropertyAccessor.class); public static final char PATH_SEPARATOR = '.'; + private static final Tuple, PropertyAccessFailure> FIELD_DOES_NOT_EXIST = Tuple.of(null, PropertyAccessFailure.FIELD_DOES_NOT_EXIST); + + private static final Tuple, PropertyAccessFailure> UNSUPPORTED_FIELD = + Tuple.of(null, PropertyAccessFailure.UNSUPPORTED_FIELD_FOR_DISEASE_OR_COUNTRY_OR_FEATURE); + + private static final Tuple, PropertyAccessFailure> INVALID_INPUT = Tuple.of(null, PropertyAccessFailure.INVALID_INPUT); private PropertyAccessor() { } - public static Optional, Boolean>> getNestedPropertyType( +// public static Tuple getNestedPropertyAndType( +// final Object bean, +// final String fieldName, +// FieldVisibilityCheckers fieldVisibilityCheckers) { +// if (bean == null || fieldName == null || fieldName.isEmpty()) { +// return INVALID_INPUT; +// } +// +// boolean notNestedPath = fieldName.indexOf(PATH_SEPARATOR) == fieldName.lastIndexOf(PATH_SEPARATOR); +// +// if (notNestedPath) { +// return getPropertyType(bean, fieldName, fieldVisibilityCheckers); +// } +// +// String leafPath = fieldName.substring(fieldName.lastIndexOf(PATH_SEPARATOR) + 1); +// +// return Optional.ofNullable(getNestedProperty(bean, fieldName)) +// .map(leafParent -> getPropertyType(leafParent, leafPath, fieldVisibilityCheckers)) +// .orElse(FIELD_DOES_NOT_EXIST); +// } + + public static Tuple, PropertyAccessFailure> getNestedPropertyType( final Object bean, final String fieldName, FieldVisibilityCheckers fieldVisibilityCheckers) { if (bean == null || fieldName == null || fieldName.isEmpty()) { - return Optional.empty(); + return INVALID_INPUT; } boolean notNestedPath = fieldName.indexOf(PATH_SEPARATOR) == fieldName.lastIndexOf(PATH_SEPARATOR); @@ -40,21 +67,27 @@ public static Optional, Boolean>> getNestedPropertyType( String leafPath = fieldName.substring(fieldName.lastIndexOf(PATH_SEPARATOR) + 1); return Optional.ofNullable(getNestedProperty(bean, fieldName)) - .flatMap(leafParent -> getPropertyType(leafParent, leafPath, fieldVisibilityCheckers)); + .map(leafParent -> getPropertyType(leafParent, leafPath, fieldVisibilityCheckers)) + .orElse(FIELD_DOES_NOT_EXIST); } - public static Optional, Boolean>> getPropertyType( + public static Tuple, PropertyAccessFailure> getPropertyType( final Object bean, final String fieldName, FieldVisibilityCheckers fieldVisibilityCheckers) { try { - return Optional.ofNullable(PropertyUtils.getPropertyType(bean, fieldName)).map(propertyType -> { + return Optional.ofNullable(PropertyUtils.getPropertyType(bean, fieldName))., PropertyAccessFailure>> map(propertyType -> { boolean visible = fieldVisibilityCheckers.isVisible(bean.getClass(), fieldName); - return new Tuple<>(propertyType, visible); - }); + + if (!visible) { + return UNSUPPORTED_FIELD; + } + + return new Tuple<>(propertyType, null); + }).orElse(FIELD_DOES_NOT_EXIST); } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) { logger.info("Could not get property type for [{}], [{}]", fieldName, bean.getClass().getSimpleName(), e); - return Optional.empty(); + return FIELD_DOES_NOT_EXIST; } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java index c0a3121780c..a30d4770723 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java @@ -2,6 +2,7 @@ import static de.symeda.sormas.backend.patch.PatchFieldHelper.PATH_SEPARATOR; +import java.util.AbstractMap; import java.util.HashMap; import java.util.Map; import java.util.Set; @@ -77,6 +78,7 @@ public Tuple resolveAlias(String pathWithPotentia return tupleWithFailure(DataPatchFailureCause.FORBIDDEN_NON_UNIQUE_ALIAS); } + // TODO: refactor this String pathWithFixedRootObjectReferences = REFERENCE_TO_ROOT_DICTIONARY.values() .stream() .reduce( @@ -93,6 +95,31 @@ public Tuple resolveAlias(String pathWithPotentia return tupleWithoutFailure(pathWithFixedRootObjectReferences); } + /** + * Objective is to retrieve a path WITH an alias to get the Field ID as in the data dictionary. + * + * @param pathWithoutAlias + * @return + */ + public static String toAliasPath(String pathWithoutAlias) { + Set> reduce = Stream.concat( + DEFAULT_ALIAS_DICTIONARY.entrySet().stream(), + DEFAULT_FORBIDDEN_ALIASES_DICTIONARY.entrySet() + .stream() + .flatMap(entry -> entry.getValue().stream().map(replacementPath -> new AbstractMap.SimpleEntry<>(entry.getKey(), replacementPath)))) + .collect(Collectors.toSet()); + + for (Map.Entry entry : reduce) { + pathWithoutAlias = pathWithoutAlias.replace(entry.getValue(), entry.getKey()); + } + + for (Map.Entry entry : REFERENCE_TO_ROOT_DICTIONARY.entrySet()) { + pathWithoutAlias = pathWithoutAlias.replace(entry.getKey(), entry.getValue()); + } + + return pathWithoutAlias; + } + private static @NotNull Tuple tupleWithFailure(DataPatchFailureCause forbiddenNonUniqueAlias) { return new Tuple<>(null, forbiddenNonUniqueAlias); } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java new file mode 100644 index 00000000000..8408a77d00c --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java @@ -0,0 +1,22 @@ +package de.symeda.sormas.backend.patch.partial_retrieval; + +import de.symeda.sormas.api.patch.partial_retrieval.PartialRetrievalRequest; +import de.symeda.sormas.api.patch.partial_retrieval.PartialRetrievalResponse; +import de.symeda.sormas.api.patch.partial_retrieval.PartialRetriever; + +public class PartialRetrieverImpl implements PartialRetriever { + + @Override + public PartialRetrievalResponse retrievePartial(PartialRetrievalRequest request) { + /* + * Implementation steps: + * - Iterate over fields + * - Validate if allowed + * - Un-alias to get physical for Reflection + * - Alias to get Field ID for I18N + * - Get type + * - Get value + */ + return null; + } +} From 05483e0bdb766263c4e4ee5307ad94f28c6e57ba Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Wed, 4 Mar 2026 13:16:23 +0100 Subject: [PATCH 035/134] =?UTF-8?q?=F0=9F=9A=A7=20prepared=20somewhat=20lo?= =?UTF-8?q?gic=20for=20RSV?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vaccine/RsvVaccinationPatchHelper.java | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/backend/patch/vaccine/RsvVaccinationPatchHelper.java diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/vaccine/RsvVaccinationPatchHelper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/vaccine/RsvVaccinationPatchHelper.java new file mode 100644 index 00000000000..5e4bd8215d6 --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/vaccine/RsvVaccinationPatchHelper.java @@ -0,0 +1,53 @@ +package de.symeda.sormas.backend.patch.vaccine; + +import java.util.Date; +import java.util.List; + +import de.symeda.sormas.api.caze.CaseDataDto; +import de.symeda.sormas.api.caze.Vaccine; +import de.symeda.sormas.api.immunization.ImmunizationDto; +import de.symeda.sormas.api.immunization.ImmunizationStatus; +import de.symeda.sormas.api.immunization.MeansOfImmunization; +import de.symeda.sormas.api.vaccination.VaccinationDto; + +public class RsvVaccinationPatchHelper { + + public void createImmunziation(Request request) { + CaseDataDto caze = request.caze; + ImmunizationDto result = ImmunizationDto.build(caze.getPerson()); + result.setDisease(caze.getDisease()); + result.setReportDate(new Date()); + + // TODO: for successfull vaccine + result.setMeansOfImmunization(MeansOfImmunization.VACCINATION); + result.setImmunizationStatus(ImmunizationStatus.ACQUIRED); + + // TODO: mandatory + result.setNumberOfDoses(5); + + // TODO: not vaccinated + result.setMeansOfImmunization(MeansOfImmunization.OTHER); + result.setMeansOfImmunizationDetails("NOT_VACCINATED: TODO: must be retrieved from the text ?"); + // OR + result.setMeansOfImmunizationDetails("DON'T KNOW"); + result.setImmunizationStatus(ImmunizationStatus.NOT_ACQUIRED); + + // TODO: create ngSurvey user + VaccinationDto vaccine = VaccinationDto.build(null); + + // TODO: missing vaccines for RSV and Pertusis + vaccine.setVaccineName(Vaccine.LC_16); + vaccine.setVaccineType("Something useful here ?"); + // TODO: set actual date // MANDATORY + vaccine.setVaccinationDate(new Date()); + + // TODO: create + + result.setVaccinations(List.of(vaccine)); + } + + public static class Request { + + private CaseDataDto caze; + } +} From f7204b84e2a1aa11e1273e16471b5b608f8462fb Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Wed, 4 Mar 2026 15:07:47 +0100 Subject: [PATCH 036/134] =?UTF-8?q?=F0=9F=93=9D=20added=20explanation=20ho?= =?UTF-8?q?w=20to=20implement=20the=20GroupedFieldsMapper=20logic.=20Nothi?= =?UTF-8?q?ng=20was=20really=20implemented=20but=20API=20is=20somewhat=20d?= =?UTF-8?q?esigned=20for=20that=20purpose.=20Requires=20a=20few=20adaption?= =?UTF-8?q?s=20in=20the=20mapper=20to=20make=20API=20more=20usable.=20WARN?= =?UTF-8?q?ING:=20would=20require=20circular=20dependency:=20DataPatcher?= =?UTF-8?q?=20->=20Factory=20->=20ImmunizationGroupedFieldMapper.java=20->?= =?UTF-8?q?=20DataPatcher=20(make=20lazy=20fetch=20on=20first=20usage)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...{CaseDataPatcher.java => DataPatcher.java} | 2 +- .../patch/mapping/GroupedFieldsMapper.java | 29 ++++ .../patch/mapping/GroupedFieldsRequest.java | 148 ++++++++++++++++++ ...aPatcherImpl.java => DataPatcherImpl.java} | 20 ++- .../ImmunizationGroupedFieldMapper.java | 46 ++++++ .../impl/valuemapper/EnumPatchMapper.java | 5 + .../sormas/backend/AbstractBeanTest.java | 8 +- ...ImplTest.java => DataPatcherImplTest.java} | 6 +- 8 files changed, 249 insertions(+), 15 deletions(-) rename sormas-api/src/main/java/de/symeda/sormas/api/patch/{CaseDataPatcher.java => DataPatcher.java} (89%) create mode 100644 sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsMapper.java create mode 100644 sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsRequest.java rename sormas-backend/src/main/java/de/symeda/sormas/backend/patch/{CaseDataPatcherImpl.java => DataPatcherImpl.java} (95%) create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/groupedfieldmapper/ImmunizationGroupedFieldMapper.java rename sormas-backend/src/test/java/de/symeda/sormas/patch/{CaseDataPatcherImplTest.java => DataPatcherImplTest.java} (99%) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/CaseDataPatcher.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatcher.java similarity index 89% rename from sormas-api/src/main/java/de/symeda/sormas/api/patch/CaseDataPatcher.java rename to sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatcher.java index 067d936f9c6..6d8f0d2a146 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/CaseDataPatcher.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatcher.java @@ -3,7 +3,7 @@ /** * Allows to partially patch data from a case. */ -public interface CaseDataPatcher { +public interface DataPatcher { /** * Allow patching data for a specific case. diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsMapper.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsMapper.java new file mode 100644 index 00000000000..fdec4d074a6 --- /dev/null +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsMapper.java @@ -0,0 +1,29 @@ +package de.symeda.sormas.api.patch.mapping; + +import java.util.Map; +import java.util.Set; + +import javax.validation.constraints.NotNull; + +/** + * Some complex - fields objects cannot be mapped using the simple 1 key <-> 1 value approach as some fields must be grouped together to + * make sense. + */ +public interface GroupedFieldsMapper { + + /** + * Will try to + * + * @param request + * to determine what may or may not be aggregated. + * @return result dictionary: key path and value the result: patched value or failure. + */ + Map> aggregatedPatch(@NotNull GroupedFieldsRequest request); + + /** + * Specifies the prefixes that are supported by this grouped mapper. + * + * @return supported prefixes. + */ + Set aggregatedPrefixes(); +} diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsRequest.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsRequest.java new file mode 100644 index 00000000000..c2dbc2bee21 --- /dev/null +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsRequest.java @@ -0,0 +1,148 @@ +package de.symeda.sormas.api.patch.mapping; + +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import javax.annotation.Nullable; +import javax.validation.constraints.NotNull; + +import de.symeda.sormas.api.Language; +import de.symeda.sormas.api.patch.DataReplacementStrategy; +import de.symeda.sormas.api.patch.EmptyValueBehavior; + +/** + * Request object to patch more complex objects together will all fields belonging to that object. + */ +public class GroupedFieldsRequest { + + private boolean patchedInCaseOfFailures = false; + + @NotNull + private DataReplacementStrategy replacementStrategy = DataReplacementStrategy.IF_NOT_ALREADY_PRESENT; + + @NotNull + private EmptyValueBehavior emptyValueBehavior = EmptyValueBehavior.IGNORE; + + /** + * Only contains the key and values adapted for the current {@link GroupedFieldsMapper}. + */ + @NotNull + private Map partialPatchDictionary; + + /** + * Origin that wants the patch operation. + */ + @Nullable + private String origin; + + /** + * To be able to support I18n inputs the input languages can be passed, system locale by default. + */ + @Nullable + private List inputLanguages; + + /** + * If true, for enumeration-like targetTypes the default value will be used. + * Mostly "OTHER". + */ + private boolean allowFallbackValues = true; + + public boolean isPatchedInCaseOfFailures() { + return patchedInCaseOfFailures; + } + + public GroupedFieldsRequest setPatchedInCaseOfFailures(boolean patchedInCaseOfFailures) { + this.patchedInCaseOfFailures = patchedInCaseOfFailures; + return this; + } + + public DataReplacementStrategy getReplacementStrategy() { + return replacementStrategy; + } + + public GroupedFieldsRequest setReplacementStrategy(DataReplacementStrategy replacementStrategy) { + this.replacementStrategy = replacementStrategy; + return this; + } + + public EmptyValueBehavior getEmptyValueBehavior() { + return emptyValueBehavior; + } + + public GroupedFieldsRequest setEmptyValueBehavior(EmptyValueBehavior emptyValueBehavior) { + this.emptyValueBehavior = emptyValueBehavior; + return this; + } + + public Map getPartialPatchDictionary() { + return partialPatchDictionary; + } + + public GroupedFieldsRequest setPartialPatchDictionary(Map partialPatchDictionary) { + this.partialPatchDictionary = partialPatchDictionary; + return this; + } + + @Nullable + public String getOrigin() { + return origin; + } + + public GroupedFieldsRequest setOrigin(@Nullable String origin) { + this.origin = origin; + return this; + } + + @Nullable + public List getInputLanguages() { + return inputLanguages; + } + + public GroupedFieldsRequest setInputLanguages(@Nullable List inputLanguages) { + this.inputLanguages = inputLanguages; + return this; + } + + public boolean isAllowFallbackValues() { + return allowFallbackValues; + } + + public GroupedFieldsRequest setAllowFallbackValues(boolean allowFallbackValues) { + this.allowFallbackValues = allowFallbackValues; + return this; + } + + @Override + public boolean equals(Object o) { + if (o == null || getClass() != o.getClass()) + return false; + GroupedFieldsRequest that = (GroupedFieldsRequest) o; + return patchedInCaseOfFailures == that.patchedInCaseOfFailures + && allowFallbackValues == that.allowFallbackValues + && replacementStrategy == that.replacementStrategy + && emptyValueBehavior == that.emptyValueBehavior + && Objects.equals(partialPatchDictionary, that.partialPatchDictionary) + && Objects.equals(origin, that.origin) + && Objects.equals(inputLanguages, that.inputLanguages); + } + + @Override + public int hashCode() { + return Objects.hash( + patchedInCaseOfFailures, + replacementStrategy, + emptyValueBehavior, + partialPatchDictionary, + origin, + inputLanguages, + allowFallbackValues); + } + + @Override + public String toString() { + return "GroupedFieldsRequest{" + "patchedInCaseOfFailures=" + patchedInCaseOfFailures + ", replacementStrategy=" + replacementStrategy + + ", emptyValueBehavior=" + emptyValueBehavior + ", partialPatchDictionary=" + partialPatchDictionary + ", origin='" + origin + '\'' + + ", inputLanguages=" + inputLanguages + ", allowFallbackValues=" + allowFallbackValues + '}'; + } +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java similarity index 95% rename from sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java rename to sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java index 6ddffa2bde5..3900f60f92a 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/CaseDataPatcherImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java @@ -27,10 +27,10 @@ import de.symeda.sormas.api.Disease; import de.symeda.sormas.api.caze.CaseDataDto; import de.symeda.sormas.api.patch.CaseDataPatchRequest; -import de.symeda.sormas.api.patch.CaseDataPatcher; import de.symeda.sormas.api.patch.DataPatchFailure; import de.symeda.sormas.api.patch.DataPatchFailureCause; import de.symeda.sormas.api.patch.DataPatchResponse; +import de.symeda.sormas.api.patch.DataPatcher; import de.symeda.sormas.api.patch.DataReplacementStrategy; import de.symeda.sormas.api.patch.EmptyValueBehavior; import de.symeda.sormas.api.patch.mapping.FieldCustomMapper; @@ -52,11 +52,11 @@ // TODO: test integration vaccines @Stateless @LocalBean -public class CaseDataPatcherImpl implements CaseDataPatcher { +public class DataPatcherImpl implements DataPatcher { public static final String PERSON_FIELD_NAME_PREFIX = "Person."; - private final static Logger logger = LoggerFactory.getLogger(CaseDataPatcherImpl.class); + private final static Logger logger = LoggerFactory.getLogger(DataPatcherImpl.class); private static final Map PROPERTY_FAILURE_TO_PATCH_FAILURE = Map.of( PropertyAccessFailure.INVALID_INPUT, @@ -89,10 +89,10 @@ public class CaseDataPatcherImpl implements CaseDataPatcher { @EJB private ConfigFacadeEjb.ConfigFacadeEjbLocal configFacade; - public CaseDataPatcherImpl() { + public DataPatcherImpl() { } - public CaseDataPatcherImpl( + public DataPatcherImpl( ValueMapperRegistry valueMapperRegistry, FieldCustomMapperRegistry fieldCustomMapperRegistry, PatchFieldHelper patchFieldHelper, @@ -120,7 +120,12 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { // make this generic for additional "root"-types Supplier personSupplier = Suppliers.memoize(() -> getPersonDto(caseData)); - List results = computeActualDictionary(request).map(entry -> { + Stream>> tupleStream = computeActualDictionary(request); + + // TODO: tupleStream (transform to map ?) must be passed to the group field handler so that it can be handled. + // TODO: provide only the valid one as simple object ? Once this is done the actual dictionary must be not contain does anymore + + List results = tupleStream.map(entry -> { String fullFieldName = entry.getFirst(); SinglePatchResult singlePatchResult = new SinglePatchResult().setFieldName(fullFieldName); @@ -196,6 +201,7 @@ private boolean anyFieldPatchedWithPrefix(Map validPatchDictiona .collect(CollectorUtils.toNullSafeMap(SinglePatchResult::getFieldName, fct)); } + // TODO: make usable for external use private @NotNull SinglePatchResult valueMappingResult( Tuple> entry, Disease disease, @@ -266,7 +272,6 @@ private DataPatchFailure buildFailure(DataPatchFailureCause fieldDoesNotExist, O } private @NotNull Optional invalidFieldResult(Tuple> entry) { - return Optional.ofNullable(extractFailureCause(entry)).map(invalidFieldFailureCause -> buildFailureFor(entry, invalidFieldFailureCause)); } @@ -274,6 +279,7 @@ private DataPatchFailureCause extractFailureCause(Tuple fieldMappingResult( Tuple> entry, Disease disease, diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/groupedfieldmapper/ImmunizationGroupedFieldMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/groupedfieldmapper/ImmunizationGroupedFieldMapper.java new file mode 100644 index 00000000000..c3915d8e92d --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/groupedfieldmapper/ImmunizationGroupedFieldMapper.java @@ -0,0 +1,46 @@ +package de.symeda.sormas.backend.patch.mapping.impl.groupedfieldmapper; + +import java.util.Map; +import java.util.Set; + +import javax.enterprise.context.ApplicationScoped; + +import de.symeda.sormas.api.patch.mapping.GroupedFieldsMapper; +import de.symeda.sormas.api.patch.mapping.GroupedFieldsRequest; +import de.symeda.sormas.api.patch.mapping.ValueMappingResult; + +@ApplicationScoped +public class ImmunizationGroupedFieldMapper implements GroupedFieldsMapper { + + @Override + public Map> aggregatedPatch(GroupedFieldsRequest request) { + // TODO: use a field as reference to trigger one or another logic: Immunization.immunizationStatus + + /* + * Implementation steps: + * - Retrieve value for: 'Immunization.immunizationStatus' + * - Try to detect what is it: + * - Yes: must be a vaccine that will be specified in the rest of the object + * - No OR don't know: create "dummy-object" that says: + * result.setImmunizationStatus(ImmunizationStatus.NOT_ACQUIRED).setMeansOfImmunization(MeansOfImmunization.OTHER); + * - no: result.setMeansOfImmunizationDetails("NOT_VACCINATED") + * - don't know: result.setMeansOfImmunizationDetails("DON'T KNOW") + * YES detailed explanation: + * - create ImmunizationDto + * - create VaccineDto + * - Patch the remaining values as usual ? + * - Can use the DataPatcher again to be able to set all single field values: values or exact fields. (focus on values now) + */ + + return Map.of(); + } + + @Override + public Set aggregatedPrefixes() { + if (true) { + // TODO: specifiy adequate fields. + throw new IllegalStateException(); + } + return Set.of(); + } +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumPatchMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumPatchMapper.java index f12201f0678..b63461e13f2 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumPatchMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumPatchMapper.java @@ -84,6 +84,11 @@ public ValueMappingResult map(ValuePatchRequest request) { } } + if (!request.isAllowFallbackValues()) { + logger.info("Fallback values are not allowed: therefore nothing found for [{}] to referenceType: [{}]", normalizedInput, targetType); + return ValueMappingResult.withCause(DataPatchFailureCause.NOT_PRESENT_IN_REFERENCE_DATA_LIST); + } + // overridden fallback Enum annotatedDefault = findAnnotatedDefault((Class>) enumType, constants); if (annotatedDefault != null) { diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/AbstractBeanTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/AbstractBeanTest.java index fca58c0b52d..e8611c67fec 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/backend/AbstractBeanTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/AbstractBeanTest.java @@ -98,7 +98,7 @@ import de.symeda.sormas.api.infrastructure.subcontinent.SubcontinentFacade; import de.symeda.sormas.api.manualmessagelog.ManualMessageLogFacade; import de.symeda.sormas.api.outbreak.OutbreakFacade; -import de.symeda.sormas.api.patch.CaseDataPatcher; +import de.symeda.sormas.api.patch.DataPatcher; import de.symeda.sormas.api.person.notifier.NotifierFacade; import de.symeda.sormas.api.referencedata.ReferenceDataValueInstanceProvider; import de.symeda.sormas.api.report.AggregateReportFacade; @@ -220,7 +220,7 @@ import de.symeda.sormas.backend.manualmessagelog.ManualMessageLogFacadeEjb.ManualMessageLogFacadeEjbLocal; import de.symeda.sormas.backend.manualmessagelog.ManualMessageLogService; import de.symeda.sormas.backend.outbreak.OutbreakFacadeEjb.OutbreakFacadeEjbLocal; -import de.symeda.sormas.backend.patch.CaseDataPatcherImpl; +import de.symeda.sormas.backend.patch.DataPatcherImpl; import de.symeda.sormas.backend.person.PersonFacadeEjb.PersonFacadeEjbLocal; import de.symeda.sormas.backend.person.PersonService; import de.symeda.sormas.backend.person.notifier.NotifierEjb; @@ -1155,8 +1155,8 @@ public NotifierService getNotifierService() { return getBean(NotifierService.class); } - public CaseDataPatcher getCaseDataPatcher() { - return getBean(CaseDataPatcherImpl.class); + public DataPatcher getCaseDataPatcher() { + return getBean(DataPatcherImpl.class); } public ReferenceDataValueInstanceProvider getReferenceDataValueInstanceProvider() { diff --git a/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java similarity index 99% rename from sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java rename to sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java index 30e44082ddc..88ae4ee0bbc 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/patch/CaseDataPatcherImplTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java @@ -27,10 +27,10 @@ import de.symeda.sormas.api.infrastructure.facility.FacilityDto; import de.symeda.sormas.api.infrastructure.region.RegionFacade; import de.symeda.sormas.api.patch.CaseDataPatchRequest; -import de.symeda.sormas.api.patch.CaseDataPatcher; import de.symeda.sormas.api.patch.DataPatchFailure; import de.symeda.sormas.api.patch.DataPatchFailureCause; import de.symeda.sormas.api.patch.DataPatchResponse; +import de.symeda.sormas.api.patch.DataPatcher; import de.symeda.sormas.api.patch.DataReplacementStrategy; import de.symeda.sormas.api.patch.EmptyValueBehavior; import de.symeda.sormas.api.person.OccupationType; @@ -45,7 +45,7 @@ import de.symeda.sormas.backend.common.ConfigFacadeEjb; import de.symeda.sormas.backend.customizableenum.CustomizableEnumValue; -class CaseDataPatcherImplTest extends AbstractBeanTest { +class DataPatcherImplTest extends AbstractBeanTest { // TODO: test different replacement strategy: with/without failure @@ -710,7 +710,7 @@ void patch_emptyValueBehavior() { throw new IllegalStateException("toImplement"); } - private CaseDataPatcher victim() { + private DataPatcher victim() { return getCaseDataPatcher(); } } From 143d3d62e4578f24bbc36d089749345d6f6a22bc Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Thu, 5 Mar 2026 07:55:58 +0100 Subject: [PATCH 037/134] drafted impl --- .../sormas/api}/patch/SinglePatchResult.java | 4 +- .../patch/mapping/GroupedFieldsMapper.java | 10 +- .../sormas/backend/patch/DataPatcherImpl.java | 49 ++++++---- .../mapping/GroupedFieldMapperRegistry.java | 92 +++++++++++++++++++ .../ImmunizationGroupedFieldMapper.java | 15 ++- 5 files changed, 142 insertions(+), 28 deletions(-) rename {sormas-backend/src/main/java/de/symeda/sormas/backend => sormas-api/src/main/java/de/symeda/sormas/api}/patch/SinglePatchResult.java (89%) create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/GroupedFieldMapperRegistry.java diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/SinglePatchResult.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/SinglePatchResult.java similarity index 89% rename from sormas-backend/src/main/java/de/symeda/sormas/backend/patch/SinglePatchResult.java rename to sormas-api/src/main/java/de/symeda/sormas/api/patch/SinglePatchResult.java index 66fbfb86005..746d85527ee 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/SinglePatchResult.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/SinglePatchResult.java @@ -1,10 +1,8 @@ -package de.symeda.sormas.backend.patch; +package de.symeda.sormas.api.patch; import javax.annotation.Nullable; import javax.validation.constraints.NotNull; -import de.symeda.sormas.api.patch.DataPatchFailure; - public class SinglePatchResult { @NotNull diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsMapper.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsMapper.java index fdec4d074a6..4236fbdb356 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsMapper.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsMapper.java @@ -1,10 +1,13 @@ package de.symeda.sormas.api.patch.mapping; -import java.util.Map; +import java.util.List; import java.util.Set; +import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; +import de.symeda.sormas.api.patch.SinglePatchResult; + /** * Some complex - fields objects cannot be mapped using the simple 1 key <-> 1 value approach as some fields must be grouped together to * make sense. @@ -18,12 +21,15 @@ public interface GroupedFieldsMapper { * to determine what may or may not be aggregated. * @return result dictionary: key path and value the result: patched value or failure. */ - Map> aggregatedPatch(@NotNull GroupedFieldsRequest request); + @NotNull + List aggregatedPatch(@NotNull GroupedFieldsRequest request); /** * Specifies the prefixes that are supported by this grouped mapper. * * @return supported prefixes. */ + @NotNull + @NotEmpty Set aggregatedPrefixes(); } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java index 3900f60f92a..ebebf719b4c 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java @@ -45,6 +45,7 @@ import de.symeda.sormas.backend.feature.FeatureConfigurationFacadeEjb; import de.symeda.sormas.backend.json.ObjectMapperProvider; import de.symeda.sormas.backend.patch.mapping.FieldCustomMapperRegistry; +import de.symeda.sormas.backend.patch.mapping.GroupedFieldMapperRegistry; import de.symeda.sormas.backend.patch.mapping.ValueMapperRegistry; import de.symeda.sormas.backend.person.PersonFacadeEjb; import de.symeda.sormas.backend.util.CollectorUtils; @@ -89,6 +90,9 @@ public class DataPatcherImpl implements DataPatcher { @EJB private ConfigFacadeEjb.ConfigFacadeEjbLocal configFacade; + @Inject + private GroupedFieldMapperRegistry groupedFieldMapperRegistry; + public DataPatcherImpl() { } @@ -120,14 +124,16 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { // make this generic for additional "root"-types Supplier personSupplier = Suppliers.memoize(() -> getPersonDto(caseData)); - Stream>> tupleStream = computeActualDictionary(request); + List>> patchingTuples = computePatchingTuples(request); - // TODO: tupleStream (transform to map ?) must be passed to the group field handler so that it can be handled. + groupedFieldMapperRegistry.aggregatedPatch() + + // TODO: patchingTuples (transform to map ?) must be passed to the group field handler so that it can be handled. // TODO: provide only the valid one as simple object ? Once this is done the actual dictionary must be not contain does anymore - List results = tupleStream.map(entry -> { + List results = patchingTuples.stream().map(entry -> { String fullFieldName = entry.getFirst(); - SinglePatchResult singlePatchResult = new SinglePatchResult().setFieldName(fullFieldName); + de.symeda.sormas.api.patch.SinglePatchResult singlePatchResult = new de.symeda.sormas.api.patch.SinglePatchResult().setFieldName(fullFieldName); Supplier target = () -> findAppropriateTarget(fullFieldName, caseData, personSupplier); @@ -142,9 +148,9 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { }).collect(Collectors.toList()); - Map validPatchDictionary = buildDictionaryFor(results, SinglePatchResult::getValue, true); + Map validPatchDictionary = buildDictionaryFor(results, de.symeda.sormas.api.patch.SinglePatchResult::getValue, true); DataPatchResponse response = new DataPatchResponse().setApplied(false) - .setFailures(buildDictionaryFor(results, SinglePatchResult::getFailure, false)) + .setFailures(buildDictionaryFor(results, de.symeda.sormas.api.patch.SinglePatchResult::getFailure, false)) .setValidPatchDictionary(validPatchDictionary); if (validPatchDictionary.isEmpty() || (!request.isPatchedInCaseOfFailures() && response.hasFailures())) { @@ -190,19 +196,19 @@ private boolean anyFieldPatchedWithPrefix(Map validPatchDictiona } private @NotNull Map buildDictionaryFor( - List results, - Function fct, + List results, + Function fct, boolean valueContext) { return results.stream() // edge case were target value is null: this is allowed, which makes both fields null. .filter( singlePatchResult -> fct.apply(singlePatchResult) != null || (valueContext && singlePatchResult.getFailure() == null && singlePatchResult.getValue() == null)) - .collect(CollectorUtils.toNullSafeMap(SinglePatchResult::getFieldName, fct)); + .collect(CollectorUtils.toNullSafeMap(de.symeda.sormas.api.patch.SinglePatchResult::getFieldName, fct)); } // TODO: make usable for external use - private @NotNull SinglePatchResult valueMappingResult( + private @NotNull de.symeda.sormas.api.patch.SinglePatchResult valueMappingResult( Tuple> entry, Disease disease, CaseDataPatchRequest request, @@ -210,7 +216,8 @@ private boolean anyFieldPatchedWithPrefix(Map validPatchDictiona String fullFieldName = entry.getFirst(); - SinglePatchResult singlePatchResult = new SinglePatchResult().setFieldName(fullFieldName); + de.symeda.sormas.api.patch.SinglePatchResult singlePatchResult = + new de.symeda.sormas.api.patch.SinglePatchResult().setFieldName(fullFieldName); Object target = targetOpt.get(); String relativeFieldName = fullFieldName.substring(fullFieldName.indexOf('.') + 1); @@ -271,7 +278,8 @@ private DataPatchFailure buildFailure(DataPatchFailureCause fieldDoesNotExist, O return new DataPatchFailure().setDataPatchFailureCause(fieldDoesNotExist).setProvidedFieldValue(untypedTargetValue); } - private @NotNull Optional invalidFieldResult(Tuple> entry) { + private @NotNull Optional invalidFieldResult( + Tuple> entry) { return Optional.ofNullable(extractFailureCause(entry)).map(invalidFieldFailureCause -> buildFailureFor(entry, invalidFieldFailureCause)); } @@ -280,7 +288,7 @@ private DataPatchFailureCause extractFailureCause(Tuple fieldMappingResult( + public Optional fieldMappingResult( Tuple> entry, Disease disease, CaseDataPatchRequest request, @@ -292,7 +300,8 @@ public Optional fieldMappingResult( Object untypedTargetValue = extractValue(entry); if (mapper.isPresent()) { - SinglePatchResult singlePatchResult = new SinglePatchResult().setFieldName(fullFieldName); + de.symeda.sormas.api.patch.SinglePatchResult singlePatchResult = + new de.symeda.sormas.api.patch.SinglePatchResult().setFieldName(fullFieldName); Optional dataPatchFailureOpt = mapper.orElseThrow() .map( @@ -308,9 +317,12 @@ public Optional fieldMappingResult( return Optional.empty(); } - private SinglePatchResult buildFailureFor(Tuple> entry, DataPatchFailureCause fieldFailureCause) { + private de.symeda.sormas.api.patch.SinglePatchResult buildFailureFor( + Tuple> entry, + DataPatchFailureCause fieldFailureCause) { - return new SinglePatchResult().setFieldName(entry.getFirst()).setFailure(buildFailure(fieldFailureCause, extractValue(entry))); + return new de.symeda.sormas.api.patch.SinglePatchResult().setFieldName(entry.getFirst()) + .setFailure(buildFailure(fieldFailureCause, extractValue(entry))); } private Object extractValue(Tuple> entry) { @@ -323,7 +335,7 @@ private FieldVisibilityCheckers getFieldVisibilityCheckers(Disease disease) { .andWithFeatureType(featureConfigurationFacade.getActiveServerFeatureConfigurations()); } - private Stream>> computeActualDictionary(CaseDataPatchRequest request) { + private List>> computePatchingTuples(CaseDataPatchRequest request) { Predicate> filterPredicate = buildAdequateDictionaryValuePredicate(request); return request.getPatchDictionary() @@ -351,7 +363,8 @@ private Stream>> computeActua return splitMultipleFieldsPath(entry); }) - .map(tuple -> Tuple.of(tuple.getFirst(), tuple.getSecond())); + .map(tuple -> Tuple.of(tuple.getFirst(), tuple.getSecond())) + .collect(Collectors.toList()); } private AbstractMap.@NotNull SimpleEntry toMapEntry(String first, Object value) { diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/GroupedFieldMapperRegistry.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/GroupedFieldMapperRegistry.java new file mode 100644 index 00000000000..82dd8775f59 --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/GroupedFieldMapperRegistry.java @@ -0,0 +1,92 @@ +package de.symeda.sormas.backend.patch.mapping; + +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; + +import javax.annotation.PostConstruct; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Instance; +import javax.inject.Inject; +import javax.validation.constraints.NotNull; + +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import de.symeda.sormas.api.patch.SinglePatchResult; +import de.symeda.sormas.api.patch.mapping.GroupedFieldsMapper; +import de.symeda.sormas.api.patch.mapping.GroupedFieldsRequest; +import de.symeda.sormas.api.utils.Tuple; +import de.symeda.sormas.backend.util.CollectorUtils; + +@ApplicationScoped +public class GroupedFieldMapperRegistry { + + private final static Logger logger = LoggerFactory.getLogger(GroupedFieldMapperRegistry.class); + + @Inject + private Instance instances; + + private Set> prefixMapperTuples; + + @PostConstruct + void init() { + Map> mappersByPrefixDictionary = instances.stream() + .flatMap(mapper -> mapper.aggregatedPrefixes().stream().map(prefix -> Tuple.of(mapper, prefix))) + .collect(Collectors.groupingBy(Tuple::getSecond, Collectors.mapping(Tuple::getFirst, Collectors.toList()))); + + Set>> duplicateMappings = mappersByPrefixDictionary.entrySet() + .stream() + .filter(entry -> CollectionUtils.size(entry.getValue()) > 1) + .map( + entry -> Tuple + .of(entry.getKey(), entry.getValue().stream().map(mapper -> mapper.getClass().getSimpleName()).collect(Collectors.toSet()))) + .collect(Collectors.toSet()); + + if (CollectionUtils.isNotEmpty(duplicateMappings)) { + throw new IllegalStateException( + String.format( + "There are duplicate grouped field mappings: [%s]. \nA prefix can only be handled by a single mapper", + duplicateMappings)); + } + + prefixMapperTuples = + mappersByPrefixDictionary.entrySet().stream().map(entry -> Tuple.of(entry.getKey(), entry.getValue().get(0))).collect(Collectors.toSet()); + } + + @NotNull + public List aggregatedPatch(@NotNull GroupedFieldsRequest request) { + + Map> dictionary = request.getPartialPatchDictionary() + .entrySet() + .stream() + .map( + patchKeyValueEntry -> prefixMapperTuples.stream() + .filter(prefixMapperTuple -> StringUtils.startsWith(patchKeyValueEntry.getKey(), prefixMapperTuple.getFirst())) + .findAny() + .map(tuple -> Tuple.of(tuple.getSecond(), patchKeyValueEntry))) + .flatMap(Optional::stream) + .collect( + Collectors.groupingBy( + Tuple::getFirst, + CollectorUtils.toNullSafeMap(tuple -> tuple.getSecond().getKey(), tuple -> tuple.getSecond().getValue()))); + + return dictionary.entrySet() + .stream() + .flatMap(entry -> entry.getKey().aggregatedPatch(buildCopy(request).setPartialPatchDictionary(entry.getValue())).stream()) + .collect(Collectors.toList()); + } + + private static GroupedFieldsRequest buildCopy(GroupedFieldsRequest request) { + return new GroupedFieldsRequest().setAllowFallbackValues(request.isAllowFallbackValues()) + .setEmptyValueBehavior(request.getEmptyValueBehavior()) + .setOrigin(request.getOrigin()) + .setInputLanguages(request.getInputLanguages()) + .setPatchedInCaseOfFailures(request.isPatchedInCaseOfFailures()) + .setReplacementStrategy(request.getReplacementStrategy()); + } +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/groupedfieldmapper/ImmunizationGroupedFieldMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/groupedfieldmapper/ImmunizationGroupedFieldMapper.java index c3915d8e92d..4cac4d96f90 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/groupedfieldmapper/ImmunizationGroupedFieldMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/groupedfieldmapper/ImmunizationGroupedFieldMapper.java @@ -2,16 +2,25 @@ import java.util.Map; import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; import javax.enterprise.context.ApplicationScoped; +import de.symeda.sormas.api.immunization.ImmunizationDto; import de.symeda.sormas.api.patch.mapping.GroupedFieldsMapper; import de.symeda.sormas.api.patch.mapping.GroupedFieldsRequest; import de.symeda.sormas.api.patch.mapping.ValueMappingResult; +import de.symeda.sormas.api.vaccination.VaccinationDto; +import de.symeda.sormas.backend.patch.PatchFieldHelper; @ApplicationScoped public class ImmunizationGroupedFieldMapper implements GroupedFieldsMapper { + private static final Set SUPPORTED_PREFIXES = Stream.of(ImmunizationDto.I18N_PREFIX, VaccinationDto.I18N_PREFIX) + .map(prefix -> prefix + PatchFieldHelper.PATH_SEPARATOR) + .collect(Collectors.toSet()); + @Override public Map> aggregatedPatch(GroupedFieldsRequest request) { // TODO: use a field as reference to trigger one or another logic: Immunization.immunizationStatus @@ -37,10 +46,6 @@ public Map> aggregatedPatch(GroupedFieldsRequ @Override public Set aggregatedPrefixes() { - if (true) { - // TODO: specifiy adequate fields. - throw new IllegalStateException(); - } - return Set.of(); + return SUPPORTED_PREFIXES; } } From 51540d3122b45fc9e0e71f238cb42f8869527439 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Thu, 5 Mar 2026 08:04:08 +0100 Subject: [PATCH 038/134] integrated api doesn't break anything for now, to see how it goes --- .../sormas/backend/patch/DataPatcherImpl.java | 49 +++++++++++++------ .../ImmunizationGroupedFieldMapper.java | 8 +-- 2 files changed, 37 insertions(+), 20 deletions(-) diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java index ebebf719b4c..f7a75216103 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java @@ -5,6 +5,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; +import java.util.Set; import java.util.function.Function; import java.util.function.Predicate; import java.util.function.Supplier; @@ -33,8 +34,10 @@ import de.symeda.sormas.api.patch.DataPatcher; import de.symeda.sormas.api.patch.DataReplacementStrategy; import de.symeda.sormas.api.patch.EmptyValueBehavior; +import de.symeda.sormas.api.patch.SinglePatchResult; import de.symeda.sormas.api.patch.mapping.FieldCustomMapper; import de.symeda.sormas.api.patch.mapping.FieldPatchRequest; +import de.symeda.sormas.api.patch.mapping.GroupedFieldsRequest; import de.symeda.sormas.api.patch.mapping.ValueMappingResult; import de.symeda.sormas.api.patch.mapping.ValuePatchRequest; import de.symeda.sormas.api.person.PersonDto; @@ -126,27 +129,31 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { List>> patchingTuples = computePatchingTuples(request); - groupedFieldMapperRegistry.aggregatedPatch() + List groupedFieldsSinglePatchResults = groupedFieldMapperRegistry.aggregatedPatch(from(request)); + Set alreadyProcessedFields = + groupedFieldsSinglePatchResults.stream().map(SinglePatchResult::getFieldName).collect(Collectors.toSet()); // TODO: patchingTuples (transform to map ?) must be passed to the group field handler so that it can be handled. // TODO: provide only the valid one as simple object ? Once this is done the actual dictionary must be not contain does anymore - List results = patchingTuples.stream().map(entry -> { - String fullFieldName = entry.getFirst(); - de.symeda.sormas.api.patch.SinglePatchResult singlePatchResult = new de.symeda.sormas.api.patch.SinglePatchResult().setFieldName(fullFieldName); - - Supplier target = () -> findAppropriateTarget(fullFieldName, caseData, personSupplier); - - try { - return invalidFieldResult(entry).or(() -> fieldMappingResult(entry, disease, request, target)) - .orElseGet(() -> valueMappingResult(entry, disease, request, target)); - } catch (RuntimeException e) { - logger.error("Failure during patch operation", e); - return singlePatchResult - .setFailure(new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.TECHNICAL).setDescription(e.getMessage())); - } + List results = + Stream.concat(patchingTuples.stream().filter(tuple -> !alreadyProcessedFields.contains(tuple.getFirst())).map(entry -> { + String fullFieldName = entry.getFirst(); + de.symeda.sormas.api.patch.SinglePatchResult singlePatchResult = + new de.symeda.sormas.api.patch.SinglePatchResult().setFieldName(fullFieldName); + + Supplier target = () -> findAppropriateTarget(fullFieldName, caseData, personSupplier); + + try { + return invalidFieldResult(entry).or(() -> fieldMappingResult(entry, disease, request, target)) + .orElseGet(() -> valueMappingResult(entry, disease, request, target)); + } catch (RuntimeException e) { + logger.error("Failure during patch operation", e); + return singlePatchResult + .setFailure(new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.TECHNICAL).setDescription(e.getMessage())); + } - }).collect(Collectors.toList()); + }), groupedFieldsSinglePatchResults.stream()).collect(Collectors.toList()); Map validPatchDictionary = buildDictionaryFor(results, de.symeda.sormas.api.patch.SinglePatchResult::getValue, true); DataPatchResponse response = new DataPatchResponse().setApplied(false) @@ -168,6 +175,16 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { return response.setApplied(true); } + private GroupedFieldsRequest from(CaseDataPatchRequest request) { + return new GroupedFieldsRequest().setPartialPatchDictionary(request.getPatchDictionary()) + .setInputLanguages(request.getInputLanguages()) + .setOrigin(request.getOrigin()) + .setAllowFallbackValues(request.isAllowFallbackValues()) + .setPatchedInCaseOfFailures(request.isPatchedInCaseOfFailures()) + .setReplacementStrategy(request.getReplacementStrategy()) + .setEmptyValueBehavior(request.getEmptyValueBehavior()); + } + private void saveDTOsIfAppropriate(Map validPatchDictionary, CaseDataDto caseData, Supplier personSupplier) { if (anyFieldPatchedWithPrefix(validPatchDictionary, PatchFieldHelper.CASE_DATA_PREFIX)) { logger.info("CaseData was modified will be applied for: [{}]. Enable debug to see fully patched object", caseData); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/groupedfieldmapper/ImmunizationGroupedFieldMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/groupedfieldmapper/ImmunizationGroupedFieldMapper.java index 4cac4d96f90..dcf909a4f0a 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/groupedfieldmapper/ImmunizationGroupedFieldMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/groupedfieldmapper/ImmunizationGroupedFieldMapper.java @@ -1,6 +1,6 @@ package de.symeda.sormas.backend.patch.mapping.impl.groupedfieldmapper; -import java.util.Map; +import java.util.List; import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -8,9 +8,9 @@ import javax.enterprise.context.ApplicationScoped; import de.symeda.sormas.api.immunization.ImmunizationDto; +import de.symeda.sormas.api.patch.SinglePatchResult; import de.symeda.sormas.api.patch.mapping.GroupedFieldsMapper; import de.symeda.sormas.api.patch.mapping.GroupedFieldsRequest; -import de.symeda.sormas.api.patch.mapping.ValueMappingResult; import de.symeda.sormas.api.vaccination.VaccinationDto; import de.symeda.sormas.backend.patch.PatchFieldHelper; @@ -22,7 +22,7 @@ public class ImmunizationGroupedFieldMapper implements GroupedFieldsMapper { .collect(Collectors.toSet()); @Override - public Map> aggregatedPatch(GroupedFieldsRequest request) { + public List aggregatedPatch(GroupedFieldsRequest request) { // TODO: use a field as reference to trigger one or another logic: Immunization.immunizationStatus /* @@ -41,7 +41,7 @@ public Map> aggregatedPatch(GroupedFieldsRequ * - Can use the DataPatcher again to be able to set all single field values: values or exact fields. (focus on values now) */ - return Map.of(); + return List.of(); } @Override From 9a0f4bce872f39cdd7e20c13b8701ef86fd8429b Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Thu, 5 Mar 2026 11:21:20 +0100 Subject: [PATCH 039/134] =?UTF-8?q?=F0=9F=9A=A7:=20WIP:=20started=20groupe?= =?UTF-8?q?dFields=20impl.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit TODO: launch unit tests --- .../api/patch/DataPatchFailureCause.java | 2 + .../patch/mapping/GroupedFieldsMapper.java | 12 ++-- .../patch/mapping/GroupedFieldsRequest.java | 52 +++++++++++++- .../patch/mapping/GroupedFieldsResponse.java | 60 ++++++++++++++++ ...eferenceDataValueInstanceProviderImpl.java | 2 +- .../backend/patch/BusinessDtoFacade.java | 72 +++++++++++++++++++ .../sormas/backend/patch/DataPatcherImpl.java | 4 +- .../ImmunizationGroupedFieldMapper.java | 43 +++++++++-- 8 files changed, 232 insertions(+), 15 deletions(-) create mode 100644 sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsResponse.java create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java index 902b4fccbdf..9209c73d777 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java @@ -7,6 +7,8 @@ public enum DataPatchFailureCause { */ INVALID_MULTIPLE_FIELDS_FORMAT, + MISSING_MANDATORY_FIELD_FOR_GROUP, + /** * Alias cannot be mapped to a single physical path. * Path aliases base on the "Field ID" field from the generated data dictionary can be used to shorten the physical path. diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsMapper.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsMapper.java index 4236fbdb356..96d98061940 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsMapper.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsMapper.java @@ -1,28 +1,30 @@ package de.symeda.sormas.api.patch.mapping; -import java.util.List; import java.util.Set; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; -import de.symeda.sormas.api.patch.SinglePatchResult; +import de.symeda.sormas.api.EntityDto; /** * Some complex - fields objects cannot be mapped using the simple 1 key <-> 1 value approach as some fields must be grouped together to * make sense. + *

+ * This also allows creating entities that are not accessible from the Mapping context Root (as of 2026-03-05: + * {@link de.symeda.sormas.api.caze.CaseDataDto}) */ -public interface GroupedFieldsMapper { +public interface GroupedFieldsMapper { /** - * Will try to + * Attempts to create a response for the mapping. * * @param request * to determine what may or may not be aggregated. * @return result dictionary: key path and value the result: patched value or failure. */ @NotNull - List aggregatedPatch(@NotNull GroupedFieldsRequest request); + GroupedFieldsResponse aggregatedPatch(@NotNull GroupedFieldsRequest request); /** * Specifies the prefixes that are supported by this grouped mapper. diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsRequest.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsRequest.java index c2dbc2bee21..6263ec805c4 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsRequest.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsRequest.java @@ -7,15 +7,27 @@ import javax.annotation.Nullable; import javax.validation.constraints.NotNull; +import de.symeda.sormas.api.Disease; import de.symeda.sormas.api.Language; +import de.symeda.sormas.api.caze.CaseReferenceDto; import de.symeda.sormas.api.patch.DataReplacementStrategy; import de.symeda.sormas.api.patch.EmptyValueBehavior; +import de.symeda.sormas.api.person.PersonReferenceDto; /** * Request object to patch more complex objects together will all fields belonging to that object. */ public class GroupedFieldsRequest { + @NotNull + private Disease disease; + + @NotNull + private CaseReferenceDto caseData; + + @NotNull + private PersonReferenceDto person; + private boolean patchedInCaseOfFailures = false; @NotNull @@ -113,6 +125,33 @@ public GroupedFieldsRequest setAllowFallbackValues(boolean allowFallbackValues) return this; } + public CaseReferenceDto getCaseData() { + return caseData; + } + + public GroupedFieldsRequest setCaseData(CaseReferenceDto caseData) { + this.caseData = caseData; + return this; + } + + public PersonReferenceDto getPerson() { + return person; + } + + public GroupedFieldsRequest setPerson(PersonReferenceDto person) { + this.person = person; + return this; + } + + public Disease getDisease() { + return disease; + } + + public GroupedFieldsRequest setDisease(Disease disease) { + this.disease = disease; + return this; + } + @Override public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) @@ -120,6 +159,9 @@ public boolean equals(Object o) { GroupedFieldsRequest that = (GroupedFieldsRequest) o; return patchedInCaseOfFailures == that.patchedInCaseOfFailures && allowFallbackValues == that.allowFallbackValues + && disease == that.disease + && Objects.equals(caseData, that.caseData) + && Objects.equals(person, that.person) && replacementStrategy == that.replacementStrategy && emptyValueBehavior == that.emptyValueBehavior && Objects.equals(partialPatchDictionary, that.partialPatchDictionary) @@ -130,6 +172,9 @@ public boolean equals(Object o) { @Override public int hashCode() { return Objects.hash( + disease, + caseData, + person, patchedInCaseOfFailures, replacementStrategy, emptyValueBehavior, @@ -141,8 +186,9 @@ public int hashCode() { @Override public String toString() { - return "GroupedFieldsRequest{" + "patchedInCaseOfFailures=" + patchedInCaseOfFailures + ", replacementStrategy=" + replacementStrategy - + ", emptyValueBehavior=" + emptyValueBehavior + ", partialPatchDictionary=" + partialPatchDictionary + ", origin='" + origin + '\'' - + ", inputLanguages=" + inputLanguages + ", allowFallbackValues=" + allowFallbackValues + '}'; + return "GroupedFieldsRequest{" + "disease=" + disease + ", caseData=" + caseData + ", person=" + person + ", patchedInCaseOfFailures=" + + patchedInCaseOfFailures + ", replacementStrategy=" + replacementStrategy + ", emptyValueBehavior=" + emptyValueBehavior + + ", partialPatchDictionary=" + partialPatchDictionary + ", origin='" + origin + '\'' + ", inputLanguages=" + inputLanguages + + ", allowFallbackValues=" + allowFallbackValues + '}'; } } diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsResponse.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsResponse.java new file mode 100644 index 00000000000..c92fd56c625 --- /dev/null +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsResponse.java @@ -0,0 +1,60 @@ +package de.symeda.sormas.api.patch.mapping; + +import java.util.List; +import java.util.Objects; + +import javax.annotation.Nullable; + +import de.symeda.sormas.api.EntityDto; +import de.symeda.sormas.api.patch.SinglePatchResult; + +public class GroupedFieldsResponse { + + /** + * In case of errors this might be null, otherwise should always be present to be stored at the very end of the patching processing. + */ + @Nullable + private T entityDto; + + /** + * Actual results from the original {@link GroupedFieldsRequest}. + */ + private List patchingResults; + + @Nullable + public T getEntityDto() { + return entityDto; + } + + public GroupedFieldsResponse setEntityDto(@Nullable T entityDto) { + this.entityDto = entityDto; + return this; + } + + public List getPatchingResults() { + return patchingResults; + } + + public GroupedFieldsResponse setPatchingResults(List patchingResults) { + this.patchingResults = patchingResults; + return this; + } + + @Override + public boolean equals(Object o) { + if (o == null || getClass() != o.getClass()) + return false; + GroupedFieldsResponse that = (GroupedFieldsResponse) o; + return Objects.equals(entityDto, that.entityDto) && Objects.equals(patchingResults, that.patchingResults); + } + + @Override + public int hashCode() { + return Objects.hash(entityDto, patchingResults); + } + + @Override + public String toString() { + return "GroupedFieldsResponse{" + "entityDto=" + entityDto + ", patchingResults=" + patchingResults + '}'; + } +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/ReferenceDataValueInstanceProviderImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/ReferenceDataValueInstanceProviderImpl.java index 50e75148a60..eae74e9645f 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/ReferenceDataValueInstanceProviderImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/ReferenceDataValueInstanceProviderImpl.java @@ -38,7 +38,7 @@ public class ReferenceDataValueInstanceProviderImpl implements ReferenceDataValu private Map, Supplier>> dictionary; @PostConstruct - public void init() { + private void init() { dictionary = Map.ofEntries( Map.entry(CountryReferenceDto.class, () -> getInstance(CountryFacade.class).getAllActiveAsReference()), Map.entry(RegionReferenceDto.class, () -> getInstance(RegionFacade.class).getAllActiveAsReference()), diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java new file mode 100644 index 00000000000..5a4ddf66213 --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java @@ -0,0 +1,72 @@ +package de.symeda.sormas.backend.patch; + +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; +import java.util.function.Consumer; +import java.util.function.Function; + +import javax.annotation.PostConstruct; +import javax.ejb.EJB; +import javax.enterprise.context.ApplicationScoped; +import javax.validation.constraints.NotNull; + +import de.symeda.sormas.api.EntityDto; +import de.symeda.sormas.api.caze.CaseDataDto; +import de.symeda.sormas.api.immunization.ImmunizationDto; +import de.symeda.sormas.api.person.PersonDto; +import de.symeda.sormas.backend.caze.CaseFacadeEjb; +import de.symeda.sormas.backend.immunization.ImmunizationFacadeEjb; +import de.symeda.sormas.backend.person.PersonFacadeEjb; + +@ApplicationScoped +public class BusinessDtoFacade { + + @EJB + private CaseFacadeEjb.CaseFacadeEjbLocal caseFacade; + + @EJB + private PersonFacadeEjb.PersonFacadeEjbLocal personFacade; + + @EJB + private ImmunizationFacadeEjb.ImmunizationFacadeEjbLocal immunizationFacade; + + private final Map, Consumer> dtoSaveDictionary = new HashMap<>(); + + private final Map, Function> dtoRetrieverDictionary = new HashMap<>(); + + @PostConstruct + private void init() { + registerSaveOperations(); + getRegisterFetchOperations(); + } + + private void getRegisterFetchOperations() { + registerFetch(PersonDto.class, caseDataDto -> personFacade.getByUuid(caseDataDto.getPerson().getUuid())); + } + + private void registerFetch(Class dtoClass, Function fct) { + dtoRetrieverDictionary.put(dtoClass, fct); + } + + private void registerSaveOperations() { + registerSave(PersonDto.class, personDto -> personFacade.save(personDto)); + registerSave(ImmunizationDto.class, immunizationDto -> immunizationFacade.save(immunizationDto)); + } + + private void registerSave(Class dtoClass, Consumer consumer) { + dtoSaveDictionary.put(dtoClass, consumer); + } + + public CaseDataDto getCaseDataDto(String caseUuid) { + return caseFacade.getByUuid(caseUuid); + } + + public Optional> fetch(@NotNull Class entity) { + return Optional.ofNullable((Function) dtoRetrieverDictionary.get(entity)); + } + + public Optional> save(@NotNull EntityDto entityDto) { + return Optional.ofNullable((Consumer) dtoSaveDictionary.get(entityDto)); + } +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java index f7a75216103..767d2c72ee4 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java @@ -62,7 +62,7 @@ public class DataPatcherImpl implements DataPatcher { private final static Logger logger = LoggerFactory.getLogger(DataPatcherImpl.class); - private static final Map PROPERTY_FAILURE_TO_PATCH_FAILURE = Map.of( + private static final Map PROPERTY_FAILURE_TO_DATA_PATCH_FAILURE = Map.of( PropertyAccessFailure.INVALID_INPUT, DataPatchFailureCause.TECHNICAL, @@ -247,7 +247,7 @@ private boolean anyFieldPatchedWithPrefix(Map validPatchDictiona logger.info("Missing field: [{}] on target: [{}]", relativeFieldName, target); return singlePatchResult.setFailure( buildFailure( - PROPERTY_FAILURE_TO_PATCH_FAILURE.getOrDefault(propertyAccessFailure, DataPatchFailureCause.TECHNICAL), + PROPERTY_FAILURE_TO_DATA_PATCH_FAILURE.getOrDefault(propertyAccessFailure, DataPatchFailureCause.TECHNICAL), untypedTargetValue)); } Class targetType = nestedPropertyTypeTuple.getFirst(); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/groupedfieldmapper/ImmunizationGroupedFieldMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/groupedfieldmapper/ImmunizationGroupedFieldMapper.java index dcf909a4f0a..43eedeff14f 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/groupedfieldmapper/ImmunizationGroupedFieldMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/groupedfieldmapper/ImmunizationGroupedFieldMapper.java @@ -1,30 +1,63 @@ package de.symeda.sormas.backend.patch.mapping.impl.groupedfieldmapper; -import java.util.List; +import java.util.Map; import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; import javax.enterprise.context.ApplicationScoped; +import javax.inject.Inject; import de.symeda.sormas.api.immunization.ImmunizationDto; +import de.symeda.sormas.api.patch.DataPatchFailure; +import de.symeda.sormas.api.patch.DataPatchFailureCause; import de.symeda.sormas.api.patch.SinglePatchResult; import de.symeda.sormas.api.patch.mapping.GroupedFieldsMapper; import de.symeda.sormas.api.patch.mapping.GroupedFieldsRequest; +import de.symeda.sormas.api.patch.mapping.GroupedFieldsResponse; +import de.symeda.sormas.api.patch.mapping.ValuePatchRequest; import de.symeda.sormas.api.vaccination.VaccinationDto; import de.symeda.sormas.backend.patch.PatchFieldHelper; +import de.symeda.sormas.backend.patch.mapping.ValueMapperRegistry; @ApplicationScoped -public class ImmunizationGroupedFieldMapper implements GroupedFieldsMapper { +public class ImmunizationGroupedFieldMapper implements GroupedFieldsMapper { private static final Set SUPPORTED_PREFIXES = Stream.of(ImmunizationDto.I18N_PREFIX, VaccinationDto.I18N_PREFIX) .map(prefix -> prefix + PatchFieldHelper.PATH_SEPARATOR) .collect(Collectors.toSet()); + @Inject + private ValueMapperRegistry valueMapperRegistry; + @Override - public List aggregatedPatch(GroupedFieldsRequest request) { + public GroupedFieldsResponse aggregatedPatch(GroupedFieldsRequest request) { // TODO: use a field as reference to trigger one or another logic: Immunization.immunizationStatus + Map originalPatchDictionary = request.getPartialPatchDictionary(); + + ImmunizationDto build = ImmunizationDto.build(request.getPerson()); + build.setDisease(request.getDisease()); + + Object immunizationStatus = originalPatchDictionary.get(ImmunizationDto.IMMUNIZATION_STATUS); + if (immunizationStatus == null) { + return new GroupedFieldsResponse().setPatchingResults( + originalPatchDictionary.entrySet() + .stream() + .map( + entry -> new SinglePatchResult().setFieldName(entry.getKey()) + .setFailure( + new DataPatchFailure().setProvidedFieldValue(entry.getValue()) + .setDataPatchFailureCause(DataPatchFailureCause.MISSING_MANDATORY_FIELD_FOR_GROUP))) + .collect(Collectors.toList())); + } + + String immunizationStatusString = immunizationStatus.toString(); + + valueMapperRegistry.map(new ValuePatchRequest().setValue(immunizationStatus).setTargetType(Boolean.class)); + + // TODO: use (Field ID) Vaccination.vaccineType: to determine if it is a vaccine for the mother. + /* * Implementation steps: * - Retrieve value for: 'Immunization.immunizationStatus' @@ -41,7 +74,9 @@ public List aggregatedPatch(GroupedFieldsRequest request) { * - Can use the DataPatcher again to be able to set all single field values: values or exact fields. (focus on values now) */ - return List.of(); + GroupedFieldsResponse groupedFieldsResponse = + new GroupedFieldsResponse().setEntityDto(build).setPatchingResults(null); + return groupedFieldsResponse; } @Override From 642c9229383b0b026883d3d21b5afeffd395a1fd Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Thu, 5 Mar 2026 12:06:27 +0100 Subject: [PATCH 040/134] before changing branch, does not build --- .../backend/patch/mapping/GroupedFieldMapperRegistry.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/GroupedFieldMapperRegistry.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/GroupedFieldMapperRegistry.java index 82dd8775f59..ec5ddc6fdd1 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/GroupedFieldMapperRegistry.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/GroupedFieldMapperRegistry.java @@ -29,13 +29,13 @@ public class GroupedFieldMapperRegistry { private final static Logger logger = LoggerFactory.getLogger(GroupedFieldMapperRegistry.class); @Inject - private Instance instances; + private Instance> instances; - private Set> prefixMapperTuples; + private Set>> prefixMapperTuples; @PostConstruct void init() { - Map> mappersByPrefixDictionary = instances.stream() + Map>> mappersByPrefixDictionary = instances.stream() .flatMap(mapper -> mapper.aggregatedPrefixes().stream().map(prefix -> Tuple.of(mapper, prefix))) .collect(Collectors.groupingBy(Tuple::getSecond, Collectors.mapping(Tuple::getFirst, Collectors.toList()))); @@ -61,7 +61,7 @@ void init() { @NotNull public List aggregatedPatch(@NotNull GroupedFieldsRequest request) { - Map> dictionary = request.getPartialPatchDictionary() + Map, Map> dictionary = request.getPartialPatchDictionary() .entrySet() .stream() .map( From ec675d66fc689799e6d53e56c98f456bee5f7c93 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Mon, 9 Mar 2026 10:46:18 +0100 Subject: [PATCH 041/134] now using BusinessDtoFacade to have a single entry --- .../api/patch/DataPatchFailureCause.java | 3 + .../backend/patch/BusinessDtoFacade.java | 22 ++++--- .../sormas/backend/patch/DataPatcherImpl.java | 63 +++++++------------ .../mapping/GroupedFieldMapperRegistry.java | 9 +-- .../ImmunizationGroupedFieldMapper.java | 24 +++++-- 5 files changed, 65 insertions(+), 56 deletions(-) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java index 9209c73d777..0b34f24a5a8 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java @@ -7,6 +7,9 @@ public enum DataPatchFailureCause { */ INVALID_MULTIPLE_FIELDS_FORMAT, + /** + * Some fields require a particular handling and are handled as group, to trigger the handling some fields are mandatory. + */ MISSING_MANDATORY_FIELD_FOR_GROUP, /** diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java index 5a4ddf66213..3e3b855bb91 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java @@ -3,9 +3,9 @@ import java.util.HashMap; import java.util.Map; import java.util.Optional; -import java.util.function.Consumer; import java.util.function.Function; +import javax.annotation.Nullable; import javax.annotation.PostConstruct; import javax.ejb.EJB; import javax.enterprise.context.ApplicationScoped; @@ -31,7 +31,7 @@ public class BusinessDtoFacade { @EJB private ImmunizationFacadeEjb.ImmunizationFacadeEjbLocal immunizationFacade; - private final Map, Consumer> dtoSaveDictionary = new HashMap<>(); + private final Map, Function> dtoSaveDictionary = new HashMap<>(); private final Map, Function> dtoRetrieverDictionary = new HashMap<>(); @@ -50,11 +50,12 @@ private void registerFetch(Class dtoClass, Function caseFacade.save(caseDataDto)); registerSave(PersonDto.class, personDto -> personFacade.save(personDto)); registerSave(ImmunizationDto.class, immunizationDto -> immunizationFacade.save(immunizationDto)); } - private void registerSave(Class dtoClass, Consumer consumer) { + private void registerSave(Class dtoClass, Function consumer) { dtoSaveDictionary.put(dtoClass, consumer); } @@ -62,11 +63,18 @@ public CaseDataDto getCaseDataDto(String caseUuid) { return caseFacade.getByUuid(caseUuid); } - public Optional> fetch(@NotNull Class entity) { - return Optional.ofNullable((Function) dtoRetrieverDictionary.get(entity)); + @Nullable + public T fetch(@NotNull Class entityClass, CaseDataDto caseDataDto) { + return Optional.ofNullable((Function) dtoRetrieverDictionary.get(entityClass)) + .orElseThrow(() -> new IllegalStateException(String.format("No fetch function defined for: [%s]", entityClass))) + .apply(caseDataDto); } - public Optional> save(@NotNull EntityDto entityDto) { - return Optional.ofNullable((Consumer) dtoSaveDictionary.get(entityDto)); + public T save(@NotNull EntityDto entityDto) { + Class entityDtoClass = entityDto.getClass(); + + return Optional.ofNullable((Function) dtoSaveDictionary.get(entityDtoClass)) + .orElseThrow(() -> new IllegalStateException(String.format("No save function defined for: [%s]", entityDtoClass))) + .apply((T) entityDto); } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java index 767d2c72ee4..a181e4175b7 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java @@ -38,19 +38,18 @@ import de.symeda.sormas.api.patch.mapping.FieldCustomMapper; import de.symeda.sormas.api.patch.mapping.FieldPatchRequest; import de.symeda.sormas.api.patch.mapping.GroupedFieldsRequest; +import de.symeda.sormas.api.patch.mapping.GroupedFieldsResponse; import de.symeda.sormas.api.patch.mapping.ValueMappingResult; import de.symeda.sormas.api.patch.mapping.ValuePatchRequest; import de.symeda.sormas.api.person.PersonDto; import de.symeda.sormas.api.utils.Tuple; import de.symeda.sormas.api.utils.fieldvisibility.FieldVisibilityCheckers; -import de.symeda.sormas.backend.caze.CaseFacadeEjb; import de.symeda.sormas.backend.common.ConfigFacadeEjb; import de.symeda.sormas.backend.feature.FeatureConfigurationFacadeEjb; import de.symeda.sormas.backend.json.ObjectMapperProvider; import de.symeda.sormas.backend.patch.mapping.FieldCustomMapperRegistry; import de.symeda.sormas.backend.patch.mapping.GroupedFieldMapperRegistry; import de.symeda.sormas.backend.patch.mapping.ValueMapperRegistry; -import de.symeda.sormas.backend.person.PersonFacadeEjb; import de.symeda.sormas.backend.util.CollectorUtils; // TODO: test integration vaccines @@ -72,6 +71,9 @@ public class DataPatcherImpl implements DataPatcher { PropertyAccessFailure.UNSUPPORTED_FIELD_FOR_DISEASE_OR_COUNTRY_OR_FEATURE, DataPatchFailureCause.UNSUPPORTED_FIELD_FOR_DISEASE_OR_COUNTRY_OR_FEATURE); + @Inject + private PatchFieldHelper patchFieldHelper; + @Inject private ValueMapperRegistry valueMapperRegistry; @@ -79,13 +81,10 @@ public class DataPatcherImpl implements DataPatcher { private FieldCustomMapperRegistry fieldCustomMapperRegistry; @Inject - private PatchFieldHelper patchFieldHelper; - - @EJB - private CaseFacadeEjb.CaseFacadeEjbLocal caseFacade; + private GroupedFieldMapperRegistry groupedFieldMapperRegistry; - @EJB - private PersonFacadeEjb.PersonFacadeEjbLocal personFacade; + @Inject + private BusinessDtoFacade businessDtoFacade; @EJB private FeatureConfigurationFacadeEjb.FeatureConfigurationFacadeEjbLocal featureConfigurationFacade; @@ -93,25 +92,22 @@ public class DataPatcherImpl implements DataPatcher { @EJB private ConfigFacadeEjb.ConfigFacadeEjbLocal configFacade; - @Inject - private GroupedFieldMapperRegistry groupedFieldMapperRegistry; - public DataPatcherImpl() { } public DataPatcherImpl( + PatchFieldHelper patchFieldHelper, ValueMapperRegistry valueMapperRegistry, FieldCustomMapperRegistry fieldCustomMapperRegistry, - PatchFieldHelper patchFieldHelper, - CaseFacadeEjb.CaseFacadeEjbLocal caseFacade, - PersonFacadeEjb.PersonFacadeEjbLocal personFacade, + GroupedFieldMapperRegistry groupedFieldMapperRegistry, + BusinessDtoFacade businessDtoFacade, FeatureConfigurationFacadeEjb.FeatureConfigurationFacadeEjbLocal featureConfigurationFacade, ConfigFacadeEjb.ConfigFacadeEjbLocal configFacade) { + this.patchFieldHelper = patchFieldHelper; this.valueMapperRegistry = valueMapperRegistry; this.fieldCustomMapperRegistry = fieldCustomMapperRegistry; - this.patchFieldHelper = patchFieldHelper; - this.caseFacade = caseFacade; - this.personFacade = personFacade; + this.groupedFieldMapperRegistry = groupedFieldMapperRegistry; + this.businessDtoFacade = businessDtoFacade; this.featureConfigurationFacade = featureConfigurationFacade; this.configFacade = configFacade; } @@ -129,9 +125,10 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { List>> patchingTuples = computePatchingTuples(request); - List groupedFieldsSinglePatchResults = groupedFieldMapperRegistry.aggregatedPatch(from(request)); - Set alreadyProcessedFields = - groupedFieldsSinglePatchResults.stream().map(SinglePatchResult::getFieldName).collect(Collectors.toSet()); + List> groupedFieldsSinglePatchResults = groupedFieldMapperRegistry.aggregatedPatch(from(request)); + Set alreadyProcessedFields = groupedFieldsSinglePatchResults.stream() + .flatMap(response -> response.getPatchingResults().stream().map(SinglePatchResult::getFieldName)) + .collect(Collectors.toSet()); // TODO: patchingTuples (transform to map ?) must be passed to the group field handler so that it can be handled. // TODO: provide only the valid one as simple object ? Once this is done the actual dictionary must be not contain does anymore @@ -153,7 +150,8 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { .setFailure(new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.TECHNICAL).setDescription(e.getMessage())); } - }), groupedFieldsSinglePatchResults.stream()).collect(Collectors.toList()); + }), groupedFieldsSinglePatchResults.stream().flatMap(groupedFieldResponse -> groupedFieldResponse.getPatchingResults().stream())) + .collect(Collectors.toList()); Map validPatchDictionary = buildDictionaryFor(results, de.symeda.sormas.api.patch.SinglePatchResult::getValue, true); DataPatchResponse response = new DataPatchResponse().setApplied(false) @@ -193,7 +191,7 @@ private void saveDTOsIfAppropriate(Map validPatchDictionary, Cas logger.debug("CaseData: \n{}", ObjectMapperProvider.writeValueAsStringFailSafe(caseData)); } - caseFacade.save(caseData); + businessDtoFacade.save(caseData); } if (anyFieldPatchedWithPrefix(validPatchDictionary, PatchFieldHelper.PERSON_PREFIX)) { @@ -204,7 +202,7 @@ private void saveDTOsIfAppropriate(Map validPatchDictionary, Cas logger.debug("Person: \n{}", ObjectMapperProvider.writeValueAsStringFailSafe(person)); } - personFacade.save(person); + businessDtoFacade.save(person); } } @@ -417,7 +415,7 @@ private Tuple> buildMapTupleEntryFr private @NotNull PersonDto getPersonDto(CaseDataDto caseData) { String personUuid = caseData.getPerson().getUuid(); - PersonDto person = personFacade.getByUuid(personUuid); + PersonDto person = businessDtoFacade.fetch(PersonDto.class, caseData); if (person == null) { throw new IllegalStateException(String.format("No person found for uuid: [%s]", personUuid)); @@ -427,7 +425,7 @@ private Tuple> buildMapTupleEntryFr private @NotNull CaseDataDto getCaseDataDto(CaseDataPatchRequest request) { String caseUuid = request.getCaseUuid(); - CaseDataDto caseData = caseFacade.getCaseDataByUuid(caseUuid); + CaseDataDto caseData = businessDtoFacade.getCaseDataDto(caseUuid); if (caseData == null) { throw new IllegalStateException(String.format("No case found for uuid: [%s]", caseUuid)); @@ -460,19 +458,4 @@ private Predicate> buildEmptyValuePredicate() { }; } - public void setValueMapperRegistry(ValueMapperRegistry valueMapperRegistry) { - this.valueMapperRegistry = valueMapperRegistry; - } - - public void setFieldCustomMapperRegistry(FieldCustomMapperRegistry fieldCustomMapperRegistry) { - this.fieldCustomMapperRegistry = fieldCustomMapperRegistry; - } - - public void setCaseFacade(CaseFacadeEjb.CaseFacadeEjbLocal caseFacade) { - this.caseFacade = caseFacade; - } - - public void setPersonFacade(PersonFacadeEjb.PersonFacadeEjbLocal personFacade) { - this.personFacade = personFacade; - } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/GroupedFieldMapperRegistry.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/GroupedFieldMapperRegistry.java index ec5ddc6fdd1..15c01875013 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/GroupedFieldMapperRegistry.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/GroupedFieldMapperRegistry.java @@ -17,9 +17,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.symeda.sormas.api.patch.SinglePatchResult; import de.symeda.sormas.api.patch.mapping.GroupedFieldsMapper; import de.symeda.sormas.api.patch.mapping.GroupedFieldsRequest; +import de.symeda.sormas.api.patch.mapping.GroupedFieldsResponse; import de.symeda.sormas.api.utils.Tuple; import de.symeda.sormas.backend.util.CollectorUtils; @@ -59,8 +59,7 @@ void init() { } @NotNull - public List aggregatedPatch(@NotNull GroupedFieldsRequest request) { - + public List> aggregatedPatch(@NotNull GroupedFieldsRequest request) { Map, Map> dictionary = request.getPartialPatchDictionary() .entrySet() .stream() @@ -75,9 +74,11 @@ public List aggregatedPatch(@NotNull GroupedFieldsRequest req Tuple::getFirst, CollectorUtils.toNullSafeMap(tuple -> tuple.getSecond().getKey(), tuple -> tuple.getSecond().getValue()))); + logger.debug("GroupedFieldsMapper dictionary: [{}] for request: [{}]", dictionary, request); + return dictionary.entrySet() .stream() - .flatMap(entry -> entry.getKey().aggregatedPatch(buildCopy(request).setPartialPatchDictionary(entry.getValue())).stream()) + .map(entry -> entry.getKey().aggregatedPatch(buildCopy(request).setPartialPatchDictionary(entry.getValue()))) .collect(Collectors.toList()); } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/groupedfieldmapper/ImmunizationGroupedFieldMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/groupedfieldmapper/ImmunizationGroupedFieldMapper.java index 43eedeff14f..0964baff726 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/groupedfieldmapper/ImmunizationGroupedFieldMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/groupedfieldmapper/ImmunizationGroupedFieldMapper.java @@ -15,6 +15,7 @@ import de.symeda.sormas.api.patch.mapping.GroupedFieldsMapper; import de.symeda.sormas.api.patch.mapping.GroupedFieldsRequest; import de.symeda.sormas.api.patch.mapping.GroupedFieldsResponse; +import de.symeda.sormas.api.patch.mapping.ValueMappingResult; import de.symeda.sormas.api.patch.mapping.ValuePatchRequest; import de.symeda.sormas.api.vaccination.VaccinationDto; import de.symeda.sormas.backend.patch.PatchFieldHelper; @@ -52,9 +53,13 @@ public GroupedFieldsResponse aggregatedPatch(GroupedFieldsReque .collect(Collectors.toList())); } - String immunizationStatusString = immunizationStatus.toString(); + ValueMappingResult booleanResult = getValueAsTarget(request, immunizationStatus, Boolean.class); - valueMapperRegistry.map(new ValuePatchRequest().setValue(immunizationStatus).setTargetType(Boolean.class)); + if (Boolean.TRUE.equals(booleanResult.getData())) { + return new GroupedFieldsResponse(); + } + + ValueMappingResult stringResult = getValueAsTarget(request, immunizationStatus, String.class); // TODO: use (Field ID) Vaccination.vaccineType: to determine if it is a vaccine for the mother. @@ -64,9 +69,9 @@ public GroupedFieldsResponse aggregatedPatch(GroupedFieldsReque * - Try to detect what is it: * - Yes: must be a vaccine that will be specified in the rest of the object * - No OR don't know: create "dummy-object" that says: - * result.setImmunizationStatus(ImmunizationStatus.NOT_ACQUIRED).setMeansOfImmunization(MeansOfImmunization.OTHER); - * - no: result.setMeansOfImmunizationDetails("NOT_VACCINATED") - * - don't know: result.setMeansOfImmunizationDetails("DON'T KNOW") + * booleanResult.setImmunizationStatus(ImmunizationStatus.NOT_ACQUIRED).setMeansOfImmunization(MeansOfImmunization.OTHER); + * - no: booleanResult.setMeansOfImmunizationDetails("NOT_VACCINATED") + * - don't know: booleanResult.setMeansOfImmunizationDetails("DON'T KNOW") * YES detailed explanation: * - create ImmunizationDto * - create VaccineDto @@ -76,9 +81,18 @@ public GroupedFieldsResponse aggregatedPatch(GroupedFieldsReque GroupedFieldsResponse groupedFieldsResponse = new GroupedFieldsResponse().setEntityDto(build).setPatchingResults(null); + return groupedFieldsResponse; } + private ValueMappingResult getValueAsTarget(GroupedFieldsRequest request, Object immunizationStatus, Class targetType) { + return valueMapperRegistry.map( + new ValuePatchRequest().setValue(immunizationStatus) + .setInputLanguages(request.getInputLanguages()) + .setAllowFallbackValues(request.isAllowFallbackValues()) + .setTargetType(targetType)); + } + @Override public Set aggregatedPrefixes() { return SUPPORTED_PREFIXES; From eab9db4e975517ffebb8118082871c8e531f7c52 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Tue, 10 Mar 2026 10:01:17 +0100 Subject: [PATCH 042/134] naive vaccination implementation --- .../patch/mapping/GroupedFieldsRequest.java | 7 +- .../sormas/backend/patch/DataPatcherImpl.java | 41 ++++- .../mapping/GroupedFieldMapperRegistry.java | 5 +- .../ImmunizationGroupedFieldMapper.java | 149 ++++++++++++++++- .../sormas/patch/DataPatcherImplTest.java | 150 +++++++++++++++++- 5 files changed, 332 insertions(+), 20 deletions(-) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsRequest.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsRequest.java index 6263ec805c4..1bea0e3b48b 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsRequest.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsRequest.java @@ -3,6 +3,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.function.Supplier; import javax.annotation.Nullable; import javax.validation.constraints.NotNull; @@ -26,7 +27,7 @@ public class GroupedFieldsRequest { private CaseReferenceDto caseData; @NotNull - private PersonReferenceDto person; + private Supplier person; private boolean patchedInCaseOfFailures = false; @@ -134,11 +135,11 @@ public GroupedFieldsRequest setCaseData(CaseReferenceDto caseData) { return this; } - public PersonReferenceDto getPerson() { + public Supplier getPerson() { return person; } - public GroupedFieldsRequest setPerson(PersonReferenceDto person) { + public GroupedFieldsRequest setPerson(Supplier person) { this.person = person; return this; } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java index a181e4175b7..a9a49e20914 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java @@ -26,6 +26,7 @@ import com.google.common.base.Suppliers; import de.symeda.sormas.api.Disease; +import de.symeda.sormas.api.EntityDto; import de.symeda.sormas.api.caze.CaseDataDto; import de.symeda.sormas.api.patch.CaseDataPatchRequest; import de.symeda.sormas.api.patch.DataPatchFailure; @@ -125,7 +126,8 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { List>> patchingTuples = computePatchingTuples(request); - List> groupedFieldsSinglePatchResults = groupedFieldMapperRegistry.aggregatedPatch(from(request)); + List> groupedFieldsSinglePatchResults = + groupedFieldMapperRegistry.aggregatedPatch(from(request, personSupplier, caseData)); Set alreadyProcessedFields = groupedFieldsSinglePatchResults.stream() .flatMap(response -> response.getPatchingResults().stream().map(SinglePatchResult::getFieldName)) .collect(Collectors.toSet()); @@ -142,8 +144,7 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { Supplier target = () -> findAppropriateTarget(fullFieldName, caseData, personSupplier); try { - return invalidFieldResult(entry).or(() -> fieldMappingResult(entry, disease, request, target)) - .orElseGet(() -> valueMappingResult(entry, disease, request, target)); + return produceSinglePatchResult(request, entry, disease, target); } catch (RuntimeException e) { logger.error("Failure during patch operation", e); return singlePatchResult @@ -166,15 +167,33 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { return response; } - saveDTOsIfAppropriate(validPatchDictionary, caseData, personSupplier); + saveDTOsIfAppropriate( + validPatchDictionary, + caseData, + personSupplier, + groupedFieldsSinglePatchResults.stream().map(GroupedFieldsResponse::getEntityDto).collect(Collectors.toList())); logger.debug("dataPatchResponse: [{}]", response); return response.setApplied(true); } - private GroupedFieldsRequest from(CaseDataPatchRequest request) { - return new GroupedFieldsRequest().setPartialPatchDictionary(request.getPatchDictionary()) + @NotNull + public SinglePatchResult produceSinglePatchResult( + CaseDataPatchRequest request, + Tuple> entry, + Disease disease, + Supplier target) { + + return invalidFieldResult(entry).or(() -> fieldMappingResult(entry, disease, request, target)) + .orElseGet(() -> valueMappingResult(entry, disease, request, target)); + } + + private GroupedFieldsRequest from(CaseDataPatchRequest request, Supplier personSupplier, CaseDataDto caseData) { + return new GroupedFieldsRequest().setDisease(caseData.getDisease()) + .setCaseData(caseData.toReference()) + .setPerson(() -> personSupplier.get().toReference()) + .setPartialPatchDictionary(request.getPatchDictionary()) .setInputLanguages(request.getInputLanguages()) .setOrigin(request.getOrigin()) .setAllowFallbackValues(request.isAllowFallbackValues()) @@ -183,7 +202,11 @@ private GroupedFieldsRequest from(CaseDataPatchRequest request) { .setEmptyValueBehavior(request.getEmptyValueBehavior()); } - private void saveDTOsIfAppropriate(Map validPatchDictionary, CaseDataDto caseData, Supplier personSupplier) { + private void saveDTOsIfAppropriate( + Map validPatchDictionary, + CaseDataDto caseData, + Supplier personSupplier, + List additionalEntityDtos) { if (anyFieldPatchedWithPrefix(validPatchDictionary, PatchFieldHelper.CASE_DATA_PREFIX)) { logger.info("CaseData was modified will be applied for: [{}]. Enable debug to see fully patched object", caseData); @@ -204,6 +227,8 @@ private void saveDTOsIfAppropriate(Map validPatchDictionary, Cas businessDtoFacade.save(person); } + + additionalEntityDtos.forEach(entityDto -> businessDtoFacade.save(entityDto)); } private boolean anyFieldPatchedWithPrefix(Map validPatchDictionary, String caseDataPrefix) { @@ -303,7 +328,7 @@ private DataPatchFailureCause extractFailureCause(Tuple fieldMappingResult( + private Optional fieldMappingResult( Tuple> entry, Disease disease, CaseDataPatchRequest request, diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/GroupedFieldMapperRegistry.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/GroupedFieldMapperRegistry.java index 15c01875013..0a08314007f 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/GroupedFieldMapperRegistry.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/GroupedFieldMapperRegistry.java @@ -83,7 +83,10 @@ public List> aggregatedPatch(@NotNull GroupedFieldsRequ } private static GroupedFieldsRequest buildCopy(GroupedFieldsRequest request) { - return new GroupedFieldsRequest().setAllowFallbackValues(request.isAllowFallbackValues()) + return new GroupedFieldsRequest().setDisease(request.getDisease()) + .setCaseData(request.getCaseData()) + .setPerson(request.getPerson()) + .setAllowFallbackValues(request.isAllowFallbackValues()) .setEmptyValueBehavior(request.getEmptyValueBehavior()) .setOrigin(request.getOrigin()) .setInputLanguages(request.getInputLanguages()) diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/groupedfieldmapper/ImmunizationGroupedFieldMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/groupedfieldmapper/ImmunizationGroupedFieldMapper.java index 0964baff726..7556907ad19 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/groupedfieldmapper/ImmunizationGroupedFieldMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/groupedfieldmapper/ImmunizationGroupedFieldMapper.java @@ -1,14 +1,26 @@ package de.symeda.sormas.backend.patch.mapping.impl.groupedfieldmapper; +import java.util.Date; +import java.util.List; import java.util.Map; import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; +import javax.ejb.EJB; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; +import org.jetbrains.annotations.NotNull; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import de.symeda.sormas.api.caze.Vaccine; +import de.symeda.sormas.api.clinicalcourse.HealthConditionsDto; import de.symeda.sormas.api.immunization.ImmunizationDto; +import de.symeda.sormas.api.immunization.ImmunizationStatus; +import de.symeda.sormas.api.immunization.MeansOfImmunization; +import de.symeda.sormas.api.patch.CaseDataPatchRequest; import de.symeda.sormas.api.patch.DataPatchFailure; import de.symeda.sormas.api.patch.DataPatchFailureCause; import de.symeda.sormas.api.patch.SinglePatchResult; @@ -17,30 +29,47 @@ import de.symeda.sormas.api.patch.mapping.GroupedFieldsResponse; import de.symeda.sormas.api.patch.mapping.ValueMappingResult; import de.symeda.sormas.api.patch.mapping.ValuePatchRequest; +import de.symeda.sormas.api.utils.Tuple; import de.symeda.sormas.api.vaccination.VaccinationDto; +import de.symeda.sormas.backend.patch.DataPatcherImpl; import de.symeda.sormas.backend.patch.PatchFieldHelper; import de.symeda.sormas.backend.patch.mapping.ValueMapperRegistry; +import de.symeda.sormas.backend.user.UserFacadeEjb; +import de.symeda.sormas.backend.util.InstanceProvider; +import de.symeda.sormas.backend.util.StringNormalizer; @ApplicationScoped public class ImmunizationGroupedFieldMapper implements GroupedFieldsMapper { + private final static Logger logger = LoggerFactory.getLogger(ImmunizationGroupedFieldMapper.class); + + public static final String IMMUNIZATION_STATUS_KEY = ImmunizationDto.I18N_PREFIX + "." + ImmunizationDto.IMMUNIZATION_STATUS; private static final Set SUPPORTED_PREFIXES = Stream.of(ImmunizationDto.I18N_PREFIX, VaccinationDto.I18N_PREFIX) .map(prefix -> prefix + PatchFieldHelper.PATH_SEPARATOR) .collect(Collectors.toSet()); + public static final String UNKNOWN_STATE = StringNormalizer.normalize("UNKNOWN"); + public static final String YES_UNKNOWN_VACCINE_STATE = StringNormalizer.normalize("YES_UNKNOWN"); + public static final String VACCINATION_VACCINE_NAME_KEY = VaccinationDto.I18N_PREFIX + "." + VaccinationDto.VACCINE_NAME; + @Inject private ValueMapperRegistry valueMapperRegistry; + @EJB + private UserFacadeEjb.UserFacadeEjbLocal userFacade; + @Override public GroupedFieldsResponse aggregatedPatch(GroupedFieldsRequest request) { // TODO: use a field as reference to trigger one or another logic: Immunization.immunizationStatus Map originalPatchDictionary = request.getPartialPatchDictionary(); - ImmunizationDto build = ImmunizationDto.build(request.getPerson()); + ImmunizationDto build = ImmunizationDto.build(request.getPerson().get()); build.setDisease(request.getDisease()); - Object immunizationStatus = originalPatchDictionary.get(ImmunizationDto.IMMUNIZATION_STATUS); + // TODO: some additional hack could be added for mother vaccine: RSV: could be another ImmunizationDto + + Object immunizationStatus = originalPatchDictionary.get(IMMUNIZATION_STATUS_KEY); if (immunizationStatus == null) { return new GroupedFieldsResponse().setPatchingResults( originalPatchDictionary.entrySet() @@ -56,11 +85,56 @@ public GroupedFieldsResponse aggregatedPatch(GroupedFieldsReque ValueMappingResult booleanResult = getValueAsTarget(request, immunizationStatus, Boolean.class); if (Boolean.TRUE.equals(booleanResult.getData())) { - return new GroupedFieldsResponse(); + ImmunizationDto immunizationDto = buildImmunizationFrom(request); + immunizationDto.setImmunizationStatus(ImmunizationStatus.ACQUIRED); + immunizationDto.setMeansOfImmunization(MeansOfImmunization.VACCINATION); + VaccinationDto vaccinationDto = buildVaccine(); + immunizationDto.setVaccinations(List.of(vaccinationDto)); + + return new GroupedFieldsResponse().setEntityDto(immunizationDto) + .setPatchingResults( + Stream.concat(patch(request, immunizationDto).stream(), patch(request, vaccinationDto).stream()).collect(Collectors.toList())); } ValueMappingResult stringResult = getValueAsTarget(request, immunizationStatus, String.class); + String dataAsString = stringResult.getData(); + if (YES_UNKNOWN_VACCINE_STATE.equals(StringNormalizer.normalize(dataAsString))) { + ImmunizationDto immunizationDto = buildImmunizationFrom(request); + immunizationDto.setImmunizationStatus(ImmunizationStatus.ACQUIRED); + immunizationDto.setMeansOfImmunization(MeansOfImmunization.VACCINATION); + + VaccinationDto vaccinationDto = buildVaccine(); + vaccinationDto.setVaccineName(Vaccine.UNKNOWN); + + immunizationDto.setVaccinations(List.of(vaccinationDto)); + + return new GroupedFieldsResponse().setEntityDto(immunizationDto) + .setPatchingResults( + Stream.concat(patch(request, immunizationDto).stream(), patch(request, vaccinationDto).stream()).collect(Collectors.toList())); + + } else if (UNKNOWN_STATE.equals(StringNormalizer.normalize(dataAsString))) { + ImmunizationDto immunizationDto = buildImmunizationFrom(request); + immunizationDto.setImmunizationStatus(ImmunizationStatus.NOT_ACQUIRED); + + return new GroupedFieldsResponse().setEntityDto(immunizationDto).setPatchingResults(patch(request, immunizationDto)); + } else { + ImmunizationDto immunizationDto = buildImmunizationFrom(request); + immunizationDto.setImmunizationStatus(ImmunizationStatus.ACQUIRED); + immunizationDto.setMeansOfImmunization(MeansOfImmunization.VACCINATION); + + VaccinationDto vaccinationDto = buildVaccine(); + vaccinationDto.setVaccineName(Vaccine.OTHER); + + vaccinationDto.setOtherVaccineName(dataAsString); + + immunizationDto.setVaccinations(List.of(vaccinationDto)); + + return new GroupedFieldsResponse().setEntityDto(immunizationDto) + .setPatchingResults( + Stream.concat(patch(request, immunizationDto).stream(), patch(request, vaccinationDto).stream()).collect(Collectors.toList())); + } + // TODO: use (Field ID) Vaccination.vaccineType: to determine if it is a vaccine for the mother. /* @@ -79,10 +153,73 @@ public GroupedFieldsResponse aggregatedPatch(GroupedFieldsReque * - Can use the DataPatcher again to be able to set all single field values: values or exact fields. (focus on values now) */ - GroupedFieldsResponse groupedFieldsResponse = - new GroupedFieldsResponse().setEntityDto(build).setPatchingResults(null); + } - return groupedFieldsResponse; + @NotNull + private VaccinationDto buildVaccine() { + VaccinationDto vaccinationDto = new VaccinationDto(); + + vaccinationDto.setVaccineName(Vaccine.OTHER); + vaccinationDto.setReportDate(new Date()); + vaccinationDto.setReportingUser(userFacade.getCurrentUserAsReference()); + + vaccinationDto.setHealthConditions(HealthConditionsDto.build()); + + return vaccinationDto; + } + + @NotNull + private ImmunizationDto buildImmunizationFrom(GroupedFieldsRequest request) { + ImmunizationDto immunizationDto = new ImmunizationDto(); + + immunizationDto.setRelatedCase(request.getCaseData()); + immunizationDto.setPerson(request.getPerson().get()); + immunizationDto.setReportDate(new Date()); + immunizationDto.setDisease(request.getDisease()); + + // TODO: this is not correct and hardcoded. + logger.error("User ist still harcoded for now"); + immunizationDto.setReportingUser(userFacade.getCurrentUserAsReference()); + + return immunizationDto; + } + + private static @NotNull List patch(GroupedFieldsRequest request, ImmunizationDto immunizationDto) { + DataPatcherImpl dataPatcher = InstanceProvider.getInstanceFor(DataPatcherImpl.class); + return Stream + .concat( + request.getPartialPatchDictionary() + .entrySet() + .stream() + .filter(entry -> !IMMUNIZATION_STATUS_KEY.equals(entry.getKey())) + .filter(entry -> entry.getKey().startsWith(ImmunizationDto.I18N_PREFIX)) + .map( + entry -> dataPatcher.produceSinglePatchResult( + new CaseDataPatchRequest().setReplacementStrategy(request.getReplacementStrategy()), + new Tuple<>(entry.getKey(), new Tuple<>(null, entry.getValue())), + request.getDisease(), + () -> immunizationDto)), + Stream.of(new SinglePatchResult().setFieldName(IMMUNIZATION_STATUS_KEY).setValue(immunizationDto.getImmunizationStatus()))) + .collect(Collectors.toList()); + } + + private static @NotNull List patch(GroupedFieldsRequest request, VaccinationDto vaccineDto) { + DataPatcherImpl dataPatcher = InstanceProvider.getInstanceFor(DataPatcherImpl.class); + return Stream + .concat( + request.getPartialPatchDictionary() + .entrySet() + .stream() + .filter(entry -> !VACCINATION_VACCINE_NAME_KEY.equals(entry.getKey())) + .filter(entry -> entry.getKey().startsWith(VaccinationDto.I18N_PREFIX)) + .map( + entry -> dataPatcher.produceSinglePatchResult( + new CaseDataPatchRequest().setReplacementStrategy(request.getReplacementStrategy()), + new Tuple<>(entry.getKey(), new Tuple<>(null, entry.getValue())), + request.getDisease(), + () -> vaccineDto)), + Stream.of(new SinglePatchResult().setFieldName(VACCINATION_VACCINE_NAME_KEY).setValue(vaccineDto.getVaccineName()))) + .collect(Collectors.toList()); } private ValueMappingResult getValueAsTarget(GroupedFieldsRequest request, Object immunizationStatus, Class targetType) { diff --git a/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java index 88ae4ee0bbc..a685280fc62 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java @@ -3,6 +3,7 @@ import java.sql.Date; import java.time.LocalDate; import java.time.ZoneId; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -20,8 +21,12 @@ import de.symeda.sormas.api.Disease; import de.symeda.sormas.api.Language; import de.symeda.sormas.api.caze.CaseDataDto; +import de.symeda.sormas.api.caze.Vaccine; import de.symeda.sormas.api.customizableenum.CustomizableEnumTranslation; import de.symeda.sormas.api.customizableenum.CustomizableEnumType; +import de.symeda.sormas.api.immunization.ImmunizationDto; +import de.symeda.sormas.api.immunization.ImmunizationStatus; +import de.symeda.sormas.api.immunization.MeansOfImmunization; import de.symeda.sormas.api.infrastructure.country.CountryDto; import de.symeda.sormas.api.infrastructure.country.CountryReferenceDto; import de.symeda.sormas.api.infrastructure.facility.FacilityDto; @@ -40,6 +45,7 @@ import de.symeda.sormas.api.person.PhoneNumberType; import de.symeda.sormas.api.person.Sex; import de.symeda.sormas.api.symptoms.SymptomState; +import de.symeda.sormas.api.vaccination.VaccinationDto; import de.symeda.sormas.backend.AbstractBeanTest; import de.symeda.sormas.backend.MockProducer; import de.symeda.sormas.backend.common.ConfigFacadeEjb; @@ -638,8 +644,148 @@ void patch_noPatchInCaseOfFailureFalse() { } @Test - void patch_addVaccine() { - throw new IllegalStateException("toImplement"); + void patch_addVaccine_unknown() { + // PREPARE + Disease disease = Disease.RESPIRATORY_SYNCYTIAL_VIRUS; + CaseDataDto originalCase = creator.createUnclassifiedCase(disease); + + getCaseFacade().save(originalCase); + + Assertions.assertFalse(originalCase.getSymptoms().getSymptomatic()); + + Map patchDictionary = new HashMap<>(); + patchDictionary.put("Immunization.immunizationStatus", "UNKNOWN"); + + CaseDataPatchRequest request = new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()).setPatchDictionary(patchDictionary); + + // EXECUTE + DataPatchResponse response = victim().patch(request); + + List immunizationDtos = getImmunizationFacade().getByPersonUuids(List.of(originalCase.getPerson().getUuid())); + + ImmunizationDto createdImmunizationDto = immunizationDtos.get(0); + + // CHECK + Assertions.assertAll(() -> Assertions.assertTrue(response.isApplied()), + +// TODO: check what about patch dictionary for those values. +// () -> Assertions.assertEquals(patchDictionary, response.getValidPatchDictionary()), + + () -> Assertions.assertEquals(1, immunizationDtos.size()), + + () -> Assertions.assertEquals(ImmunizationStatus.NOT_ACQUIRED, createdImmunizationDto.getImmunizationStatus()), + () -> Assertions.assertEquals(disease, createdImmunizationDto.getDisease()), + + () -> Assertions.assertNotNull(createdImmunizationDto.getReportDate()), + + () -> Assertions.assertNotNull(createdImmunizationDto.getReportingUser()), + + // FAILURES + () -> Assertions.assertEquals(Map.of(), response.getFailures())); + } + + @Test + void patch_addVaccine_true() { + // PREPARE + Disease disease = Disease.DENGUE; + CaseDataDto originalCase = creator.createUnclassifiedCase(disease); + + getCaseFacade().save(originalCase); + + Assertions.assertFalse(originalCase.getSymptoms().getSymptomatic()); + + Map patchDictionary = new HashMap<>(); + patchDictionary.put("Immunization.immunizationStatus", " ja "); + + CaseDataPatchRequest request = new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()) + .setPatchDictionary(patchDictionary) + .setInputLanguages(Collections.singletonList(Language.DE)); + + // EXECUTE + DataPatchResponse response = victim().patch(request); + + // CHECK + List immunizationDtos = getImmunizationFacade().getByPersonUuids(List.of(originalCase.getPerson().getUuid())); + + ImmunizationDto createdImmunizationDto = immunizationDtos.get(0); + + List vaccinations = createdImmunizationDto.getVaccinations(); + VaccinationDto vaccinationDto = vaccinations.get(0); + + Assertions.assertAll(() -> Assertions.assertTrue(response.isApplied()), + +// TODO: check what about patch dictionary for those values. +// () -> Assertions.assertEquals(patchDictionary, response.getValidPatchDictionary()), + + () -> Assertions.assertEquals(1, immunizationDtos.size()), + + () -> Assertions.assertEquals(ImmunizationStatus.ACQUIRED, createdImmunizationDto.getImmunizationStatus()), + () -> Assertions.assertEquals(MeansOfImmunization.VACCINATION, createdImmunizationDto.getMeansOfImmunization()), + + () -> Assertions.assertEquals(disease, createdImmunizationDto.getDisease()), + + () -> Assertions.assertNotNull(createdImmunizationDto.getReportDate()), + + () -> Assertions.assertNotNull(createdImmunizationDto.getReportingUser()), + + () -> Assertions.assertEquals(1, vaccinations.size()), + + () -> Assertions.assertEquals(Vaccine.UNKNOWN, vaccinationDto.getVaccineName()), + + // FAILURES + () -> Assertions.assertEquals(Map.of(), response.getFailures())); + } + + @Test + void patch_addVaccine_vaccine_name() { + // PREPARE + Disease disease = Disease.DENGUE; + CaseDataDto originalCase = creator.createUnclassifiedCase(disease); + + getCaseFacade().save(originalCase); + + Assertions.assertFalse(originalCase.getSymptoms().getSymptomatic()); + + Map patchDictionary = new HashMap<>(); + String vaccineName = "Beyfortus"; + patchDictionary.put("Immunization.immunizationStatus", vaccineName); + + CaseDataPatchRequest request = new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()) + .setPatchDictionary(patchDictionary) + .setInputLanguages(Collections.singletonList(Language.DE)); + + // EXECUTE + DataPatchResponse response = victim().patch(request); + + List immunizationDtos = getImmunizationFacade().getByPersonUuids(List.of(originalCase.getPerson().getUuid())); + + ImmunizationDto createdImmunizationDto = immunizationDtos.get(0); + + // CHECK + List vaccinations = createdImmunizationDto.getVaccinations(); + VaccinationDto vaccinationDto = vaccinations.get(0); + Assertions.assertAll(() -> Assertions.assertTrue(response.isApplied()), + +// TODO: check what about patch dictionary for those values. +// () -> Assertions.assertEquals(patchDictionary, response.getValidPatchDictionary()), + + () -> Assertions.assertEquals(1, immunizationDtos.size()), + + () -> Assertions.assertEquals(ImmunizationStatus.ACQUIRED, createdImmunizationDto.getImmunizationStatus()), + () -> Assertions.assertEquals(MeansOfImmunization.VACCINATION, createdImmunizationDto.getMeansOfImmunization()), + () -> Assertions.assertEquals(disease, createdImmunizationDto.getDisease()), + + () -> Assertions.assertNotNull(createdImmunizationDto.getReportDate()), + + () -> Assertions.assertNotNull(createdImmunizationDto.getReportingUser()), + + () -> Assertions.assertEquals(1, vaccinations.size()), + + () -> Assertions.assertEquals(Vaccine.OTHER, vaccinationDto.getVaccineName()), + () -> Assertions.assertEquals(vaccineName, vaccinationDto.getOtherVaccineName()), + + // FAILURES + () -> Assertions.assertEquals(Map.of(), response.getFailures())); } @Test From 540e59f0b83288d8db6469ea6d35238c869cf6b2 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Tue, 10 Mar 2026 15:27:51 +0100 Subject: [PATCH 043/134] =?UTF-8?q?=E2=9C=A8=F0=9F=9A=A7=20naive=20mother?= =?UTF-8?q?=20vaccination=20implementation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../patch/mapping/GroupedFieldsResponse.java | 6 +- .../symeda/sormas/api/utils/YesNoUnknown.java | 2 +- .../sormas/backend/patch/DataPatcherImpl.java | 9 +- .../ImmunizationGroupedFieldMapper.java | 107 ++++++++++++------ .../sormas/patch/DataPatcherImplTest.java | 75 ++++++++++-- 5 files changed, 145 insertions(+), 54 deletions(-) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsResponse.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsResponse.java index c92fd56c625..5599a08ade6 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsResponse.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsResponse.java @@ -14,7 +14,7 @@ public class GroupedFieldsResponse { * In case of errors this might be null, otherwise should always be present to be stored at the very end of the patching processing. */ @Nullable - private T entityDto; + private List entityDto; /** * Actual results from the original {@link GroupedFieldsRequest}. @@ -22,11 +22,11 @@ public class GroupedFieldsResponse { private List patchingResults; @Nullable - public T getEntityDto() { + public List getEntityDto() { return entityDto; } - public GroupedFieldsResponse setEntityDto(@Nullable T entityDto) { + public GroupedFieldsResponse setEntityDto(@Nullable List entityDto) { this.entityDto = entityDto; return this; } diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/utils/YesNoUnknown.java b/sormas-api/src/main/java/de/symeda/sormas/api/utils/YesNoUnknown.java index 03bd1cea63e..09f9072ff4e 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/utils/YesNoUnknown.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/utils/YesNoUnknown.java @@ -23,8 +23,8 @@ public enum YesNoUnknown { YES, - @ValueMapperDefault NO, + @ValueMapperDefault UNKNOWN; @Override diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java index a9a49e20914..dfc4648346f 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java @@ -2,6 +2,7 @@ import java.util.AbstractMap; import java.util.Arrays; +import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Optional; @@ -171,7 +172,9 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { validPatchDictionary, caseData, personSupplier, - groupedFieldsSinglePatchResults.stream().map(GroupedFieldsResponse::getEntityDto).collect(Collectors.toList())); + groupedFieldsSinglePatchResults.stream() + .flatMap(groupedFieldsResponse -> Stream.ofNullable(groupedFieldsResponse.getEntityDto()).flatMap(Collection::stream)) + .collect(Collectors.toList())); logger.debug("dataPatchResponse: [{}]", response); @@ -206,7 +209,7 @@ private void saveDTOsIfAppropriate( Map validPatchDictionary, CaseDataDto caseData, Supplier personSupplier, - List additionalEntityDtos) { + List additionalEntityDTOs) { if (anyFieldPatchedWithPrefix(validPatchDictionary, PatchFieldHelper.CASE_DATA_PREFIX)) { logger.info("CaseData was modified will be applied for: [{}]. Enable debug to see fully patched object", caseData); @@ -228,7 +231,7 @@ private void saveDTOsIfAppropriate( businessDtoFacade.save(person); } - additionalEntityDtos.forEach(entityDto -> businessDtoFacade.save(entityDto)); + additionalEntityDTOs.forEach(entityDto -> businessDtoFacade.save(entityDto)); } private boolean anyFieldPatchedWithPrefix(Map validPatchDictionary, String caseDataPrefix) { diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/groupedfieldmapper/ImmunizationGroupedFieldMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/groupedfieldmapper/ImmunizationGroupedFieldMapper.java index 7556907ad19..7babc3a5ad7 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/groupedfieldmapper/ImmunizationGroupedFieldMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/groupedfieldmapper/ImmunizationGroupedFieldMapper.java @@ -3,6 +3,7 @@ import java.util.Date; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -20,7 +21,6 @@ import de.symeda.sormas.api.immunization.ImmunizationDto; import de.symeda.sormas.api.immunization.ImmunizationStatus; import de.symeda.sormas.api.immunization.MeansOfImmunization; -import de.symeda.sormas.api.patch.CaseDataPatchRequest; import de.symeda.sormas.api.patch.DataPatchFailure; import de.symeda.sormas.api.patch.DataPatchFailureCause; import de.symeda.sormas.api.patch.SinglePatchResult; @@ -29,7 +29,7 @@ import de.symeda.sormas.api.patch.mapping.GroupedFieldsResponse; import de.symeda.sormas.api.patch.mapping.ValueMappingResult; import de.symeda.sormas.api.patch.mapping.ValuePatchRequest; -import de.symeda.sormas.api.utils.Tuple; +import de.symeda.sormas.api.utils.YesNoUnknown; import de.symeda.sormas.api.vaccination.VaccinationDto; import de.symeda.sormas.backend.patch.DataPatcherImpl; import de.symeda.sormas.backend.patch.PatchFieldHelper; @@ -44,6 +44,7 @@ public class ImmunizationGroupedFieldMapper implements GroupedFieldsMapper SUPPORTED_PREFIXES = Stream.of(ImmunizationDto.I18N_PREFIX, VaccinationDto.I18N_PREFIX) .map(prefix -> prefix + PatchFieldHelper.PATH_SEPARATOR) .collect(Collectors.toSet()); @@ -58,6 +59,9 @@ public class ImmunizationGroupedFieldMapper implements GroupedFieldsMapper aggregatedPatch(GroupedFieldsRequest request) { // TODO: use a field as reference to trigger one or another logic: Immunization.immunizationStatus @@ -67,6 +71,8 @@ public GroupedFieldsResponse aggregatedPatch(GroupedFieldsReque ImmunizationDto build = ImmunizationDto.build(request.getPerson().get()); build.setDisease(request.getDisease()); + // TODO: mother vaccine + // TODO: case for NO. // TODO: some additional hack could be added for mother vaccine: RSV: could be another ImmunizationDto Object immunizationStatus = originalPatchDictionary.get(IMMUNIZATION_STATUS_KEY); @@ -82,6 +88,25 @@ public GroupedFieldsResponse aggregatedPatch(GroupedFieldsReque .collect(Collectors.toList())); } + // TODO: add check for vaccination. + Object meansOfImmunization = originalPatchDictionary.get(ImmunizationDto.I18N_PREFIX + "." + ImmunizationDto.MEANS_OF_IMMUNIZATION); + + // TODO: also mother + Optional maternalImmunization = Optional.empty(); + if (meansOfImmunization != null) { + ValueMappingResult meansOfImmunizationValueMappingResult = + getValueAsTarget(request, meansOfImmunization, MeansOfImmunization.class); + + if (meansOfImmunizationValueMappingResult.getData() == MeansOfImmunization.MATERNAL_VACCINATION) { + ImmunizationDto immunizationDto = buildImmunizationFrom(request); + immunizationDto.setImmunizationStatus(ImmunizationStatus.ACQUIRED); + immunizationDto.setMeansOfImmunization(MeansOfImmunization.MATERNAL_VACCINATION); + + maternalImmunization = Optional.of(immunizationDto); + } + } + + // TODO: remove this, use YesNoUnknow enum instead. ValueMappingResult booleanResult = getValueAsTarget(request, immunizationStatus, Boolean.class); if (Boolean.TRUE.equals(booleanResult.getData())) { @@ -91,13 +116,15 @@ public GroupedFieldsResponse aggregatedPatch(GroupedFieldsReque VaccinationDto vaccinationDto = buildVaccine(); immunizationDto.setVaccinations(List.of(vaccinationDto)); - return new GroupedFieldsResponse().setEntityDto(immunizationDto) + return new GroupedFieldsResponse().setEntityDto(buildEntityList(immunizationDto, maternalImmunization)) .setPatchingResults( Stream.concat(patch(request, immunizationDto).stream(), patch(request, vaccinationDto).stream()).collect(Collectors.toList())); } ValueMappingResult stringResult = getValueAsTarget(request, immunizationStatus, String.class); + ValueMappingResult enumYesNoUnknown = getValueAsTarget(request, immunizationStatus, YesNoUnknown.class); + String dataAsString = stringResult.getData(); if (YES_UNKNOWN_VACCINE_STATE.equals(StringNormalizer.normalize(dataAsString))) { ImmunizationDto immunizationDto = buildImmunizationFrom(request); @@ -109,15 +136,16 @@ public GroupedFieldsResponse aggregatedPatch(GroupedFieldsReque immunizationDto.setVaccinations(List.of(vaccinationDto)); - return new GroupedFieldsResponse().setEntityDto(immunizationDto) + return new GroupedFieldsResponse().setEntityDto(buildEntityList(immunizationDto, maternalImmunization)) .setPatchingResults( Stream.concat(patch(request, immunizationDto).stream(), patch(request, vaccinationDto).stream()).collect(Collectors.toList())); - } else if (UNKNOWN_STATE.equals(StringNormalizer.normalize(dataAsString))) { + } else if (UNKNOWN_STATE.equals(StringNormalizer.normalize(dataAsString)) || enumYesNoUnknown.getData() == YesNoUnknown.NO) { ImmunizationDto immunizationDto = buildImmunizationFrom(request); immunizationDto.setImmunizationStatus(ImmunizationStatus.NOT_ACQUIRED); - return new GroupedFieldsResponse().setEntityDto(immunizationDto).setPatchingResults(patch(request, immunizationDto)); + return new GroupedFieldsResponse().setEntityDto(buildEntityList(immunizationDto, maternalImmunization)) + .setPatchingResults(patch(request, immunizationDto)); } else { ImmunizationDto immunizationDto = buildImmunizationFrom(request); immunizationDto.setImmunizationStatus(ImmunizationStatus.ACQUIRED); @@ -130,7 +158,7 @@ public GroupedFieldsResponse aggregatedPatch(GroupedFieldsReque immunizationDto.setVaccinations(List.of(vaccinationDto)); - return new GroupedFieldsResponse().setEntityDto(immunizationDto) + return new GroupedFieldsResponse().setEntityDto(buildEntityList(immunizationDto, maternalImmunization)) .setPatchingResults( Stream.concat(patch(request, immunizationDto).stream(), patch(request, vaccinationDto).stream()).collect(Collectors.toList())); } @@ -155,6 +183,10 @@ public GroupedFieldsResponse aggregatedPatch(GroupedFieldsReque } + private static @NotNull List buildEntityList(ImmunizationDto immunizationDto, Optional maternalImmunization) { + return Stream.of(Optional.of(immunizationDto), maternalImmunization).flatMap(Optional::stream).collect(Collectors.toList()); + } + @NotNull private VaccinationDto buildVaccine() { VaccinationDto vaccinationDto = new VaccinationDto(); @@ -184,41 +216,42 @@ private ImmunizationDto buildImmunizationFrom(GroupedFieldsRequest request) { return immunizationDto; } - private static @NotNull List patch(GroupedFieldsRequest request, ImmunizationDto immunizationDto) { - DataPatcherImpl dataPatcher = InstanceProvider.getInstanceFor(DataPatcherImpl.class); - return Stream - .concat( - request.getPartialPatchDictionary() - .entrySet() - .stream() - .filter(entry -> !IMMUNIZATION_STATUS_KEY.equals(entry.getKey())) - .filter(entry -> entry.getKey().startsWith(ImmunizationDto.I18N_PREFIX)) - .map( - entry -> dataPatcher.produceSinglePatchResult( - new CaseDataPatchRequest().setReplacementStrategy(request.getReplacementStrategy()), - new Tuple<>(entry.getKey(), new Tuple<>(null, entry.getValue())), - request.getDisease(), - () -> immunizationDto)), - Stream.of(new SinglePatchResult().setFieldName(IMMUNIZATION_STATUS_KEY).setValue(immunizationDto.getImmunizationStatus()))) + private @NotNull List patch(GroupedFieldsRequest request, ImmunizationDto immunizationDto) { + return Stream.concat( + request.getPartialPatchDictionary() + .entrySet() + .stream() + .filter(entry -> !IMMUNIZATION_STATUS_KEY.equals(entry.getKey())) + .filter(entry -> entry.getKey().startsWith(ImmunizationDto.I18N_PREFIX)) + // TODO: if needed put back single mapping +// .map( +// entry -> dataPatcher.produceSinglePatchResult( +// new CaseDataPatchRequest().setReplacementStrategy(request.getReplacementStrategy()), +// new Tuple<>(entry.getKey(), new Tuple<>(null, entry.getValue())), +// request.getDisease(), +// () -> immunizationDto)), + .map(a -> new SinglePatchResult().setFieldName(a.getKey()).setValue(a.getValue())), + Stream.of(new SinglePatchResult().setFieldName(IMMUNIZATION_STATUS_KEY).setValue(immunizationDto.getImmunizationStatus()))) .collect(Collectors.toList()); } private static @NotNull List patch(GroupedFieldsRequest request, VaccinationDto vaccineDto) { DataPatcherImpl dataPatcher = InstanceProvider.getInstanceFor(DataPatcherImpl.class); - return Stream - .concat( - request.getPartialPatchDictionary() - .entrySet() - .stream() - .filter(entry -> !VACCINATION_VACCINE_NAME_KEY.equals(entry.getKey())) - .filter(entry -> entry.getKey().startsWith(VaccinationDto.I18N_PREFIX)) - .map( - entry -> dataPatcher.produceSinglePatchResult( - new CaseDataPatchRequest().setReplacementStrategy(request.getReplacementStrategy()), - new Tuple<>(entry.getKey(), new Tuple<>(null, entry.getValue())), - request.getDisease(), - () -> vaccineDto)), - Stream.of(new SinglePatchResult().setFieldName(VACCINATION_VACCINE_NAME_KEY).setValue(vaccineDto.getVaccineName()))) + return Stream.concat( + request.getPartialPatchDictionary() + .entrySet() + .stream() + .filter(entry -> !VACCINATION_VACCINE_NAME_KEY.equals(entry.getKey())) + .filter(entry -> entry.getKey().startsWith(VaccinationDto.I18N_PREFIX)) +// .map( +// entry -> dataPatcher.produceSinglePatchResult( +// new CaseDataPatchRequest().setReplacementStrategy(request.getReplacementStrategy()), +// new Tuple<>(entry.getKey(), new Tuple<>(null, entry.getValue())), +// request.getDisease(), +// () -> vaccineDto)), + .map(a -> new SinglePatchResult().setFieldName(a.getKey()).setValue(a.getValue())), + + Stream.of(new SinglePatchResult().setFieldName(VACCINATION_VACCINE_NAME_KEY).setValue(vaccineDto.getVaccineName()))) .collect(Collectors.toList()); } diff --git a/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java index a685280fc62..06bb9b0d602 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java @@ -643,8 +643,12 @@ void patch_noPatchInCaseOfFailureFalse() { () -> Assertions.assertEquals(expectedFailures, response.getFailures())); } - @Test - void patch_addVaccine_unknown() { + @ParameterizedTest + @ValueSource(strings = { + "NO", + " nein ", + " unknown " }) + void patch_addVaccine_unknown_or_no(String unknownOrNo) { // PREPARE Disease disease = Disease.RESPIRATORY_SYNCYTIAL_VIRUS; CaseDataDto originalCase = creator.createUnclassifiedCase(disease); @@ -654,9 +658,11 @@ void patch_addVaccine_unknown() { Assertions.assertFalse(originalCase.getSymptoms().getSymptomatic()); Map patchDictionary = new HashMap<>(); - patchDictionary.put("Immunization.immunizationStatus", "UNKNOWN"); + patchDictionary.put("Immunization.immunizationStatus", unknownOrNo); - CaseDataPatchRequest request = new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()).setPatchDictionary(patchDictionary); + CaseDataPatchRequest request = new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()) + .setPatchDictionary(patchDictionary) + .setInputLanguages(List.of(Language.EN, Language.DE_CH)); // EXECUTE DataPatchResponse response = victim().patch(request); @@ -674,6 +680,7 @@ void patch_addVaccine_unknown() { () -> Assertions.assertEquals(1, immunizationDtos.size()), () -> Assertions.assertEquals(ImmunizationStatus.NOT_ACQUIRED, createdImmunizationDto.getImmunizationStatus()), + () -> Assertions.assertEquals(0, createdImmunizationDto.getVaccinations().size()), () -> Assertions.assertEquals(disease, createdImmunizationDto.getDisease()), () -> Assertions.assertNotNull(createdImmunizationDto.getReportDate()), @@ -684,6 +691,56 @@ void patch_addVaccine_unknown() { () -> Assertions.assertEquals(Map.of(), response.getFailures())); } + @ParameterizedTest + @ValueSource(strings = { + "Maternal vaccination" }) + void patch_addVaccine_true_and_mother_vaccine(String matternalVaccination) { + // PREPARE + Disease disease = Disease.DENGUE; + CaseDataDto originalCase = creator.createUnclassifiedCase(disease); + + getCaseFacade().save(originalCase); + + Assertions.assertFalse(originalCase.getSymptoms().getSymptomatic()); + + Map patchDictionary = new HashMap<>(); + patchDictionary.put("Immunization.immunizationStatus", " ja "); + patchDictionary.put("Immunization.meansOfImmunization", matternalVaccination); + + CaseDataPatchRequest request = new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()) + .setPatchDictionary(patchDictionary) + .setInputLanguages(List.of(Language.DE, Language.EN)); + + // EXECUTE + DataPatchResponse response = victim().patch(request); + + // CHECK + List immunizationDtos = getImmunizationFacade().getByPersonUuids(List.of(originalCase.getPerson().getUuid())); + + ImmunizationDto matternalImmunizationDto = immunizationDtos.get(1); + + Assertions.assertAll(() -> Assertions.assertTrue(response.isApplied()), + +// TODO: check what about patch dictionary for those values. +// () -> Assertions.assertEquals(patchDictionary, response.getValidPatchDictionary()), + + () -> Assertions.assertEquals(2, immunizationDtos.size()), + + () -> Assertions.assertEquals(ImmunizationStatus.ACQUIRED, matternalImmunizationDto.getImmunizationStatus()), + () -> Assertions.assertEquals(MeansOfImmunization.MATERNAL_VACCINATION, matternalImmunizationDto.getMeansOfImmunization()), + + () -> Assertions.assertEquals(disease, matternalImmunizationDto.getDisease()), + + () -> Assertions.assertEquals(0, matternalImmunizationDto.getVaccinations().size()), + + () -> Assertions.assertNotNull(matternalImmunizationDto.getReportDate()), + + () -> Assertions.assertNotNull(matternalImmunizationDto.getReportingUser()), + + // FAILURES + () -> Assertions.assertEquals(Map.of(), response.getFailures())); + } + @Test void patch_addVaccine_true() { // PREPARE @@ -696,6 +753,8 @@ void patch_addVaccine_true() { Map patchDictionary = new HashMap<>(); patchDictionary.put("Immunization.immunizationStatus", " ja "); + patchDictionary.put("Immunization.country", "France"); + patchDictionary.put("Vaccination.country", "France"); CaseDataPatchRequest request = new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()) .setPatchDictionary(patchDictionary) @@ -730,7 +789,8 @@ void patch_addVaccine_true() { () -> Assertions.assertEquals(1, vaccinations.size()), - () -> Assertions.assertEquals(Vaccine.UNKNOWN, vaccinationDto.getVaccineName()), + () -> Assertions.assertEquals(Vaccine.OTHER, vaccinationDto.getVaccineName()), + () -> Assertions.assertNull(vaccinationDto.getOtherVaccineName()), // FAILURES () -> Assertions.assertEquals(Map.of(), response.getFailures())); @@ -851,11 +911,6 @@ void patch_fieldDoesNoExist() { () -> Assertions.assertEquals(Map.of(), response.getValidPatchDictionary())); } - @Test - void patch_emptyValueBehavior() { - throw new IllegalStateException("toImplement"); - } - private DataPatcher victim() { return getCaseDataPatcher(); } From 9452b3c093d5f6c2f507636f0604970cdb13d4e4 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Tue, 10 Mar 2026 15:32:16 +0100 Subject: [PATCH 044/134] =?UTF-8?q?=E2=9C=85=20ignored=20null=20value?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sormas/patch/DataPatcherImplTest.java | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java index 06bb9b0d602..35df65617fa 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java @@ -885,6 +885,44 @@ void patch_replacementMode_null_value() { () -> Assertions.assertEquals(Map.of(), response.getFailures())); } + @Test + void patch_replacementMode_null_value_error() { + // PREPARE + CaseDataDto originalCase = creator.createUnclassifiedCase(Disease.RESPIRATORY_SYNCYTIAL_VIRUS); + String expectedQuarantineChangeComment = "some non empty value"; + originalCase.setQuarantineChangeComment(expectedQuarantineChangeComment); + + getCaseFacade().save(originalCase); + + Assertions.assertFalse(originalCase.getSymptoms().getSymptomatic()); + + String ignoredValue = "ignoredValue"; + + Map patchDictionary = new HashMap<>(); + patchDictionary.put("CaseData.quarantineChangeComment", null); + + CaseDataPatchRequest request = new CaseDataPatchRequest().setReplacementStrategy(DataReplacementStrategy.ALWAYS) + .setEmptyValueBehavior(EmptyValueBehavior.IGNORE) + .setCaseUuid(originalCase.getUuid()) + .setPatchDictionary(patchDictionary); + + // EXECUTE + DataPatchResponse response = victim().patch(request); + + CaseDataDto actual = getCaseFacade().getByUuid(originalCase.getUuid()); + + // CHECK + Assertions.assertAll( + () -> Assertions.assertFalse(response.isApplied()), + + () -> Assertions.assertEquals(Map.of(), response.getValidPatchDictionary()), + + () -> Assertions.assertEquals(expectedQuarantineChangeComment, actual.getQuarantineChangeComment()), + + // FAILURES + () -> Assertions.assertEquals(Map.of(), response.getFailures())); + } + @Test void patch_fieldDoesNoExist() { // PREPARE From 475b8403068730ef1be4ff603284fee4a87f582c Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Wed, 11 Mar 2026 14:09:51 +0100 Subject: [PATCH 045/134] Started boilerplate for ExternalMessage-API. Breaks unit tests because some permission is missing: de.symeda.sormas.api.utils.ValidationRuntimeException: The following user right(s) are required based on other user right(s):
[Edit surveys] required by 'EXTERNAL_MESSAGE_SURVEY_RESPONSE_PROCESS'
[View surveys] required by 'EXTERNAL_MESSAGE_SURVEY_RESPONSE_PROCESS'
[Create surveys] required by 'EXTERNAL_MESSAGE_SURVEY_RESPONSE_PROCESS'
[Delete surveys] required by 'EXTERNAL_MESSAGE_SURVEY_RESPONSE_PROCESS'
[View survey tokens] required by 'EXTERNAL_MESSAGE_SURVEY_RESPONSE_PROCESS'
--- .../externalmessage/ExternalMessageDto.java | 188 + .../ExternalMessageFacade.java | 2 + .../ExternalMessageSurveyResponseRequest.java | 147 + .../ExternalMessageSurveyResponseResult.java | 62 + .../ExternalMessageSurveyResponseWrapper.java | 45 + .../sormas/api/user/DefaultUserRole.java | 6 + .../de/symeda/sormas/api/user/UserRight.java | 14 + .../src/main/resources/enum_fr-FR.properties | 3383 ++++++++--------- .../externalmessage/ExternalMessage.java | 25 + .../ExternalMessageAdditionalDataType.java | 22 + .../ExternalMessageFacadeEjb.java | 70 +- .../AutomaticSurveyResponseProcessor.java | 20 + ...SurveyResponseProcessingResultWrapper.java | 62 + .../ExternalMessageController.java | 33 + .../externalmessage/ExternalMessageGrid.java | 11 +- 15 files changed, 2288 insertions(+), 1802 deletions(-) create mode 100644 sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseRequest.java create mode 100644 sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseResult.java create mode 100644 sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseWrapper.java create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageAdditionalDataType.java create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/SurveyResponseProcessingResultWrapper.java diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageDto.java index fae5d47e490..af9a9aa7932 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageDto.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageDto.java @@ -18,7 +18,9 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Objects; +import javax.annotation.Nullable; import javax.validation.constraints.Size; import de.symeda.sormas.api.CountryHelper; @@ -32,6 +34,7 @@ import de.symeda.sormas.api.clinicalcourse.ComplianceWithTreatment; import de.symeda.sormas.api.disease.DiseaseVariant; import de.symeda.sormas.api.externalmessage.labmessage.SampleReportDto; +import de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseWrapper; import de.symeda.sormas.api.feature.FeatureType; import de.symeda.sormas.api.i18n.Validations; import de.symeda.sormas.api.infrastructure.country.CountryReferenceDto; @@ -262,6 +265,9 @@ public class ExternalMessageDto extends SormasToSormasShareableDto { private Boolean tuberculosisMdrXdrTuberculosis; private Boolean tuberculosisBeijingLineage; + @Nullable + private ExternalMessageSurveyResponseWrapper surveyResponseWrapper; + public ExternalMessageType getType() { return type; } @@ -939,4 +945,186 @@ public Boolean getTuberculosisBeijingLineage() { public void setTuberculosisBeijingLineage(Boolean tuberculosisBeijingLineage) { this.tuberculosisBeijingLineage = tuberculosisBeijingLineage; } + + public ExternalMessageSurveyResponseWrapper getSurveyResponseWrapper() { + return surveyResponseWrapper; + } + + public ExternalMessageDto setSurveyResponseWrapper(ExternalMessageSurveyResponseWrapper surveyResponseWrapper) { + this.surveyResponseWrapper = surveyResponseWrapper; + return this; + } + + @Override + public boolean equals(Object o) { + if (o == null || getClass() != o.getClass()) + return false; + if (!super.equals(o)) + return false; + ExternalMessageDto that = (ExternalMessageDto) o; + return automaticProcessingPossible == that.automaticProcessingPossible + && type == that.type + && disease == that.disease + && Objects.equals(diseaseVariant, that.diseaseVariant) + && Objects.equals(diseaseVariantDetails, that.diseaseVariantDetails) + && Objects.equals(messageDateTime, that.messageDateTime) + && caseClassification == that.caseClassification + && Objects.equals(caseReportDate, that.caseReportDate) + && Objects.equals(caseSymptoms, that.caseSymptoms) + && Objects.equals(reporterName, that.reporterName) + && Objects.equals(reporterExternalIds, that.reporterExternalIds) + && Objects.equals(reporterPostalCode, that.reporterPostalCode) + && Objects.equals(reporterCity, that.reporterCity) + && Objects.equals(personFirstName, that.personFirstName) + && Objects.equals(personLastName, that.personLastName) + && Objects.equals(personExternalId, that.personExternalId) + && Objects.equals(personNationalHealthId, that.personNationalHealthId) + && personSex == that.personSex + && personPresentCondition == that.personPresentCondition + && Objects.equals(personBirthDateDD, that.personBirthDateDD) + && Objects.equals(personBirthDateMM, that.personBirthDateMM) + && Objects.equals(personBirthDateYYYY, that.personBirthDateYYYY) + && Objects.equals(personPostalCode, that.personPostalCode) + && Objects.equals(personCity, that.personCity) + && Objects.equals(personStreet, that.personStreet) + && Objects.equals(personHouseNumber, that.personHouseNumber) + && Objects.equals(personCountry, that.personCountry) + && Objects.equals(personFacility, that.personFacility) + && Objects.equals(personPhone, that.personPhone) + && personPhoneNumberType == that.personPhoneNumberType + && Objects.equals(personEmail, that.personEmail) + && Objects.equals(personGuardianFirstName, that.personGuardianFirstName) + && Objects.equals(personGuardianLastName, that.personGuardianLastName) + && Objects.equals(personGuardianRelationship, that.personGuardianRelationship) + && Objects.equals(personGuardianPhone, that.personGuardianPhone) + && Objects.equals(personGuardianEmail, that.personGuardianEmail) + && Objects.equals(personOccupation, that.personOccupation) + && treatmentStarted == that.treatmentStarted + && Objects.equals(treatmentNotApplicable, that.treatmentNotApplicable) + && Objects.equals(treatmentStartedDate, that.treatmentStartedDate) + && Objects.equals(diagnosticDate, that.diagnosticDate) + && Objects.equals(deceasedDate, that.deceasedDate) + && Objects.equals(sampleReports, that.sampleReports) + && Objects.equals(surveillanceReport, that.surveillanceReport) + && Objects.equals(externalMessageDetails, that.externalMessageDetails) + && Objects.equals(caseComments, that.caseComments) + && Objects.equals(reportId, that.reportId) + && Objects.equals(reportMessageId, that.reportMessageId) + && status == that.status + && Objects.equals(assignee, that.assignee) + && Objects.equals(reportingUser, that.reportingUser) + && Objects.equals(personAdditionalDetails, that.personAdditionalDetails) + && vaccinationStatus == that.vaccinationStatus + && admittedToHealthFacility == that.admittedToHealthFacility + && Objects.equals(hospitalizationFacilityName, that.hospitalizationFacilityName) + && Objects.equals(hospitalizationFacilityExternalId, that.hospitalizationFacilityExternalId) + && Objects.equals(hospitalizationFacilityDepartment, that.hospitalizationFacilityDepartment) + && Objects.equals(hospitalizationAdmissionDate, that.hospitalizationAdmissionDate) + && Objects.equals(hospitalizationDischargeDate, that.hospitalizationDischargeDate) + && Objects.equals(notifierFirstName, that.notifierFirstName) + && Objects.equals(notifierLastName, that.notifierLastName) + && Objects.equals(notifierRegistrationNumber, that.notifierRegistrationNumber) + && Objects.equals(notifierAddress, that.notifierAddress) + && Objects.equals(notifierEmail, that.notifierEmail) + && Objects.equals(notifierPhone, that.notifierPhone) + && Objects.equals(activitiesAsCase, that.activitiesAsCase) + && Objects.equals(exposures, that.exposures) + && radiographyCompatibility == that.radiographyCompatibility + && Objects.equals(otherDiagnosticCriteria, that.otherDiagnosticCriteria) + && tuberculosis == that.tuberculosis + && hiv == that.hiv + && hivArt == that.hivArt + && Objects.equals(tuberculosisInfectionYear, that.tuberculosisInfectionYear) + && previousTuberculosisTreatment == that.previousTuberculosisTreatment + && complianceWithTreatment == that.complianceWithTreatment + && Objects.equals(tuberculosisDirectlyObservedTreatment, that.tuberculosisDirectlyObservedTreatment) + && Objects.equals(tuberculosisMdrXdrTuberculosis, that.tuberculosisMdrXdrTuberculosis) + && Objects.equals(tuberculosisBeijingLineage, that.tuberculosisBeijingLineage) + && Objects.equals(surveyResponseWrapper, that.surveyResponseWrapper); + } + + @Override + public int hashCode() { + return Objects.hash( + super.hashCode(), + type, + disease, + diseaseVariant, + diseaseVariantDetails, + messageDateTime, + caseClassification, + caseReportDate, + caseSymptoms, + reporterName, + reporterExternalIds, + reporterPostalCode, + reporterCity, + personFirstName, + personLastName, + personExternalId, + personNationalHealthId, + personSex, + personPresentCondition, + personBirthDateDD, + personBirthDateMM, + personBirthDateYYYY, + personPostalCode, + personCity, + personStreet, + personHouseNumber, + personCountry, + personFacility, + personPhone, + personPhoneNumberType, + personEmail, + personGuardianFirstName, + personGuardianLastName, + personGuardianRelationship, + personGuardianPhone, + personGuardianEmail, + personOccupation, + treatmentStarted, + treatmentNotApplicable, + treatmentStartedDate, + diagnosticDate, + deceasedDate, + sampleReports, + surveillanceReport, + externalMessageDetails, + caseComments, + reportId, + reportMessageId, + status, + assignee, + reportingUser, + automaticProcessingPossible, + personAdditionalDetails, + vaccinationStatus, + admittedToHealthFacility, + hospitalizationFacilityName, + hospitalizationFacilityExternalId, + hospitalizationFacilityDepartment, + hospitalizationAdmissionDate, + hospitalizationDischargeDate, + notifierFirstName, + notifierLastName, + notifierRegistrationNumber, + notifierAddress, + notifierEmail, + notifierPhone, + activitiesAsCase, + exposures, + radiographyCompatibility, + otherDiagnosticCriteria, + tuberculosis, + hiv, + hivArt, + tuberculosisInfectionYear, + previousTuberculosisTreatment, + complianceWithTreatment, + tuberculosisDirectlyObservedTreatment, + tuberculosisMdrXdrTuberculosis, + tuberculosisBeijingLineage, + surveyResponseWrapper); + } } diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageFacade.java b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageFacade.java index b8ac0f9a17f..187e4c33c31 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageFacade.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageFacade.java @@ -22,6 +22,8 @@ public interface ExternalMessageFacade extends PermanentlyDeletableFacade { ExternalMessageDto saveAndProcessLabmessage(@Valid ExternalMessageDto dto); + List saveAndProcessSurveyResponses(@Valid List dtos); + void validate(ExternalMessageDto dto); // Also returns deleted lab messages diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseRequest.java b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseRequest.java new file mode 100644 index 00000000000..51ccbffe03c --- /dev/null +++ b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseRequest.java @@ -0,0 +1,147 @@ +package de.symeda.sormas.api.externalmessage.survey; + +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import javax.annotation.Nullable; +import javax.validation.constraints.NotNull; + +import de.symeda.sormas.api.Language; +import de.symeda.sormas.api.externalmessage.ExternalMessageType; +import de.symeda.sormas.api.info.InfoFacade; +import de.symeda.sormas.api.patch.DataReplacementStrategy; +import de.symeda.sormas.api.patch.EmptyValueBehavior; + +/** + * Mandatory fields that require + * Will be present for {@link ExternalMessageType#SURVEY_RESPONSE}. + */ +public class ExternalMessageSurveyResponseRequest { + + private String token; + private String externalSurveyId; + + private boolean patchedInCaseOfFailures = false; + + @NotNull + private DataReplacementStrategy replacementStrategy = DataReplacementStrategy.IF_NOT_ALREADY_PRESENT; + + @NotNull + private EmptyValueBehavior emptyValueBehavior = EmptyValueBehavior.IGNORE; + + /** + * Key are those from with root being the {@link de.symeda.sormas.api.caze.CaseDataDto}. + * The accepted fields are those from {@link InfoFacade#generateDataDictionary()}. + */ + @NotNull + private Map patchDictionary; + + /** + * Origin that wants the patch operation. + * Can be used within {@link de.symeda.sormas.api.patch.mapping.FieldCustomMapper}. + */ + @Nullable + private String origin; + + /** + * To be able to support I18n inputs the input languages can be passed, system locale by default. + */ + @Nullable + private List inputLanguages; + + public String getToken() { + return token; + } + + public ExternalMessageSurveyResponseRequest setToken(String token) { + this.token = token; + return this; + } + + public String getExternalSurveyId() { + return externalSurveyId; + } + + public ExternalMessageSurveyResponseRequest setExternalSurveyId(String externalSurveyId) { + this.externalSurveyId = externalSurveyId; + return this; + } + + public boolean isPatchedInCaseOfFailures() { + return patchedInCaseOfFailures; + } + + public ExternalMessageSurveyResponseRequest setPatchedInCaseOfFailures(boolean patchedInCaseOfFailures) { + this.patchedInCaseOfFailures = patchedInCaseOfFailures; + return this; + } + + public DataReplacementStrategy getReplacementStrategy() { + return replacementStrategy; + } + + public ExternalMessageSurveyResponseRequest setReplacementStrategy(DataReplacementStrategy replacementStrategy) { + this.replacementStrategy = replacementStrategy; + return this; + } + + public EmptyValueBehavior getEmptyValueBehavior() { + return emptyValueBehavior; + } + + public ExternalMessageSurveyResponseRequest setEmptyValueBehavior(EmptyValueBehavior emptyValueBehavior) { + this.emptyValueBehavior = emptyValueBehavior; + return this; + } + + public Map getPatchDictionary() { + return patchDictionary; + } + + public ExternalMessageSurveyResponseRequest setPatchDictionary(Map patchDictionary) { + this.patchDictionary = patchDictionary; + return this; + } + + @Nullable + public String getOrigin() { + return origin; + } + + public ExternalMessageSurveyResponseRequest setOrigin(@Nullable String origin) { + this.origin = origin; + return this; + } + + @Nullable + public List getInputLanguages() { + return inputLanguages; + } + + public ExternalMessageSurveyResponseRequest setInputLanguages(@Nullable List inputLanguages) { + this.inputLanguages = inputLanguages; + return this; + } + + @Override + public boolean equals(Object o) { + if (o == null || getClass() != o.getClass()) + return false; + ExternalMessageSurveyResponseRequest that = (ExternalMessageSurveyResponseRequest) o; + return patchedInCaseOfFailures == that.patchedInCaseOfFailures + && Objects.equals(token, that.token) + && Objects.equals(externalSurveyId, that.externalSurveyId) + && replacementStrategy == that.replacementStrategy + && emptyValueBehavior == that.emptyValueBehavior + && Objects.equals(patchDictionary, that.patchDictionary) + && Objects.equals(origin, that.origin) + && Objects.equals(inputLanguages, that.inputLanguages); + } + + @Override + public int hashCode() { + return Objects + .hash(token, externalSurveyId, patchedInCaseOfFailures, replacementStrategy, emptyValueBehavior, patchDictionary, origin, inputLanguages); + } +} diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseResult.java b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseResult.java new file mode 100644 index 00000000000..26acbcec7b0 --- /dev/null +++ b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseResult.java @@ -0,0 +1,62 @@ +package de.symeda.sormas.api.externalmessage.survey; + +import java.util.Objects; + +import de.symeda.sormas.api.patch.DataPatchResponse; + +public class ExternalMessageSurveyResponseResult { + + private String caseUuid; + + private String surveyTokenUuid; + + private DataPatchResponse patchResponse; + + public String getCaseUuid() { + return caseUuid; + } + + public ExternalMessageSurveyResponseResult setCaseUuid(String caseUuid) { + this.caseUuid = caseUuid; + return this; + } + + public String getSurveyTokenUuid() { + return surveyTokenUuid; + } + + public ExternalMessageSurveyResponseResult setSurveyTokenUuid(String surveyTokenUuid) { + this.surveyTokenUuid = surveyTokenUuid; + return this; + } + + public DataPatchResponse getPatchResponse() { + return patchResponse; + } + + public ExternalMessageSurveyResponseResult setPatchResponse(DataPatchResponse patchResponse) { + this.patchResponse = patchResponse; + return this; + } + + @Override + public boolean equals(Object o) { + if (o == null || getClass() != o.getClass()) + return false; + ExternalMessageSurveyResponseResult that = (ExternalMessageSurveyResponseResult) o; + return Objects.equals(caseUuid, that.caseUuid) + && Objects.equals(surveyTokenUuid, that.surveyTokenUuid) + && Objects.equals(patchResponse, that.patchResponse); + } + + @Override + public int hashCode() { + return Objects.hash(caseUuid, surveyTokenUuid, patchResponse); + } + + @Override + public String toString() { + return "ExternalMessageSurveyResponseResult{" + "caseUuid='" + caseUuid + '\'' + ", surveyTokenUuid='" + surveyTokenUuid + '\'' + + ", patchResponse=" + patchResponse + '}'; + } +} diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseWrapper.java b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseWrapper.java new file mode 100644 index 00000000000..3746cc723be --- /dev/null +++ b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseWrapper.java @@ -0,0 +1,45 @@ +package de.symeda.sormas.api.externalmessage.survey; + +import java.util.Objects; + +public class ExternalMessageSurveyResponseWrapper { + + private ExternalMessageSurveyResponseRequest request; + private ExternalMessageSurveyResponseResult result; + + public ExternalMessageSurveyResponseRequest getRequest() { + return request; + } + + public ExternalMessageSurveyResponseWrapper setRequest(ExternalMessageSurveyResponseRequest request) { + this.request = request; + return this; + } + + public ExternalMessageSurveyResponseResult getResult() { + return result; + } + + public ExternalMessageSurveyResponseWrapper setResult(ExternalMessageSurveyResponseResult result) { + this.result = result; + return this; + } + + @Override + public boolean equals(Object o) { + if (o == null || getClass() != o.getClass()) + return false; + ExternalMessageSurveyResponseWrapper that = (ExternalMessageSurveyResponseWrapper) o; + return Objects.equals(request, that.request) && Objects.equals(result, that.result); + } + + @Override + public int hashCode() { + return Objects.hash(request, result); + } + + @Override + public String toString() { + return "ExternalMessageSurveyResponseWrapper{" + "request=" + request + ", result=" + result + '}'; + } +} diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/user/DefaultUserRole.java b/sormas-api/src/main/java/de/symeda/sormas/api/user/DefaultUserRole.java index dfe51b3d861..a2677d75db1 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/user/DefaultUserRole.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/user/DefaultUserRole.java @@ -1430,10 +1430,13 @@ public Set getDefaultUserRights() { EXTERNAL_MESSAGE_ACCESS, EXTERNAL_MESSAGE_LABORATORY_VIEW, EXTERNAL_MESSAGE_DOCTOR_DECLARATION_VIEW, + EXTERNAL_MESSAGE_SURVEY_RESPONSE_VIEW, EXTERNAL_MESSAGE_LABORATORY_PROCESS, EXTERNAL_MESSAGE_DOCTOR_DECLARATION_PROCESS, + EXTERNAL_MESSAGE_SURVEY_RESPONSE_PROCESS, EXTERNAL_MESSAGE_LABORATORY_DELETE, EXTERNAL_MESSAGE_DOCTOR_DECLARATION_DELETE, + EXTERNAL_MESSAGE_SURVEY_RESPONSE_DELETE, PERFORM_BULK_OPERATIONS, TRAVEL_ENTRY_MANAGEMENT_ACCESS, TRAVEL_ENTRY_VIEW, @@ -1862,10 +1865,13 @@ public Set getDefaultUserRights() { EXTERNAL_MESSAGE_ACCESS, EXTERNAL_MESSAGE_LABORATORY_VIEW, EXTERNAL_MESSAGE_DOCTOR_DECLARATION_VIEW, + EXTERNAL_MESSAGE_SURVEY_RESPONSE_VIEW, EXTERNAL_MESSAGE_LABORATORY_PROCESS, EXTERNAL_MESSAGE_DOCTOR_DECLARATION_PROCESS, + EXTERNAL_MESSAGE_SURVEY_RESPONSE_PROCESS, EXTERNAL_MESSAGE_LABORATORY_DELETE, EXTERNAL_MESSAGE_DOCTOR_DECLARATION_DELETE, + EXTERNAL_MESSAGE_SURVEY_RESPONSE_DELETE, TRAVEL_ENTRY_MANAGEMENT_ACCESS, TRAVEL_ENTRY_VIEW, TRAVEL_ENTRY_CREATE, diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/user/UserRight.java b/sormas-api/src/main/java/de/symeda/sormas/api/user/UserRight.java index d86c6fc3ebd..17eb4dcd00e 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/user/UserRight.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/user/UserRight.java @@ -290,6 +290,7 @@ public enum UserRight { EXTERNAL_MESSAGE_ACCESS(UserRightGroup.EXTERNAL), EXTERNAL_MESSAGE_LABORATORY_VIEW(UserRightGroup.EXTERNAL, UserRight._EXTERNAL_MESSAGE_ACCESS), EXTERNAL_MESSAGE_DOCTOR_DECLARATION_VIEW(UserRightGroup.EXTERNAL, UserRight._EXTERNAL_MESSAGE_ACCESS), + EXTERNAL_MESSAGE_SURVEY_RESPONSE_VIEW(UserRightGroup.EXTERNAL, UserRight._EXTERNAL_MESSAGE_ACCESS), EXTERNAL_MESSAGE_LABORATORY_PROCESS(UserRightGroup.EXTERNAL, UserRight._EXTERNAL_MESSAGE_ACCESS, UserRight._EXTERNAL_MESSAGE_LABORATORY_VIEW, UserRight._SAMPLE_CREATE, UserRight._SAMPLE_EDIT, UserRight._PATHOGEN_TEST_CREATE, UserRight._PATHOGEN_TEST_EDIT, UserRight._PATHOGEN_TEST_DELETE, @@ -298,8 +299,18 @@ public enum UserRight { UserRight._SAMPLE_CREATE, UserRight._SAMPLE_EDIT, UserRight._PATHOGEN_TEST_CREATE, UserRight._PATHOGEN_TEST_EDIT, UserRight._PATHOGEN_TEST_DELETE, UserRight._IMMUNIZATION_CREATE, UserRight._IMMUNIZATION_EDIT, UserRight._IMMUNIZATION_DELETE), + EXTERNAL_MESSAGE_SURVEY_RESPONSE_PROCESS(UserRightGroup.EXTERNAL, UserRight._EXTERNAL_MESSAGE_ACCESS, UserRight._EXTERNAL_MESSAGE_SURVEY_RESPONSE_VIEW, + UserRight._SAMPLE_CREATE, UserRight._SAMPLE_EDIT, UserRight._PATHOGEN_TEST_CREATE, UserRight._PATHOGEN_TEST_EDIT, UserRight._PATHOGEN_TEST_DELETE, + UserRight._IMMUNIZATION_CREATE, UserRight._IMMUNIZATION_EDIT, UserRight._IMMUNIZATION_DELETE, + UserRight._SURVEY_VIEW, + UserRight._SURVEY_CREATE, + UserRight._SURVEY_EDIT, + UserRight._SURVEY_DELETE, + UserRight._SURVEY_TOKEN_VIEW), + EXTERNAL_MESSAGE_LABORATORY_DELETE(UserRightGroup.EXTERNAL, UserRight._EXTERNAL_MESSAGE_ACCESS, UserRight._EXTERNAL_MESSAGE_LABORATORY_VIEW), EXTERNAL_MESSAGE_DOCTOR_DECLARATION_DELETE(UserRightGroup.EXTERNAL, UserRight._EXTERNAL_MESSAGE_ACCESS, UserRight._EXTERNAL_MESSAGE_DOCTOR_DECLARATION_VIEW), + EXTERNAL_MESSAGE_SURVEY_RESPONSE_DELETE(UserRightGroup.EXTERNAL, UserRight._EXTERNAL_MESSAGE_ACCESS, UserRight._EXTERNAL_MESSAGE_SURVEY_RESPONSE_VIEW), SURVEY_VIEW(UserRightGroup.SURVEY), SURVEY_CREATE(UserRightGroup.SURVEY, UserRight._SURVEY_VIEW), @@ -510,6 +521,9 @@ public enum UserRight { public static final String _EXTERNAL_MESSAGE_DOCTOR_DECLARATION_VIEW = "EXTERNAL_MESSAGE_DOCTOR_DECLARATION_VIEW"; public static final String _EXTERNAL_MESSAGE_DOCTOR_DECLARATION_PROCESS = "EXTERNAL_MESSAGE_DOCTOR_DECLARATION_PROCESS"; public static final String _EXTERNAL_MESSAGE_DOCTOR_DECLARATION_DELETE = "EXTERNAL_MESSAGE_DOCTOR_DECLARATION_DELETE"; + public static final String _EXTERNAL_MESSAGE_SURVEY_RESPONSE_VIEW = "EXTERNAL_MESSAGE_SURVEY_RESPONSE_VIEW"; + public static final String _EXTERNAL_MESSAGE_SURVEY_RESPONSE_PROCESS = "EXTERNAL_MESSAGE_SURVEY_RESPONSE_PROCESS"; + public static final String _EXTERNAL_MESSAGE_SURVEY_RESPONSE_DELETE = "EXTERNAL_MESSAGE_SURVEY_RESPONSE_DELETE"; public static final String _TRAVEL_ENTRY_MANAGEMENT_ACCESS = "TRAVEL_ENTRY_MANAGEMENT_ACCESS"; public static final String _TRAVEL_ENTRY_VIEW = "TRAVEL_ENTRY_VIEW"; public static final String _TRAVEL_ENTRY_VIEW_ARCHIVED = "TRAVEL_ENTRY_VIEW_ARCHIVED"; diff --git a/sormas-api/src/main/resources/enum_fr-FR.properties b/sormas-api/src/main/resources/enum_fr-FR.properties index eee28de29a4..33e985e3fdf 100644 --- a/sormas-api/src/main/resources/enum_fr-FR.properties +++ b/sormas-api/src/main/resources/enum_fr-FR.properties @@ -15,33 +15,27 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . ############################################################################### - # Enum captions and descriptions - # ActionContext -ActionContext.EVENT = Évènement - -ActionMeasure.PROHIBITION_OF_ENTRY_AND_WORK_CASES = Interdiction d'entrée et de travail pour les personnes de cas -ActionMeasure.SAMPLE_COLLECTION = Collection d'échantillons -ActionMeasure.FORWARDING_TO_NATIONAL_REFERENCE_CENTER = Transmission vers le centre national de référence -ActionMeasure.CONTACT_FOLLOW_UP = Activer le suivi des personnes de contact -ActionMeasure.VERIFICATION_OF_VACCINATION_IMMUNIZATION = Vérification du statut de vaccination ou d'immunisation -ActionMeasure.POST_EXPOSURE_PROPHYLAXIS_VACCINATION = Effectuer une vaccination prophylactique après exposition -ActionMeasure.CLOSURE_OF_FACILITY = Fermeture de l'établissement -ActionMeasure.PROHIBITION_OF_ENTRY_AND_WORK_CONTACTS = Interdiction d'entrée et de travail pour les personnes de contact -ActionMeasure.POPULATION_INFORMATION = Informations sur la population à propos de l'épidémie -ActionMeasure.OTHER = Autres - +ActionContext.EVENT=Évènement +ActionMeasure.PROHIBITION_OF_ENTRY_AND_WORK_CASES=Interdiction d'entrée et de travail pour les personnes de cas +ActionMeasure.SAMPLE_COLLECTION=Collection d'échantillons +ActionMeasure.FORWARDING_TO_NATIONAL_REFERENCE_CENTER=Transmission vers le centre national de référence +ActionMeasure.CONTACT_FOLLOW_UP=Activer le suivi des personnes de contact +ActionMeasure.VERIFICATION_OF_VACCINATION_IMMUNIZATION=Vérification du statut de vaccination ou d'immunisation +ActionMeasure.POST_EXPOSURE_PROPHYLAXIS_VACCINATION=Effectuer une vaccination prophylactique après exposition +ActionMeasure.CLOSURE_OF_FACILITY=Fermeture de l'établissement +ActionMeasure.PROHIBITION_OF_ENTRY_AND_WORK_CONTACTS=Interdiction d'entrée et de travail pour les personnes de contact +ActionMeasure.POPULATION_INFORMATION=Informations sur la population à propos de l'épidémie +ActionMeasure.OTHER=Autres # ActionPriority -ActionPriority.HIGH = Élevée -ActionPriority.LOW = Bas -ActionPriority.NORMAL = Normal - +ActionPriority.HIGH=Élevée +ActionPriority.LOW=Bas +ActionPriority.NORMAL=Normal # ActionStatus -ActionStatus.DONE = Fait -ActionStatus.PENDING = En attente -ActionStatus.IN_PROGRESS = En cours - +ActionStatus.DONE=Fait +ActionStatus.PENDING=En attente +ActionStatus.IN_PROGRESS=En cours # ActivityAsCaseType ActivityAsCaseType.WORK=Travail ActivityAsCaseType.TRAVEL=Voyage @@ -53,620 +47,563 @@ ActivityAsCaseType.PERSONAL_SERVICES=Services personnels ActivityAsCaseType.CARED_FOR=Soigné pour ActivityAsCaseType.OTHER=Autres ActivityAsCaseType.UNKNOWN=Inconnu - # AdditionalTestingStatus -AdditionalTestingStatus.NOT_REQUESTED = Non demandé -AdditionalTestingStatus.REQUESTED = Demandé -AdditionalTestingStatus.PERFORMED = Exécutées - +AdditionalTestingStatus.NOT_REQUESTED=Non demandé +AdditionalTestingStatus.REQUESTED=Demandé +AdditionalTestingStatus.PERFORMED=Exécutées # AdditionalTestType -AdditionalTestType.HAEMOGLOBINURIA = Hémoglobine dans l'urine -AdditionalTestType.PROTEINURIA = Protéine dans l'urine -AdditionalTestType.HEMATURIA = Cellules sanguines rouges dans l'urine -AdditionalTestType.ARTERIAL_VENOUS_BLOOD_GAS = Gaz du sang artériel/veineux -AdditionalTestType.ALT_SGPT = ALT/SGPT -AdditionalTestType.AST_SGOT = AST/SGOT -AdditionalTestType.CREATININE = Créatinine -AdditionalTestType.POTASSIUM = Potassium -AdditionalTestType.UREA = Urée -AdditionalTestType.HAEMOGLOBIN = Hémoglobine -AdditionalTestType.TOTAL_BILIRUBIN = Bilirubine totale -AdditionalTestType.CONJ_BILIRUBIN = Conj.bilirubine -AdditionalTestType.WBC_COUNT = Nombre WBC -AdditionalTestType.PLATELETS = Plaquettes -AdditionalTestType.PROTHROMBIN_TIME = Heure Prothrombine - -AgeGroup.AGE_0_4 = 0-4 -AgeGroup.AGE_5_9 = 5-9 -AgeGroup.AGE_10_14 = 10-14 -AgeGroup.AGE_15_19 = 15-19 -AgeGroup.AGE_20_24 = 20-24 -AgeGroup.AGE_25_29 = 25-29 -AgeGroup.AGE_30_34 = 30-34 -AgeGroup.AGE_35_39 = 35-59 -AgeGroup.AGE_40_44 = 40-44 -AgeGroup.AGE_45_49 = 45-49 -AgeGroup.AGE_50_54 = 50-54 -AgeGroup.AGE_55_59 = 55-59 -AgeGroup.AGE_60_64 = 60-64 -AgeGroup.AGE_65_69 = 65-69 -AgeGroup.AGE_70_74 = 70-74 -AgeGroup.AGE_75_79 = 75-79 -AgeGroup.AGE_80_84 = 80-84 -AgeGroup.AGE_80_PLUS = 80+ - +AdditionalTestType.HAEMOGLOBINURIA=Hémoglobine dans l'urine +AdditionalTestType.PROTEINURIA=Protéine dans l'urine +AdditionalTestType.HEMATURIA=Cellules sanguines rouges dans l'urine +AdditionalTestType.ARTERIAL_VENOUS_BLOOD_GAS=Gaz du sang artériel/veineux +AdditionalTestType.ALT_SGPT=ALT/SGPT +AdditionalTestType.AST_SGOT=AST/SGOT +AdditionalTestType.CREATININE=Créatinine +AdditionalTestType.POTASSIUM=Potassium +AdditionalTestType.UREA=Urée +AdditionalTestType.HAEMOGLOBIN=Hémoglobine +AdditionalTestType.TOTAL_BILIRUBIN=Bilirubine totale +AdditionalTestType.CONJ_BILIRUBIN=Conj.bilirubine +AdditionalTestType.WBC_COUNT=Nombre WBC +AdditionalTestType.PLATELETS=Plaquettes +AdditionalTestType.PROTHROMBIN_TIME=Heure Prothrombine +AgeGroup.AGE_0_4=0-4 +AgeGroup.AGE_5_9=5-9 +AgeGroup.AGE_10_14=10-14 +AgeGroup.AGE_15_19=15-19 +AgeGroup.AGE_20_24=20-24 +AgeGroup.AGE_25_29=25-29 +AgeGroup.AGE_30_34=30-34 +AgeGroup.AGE_35_39=35-59 +AgeGroup.AGE_40_44=40-44 +AgeGroup.AGE_45_49=45-49 +AgeGroup.AGE_50_54=50-54 +AgeGroup.AGE_55_59=55-59 +AgeGroup.AGE_60_64=60-64 +AgeGroup.AGE_65_69=65-69 +AgeGroup.AGE_70_74=70-74 +AgeGroup.AGE_75_79=75-79 +AgeGroup.AGE_80_84=80-84 +AgeGroup.AGE_80_PLUS=80+ #AggregatedReportGroupingLevel -AggregateReportGroupingLevel.REGION = Province -AggregateReportGroupingLevel.DISTRICT = Zone de santé -AggregateReportGroupingLevel.HEALTH_FACILITY = Établissement -AggregateReportGroupingLevel.POINT_OF_ENTRY = Point d'entrée - +AggregateReportGroupingLevel.REGION=Province +AggregateReportGroupingLevel.DISTRICT=Zone de santé +AggregateReportGroupingLevel.HEALTH_FACILITY=Établissement +AggregateReportGroupingLevel.POINT_OF_ENTRY=Point d'entrée # AnimalCondition -AnimalCondition.ALIVE = Vivant -AnimalCondition.DEAD = Mort -AnimalCondition.PROCESSED = Traité -AnimalCondition.UNKNOWN = Inconnu - +AnimalCondition.ALIVE=Vivant +AnimalCondition.DEAD=Mort +AnimalCondition.PROCESSED=Traité +AnimalCondition.UNKNOWN=Inconnu AnimalContactType.BITE=Mordre AnimalContactType.TOUCH=Toucher AnimalContactType.SCRATCH=Griffer AnimalContactType.LICK=Léchage AnimalContactType.OTHER=Autres - # ApproximateAgeType -ApproximateAgeType.DAYS = Jours -ApproximateAgeType.MONTHS = Mois -ApproximateAgeType.YEARS = Années - -AreaType.URBAN = Urbain -AreaType.RURAL = Rural -AreaType.UNKNOWN = Inconnu - -ArmedForcesRelationType.UNKNOWN = Inconnu -ArmedForcesRelationType.NO_RELATION = Aucun rapport avec les forces armées -ArmedForcesRelationType.CIVIL = Personne civile travaillant pour/logée dans une installation des forces armées -ArmedForcesRelationType.SOLDIER_OR_RELATIVE = Soldat, parent - -ArrivalOrDeparture.ARRIVAL = Arrivée -ArrivalOrDeparture.DEPARTURE = Départ -ArrivalOrDeparture.UNKNOWN = Inconnu - +ApproximateAgeType.DAYS=Jours +ApproximateAgeType.MONTHS=Mois +ApproximateAgeType.YEARS=Années +AreaType.URBAN=Urbain +AreaType.RURAL=Rural +AreaType.UNKNOWN=Inconnu +ArmedForcesRelationType.UNKNOWN=Inconnu +ArmedForcesRelationType.NO_RELATION=Aucun rapport avec les forces armées +ArmedForcesRelationType.CIVIL=Personne civile travaillant pour/logée dans une installation des forces armées +ArmedForcesRelationType.SOLDIER_OR_RELATIVE=Soldat, parent +ArrivalOrDeparture.ARRIVAL=Arrivée +ArrivalOrDeparture.DEPARTURE=Départ +ArrivalOrDeparture.UNKNOWN=Inconnu # BurialConductor -BurialConductor.FAMILY_COMMUNITY = Famille/Communauté -BurialConductor.OUTBREAK_TEAM = Équipe d'enterrement d'épidémie - +BurialConductor.FAMILY_COMMUNITY=Famille/Communauté +BurialConductor.OUTBREAK_TEAM=Équipe d'enterrement d'épidémie # CampaignPhase -CampaignPhase.PRE = Pré-Campagne -CampaignPhase.INTRA = Intra-Campagne -CampaignPhase.POST = Post-Campagne - +CampaignPhase.PRE=Pré-Campagne +CampaignPhase.INTRA=Intra-Campagne +CampaignPhase.POST=Post-Campagne # CampaignJurisdictionLevel -CampaignJurisdictionLevel.AREA = Zone -CampaignJurisdictionLevel.REGION = Province -CampaignJurisdictionLevel.DISTRICT = Zone de santé -CampaignJurisdictionLevel.COMMUNITY = Aires de santé - +CampaignJurisdictionLevel.AREA=Zone +CampaignJurisdictionLevel.REGION=Province +CampaignJurisdictionLevel.DISTRICT=Zone de santé +CampaignJurisdictionLevel.COMMUNITY=Aires de santé # CaseClassification -CaseClassification.CONFIRMED = Cas Confirmé -CaseClassification.CONFIRMED_NO_SYMPTOMS = Cas confirmé sans symptômes -CaseClassification.CONFIRMED_UNKNOWN_SYMPTOMS = Cas confirmé avec symptômes inconnus -CaseClassification.NO_CASE = Pas un cas -CaseClassification.NOT_CLASSIFIED = Non classé -CaseClassification.PROBABLE = Cas Probable -CaseClassification.SUSPECT = Cas Suspect -CaseClassification.Short.CONFIRMED = Confirmée -CaseClassification.Short.CONFIRMED_NO_SYMPTOMS = Confirmé avec des symptômes -CaseClassification.Short.CONFIRMED_UNKNOWN_SYMPTOMS = Symptômes inconnus confirmés -CaseClassification.Short.NO_CASE = Pas un cas -CaseClassification.Short.NOT_CLASSIFIED = Non classé -CaseClassification.Short.PROBABLE = Probable -CaseClassification.Short.SUSPECT = Suspect - +CaseClassification.CONFIRMED=Cas Confirmé +CaseClassification.CONFIRMED_NO_SYMPTOMS=Cas confirmé sans symptômes +CaseClassification.CONFIRMED_UNKNOWN_SYMPTOMS=Cas confirmé avec symptômes inconnus +CaseClassification.NO_CASE=Pas un cas +CaseClassification.NOT_CLASSIFIED=Non classé +CaseClassification.PROBABLE=Cas Probable +CaseClassification.SUSPECT=Cas Suspect +CaseClassification.Short.CONFIRMED=Confirmée +CaseClassification.Short.CONFIRMED_NO_SYMPTOMS=Confirmé avec des symptômes +CaseClassification.Short.CONFIRMED_UNKNOWN_SYMPTOMS=Symptômes inconnus confirmés +CaseClassification.Short.NO_CASE=Pas un cas +CaseClassification.Short.NOT_CLASSIFIED=Non classé +CaseClassification.Short.PROBABLE=Probable +CaseClassification.Short.SUSPECT=Suspect # CaseIdentificationSource -CaseIdentificationSource.UNKNOWN = Inconnu -CaseIdentificationSource.OUTBREAK_INVESTIGATION = Enquête sur l'épidémie -CaseIdentificationSource.CONTACT_TRACKING_APP = Application de suivi des contacts -CaseIdentificationSource.SUSPICION_REPORT = Rapport de suspicion -CaseIdentificationSource.CONTACT_TRACING = Suivi des contacts -CaseIdentificationSource.SCREENING = Dépistage -CaseIdentificationSource.OTHER = Autre - -ScreeningType.ON_HOSPITAL_ADMISSION = A l'admission dans un hôpital -ScreeningType.ON_CARE_HOME_ADMISSION = A l'entrée dans un établissement de soins -ScreeningType.ON_ASYLUM_ADMISSION = A l'admission dans un établissement d'accueil de réfugies -ScreeningType.ON_ENTRY_FROM_RISK_AREA = A l'entrée de la zone à risque -ScreeningType.HEALTH_SECTOR_EMPLOYEE = Employé du secteur de la santé -ScreeningType.EDUCATIONAL_INSTITUTIONS = Institutions éducatives -ScreeningType.SELF_ARRANGED_TEST = Auto-test organisé -ScreeningType.SELF_CONDUCTED_TEST = Auto-test effectué -ScreeningType.OTHER = Autre - -CaseCountOrIncidence.CASE_COUNT = Nombre de cas -CaseCountOrIncidence.CASE_INCIDENCE = Incidence de cas - -CaseJurisdictionType.RESPONSIBLE = Juridiction responsable -CaseJurisdictionType.PLACE_OF_STAY = Lieu du séjour -CaseJurisdictionType.ALL = Tous - +CaseIdentificationSource.UNKNOWN=Inconnu +CaseIdentificationSource.OUTBREAK_INVESTIGATION=Enquête sur l'épidémie +CaseIdentificationSource.CONTACT_TRACKING_APP=Application de suivi des contacts +CaseIdentificationSource.SUSPICION_REPORT=Rapport de suspicion +CaseIdentificationSource.CONTACT_TRACING=Suivi des contacts +CaseIdentificationSource.SCREENING=Dépistage +CaseIdentificationSource.OTHER=Autre +ScreeningType.ON_HOSPITAL_ADMISSION=A l'admission dans un hôpital +ScreeningType.ON_CARE_HOME_ADMISSION=A l'entrée dans un établissement de soins +ScreeningType.ON_ASYLUM_ADMISSION=A l'admission dans un établissement d'accueil de réfugies +ScreeningType.ON_ENTRY_FROM_RISK_AREA=A l'entrée de la zone à risque +ScreeningType.HEALTH_SECTOR_EMPLOYEE=Employé du secteur de la santé +ScreeningType.EDUCATIONAL_INSTITUTIONS=Institutions éducatives +ScreeningType.SELF_ARRANGED_TEST=Auto-test organisé +ScreeningType.SELF_CONDUCTED_TEST=Auto-test effectué +ScreeningType.OTHER=Autre +CaseCountOrIncidence.CASE_COUNT=Nombre de cas +CaseCountOrIncidence.CASE_INCIDENCE=Incidence de cas +CaseJurisdictionType.RESPONSIBLE=Juridiction responsable +CaseJurisdictionType.PLACE_OF_STAY=Lieu du séjour +CaseJurisdictionType.ALL=Tous # CaseMeasure -CaseMeasure.CASE_COUNT = Nombre de cas -CaseMeasure.CASE_INCIDENCE = Proportion d'incidence de cas - -CaseOrigin.IN_COUNTRY = Dans le pays -CaseOrigin.POINT_OF_ENTRY = Point d'entrée - +CaseMeasure.CASE_COUNT=Nombre de cas +CaseMeasure.CASE_INCIDENCE=Proportion d'incidence de cas +CaseOrigin.IN_COUNTRY=Dans le pays +CaseOrigin.POINT_OF_ENTRY=Point d'entrée # CaseOutcome -CaseOutcome.DECEASED = Décédé -CaseOutcome.NO_OUTCOME = Pas encore connu -CaseOutcome.RECOVERED = Guéri -CaseOutcome.UNKNOWN = Inconnu - +CaseOutcome.DECEASED=Décédé +CaseOutcome.NO_OUTCOME=Pas encore connu +CaseOutcome.RECOVERED=Guéri +CaseOutcome.UNKNOWN=Inconnu # CaseReferenceDefinition -CaseReferenceDefinition.FULFILLED = Réalisées -CaseReferenceDefinition.NOT_FULFILLED = Non réalisé - +CaseReferenceDefinition.FULFILLED=Réalisées +CaseReferenceDefinition.NOT_FULFILLED=Non réalisé # CauseOfDeath -CauseOfDeath.EPIDEMIC_DISEASE = Maladie épidémique -CauseOfDeath.OTHER_CAUSE = Autre cause - +CauseOfDeath.EPIDEMIC_DISEASE=Maladie épidémique +CauseOfDeath.OTHER_CAUSE=Autre cause ## Confirmed case classification -CaseConfirmationBasis.CLINICAL_CONFIRMATION = Confirmation clinique -CaseConfirmationBasis.EPIDEMIOLOGICAL_CONFIRMATION = Confirmation épidémiologique -CaseConfirmationBasis.LABORATORY_DIAGNOSTIC_CONFIRMATION = Confirmation du diagnostic par le laboratoire - -CongenitalHeartDiseaseType.PDA = Persistance du canal artériel (PCA) -CongenitalHeartDiseaseType.PPS = Sténose pulmonaire périphérique (PPS) -CongenitalHeartDiseaseType.VSD = Défaut septal ventriculaire (VSD) -CongenitalHeartDiseaseType.OTHER = Autre défaut cardiaque - +CaseConfirmationBasis.CLINICAL_CONFIRMATION=Confirmation clinique +CaseConfirmationBasis.EPIDEMIOLOGICAL_CONFIRMATION=Confirmation épidémiologique +CaseConfirmationBasis.LABORATORY_DIAGNOSTIC_CONFIRMATION=Confirmation du diagnostic par le laboratoire +CongenitalHeartDiseaseType.PDA=Persistance du canal artériel (PCA) +CongenitalHeartDiseaseType.PPS=Sténose pulmonaire périphérique (PPS) +CongenitalHeartDiseaseType.VSD=Défaut septal ventriculaire (VSD) +CongenitalHeartDiseaseType.OTHER=Autre défaut cardiaque # ContactCategory -ContactCategory.HIGH_RISK = Contact à haut risque -ContactCategory.HIGH_RISK_MED = Contact médical à haut risque -ContactCategory.MEDIUM_RISK_MED = Contact médical de risque moyen -ContactCategory.LOW_RISK = Contact à faible risque -ContactCategory.NO_RISK = Contact sans risque - +ContactCategory.HIGH_RISK=Contact à haut risque +ContactCategory.HIGH_RISK_MED=Contact médical à haut risque +ContactCategory.MEDIUM_RISK_MED=Contact médical de risque moyen +ContactCategory.LOW_RISK=Contact à faible risque +ContactCategory.NO_RISK=Contact sans risque # ContactClassification -ContactClassification.CONFIRMED = Contact confirmé -ContactClassification.NO_CONTACT = Pas un contact -ContactClassification.UNCONFIRMED = Contact non confirmé -ContactClassification.Short.CONFIRMED = Confirmée -ContactClassification.Short.NO_CONTACT = Aucun contact -ContactClassification.Short.UNCONFIRMED = Non confirmé - +ContactClassification.CONFIRMED=Contact confirmé +ContactClassification.NO_CONTACT=Pas un contact +ContactClassification.UNCONFIRMED=Contact non confirmé +ContactClassification.Short.CONFIRMED=Confirmée +ContactClassification.Short.NO_CONTACT=Aucun contact +ContactClassification.Short.UNCONFIRMED=Non confirmé # ContactDateType -ContactDateType.REPORT_DATE = Date du signalé -ContactDateType.LAST_CONTACT_DATE = Date de dernier contact - -ContactsEpiCurveMode.FOLLOW_UP_STATUS = Statut de suivi -ContactsEpiCurveMode.CONTACT_CLASSIFICATION = Classification de contact -ContactsEpiCurveMode.FOLLOW_UP_UNTIL = Suivi jusqu’à - +ContactDateType.REPORT_DATE=Date du signalé +ContactDateType.LAST_CONTACT_DATE=Date de dernier contact +ContactsEpiCurveMode.FOLLOW_UP_STATUS=Statut de suivi +ContactsEpiCurveMode.CONTACT_CLASSIFICATION=Classification de contact +ContactsEpiCurveMode.FOLLOW_UP_UNTIL=Suivi jusqu’à # ContactIdentificationSource -ContactIdentificationSource.CASE_PERSON = Personne (Cas) -ContactIdentificationSource.CONTACT_PERSON = Personne (contact) -ContactIdentificationSource.TRACING_APP = Application de recherche de proximité -ContactIdentificationSource.OTHER = Autre -ContactIdentificationSource.UNKNOWN = Inconnu - +ContactIdentificationSource.CASE_PERSON=Personne (Cas) +ContactIdentificationSource.CONTACT_PERSON=Personne (contact) +ContactIdentificationSource.TRACING_APP=Application de recherche de proximité +ContactIdentificationSource.OTHER=Autre +ContactIdentificationSource.UNKNOWN=Inconnu # ContactProximity -ContactProximity.AEROSOL = Personnes exposées aux activités de production d'aérosols -ContactProximity.AIRPLANE = Avion, assis jusqu'à deux rangées devant ou derrière le cas source -ContactProximity.CLOSE_CONTACT = 4-Était à proximité (1 mètre) du cas -ContactProximity.CLOTHES_OR_OTHER = 3-Manipulation de vêtements ou autres objets du cas source -ContactProximity.FACE_TO_FACE_LONG = Face à face d'au moins 15 minutes -ContactProximity.FACE_TO_FACE_SHORT = Face à face de moins de 15 minutes -ContactProximity.MEDICAL_DISTANT = Personnel médical à proximité (> 2 mètres), sans contact direct avec les sécrétions ou excrétions du patient et sans exposition aux aérosols -ContactProximity.MEDICAL_SAME_ROOM = Personnel médical dans la même pièce ou maison que le cas source -ContactProximity.MEDICAL_SAFE = Personnel médical à proximité (> 2 mètres) ou avec équipement de protection -ContactProximity.MEDICAL_UNSAFE = Personnel médical présentant un risque d'exposition élevé , par exemple, exposition non protégée aux sécrétions ou aux aérosols des cas COVID-19 -ContactProximity.MEDICAL_LIMITED = Personnel médical avec exposition limitée, par exemple avec un contact < 2m aux cas COVID-19 sans équipement de protection, ≥ Contact face à face de 15min (sans exposition comme décrit sous Ia) -ContactProximity.PHYSICAL_CONTACT = 2-Contact physique direct avec le cas -ContactProximity.SAME_ROOM = 5-Était dans la même pièce ou maison que le cas -ContactProximity.TOUCHED_FLUID = 1- Contact avec un fluide corporel du cas - +ContactProximity.AEROSOL=Personnes exposées aux activités de production d'aérosols +ContactProximity.AIRPLANE=Avion, assis jusqu'à deux rangées devant ou derrière le cas source +ContactProximity.CLOSE_CONTACT=4-Était à proximité (1 mètre) du cas +ContactProximity.CLOTHES_OR_OTHER=3-Manipulation de vêtements ou autres objets du cas source +ContactProximity.FACE_TO_FACE_LONG=Face à face d'au moins 15 minutes +ContactProximity.FACE_TO_FACE_SHORT=Face à face de moins de 15 minutes +ContactProximity.MEDICAL_DISTANT=Personnel médical à proximité (> 2 mètres), sans contact direct avec les sécrétions ou excrétions du patient et sans exposition aux aérosols +ContactProximity.MEDICAL_SAME_ROOM=Personnel médical dans la même pièce ou maison que le cas source +ContactProximity.MEDICAL_SAFE=Personnel médical à proximité (> 2 mètres) ou avec équipement de protection +ContactProximity.MEDICAL_UNSAFE=Personnel médical présentant un risque d'exposition élevé , par exemple, exposition non protégée aux sécrétions ou aux aérosols des cas COVID-19 +ContactProximity.MEDICAL_LIMITED=Personnel médical avec exposition limitée, par exemple avec un contact < 2m aux cas COVID-19 sans équipement de protection, ≥ Contact face à face de 15min (sans exposition comme décrit sous Ia) +ContactProximity.PHYSICAL_CONTACT=2-Contact physique direct avec le cas +ContactProximity.SAME_ROOM=5-Était dans la même pièce ou maison que le cas +ContactProximity.TOUCHED_FLUID=1- Contact avec un fluide corporel du cas # ContactRelation -ContactRelation.FAMILY_MEMBER_OR_FRIEND = Autre membre de la famille ou ami -ContactRelation.SAME_ENVIRONMENT = Travaille dans le même environnement -ContactRelation.SAME_HOUSEHOLD = Vit dans la même maison -ContactRelation.MEDICAL_CARE = Soins médicaux donnés au cas -ContactRelation.OTHER = Autres - +ContactRelation.FAMILY_MEMBER_OR_FRIEND=Autre membre de la famille ou ami +ContactRelation.SAME_ENVIRONMENT=Travaille dans le même environnement +ContactRelation.SAME_HOUSEHOLD=Vit dans la même maison +ContactRelation.MEDICAL_CARE=Soins médicaux donnés au cas +ContactRelation.OTHER=Autres # ContactStatus -ContactStatus.ACTIVE = Contact actif -ContactStatus.CONVERTED = Converti en cas -ContactStatus.DROPPED = Abandonné - -ConveyanceType.CAR = Voiture -ConveyanceType.BUS = Bus -ConveyanceType.MOTORBIKE = Moto -ConveyanceType.OTHER = Autres - -CustomizableEnumType.DISEASE_VARIANT = Variant de la maladie -CustomizableEnumType.SPECIFIC_EVENT_RISK = Risque d'événement spécifique -CustomizableEnumType.OCCUPATION_TYPE = Type de profession -CustomizableEnumType.PATHOGEN = Agent pathogène - +ContactStatus.ACTIVE=Contact actif +ContactStatus.CONVERTED=Converti en cas +ContactStatus.DROPPED=Abandonné +ConveyanceType.CAR=Voiture +ConveyanceType.BUS=Bus +ConveyanceType.MOTORBIKE=Moto +ConveyanceType.OTHER=Autres +CustomizableEnumType.DISEASE_VARIANT=Variant de la maladie +CustomizableEnumType.SPECIFIC_EVENT_RISK=Risque d'événement spécifique +CustomizableEnumType.OCCUPATION_TYPE=Type de profession +CustomizableEnumType.PATHOGEN=Agent pathogène # DashboardType -DashboardType.CONTACTS = Contacts -DashboardType.SURVEILLANCE = Surveillance -DashboardType.CAMPAIGNS = Campagnes -DashboardType.ADVERSE_EVENTS = Adverse Events - +DashboardType.CONTACTS=Contacts +DashboardType.SURVEILLANCE=Surveillance +DashboardType.CAMPAIGNS=Campagnes +DashboardType.ADVERSE_EVENTS=Adverse Events # DatabaseTable -DatabaseTable.ACTIONS = Actions -DatabaseTable.CASES = Cas -DatabaseTable.SYMPTOMS = Symptômes -DatabaseTable.CLINICAL_COURSES = Suivi médical -DatabaseTable.CLINICAL_VISITS = Visites médicales -DatabaseTable.COMMUNITIES = Communautés -DatabaseTable.CONTACTS = Contacts -DatabaseTable.CONTACTS_VISITS = Contacts → Visites -DatabaseTable.CONTINENTS = Continents -DatabaseTable.SUBCONTINENTS = Sous-continents -DatabaseTable.AREAS = Zones -DatabaseTable.COUNTRIES = Pays -DatabaseTable.CUSTOMIZABLE_ENUM_VALUES = Valeurs de l'énumération personnalisables -DatabaseTable.DISTRICTS = Zone de santé -DatabaseTable.EPIDATA = Données épidémiologiques -DatabaseTable.EVENTS = Événements -DatabaseTable.EVENTS_EVENTGROUPS = Événements → Groupes d'événements -DatabaseTable.EVENTGROUPS = Groupes d'événements -DatabaseTable.EVENTPARTICIPANTS = Event participants -DatabaseTable.EXPOSURES = Expositions -DatabaseTable.ACTIVITIES_AS_CASE = Activités comme cas -DatabaseTable.FACILITIES = Etablissements -DatabaseTable.POINTS_OF_ENTRY = Points d'entrée -DatabaseTable.HEALTH_CONDITIONS = Etats de santé -DatabaseTable.HOSPITALIZATIONS = Hospitalisations -DatabaseTable.IMMUNIZATIONS = Immunisation -DatabaseTable.LOCATIONS = Lieux -DatabaseTable.OUTBREAKS = Epidémies -DatabaseTable.PERSONS = Personnes -DatabaseTable.PERSON_CONTACT_DETAILS = Coordonnées de la personne -DatabaseTable.PERSON_LOCATIONS = Emplacements des personnes -DatabaseTable.PRESCRIPTIONS = Ordonnances -DatabaseTable.PREVIOUSHOSPITALIZATIONS = Hospitalisations précédentes -DatabaseTable.REGIONS = Province -DatabaseTable.SAMPLES = Échantillons -DatabaseTable.PATHOGEN_TESTS = Tests pathogènes -DatabaseTable.ADDITIONAL_TESTS = Tests supplémentaires -DatabaseTable.TASKS = Tâches -DatabaseTable.TASK_OBSERVER = Observateur de tâche -DatabaseTable.THERAPIES = Thérapies -DatabaseTable.TRAVEL_ENTRIES = Entrées de voyage -DatabaseTable.TREATMENTS = Traitements -DatabaseTable.USERS = Utilisateurs -DatabaseTable.USER_ROLES = Rôles utilisateur -DatabaseTable.USERS_USERROLES = Utilisateurs → Rôles d'utilisateur -DatabaseTable.USERROLES_USERRIGHTS = Rôles d'utilisateur → Droits d'utilisateur -DatabaseTable.USERROLES_EMAILNOTIFICATIONTYPES = Rôles d'utilisateur → Types de notification par e-mail -DatabaseTable.USERROLES_SMSNOTIFICATIONTYPES = Rôles d'utilisateur → Types de notification SMS -DatabaseTable.VACCINATIONS = Vaccinations -DatabaseTable.VISITS = Visites -DatabaseTable.WEEKLYREPORTS = Rapports hebdomadaires -DatabaseTable.WEEKLYREPORTENTRIES = Entrées du rapport hebdomadaire -DatabaseTable.PORT_HEALTH_INFO = Informations sur la santé des ports -DatabaseTable.MATERNAL_HISTORIES = Antécédents maternels -DatabaseTable.EXTERNAL_MESSAGES = Messages -DatabaseTable.SAMPLE_REPORTS = Exemples de rapports -DatabaseTable.TEST_REPORTS = Rapports d'essai -DatabaseTable.SORMAS_TO_SORMAS_ORIGIN_INFO = Informations sur l'origine SORMAS 2 SORMAS -DatabaseTable.SORMAS_TO_SORMAS_SHARE_INFO = SORMAS 2 SORMAS partager des informations -DatabaseTable.SORMAS_TO_SORMAS_SHARE_REQUESTS = Demandes de partage SORMAS 2 SORMAS -DatabaseTable.SHARE_REQUEST_INFO = SORMAS 2 SORMAS partager les informations de la demande -DatabaseTable.SHARE_REQUEST_INFO_SHARE_INFO = SORMAS 2 SORMAS partager les informations de demande → Partager les informations -DatabaseTable.EXTERNAL_SHARE_INFO = Informations sur le partage externe -DatabaseTable.CAMPAIGNS = Campagnes -DatabaseTable.CAMPAIGN_CAMPAIGNFORMMETA = Campagnes → Méta formulaire de campagne -DatabaseTable.CAMPAIGN_FORM_META = Méta formulaire de campagne -DatabaseTable.CAMPAIGN_FORM_DATA = Données du formulaire de campagne -DatabaseTable.CAMPAIGN_DIAGRAM_DEFINITIONS = Définitions des diagrammes de campagne -DatabaseTable.POPULATION_DATA = Données de la population -DatabaseTable.SURVEILLANCE_REPORTS = Rapports de surveillance -DatabaseTable.AGGREGATE_REPORTS = Rapports agrégés -DatabaseTable.WEEKLY_REPORTS = Rapports hebdomadaires -DatabaseTable.WEEKLY_REPORT_ENTRIES = Entrées du rapport hebdomadaire -DatabaseTable.DOCUMENTS = Documents -DatabaseTable.EXPORT_CONFIGURATIONS = Configurations d'exportation -DatabaseTable.FEATURE_CONFIGURATIONS = Configurations de fonctionnalité -DatabaseTable.DISEASE_CONFIGURATIONS = Configurations de la maladie -DatabaseTable.DELETION_CONFIGURATIONS = Configurations de suppression -DatabaseTable.SYSTEM_CONFIGURATION_VALUES = Valeurs de configuration système -DatabaseTable.SYSTEM_CONFIGURATION_CATEGORIES = Catégories de configuration système -DatabaseTable.NOTIFIER = Notificateur -DatabaseTable.DRUG_SUSCEPTIBILITY = Sensibilité aux médicaments -DatabaseTable.SPECIAL_CASE_ACCESSES = Accès spéciaux aux cas -DatabaseTable.ENVIRONMENTS = Environnements -DatabaseTable.EVENT_ENVIRONMENTS = Événements → Environnements -DatabaseTable.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATIONS = Événements indésirables suivant les immunisations -DatabaseTable.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_INVESTIGATIONS = Enquêtes sur les événements indésirables suivant l'immunisation -DatabaseTable.ADVERSE_EVENTS = Événements indésirables -DatabaseTable.DOCUMENT_RELATED_ENTITIES = Entités liées aux documents - +DatabaseTable.ACTIONS=Actions +DatabaseTable.CASES=Cas +DatabaseTable.SYMPTOMS=Symptômes +DatabaseTable.CLINICAL_COURSES=Suivi médical +DatabaseTable.CLINICAL_VISITS=Visites médicales +DatabaseTable.COMMUNITIES=Communautés +DatabaseTable.CONTACTS=Contacts +DatabaseTable.CONTACTS_VISITS=Contacts → Visites +DatabaseTable.CONTINENTS=Continents +DatabaseTable.SUBCONTINENTS=Sous-continents +DatabaseTable.AREAS=Zones +DatabaseTable.COUNTRIES=Pays +DatabaseTable.CUSTOMIZABLE_ENUM_VALUES=Valeurs de l'énumération personnalisables +DatabaseTable.DISTRICTS=Zone de santé +DatabaseTable.EPIDATA=Données épidémiologiques +DatabaseTable.EVENTS=Événements +DatabaseTable.EVENTS_EVENTGROUPS=Événements → Groupes d'événements +DatabaseTable.EVENTGROUPS=Groupes d'événements +DatabaseTable.EVENTPARTICIPANTS=Event participants +DatabaseTable.EXPOSURES=Expositions +DatabaseTable.ACTIVITIES_AS_CASE=Activités comme cas +DatabaseTable.FACILITIES=Etablissements +DatabaseTable.POINTS_OF_ENTRY=Points d'entrée +DatabaseTable.HEALTH_CONDITIONS=Etats de santé +DatabaseTable.HOSPITALIZATIONS=Hospitalisations +DatabaseTable.IMMUNIZATIONS=Immunisation +DatabaseTable.LOCATIONS=Lieux +DatabaseTable.OUTBREAKS=Epidémies +DatabaseTable.PERSONS=Personnes +DatabaseTable.PERSON_CONTACT_DETAILS=Coordonnées de la personne +DatabaseTable.PERSON_LOCATIONS=Emplacements des personnes +DatabaseTable.PRESCRIPTIONS=Ordonnances +DatabaseTable.PREVIOUSHOSPITALIZATIONS=Hospitalisations précédentes +DatabaseTable.REGIONS=Province +DatabaseTable.SAMPLES=Échantillons +DatabaseTable.PATHOGEN_TESTS=Tests pathogènes +DatabaseTable.ADDITIONAL_TESTS=Tests supplémentaires +DatabaseTable.TASKS=Tâches +DatabaseTable.TASK_OBSERVER=Observateur de tâche +DatabaseTable.THERAPIES=Thérapies +DatabaseTable.TRAVEL_ENTRIES=Entrées de voyage +DatabaseTable.TREATMENTS=Traitements +DatabaseTable.USERS=Utilisateurs +DatabaseTable.USER_ROLES=Rôles utilisateur +DatabaseTable.USERS_USERROLES=Utilisateurs → Rôles d'utilisateur +DatabaseTable.USERROLES_USERRIGHTS=Rôles d'utilisateur → Droits d'utilisateur +DatabaseTable.USERROLES_EMAILNOTIFICATIONTYPES=Rôles d'utilisateur → Types de notification par e-mail +DatabaseTable.USERROLES_SMSNOTIFICATIONTYPES=Rôles d'utilisateur → Types de notification SMS +DatabaseTable.VACCINATIONS=Vaccinations +DatabaseTable.VISITS=Visites +DatabaseTable.WEEKLYREPORTS=Rapports hebdomadaires +DatabaseTable.WEEKLYREPORTENTRIES=Entrées du rapport hebdomadaire +DatabaseTable.PORT_HEALTH_INFO=Informations sur la santé des ports +DatabaseTable.MATERNAL_HISTORIES=Antécédents maternels +DatabaseTable.EXTERNAL_MESSAGES=Messages +DatabaseTable.SAMPLE_REPORTS=Exemples de rapports +DatabaseTable.TEST_REPORTS=Rapports d'essai +DatabaseTable.SORMAS_TO_SORMAS_ORIGIN_INFO=Informations sur l'origine SORMAS 2 SORMAS +DatabaseTable.SORMAS_TO_SORMAS_SHARE_INFO=SORMAS 2 SORMAS partager des informations +DatabaseTable.SORMAS_TO_SORMAS_SHARE_REQUESTS=Demandes de partage SORMAS 2 SORMAS +DatabaseTable.SHARE_REQUEST_INFO=SORMAS 2 SORMAS partager les informations de la demande +DatabaseTable.SHARE_REQUEST_INFO_SHARE_INFO=SORMAS 2 SORMAS partager les informations de demande → Partager les informations +DatabaseTable.EXTERNAL_SHARE_INFO=Informations sur le partage externe +DatabaseTable.CAMPAIGNS=Campagnes +DatabaseTable.CAMPAIGN_CAMPAIGNFORMMETA=Campagnes → Méta formulaire de campagne +DatabaseTable.CAMPAIGN_FORM_META=Méta formulaire de campagne +DatabaseTable.CAMPAIGN_FORM_DATA=Données du formulaire de campagne +DatabaseTable.CAMPAIGN_DIAGRAM_DEFINITIONS=Définitions des diagrammes de campagne +DatabaseTable.POPULATION_DATA=Données de la population +DatabaseTable.SURVEILLANCE_REPORTS=Rapports de surveillance +DatabaseTable.AGGREGATE_REPORTS=Rapports agrégés +DatabaseTable.WEEKLY_REPORTS=Rapports hebdomadaires +DatabaseTable.WEEKLY_REPORT_ENTRIES=Entrées du rapport hebdomadaire +DatabaseTable.DOCUMENTS=Documents +DatabaseTable.EXPORT_CONFIGURATIONS=Configurations d'exportation +DatabaseTable.FEATURE_CONFIGURATIONS=Configurations de fonctionnalité +DatabaseTable.DISEASE_CONFIGURATIONS=Configurations de la maladie +DatabaseTable.DELETION_CONFIGURATIONS=Configurations de suppression +DatabaseTable.SYSTEM_CONFIGURATION_VALUES=Valeurs de configuration système +DatabaseTable.SYSTEM_CONFIGURATION_CATEGORIES=Catégories de configuration système +DatabaseTable.NOTIFIER=Notificateur +DatabaseTable.DRUG_SUSCEPTIBILITY=Sensibilité aux médicaments +DatabaseTable.SPECIAL_CASE_ACCESSES=Accès spéciaux aux cas +DatabaseTable.ENVIRONMENTS=Environnements +DatabaseTable.EVENT_ENVIRONMENTS=Événements → Environnements +DatabaseTable.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATIONS=Événements indésirables suivant les immunisations +DatabaseTable.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_INVESTIGATIONS=Enquêtes sur les événements indésirables suivant l'immunisation +DatabaseTable.ADVERSE_EVENTS=Événements indésirables +DatabaseTable.DOCUMENT_RELATED_ENTITIES=Entités liées aux documents # DateFilterOption -DateFilterOption.DATE = Par date -DateFilterOption.EPI_WEEK = Par semaine - +DateFilterOption.DATE=Par date +DateFilterOption.EPI_WEEK=Par semaine # DeathPlaceType -DeathPlaceType.COMMUNITY = Communauté -DeathPlaceType.HOSPITAL = Hôpitaux -DeathPlaceType.OTHER = Autres - +DeathPlaceType.COMMUNITY=Communauté +DeathPlaceType.HOSPITAL=Hôpitaux +DeathPlaceType.OTHER=Autres # DefaultUserRole -DefaultUserRole.ADMIN = Admin -DefaultUserRole.CASE_OFFICER = Agent de cas -DefaultUserRole.CASE_SUPERVISOR = Clinicien -DefaultUserRole.COMMUNITY_INFORMANT = Informateur communautaire -DefaultUserRole.COMMUNITY_OFFICER = Officier de la communauté -DefaultUserRole.CONTACT_OFFICER = Agent de contact -DefaultUserRole.CONTACT_SUPERVISOR = Superviseur de contact -DefaultUserRole.DISTRICT_OBSERVER = Observateur départemental -DefaultUserRole.EVENT_OFFICER = Agent d'événement -DefaultUserRole.EXTERNAL_LAB_USER = Agent de laboratoire externe -DefaultUserRole.HOSPITAL_INFORMANT = Informateur hospitalier -DefaultUserRole.IMPORT_USER = Importateur -DefaultUserRole.LAB_USER = Agent de laboratoire -DefaultUserRole.NATIONAL_CLINICIAN = Clinicien National -DefaultUserRole.NATIONAL_OBSERVER = Observateur National -DefaultUserRole.NATIONAL_USER = Utilisateur National -DefaultUserRole.POE_INFORMANT = Informateur PDE -DefaultUserRole.POE_NATIONAL_USER = Utilisateur National PDE -DefaultUserRole.POE_SUPERVISOR = Superviseur PDE -DefaultUserRole.STATE_OBSERVER = Observateur de région -DefaultUserRole.SURVEILLANCE_OFFICER = Agent de surveillance -DefaultUserRole.SURVEILLANCE_SUPERVISOR = Superviseur de surveillance -DefaultUserRole.REST_EXTERNAL_VISITS_USER = Utilisateur de visite externe -DefaultUserRole.SORMAS_TO_SORMAS_CLIENT = Client Sormas à Sormas -DefaultUserRole.ADMIN_SUPERVISOR = Admin superviseur de surveillance -DefaultUserRole.BAG_USER = Utilisateur BAG -DefaultUserRole.ENVIRONMENTAL_SURVEILLANCE_USER = Environmental Surveillance User -DefaultUserRole.Short.ADMIN = Admin -DefaultUserRole.Short.CASE_OFFICER = Caisse désactivée -DefaultUserRole.Short.CASE_SUPERVISOR = Clinicien -DefaultUserRole.Short.CONTACT_OFFICER = ContOff -DefaultUserRole.Short.CONTACT_SUPERVISOR = ContSup -DefaultUserRole.Short.COMMUNITY_INFORMANT = Info comm -DefaultUserRole.Short.DISTRICT_OBSERVER = Obs. dept. -DefaultUserRole.Short.EVENT_OFFICER = Événement désactivé -DefaultUserRole.Short.EXTERNAL_LAB_USER = ExtLabOff -DefaultUserRole.Short.HOSPITAL_INFORMANT = Info. hosp. -DefaultUserRole.Short.IMPORT_USER = UtilisateurImportateur -DefaultUserRole.Short.LAB_USER = LabOff -DefaultUserRole.Short.NATIONAL_CLINICIAN = NatClin -DefaultUserRole.Short.NATIONAL_OBSERVER = NatObs -DefaultUserRole.Short.NATIONAL_USER = NatUser -DefaultUserRole.Short.POE_INFORMANT = Info. PE -DefaultUserRole.Short.POE_NATIONAL_USER = POENat -DefaultUserRole.Short.POE_SUPERVISOR = POESup -DefaultUserRole.Short.STATE_OBSERVER = RegObs -DefaultUserRole.Short.SURVEILLANCE_SUPERVISOR = SurvSup -DefaultUserRole.Short.ADMIN_SUPERVISOR = AdminSup -DefaultUserRole.Short.SURVEILLANCE_OFFICER = SurvOff -DefaultUserRole.Short.REST_EXTERNAL_VISITS_USER = ExtVis -DefaultUserRole.Short.SORMAS_TO_SORMAS_CLIENT = Sormas vers Sormas -DefaultUserRole.Short.BAG_USER = PANIER -DefaultUserRole.Short.ENVIRONMENTAL_SURVEILLANCE_USER = EnvSurv - +DefaultUserRole.ADMIN=Admin +DefaultUserRole.CASE_OFFICER=Agent de cas +DefaultUserRole.CASE_SUPERVISOR=Clinicien +DefaultUserRole.COMMUNITY_INFORMANT=Informateur communautaire +DefaultUserRole.COMMUNITY_OFFICER=Officier de la communauté +DefaultUserRole.CONTACT_OFFICER=Agent de contact +DefaultUserRole.CONTACT_SUPERVISOR=Superviseur de contact +DefaultUserRole.DISTRICT_OBSERVER=Observateur départemental +DefaultUserRole.EVENT_OFFICER=Agent d'événement +DefaultUserRole.EXTERNAL_LAB_USER=Agent de laboratoire externe +DefaultUserRole.HOSPITAL_INFORMANT=Informateur hospitalier +DefaultUserRole.IMPORT_USER=Importateur +DefaultUserRole.LAB_USER=Agent de laboratoire +DefaultUserRole.NATIONAL_CLINICIAN=Clinicien National +DefaultUserRole.NATIONAL_OBSERVER=Observateur National +DefaultUserRole.NATIONAL_USER=Utilisateur National +DefaultUserRole.POE_INFORMANT=Informateur PDE +DefaultUserRole.POE_NATIONAL_USER=Utilisateur National PDE +DefaultUserRole.POE_SUPERVISOR=Superviseur PDE +DefaultUserRole.STATE_OBSERVER=Observateur de région +DefaultUserRole.SURVEILLANCE_OFFICER=Agent de surveillance +DefaultUserRole.SURVEILLANCE_SUPERVISOR=Superviseur de surveillance +DefaultUserRole.REST_EXTERNAL_VISITS_USER=Utilisateur de visite externe +DefaultUserRole.SORMAS_TO_SORMAS_CLIENT=Client Sormas à Sormas +DefaultUserRole.ADMIN_SUPERVISOR=Admin superviseur de surveillance +DefaultUserRole.BAG_USER=Utilisateur BAG +DefaultUserRole.ENVIRONMENTAL_SURVEILLANCE_USER=Environmental Surveillance User +DefaultUserRole.Short.ADMIN=Admin +DefaultUserRole.Short.CASE_OFFICER=Caisse désactivée +DefaultUserRole.Short.CASE_SUPERVISOR=Clinicien +DefaultUserRole.Short.CONTACT_OFFICER=ContOff +DefaultUserRole.Short.CONTACT_SUPERVISOR=ContSup +DefaultUserRole.Short.COMMUNITY_INFORMANT=Info comm +DefaultUserRole.Short.DISTRICT_OBSERVER=Obs. dept. +DefaultUserRole.Short.EVENT_OFFICER=Événement désactivé +DefaultUserRole.Short.EXTERNAL_LAB_USER=ExtLabOff +DefaultUserRole.Short.HOSPITAL_INFORMANT=Info. hosp. +DefaultUserRole.Short.IMPORT_USER=UtilisateurImportateur +DefaultUserRole.Short.LAB_USER=LabOff +DefaultUserRole.Short.NATIONAL_CLINICIAN=NatClin +DefaultUserRole.Short.NATIONAL_OBSERVER=NatObs +DefaultUserRole.Short.NATIONAL_USER=NatUser +DefaultUserRole.Short.POE_INFORMANT=Info. PE +DefaultUserRole.Short.POE_NATIONAL_USER=POENat +DefaultUserRole.Short.POE_SUPERVISOR=POESup +DefaultUserRole.Short.STATE_OBSERVER=RegObs +DefaultUserRole.Short.SURVEILLANCE_SUPERVISOR=SurvSup +DefaultUserRole.Short.ADMIN_SUPERVISOR=AdminSup +DefaultUserRole.Short.SURVEILLANCE_OFFICER=SurvOff +DefaultUserRole.Short.REST_EXTERNAL_VISITS_USER=ExtVis +DefaultUserRole.Short.SORMAS_TO_SORMAS_CLIENT=Sormas vers Sormas +DefaultUserRole.Short.BAG_USER=PANIER +DefaultUserRole.Short.ENVIRONMENTAL_SURVEILLANCE_USER=EnvSurv #DeleteReason -DeletionReason.GDPR = Demande de suppression par la personne concernée conformément au RGPD -DeletionReason.DELETION_REQUEST = Demande de suppression par une autre autorité -DeletionReason.CREATED_WITH_NO_LEGAL_REASON = Entité créée sans motif légal -DeletionReason.TRANSFERRED_RESPONSIBILITY = Responsabilité transférée à une autre autorité -DeletionReason.DUPLICATE_ENTRIES = Suppression des entrées en double -DeletionReason.OTHER_REASON = Autre motif - +DeletionReason.GDPR=Demande de suppression par la personne concernée conformément au RGPD +DeletionReason.DELETION_REQUEST=Demande de suppression par une autre autorité +DeletionReason.CREATED_WITH_NO_LEGAL_REASON=Entité créée sans motif légal +DeletionReason.TRANSFERRED_RESPONSIBILITY=Responsabilité transférée à une autre autorité +DeletionReason.DUPLICATE_ENTRIES=Suppression des entrées en double +DeletionReason.OTHER_REASON=Autre motif # DengueFeverType -DengueFeverType.DENGUE_FEVER = Dengue -DengueFeverType.DENGUE_HEMORRHAGIC_FEVER = Dengue hémorragique -DengueFeverType.DENUGE_SHOCK_SYNDROME = Syndrome de choc de la dengue - +DengueFeverType.DENGUE_FEVER=Dengue +DengueFeverType.DENGUE_HEMORRHAGIC_FEVER=Dengue hémorragique +DengueFeverType.DENUGE_SHOCK_SYNDROME=Syndrome de choc de la dengue # HumanRabiesType -RabiesType.FURIOUS_RABIES = Rage furieuse -RabiesType.PARALYTIC_RABIES = Rage paralytique - +RabiesType.FURIOUS_RABIES=Rage furieuse +RabiesType.PARALYTIC_RABIES=Rage paralytique # Disease -Disease.AFP = Paralysie Flasque Aiguë -Disease.CHOLERA = Cholera -Disease.CONGENITAL_RUBELLA = Rubéole congénitale -Disease.CSM = Méningite (CSM) -Disease.DENGUE = Dengue -Disease.EVD = Maladie à virus Ebola -Disease.GUINEA_WORM = Ver de Guinée -Disease.LASSA = Fièvre de Lassa -Disease.MEASLES = Rougeole -Disease.MONKEYPOX = Mpox -Disease.NEW_INFLUENZA = Grippe (nouveau sous-type) -Disease.UNDEFINED = Pas encore défini -Disease.OTHER = Autre maladie épidémique -Disease.PLAGUE = Peste -Disease.POLIO = Poliomyélite -Disease.UNSPECIFIED_VHF = Autre FHV -Disease.WEST_NILE_FEVER = Fièvre du Nil occidental -Disease.YELLOW_FEVER = Fièvre jaune -Disease.RABIES = Rage humaine -Disease.ANTHRAX = Anthrax -Disease.PNEUMONIA = Pneumonie -Disease.MALARIA = Paludisme -Disease.TYPHOID_FEVER = Fièvre typhoïde -Disease.ACUTE_VIRAL_HEPATITIS = Hépatite virale aiguë -Disease.NON_NEONATAL_TETANUS = Tétanos Maternel -Disease.HIV = VIH -Disease.SCHISTOSOMIASIS = Schistosomiase -Disease.SOIL_TRANSMITTED_HELMINTHS = Helminthes transmis par le sol -Disease.TRYPANOSOMIASIS = Trypanosomiase -Disease.DIARRHEA_DEHYDRATION = Diarrhée avec déshydratation (< 5) -Disease.DIARRHEA_BLOOD = Diarrhée avec / Sang (Shigella) -Disease.SNAKE_BITE = Morsure de serpent -Disease.RUBELLA = Rubéole -Disease.TUBERCULOSIS = Tuberculose -Disease.LEPROSY = Lèpre -Disease.LYMPHATIC_FILARIASIS = Filariose lymphatique -Disease.BURULI_ULCER = Ulcère de Buruli -Disease.PERTUSSIS = Coqueluche -Disease.NEONATAL_TETANUS = Tétanos néonatal -Disease.ONCHOCERCIASIS = Onchocercose -Disease.DIPHTERIA = Diphtérie -Disease.TRACHOMA = Trachome -Disease.YAWS_ENDEMIC_SYPHILIS = Pian et syphilis endémique -Disease.MATERNAL_DEATHS = Décès maternels -Disease.PERINATAL_DEATHS = Morts périnatales -Disease.CORONAVIRUS = COVID-19 +Disease.AFP=Paralysie Flasque Aiguë +Disease.CHOLERA=Cholera +Disease.CONGENITAL_RUBELLA=Rubéole congénitale +Disease.CSM=Méningite (CSM) +Disease.DENGUE=Dengue +Disease.EVD=Maladie à virus Ebola +Disease.GUINEA_WORM=Ver de Guinée +Disease.LASSA=Fièvre de Lassa +Disease.MEASLES=Rougeole +Disease.MONKEYPOX=Mpox +Disease.NEW_INFLUENZA=Grippe (nouveau sous-type) +Disease.UNDEFINED=Pas encore défini +Disease.OTHER=Autre maladie épidémique +Disease.PLAGUE=Peste +Disease.POLIO=Poliomyélite +Disease.UNSPECIFIED_VHF=Autre FHV +Disease.WEST_NILE_FEVER=Fièvre du Nil occidental +Disease.YELLOW_FEVER=Fièvre jaune +Disease.RABIES=Rage humaine +Disease.ANTHRAX=Anthrax +Disease.PNEUMONIA=Pneumonie +Disease.MALARIA=Paludisme +Disease.TYPHOID_FEVER=Fièvre typhoïde +Disease.ACUTE_VIRAL_HEPATITIS=Hépatite virale aiguë +Disease.NON_NEONATAL_TETANUS=Tétanos Maternel +Disease.HIV=VIH +Disease.SCHISTOSOMIASIS=Schistosomiase +Disease.SOIL_TRANSMITTED_HELMINTHS=Helminthes transmis par le sol +Disease.TRYPANOSOMIASIS=Trypanosomiase +Disease.DIARRHEA_DEHYDRATION=Diarrhée avec déshydratation (< 5) +Disease.DIARRHEA_BLOOD=Diarrhée avec / Sang (Shigella) +Disease.SNAKE_BITE=Morsure de serpent +Disease.RUBELLA=Rubéole +Disease.TUBERCULOSIS=Tuberculose +Disease.LEPROSY=Lèpre +Disease.LYMPHATIC_FILARIASIS=Filariose lymphatique +Disease.BURULI_ULCER=Ulcère de Buruli +Disease.PERTUSSIS=Coqueluche +Disease.NEONATAL_TETANUS=Tétanos néonatal +Disease.ONCHOCERCIASIS=Onchocercose +Disease.DIPHTERIA=Diphtérie +Disease.TRACHOMA=Trachome +Disease.YAWS_ENDEMIC_SYPHILIS=Pian et syphilis endémique +Disease.MATERNAL_DEATHS=Décès maternels +Disease.PERINATAL_DEATHS=Morts périnatales +Disease.CORONAVIRUS=COVID-19 Disease.INFLUENZA=Influenza -Disease.INFLUENZA_A = Grippe A -Disease.INFLUENZA_B = Grippe B -Disease.H_METAPNEUMOVIRUS = H. metapneumovirus -Disease.RESPIRATORY_SYNCYTIAL_VIRUS = Virus syncytique respiratoire (RSV) -Disease.PARAINFLUENZA_1_4 = Parainfluenza (1-4) -Disease.ADENOVIRUS = Adenovirus -Disease.RHINOVIRUS = Rhinovirus -Disease.ENTEROVIRUS = Enterovirus -Disease.M_PNEUMONIAE = M.pneumoniae -Disease.C_PNEUMONIAE = C.pneumoniae -Disease.ARI = IRA (Infections Respiratoires Aiguës) -Disease.CHIKUNGUNYA = Chikungunya -Disease.POST_IMMUNIZATION_ADVERSE_EVENTS_MILD = Effets indésirables post-immunisation légers -Disease.POST_IMMUNIZATION_ADVERSE_EVENTS_SEVERE = Effets indésirables post-immunisation graves -Disease.FHA = FHA (aménorrhée hypothalamique fonctionnelle) -Disease.Short.AFP = PFA -Disease.Short.CHOLERA = Choléra -Disease.Short.CONGENITAL_RUBELLA = SRC -Disease.Short.CSM = Méningite -Disease.Short.DENGUE = Dengue -Disease.Short.EVD = Ebola -Disease.Short.GUINEA_WORM = Ver de Guinée -Disease.Short.LASSA = Lassa -Disease.Short.MEASLES = Rougeole -Disease.Short.MONKEYPOX = Mpox -Disease.Short.NEW_INFLUENZA = Nouvelle grippe -Disease.Short.UNDEFINED = Non défini -Disease.Short.OTHER = Autres -Disease.Short.PLAGUE = Peste -Disease.Short.POLIO = Polio -Disease.Short.UNSPECIFIED_VHF = FHV -Disease.Short.WEST_NILE_FEVER = Fièvre du Nil occidental -Disease.Short.YELLOW_FEVER = Fièvre jaune -Disease.Short.RABIES = Rage -Disease.Short.ANTHRAX = Anthrax -Disease.Short.PNEUMONIA = Pneumonie -Disease.Short.MALARIA = Paludisme -Disease.Short.TYPHOID_FEVER = Fièvre typhoïde -Disease.Short.ACUTE_VIRAL_HEPATITIS = Hépatite virale aiguë -Disease.Short.NON_NEONATAL_TETANUS = Tétanos Maternel -Disease.Short.HIV = VIH -Disease.Short.SCHISTOSOMIASIS = Schistosomiase -Disease.Short.SOIL_TRANSMITTED_HELMINTHS = Helminthes transmis par le sol -Disease.Short.TRYPANOSOMIASIS = Trypanosomiase -Disease.Short.DIARRHEA_DEHYDRATION = Diarrhée avec déshydratation (< 5) -Disease.Short.DIARRHEA_BLOOD = Diarrhée avec / Sang (Shigella) -Disease.Short.SNAKE_BITE = Morsure de serpent -Disease.Short.RUBELLA = Rubéole -Disease.Short.TUBERCULOSIS = Tuberculose -Disease.Short.LEPROSY = Lèpre -Disease.Short.LYMPHATIC_FILARIASIS = Filariose lymphatique -Disease.Short.BURULI_ULCER = Ulcère de Buruli -Disease.Short.PERTUSSIS = Coqueluche -Disease.Short.NEONATAL_TETANUS = Tétanos néonatal -Disease.Short.ONCHOCERCIASIS = Onchocercose -Disease.Short.DIPHTERIA = Diphtérie -Disease.Short.TRACHOMA = Trachome -Disease.Short.YAWS_ENDEMIC_SYPHILIS = Pian et syphilis endémique -Disease.Short.MATERNAL_DEATHS = Décès maternels -Disease.Short.PERINATAL_DEATHS = Morts périnatales -Disease.Short.CORONAVIRUS = CoV -Disease.Short.INFLUENZA_A = Grippe A -Disease.Short.INFLUENZA_B = Grippe B -Disease.Short.H_METAPNEUMOVIRUS = H. metapneumovirus -Disease.Short.RESPIRATORY_SYNCYTIAL_VIRUS = RSV -Disease.Short.PARAINFLUENZA_1_4 = Parainfluenza -Disease.Short.ADENOVIRUS = Adenovirus -Disease.Short.RHINOVIRUS = Rhinovirus -Disease.Short.ENTEROVIRUS = Enterovirus -Disease.Short.M_PNEUMONIAE = M.pneumoniae -Disease.Short.C_PNEUMONIAE = C.pneumoniae -Disease.Short.ARI = ARI -Disease.Short.CHIKUNGUNYA = Chikungunya -Disease.Short.POST_IMMUNIZATION_ADVERSE_EVENTS_MILD = Effets indésirables post-immunisation légers -Disease.Short.POST_IMMUNIZATION_ADVERSE_EVENTS_SEVERE = Effets indésirables post-immunisation graves -Disease.Short.FHA = FHA - -DiseaseTransmissionMode.HUMAN_TO_HUMAN = Principalement de l'homme vers l'homme -DiseaseTransmissionMode.ANIMAL = Principalement via un animal -DiseaseTransmissionMode.ENVIRONMENT = Principalement via l'environnement -DiseaseTransmissionMode.FOOD = Principalement par la nourriture -DiseaseTransmissionMode.VECTOR_BORNE = Portée vectorielle principale -DiseaseTransmissionMode.UNKNOWN = Inconnu - +Disease.INFLUENZA_A=Grippe A +Disease.INFLUENZA_B=Grippe B +Disease.H_METAPNEUMOVIRUS=H. metapneumovirus +Disease.RESPIRATORY_SYNCYTIAL_VIRUS=Virus syncytique respiratoire (RSV) +Disease.PARAINFLUENZA_1_4=Parainfluenza (1-4) +Disease.ADENOVIRUS=Adenovirus +Disease.RHINOVIRUS=Rhinovirus +Disease.ENTEROVIRUS=Enterovirus +Disease.M_PNEUMONIAE=M.pneumoniae +Disease.C_PNEUMONIAE=C.pneumoniae +Disease.ARI=IRA (Infections Respiratoires Aiguës) +Disease.CHIKUNGUNYA=Chikungunya +Disease.POST_IMMUNIZATION_ADVERSE_EVENTS_MILD=Effets indésirables post-immunisation légers +Disease.POST_IMMUNIZATION_ADVERSE_EVENTS_SEVERE=Effets indésirables post-immunisation graves +Disease.FHA=FHA (aménorrhée hypothalamique fonctionnelle) +Disease.Short.AFP=PFA +Disease.Short.CHOLERA=Choléra +Disease.Short.CONGENITAL_RUBELLA=SRC +Disease.Short.CSM=Méningite +Disease.Short.DENGUE=Dengue +Disease.Short.EVD=Ebola +Disease.Short.GUINEA_WORM=Ver de Guinée +Disease.Short.LASSA=Lassa +Disease.Short.MEASLES=Rougeole +Disease.Short.MONKEYPOX=Mpox +Disease.Short.NEW_INFLUENZA=Nouvelle grippe +Disease.Short.UNDEFINED=Non défini +Disease.Short.OTHER=Autres +Disease.Short.PLAGUE=Peste +Disease.Short.POLIO=Polio +Disease.Short.UNSPECIFIED_VHF=FHV +Disease.Short.WEST_NILE_FEVER=Fièvre du Nil occidental +Disease.Short.YELLOW_FEVER=Fièvre jaune +Disease.Short.RABIES=Rage +Disease.Short.ANTHRAX=Anthrax +Disease.Short.PNEUMONIA=Pneumonie +Disease.Short.MALARIA=Paludisme +Disease.Short.TYPHOID_FEVER=Fièvre typhoïde +Disease.Short.ACUTE_VIRAL_HEPATITIS=Hépatite virale aiguë +Disease.Short.NON_NEONATAL_TETANUS=Tétanos Maternel +Disease.Short.HIV=VIH +Disease.Short.SCHISTOSOMIASIS=Schistosomiase +Disease.Short.SOIL_TRANSMITTED_HELMINTHS=Helminthes transmis par le sol +Disease.Short.TRYPANOSOMIASIS=Trypanosomiase +Disease.Short.DIARRHEA_DEHYDRATION=Diarrhée avec déshydratation (< 5) +Disease.Short.DIARRHEA_BLOOD=Diarrhée avec / Sang (Shigella) +Disease.Short.SNAKE_BITE=Morsure de serpent +Disease.Short.RUBELLA=Rubéole +Disease.Short.TUBERCULOSIS=Tuberculose +Disease.Short.LEPROSY=Lèpre +Disease.Short.LYMPHATIC_FILARIASIS=Filariose lymphatique +Disease.Short.BURULI_ULCER=Ulcère de Buruli +Disease.Short.PERTUSSIS=Coqueluche +Disease.Short.NEONATAL_TETANUS=Tétanos néonatal +Disease.Short.ONCHOCERCIASIS=Onchocercose +Disease.Short.DIPHTERIA=Diphtérie +Disease.Short.TRACHOMA=Trachome +Disease.Short.YAWS_ENDEMIC_SYPHILIS=Pian et syphilis endémique +Disease.Short.MATERNAL_DEATHS=Décès maternels +Disease.Short.PERINATAL_DEATHS=Morts périnatales +Disease.Short.CORONAVIRUS=CoV +Disease.Short.INFLUENZA_A=Grippe A +Disease.Short.INFLUENZA_B=Grippe B +Disease.Short.H_METAPNEUMOVIRUS=H. metapneumovirus +Disease.Short.RESPIRATORY_SYNCYTIAL_VIRUS=RSV +Disease.Short.PARAINFLUENZA_1_4=Parainfluenza +Disease.Short.ADENOVIRUS=Adenovirus +Disease.Short.RHINOVIRUS=Rhinovirus +Disease.Short.ENTEROVIRUS=Enterovirus +Disease.Short.M_PNEUMONIAE=M.pneumoniae +Disease.Short.C_PNEUMONIAE=C.pneumoniae +Disease.Short.ARI=ARI +Disease.Short.CHIKUNGUNYA=Chikungunya +Disease.Short.POST_IMMUNIZATION_ADVERSE_EVENTS_MILD=Effets indésirables post-immunisation légers +Disease.Short.POST_IMMUNIZATION_ADVERSE_EVENTS_SEVERE=Effets indésirables post-immunisation graves +Disease.Short.FHA=FHA +DiseaseTransmissionMode.HUMAN_TO_HUMAN=Principalement de l'homme vers l'homme +DiseaseTransmissionMode.ANIMAL=Principalement via un animal +DiseaseTransmissionMode.ENVIRONMENT=Principalement via l'environnement +DiseaseTransmissionMode.FOOD=Principalement par la nourriture +DiseaseTransmissionMode.VECTOR_BORNE=Portée vectorielle principale +DiseaseTransmissionMode.UNKNOWN=Inconnu # DocumentRelatedEntityType -DocumentRelatedEntityType.ACTION = Action -DocumentRelatedEntityType.CASE = Cas -DocumentRelatedEntityType.CONTACT = Contact -DocumentRelatedEntityType.EVENT = Évènement -DocumentRelatedEntityType.TRAVEL_ENTRY = Entrées de voyage - +DocumentRelatedEntityType.ACTION=Action +DocumentRelatedEntityType.CASE=Cas +DocumentRelatedEntityType.CONTACT=Contact +DocumentRelatedEntityType.EVENT=Évènement +DocumentRelatedEntityType.TRAVEL_ENTRY=Entrées de voyage # DocumentWorkflow -DocumentWorkflow.QUARANTINE_ORDER_CASE = Modèles de document - Cas -DocumentWorkflow.QUARANTINE_ORDER_CONTACT = Modèles de document pour les contacts -DocumentWorkflow.QUARANTINE_ORDER_EVENT_PARTICIPANT = Modèles de documents Participant à l'événement -DocumentWorkflow.QUARANTINE_ORDER_TRAVEL_ENTRY = Entrée de voyage des modèles de documents -DocumentWorkflow.EVENT_HANDOUT = Modèles de Mémo d'événement -DocumentWorkflow.CASE_EMAIL = Modèles d'e-mail pour les cas -DocumentWorkflow.CONTACT_EMAIL = Modèles d'e-mail pour les contacts -DocumentWorkflow.EVENT_PARTICIPANT_EMAIL = Modèles d'e-mail pour les participants à l'événement -DocumentWorkflow.TRAVEL_ENTRY_EMAIL = Modèles d'e-mail pour les voyageurs arrivant - -EducationType.NONE = Pas d'éducation -EducationType.NURSERY = Maternelle -EducationType.PRIMARY = Primaire -EducationType.SECONDARY = Secondaire -EducationType.TERTIARY = Universitaire -EducationType.OTHER = Autres - -EntityRelevanceStatus.ACTIVE = Actif -EntityRelevanceStatus.ARCHIVED = Archivé -EntityRelevanceStatus.ALL = Tout - +DocumentWorkflow.QUARANTINE_ORDER_CASE=Modèles de document - Cas +DocumentWorkflow.QUARANTINE_ORDER_CONTACT=Modèles de document pour les contacts +DocumentWorkflow.QUARANTINE_ORDER_EVENT_PARTICIPANT=Modèles de documents Participant à l'événement +DocumentWorkflow.QUARANTINE_ORDER_TRAVEL_ENTRY=Entrée de voyage des modèles de documents +DocumentWorkflow.EVENT_HANDOUT=Modèles de Mémo d'événement +DocumentWorkflow.CASE_EMAIL=Modèles d'e-mail pour les cas +DocumentWorkflow.CONTACT_EMAIL=Modèles d'e-mail pour les contacts +DocumentWorkflow.EVENT_PARTICIPANT_EMAIL=Modèles d'e-mail pour les participants à l'événement +DocumentWorkflow.TRAVEL_ENTRY_EMAIL=Modèles d'e-mail pour les voyageurs arrivant +EducationType.NONE=Pas d'éducation +EducationType.NURSERY=Maternelle +EducationType.PRIMARY=Primaire +EducationType.SECONDARY=Secondaire +EducationType.TERTIARY=Universitaire +EducationType.OTHER=Autres +EntityRelevanceStatus.ACTIVE=Actif +EntityRelevanceStatus.ARCHIVED=Archivé +EntityRelevanceStatus.ALL=Tout # EnvironmentInfrastructureDetails -EnvironmentInfrastructureDetails.SEPTIC_TANK = Septic tank -EnvironmentInfrastructureDetails.LATRIN = Latrin -EnvironmentInfrastructureDetails.TOILET = Toilet -EnvironmentInfrastructureDetails.MANHOLE = Bouche d'égout -EnvironmentInfrastructureDetails.WELLS = Wells -EnvironmentInfrastructureDetails.SURFACE_WATER = Surface water -EnvironmentInfrastructureDetails.OPEN_DRAIN = Open drain -EnvironmentInfrastructureDetails.OTHER = Other -EnvironmentInfrastructureDetails.UNKNOWN = Unknown - +EnvironmentInfrastructureDetails.SEPTIC_TANK=Septic tank +EnvironmentInfrastructureDetails.LATRIN=Latrin +EnvironmentInfrastructureDetails.TOILET=Toilet +EnvironmentInfrastructureDetails.MANHOLE=Bouche d'égout +EnvironmentInfrastructureDetails.WELLS=Wells +EnvironmentInfrastructureDetails.SURFACE_WATER=Surface water +EnvironmentInfrastructureDetails.OPEN_DRAIN=Open drain +EnvironmentInfrastructureDetails.OTHER=Other +EnvironmentInfrastructureDetails.UNKNOWN=Unknown # EnvironmentMedia -EnvironmentMedia.WATER = Water -EnvironmentMedia.SOIL_ROCK = Soil or rock -EnvironmentMedia.AIR = Air -EnvironmentMedia.BIOTA = Biota - +EnvironmentMedia.WATER=Water +EnvironmentMedia.SOIL_ROCK=Soil or rock +EnvironmentMedia.AIR=Air +EnvironmentMedia.BIOTA=Biota # EpiCurveGrouping -EpiCurveGrouping.DAY = Jour -EpiCurveGrouping.MONTH = Mois -EpiCurveGrouping.WEEK = Par semaine - +EpiCurveGrouping.DAY=Jour +EpiCurveGrouping.MONTH=Mois +EpiCurveGrouping.WEEK=Par semaine # EpiCurveContactsMode -EpiCurveContactsMode.CONTACT_CLASSIFICATION = Classification de contact -EpiCurveContactsMode.FOLLOW_UP_STATUS = Statut de suivi -EpiCurveContactsMode.FOLLOW_UP_UNTIL = Suivi jusqu’à - +EpiCurveContactsMode.CONTACT_CLASSIFICATION=Classification de contact +EpiCurveContactsMode.FOLLOW_UP_STATUS=Statut de suivi +EpiCurveContactsMode.FOLLOW_UP_UNTIL=Suivi jusqu’à # EpiCurveSurveillanceMode -EpiCurveSurveillanceMode.ALIVE_OR_DEAD = Vivant ou mort -EpiCurveSurveillanceMode.CASE_STATUS = Statut du cas - +EpiCurveSurveillanceMode.ALIVE_OR_DEAD=Vivant ou mort +EpiCurveSurveillanceMode.CASE_STATUS=Statut du cas # EpiWeekFilterOption -EpiWeekFilterOption.LAST_WEEK = Semaine Dernière -EpiWeekFilterOption.SPECIFY_WEEK = Spécifier -EpiWeekFilterOption.THIS_WEEK = Cette semaine - +EpiWeekFilterOption.LAST_WEEK=Semaine Dernière +EpiWeekFilterOption.SPECIFY_WEEK=Spécifier +EpiWeekFilterOption.THIS_WEEK=Cette semaine # EventContactCountMethod -EventContactCountMethod.ALL = Compter tous les contacts -EventContactCountMethod.SOURCE_CASE_IN_EVENT = Compter uniquement les contacts avec le cas source dans l'événement -EventContactCountMethod.BOTH_METHODS = Afficher les deux méthodes - +EventContactCountMethod.ALL=Compter tous les contacts +EventContactCountMethod.SOURCE_CASE_IN_EVENT=Compter uniquement les contacts avec le cas source dans l'événement +EventContactCountMethod.BOTH_METHODS=Afficher les deux méthodes # EventInvestigationStatus EventInvestigationStatus.DISCARDED=Enquête abandonnée EventInvestigationStatus.DONE=Enquête terminée @@ -676,58 +613,51 @@ EventInvestigationStatus.Short.DISCARDED=Abandonné EventInvestigationStatus.Short.DONE=Terminé EventInvestigationStatus.Short.ONGOING=En cours EventInvestigationStatus.Short.PENDING=En attente - # EventStatus -EventStatus.EVENT = Événement -EventStatus.DROPPED = Abandonné -EventStatus.SIGNAL = Signal -EventStatus.SCREENING = Dépistage -EventStatus.CLUSTER = Cluster -EventStatus.Short.EVENT = Événement -EventStatus.Short.DROPPED = Abandonné -EventStatus.Short.SIGNAL = Signal -EventStatus.Short.SCREENING = Dépistage -EventStatus.Short.CLUSTER = Cluster - +EventStatus.EVENT=Événement +EventStatus.DROPPED=Abandonné +EventStatus.SIGNAL=Signal +EventStatus.SCREENING=Dépistage +EventStatus.CLUSTER=Cluster +EventStatus.Short.EVENT=Événement +EventStatus.Short.DROPPED=Abandonné +EventStatus.Short.SIGNAL=Signal +EventStatus.Short.SCREENING=Dépistage +EventStatus.Short.CLUSTER=Cluster # EventManagementStatus -EventManagementStatus.PENDING = En attente -EventManagementStatus.ONGOING = En cours -EventManagementStatus.DONE = A clôturer -EventManagementStatus.CLOSED = Clos - +EventManagementStatus.PENDING=En attente +EventManagementStatus.ONGOING=En cours +EventManagementStatus.DONE=A clôturer +EventManagementStatus.CLOSED=Clos # EventIndentificationSource -EventIdentificationSource.UNKNOWN = Inconnu -EventIdentificationSource.BACKWARD_TRACING = Backward-tracing -EventIdentificationSource.FORWARD_TRACING = Forward-tracing - -ExportGroupType.CORE = Donnée principale -ExportGroupType.SENSITIVE = Données personnelles sensibles -ExportGroupType.PERSON = Données personnelles générales -ExportGroupType.HOSPITALIZATION = Données d'hospitalisation -ExportGroupType.EPIDEMIOLOGICAL = Données épidémiologiques -ExportGroupType.VACCINATION = Données de vaccination -ExportGroupType.FOLLOW_UP = Données de suivi -ExportGroupType.ADDITIONAL = Données supplémentaires -ExportGroupType.LOCATION = Données de localisation -ExportGroupType.EVENT = Données de l'événement -ExportGroupType.EVENT_GROUP = Données du groupe d'événements -ExportGroupType.EVENT_SOURCE = Données de la source de l'événement -ExportGroupType.CLINICAL_COURSE = Données clinique -ExportGroupType.THERAPY = Données thérapeutiques - -EventSourceType.NOT_APPLICABLE = Non applicable -EventSourceType.MEDIA_NEWS = Médias/Nouvelles -EventSourceType.HOTLINE_PERSON = Hotline/Personne -EventSourceType.MATHEMATICAL_MODEL = Modèle mathématique -EventSourceType.INSTITUTIONAL_PARTNER = Partenaire institutionnel - -InstitutionalPartnerType.HEALTH_INSURANCE = Assurance santé -InstitutionalPartnerType.TERRITORIAL_COMMUNITIES = Communautés territoriales -InstitutionalPartnerType.NATIONAL_EDUCATION = Éducation nationale -InstitutionalPartnerType.HEALTH_ESTABLISHMENTS = Établissements de santé -InstitutionalPartnerType.MEDICO_SOCIAL_ESTABLISHMENTS = Etablissements médico-sociaux -InstitutionalPartnerType.OTHER = Autre - +EventIdentificationSource.UNKNOWN=Inconnu +EventIdentificationSource.BACKWARD_TRACING=Backward-tracing +EventIdentificationSource.FORWARD_TRACING=Forward-tracing +ExportGroupType.CORE=Donnée principale +ExportGroupType.SENSITIVE=Données personnelles sensibles +ExportGroupType.PERSON=Données personnelles générales +ExportGroupType.HOSPITALIZATION=Données d'hospitalisation +ExportGroupType.EPIDEMIOLOGICAL=Données épidémiologiques +ExportGroupType.VACCINATION=Données de vaccination +ExportGroupType.FOLLOW_UP=Données de suivi +ExportGroupType.ADDITIONAL=Données supplémentaires +ExportGroupType.LOCATION=Données de localisation +ExportGroupType.EVENT=Données de l'événement +ExportGroupType.EVENT_GROUP=Données du groupe d'événements +ExportGroupType.EVENT_SOURCE=Données de la source de l'événement +ExportGroupType.CLINICAL_COURSE=Données clinique +ExportGroupType.THERAPY=Données thérapeutiques +EventSourceType.NOT_APPLICABLE=Non applicable +EventSourceType.MEDIA_NEWS=Médias/Nouvelles +EventSourceType.HOTLINE_PERSON=Hotline/Personne +EventSourceType.MATHEMATICAL_MODEL=Modèle mathématique +EventSourceType.INSTITUTIONAL_PARTNER=Partenaire institutionnel +InstitutionalPartnerType.HEALTH_INSURANCE=Assurance santé +InstitutionalPartnerType.TERRITORIAL_COMMUNITIES=Communautés territoriales +InstitutionalPartnerType.NATIONAL_EDUCATION=Éducation nationale +InstitutionalPartnerType.HEALTH_ESTABLISHMENTS=Établissements de santé +InstitutionalPartnerType.MEDICO_SOCIAL_ESTABLISHMENTS=Etablissements médico-sociaux +InstitutionalPartnerType.OTHER=Autre ExposureType.WORK=Travail ExposureType.TRAVEL=Voyage ExposureType.SPORT=Sport @@ -739,7 +669,6 @@ ExposureType.BURIAL=Enterrement ExposureType.ANIMAL_CONTACT=Contacts avec les animaux ExposureType.OTHER=Autre ExposureType.UNKNOWN=Inconnu - # FacilityType FacilityType.ASSOCIATION=Structure sportive FacilityType.BAR=Bar @@ -785,23 +714,22 @@ FacilityType.SWIMMING_POOL=Piscine FacilityType.THEATER=Structures culturelles/Théâtre/cinéma/concert/musée etc FacilityType.UNIVERSITY=Université FacilityType.ZOO=Jardin zoologique, parc animalier -FacilityType.RETAIL = Vente au détail -FacilityType.WHOLESALE = Vente en gros -FacilityType.AMBULATORY_SURGERY_FACILITY = Etablissement de chirurgie ambulatoire -FacilityType.DIALYSIS_FACILITY = Établissement de dialyse -FacilityType.DAY_HOSPITAL = Hôpital de jour -FacilityType.MATERNITY_FACILITY = Maternité -FacilityType.MEDICAL_PRACTICE = Cabinet médical -FacilityType.DENTAL_PRACTICE = Cabinet dentaire -FacilityType.OTHER_MEDICAL_PRACTICE = Autres cabinets médicaux -FacilityType.DIAGNOSTIC_PREVENTATIVE_THERAPEUTIC_FACILITY = Etablissement thérapeutique, préventif ou de diagnostique -FacilityType.EMERGENCY_MEDICAL_SERVICES = Services des urgences médicales -FacilityType.ELDERLY_CARE_FACILITY = Établissement pour personnes âgées -FacilityType.DISABLED_PERSON_HABITATION = Etablissement pour personnes en situation de handicap -FacilityType.CARE_RECIPIENT_HABITATION = Résidence du bénéficiaire des soins -FacilityType.VISITING_AMBULATORY_AID = Soins à domicile -FacilityType.AFTER_SCHOOL = Accueil périscolaire - +FacilityType.RETAIL=Vente au détail +FacilityType.WHOLESALE=Vente en gros +FacilityType.AMBULATORY_SURGERY_FACILITY=Etablissement de chirurgie ambulatoire +FacilityType.DIALYSIS_FACILITY=Établissement de dialyse +FacilityType.DAY_HOSPITAL=Hôpital de jour +FacilityType.MATERNITY_FACILITY=Maternité +FacilityType.MEDICAL_PRACTICE=Cabinet médical +FacilityType.DENTAL_PRACTICE=Cabinet dentaire +FacilityType.OTHER_MEDICAL_PRACTICE=Autres cabinets médicaux +FacilityType.DIAGNOSTIC_PREVENTATIVE_THERAPEUTIC_FACILITY=Etablissement thérapeutique, préventif ou de diagnostique +FacilityType.EMERGENCY_MEDICAL_SERVICES=Services des urgences médicales +FacilityType.ELDERLY_CARE_FACILITY=Établissement pour personnes âgées +FacilityType.DISABLED_PERSON_HABITATION=Etablissement pour personnes en situation de handicap +FacilityType.CARE_RECIPIENT_HABITATION=Résidence du bénéficiaire des soins +FacilityType.VISITING_AMBULATORY_AID=Soins à domicile +FacilityType.AFTER_SCHOOL=Accueil périscolaire #FacilityTypeGroup FacilityTypeGroup.ACCOMMODATION=Hébergement FacilityTypeGroup.CARE_FACILITY=Etablissement de soins/service à la personne @@ -812,13 +740,11 @@ FacilityTypeGroup.MEDICAL_FACILITY=Etablissement médical FacilityTypeGroup.RESIDENCE=Résidence FacilityTypeGroup.WORKING_PLACE=Lieu de travail / entreprise FacilityTypeGroup.COMMERCE=Commerce - # FollowUpStartDateType FollowUpStartDateType.SYMPTOM_ONSET_DATE=Date d'apparition du symptôme FollowUpStartDateType.LAST_CONTACT_DATE=date du dernier contact FollowUpStartDateType.EARLIEST_SAMPLE_COLLECTION_DATE=date de collecte de l'échantillon la plus ancienne FollowUpStartDateType.REPORT_DATE=date du rapport - # FollowUpStatus FollowUpStatus.CANCELED=Suivi annulé FollowUpStatus.COMPLETED=Suivi complété @@ -835,7 +761,6 @@ FollowUpStatus.Desc.COMPLETED=Le processus de suivi a été terminé FollowUpStatus.Desc.FOLLOW_UP=Le processus de suivi est en cours d'exécution FollowUpStatus.Desc.LOST=Le processus de suivi n'a pas pu être poursuivi car la personne n'était pas disponible FollowUpStatus.Desc.NO_FOLLOW_UP=Aucun suivi de contact n'est en cours - GatheringType.PARTY=Fête GatheringType.RELIGIOUS=Collecte de Religieux GatheringType.MUSICAL=Chœur/Club de chant/Orchestre @@ -845,25 +770,21 @@ GatheringType.CARNIVAL=Carnaval GatheringType.FAIR=Foire GatheringType.SPORTING_EVENT=Événement sportif GatheringType.OTHER=Autre - HabitationType.MEDICAL=Séjour dans un établissement médical HabitationType.OTHER=Autre - HospitalizationReasonType.REPORTED_DISEASE=Maladie signalée HospitalizationReasonType.ISOLATION=Isolement HospitalizationReasonType.OTHER=Autre motif HospitalizationReasonType.UNKNOWN=Inconnu - -HospitalWardType.PEDIATRIC_INPATIENT = Pediatrique-Inpatient -HospitalWardType.NURSERY = Maternelle -HospitalWardType.EPU = EPU -HospitalWardType.CHER = CHER -HospitalWardType.OPD = OPD -HospitalWardType.EYE = Yeux -HospitalWardType.ENT = ENT -HospitalWardType.CARDIOLOGY = Cardiologie -HospitalWardType.OTHER = Autres - +HospitalWardType.PEDIATRIC_INPATIENT=Pediatrique-Inpatient +HospitalWardType.NURSERY=Maternelle +HospitalWardType.EPU=EPU +HospitalWardType.CHER=CHER +HospitalWardType.OPD=OPD +HospitalWardType.EYE=Yeux +HospitalWardType.ENT=ENT +HospitalWardType.CARDIOLOGY=Cardiologie +HospitalWardType.OTHER=Autres # ImmunizationDateType ImmunizationDateType.FIRST_VACCINATION_DATE=Date de la première vaccination ImmunizationDateType.IMMUNIZATION_END=Fin de la vaccination @@ -871,7 +792,6 @@ ImmunizationDateType.LAST_VACCINATION_DATE=Date de la dernière vaccination ImmunizationDateType.RECOVERY_DATE=Date de récupération ImmunizationDateType.REPORT_DATE=Date du rapport ImmunizationDateType.VALID_UNTIL=Valable jusqu’au - # InvestigationStatus InvestigationStatus.DISCARDED=Enquête abandonnée InvestigationStatus.DONE=Enquête terminée @@ -879,277 +799,249 @@ InvestigationStatus.PENDING=Enquête en attente InvestigationStatus.Short.DISCARDED=Abandonné InvestigationStatus.Short.DONE=Terminé InvestigationStatus.Short.PENDING=En attente - # KindOfInvolvement -KindOfInvolvement.OTHER = Autres -KindOfInvolvement.POTENTIALLY_EXPOSED = Potentiellement exposé -KindOfInvolvement.POTENTIAL_INDEX_CASE = Cas d'index potentiel - -Language.EN = Anglais -Language.EN_GM = English (The Gambia) -Language.EN_LR = English (Liberia) -Language.EN_AF = Anglais (Afghanistan) -Language.EN_NG = Anglais (Nigeria) -Language.EN_GH = Anglais (Ghana) -Language.EN_KE = English (Kenya) -Language.FR = Français -Language.DE = Allemand -Language.ES_BO = Español (Bolivia) -Language.ES_EC = Espagnol (Équateur) -Language.ES_CU = Espagnol (Cuba) -Language.FI = Finlande -Language.IT = Italien -Language.DE_CH = Deutsch (Schweiz) -Language.PT_CV = Português (Cabo Verde) -Language.IT_CH = Italiano (Svizzera) -Language.FR_CH = Français (Suisse) -Language.PS = Pachto -Language.FA = Dari -Language.CZ = Tchèque -Language.UR_PK = Ourdou -Language.FR_TN = Français (Tunisie) - +KindOfInvolvement.OTHER=Autres +KindOfInvolvement.POTENTIALLY_EXPOSED=Potentiellement exposé +KindOfInvolvement.POTENTIAL_INDEX_CASE=Cas d'index potentiel +Language.EN=Anglais +Language.EN_GM=English (The Gambia) +Language.EN_LR=English (Liberia) +Language.EN_AF=Anglais (Afghanistan) +Language.EN_NG=Anglais (Nigeria) +Language.EN_GH=Anglais (Ghana) +Language.EN_KE=English (Kenya) +Language.FR=Français +Language.DE=Allemand +Language.ES_BO=Español (Bolivia) +Language.ES_EC=Espagnol (Équateur) +Language.ES_CU=Espagnol (Cuba) +Language.FI=Finlande +Language.IT=Italien +Language.DE_CH=Deutsch (Schweiz) +Language.PT_CV=Português (Cabo Verde) +Language.IT_CH=Italiano (Svizzera) +Language.FR_CH=Français (Suisse) +Language.PS=Pachto +Language.FA=Dari +Language.CZ=Tchèque +Language.UR_PK=Ourdou +Language.FR_TN=Français (Tunisie) # MapCaseDisplayMode -MapCaseDisplayMode.CASE_ADDRESS = ... par domicile -MapCaseDisplayMode.FACILITY = ... par établissement -MapCaseDisplayMode.FACILITY_OR_CASE_ADDRESS = ... par établissement ou par domicile - -MapCaseClassificationOption.ALL_CASES = Afficher tous les cas -MapCaseClassificationOption.CONFIRMED_CASES_ONLY = Afficher uniquement les cas confirmés - -MapPeriodType.DAILY = Quotidien -MapPeriodType.WEEKLY = Hebdomadaire -MapPeriodType.MONTHLY = Mensuel -MapPeriodType.YEARLY = Annuel - - +MapCaseDisplayMode.CASE_ADDRESS=... par domicile +MapCaseDisplayMode.FACILITY=... par établissement +MapCaseDisplayMode.FACILITY_OR_CASE_ADDRESS=... par établissement ou par domicile +MapCaseClassificationOption.ALL_CASES=Afficher tous les cas +MapCaseClassificationOption.CONFIRMED_CASES_ONLY=Afficher uniquement les cas confirmés +MapPeriodType.DAILY=Quotidien +MapPeriodType.WEEKLY=Hebdomadaire +MapPeriodType.MONTHLY=Mensuel +MapPeriodType.YEARLY=Annuel MeansOfTransport.LOCAL_PUBLIC_TRANSPORT=Transports en commun MeansOfTransport.BUS=Bus MeansOfTransport.FERRY=Navire/Traversier MeansOfTransport.PLANE=Avion MeansOfTransport.TRAIN=Train MeansOfTransport.OTHER=Autres - # MessageSubject -MessageSubject.CASE_CLASSIFICATION_CHANGED = Classification de cas modifiée -MessageSubject.CASE_INVESTIGATION_DONE = Enquête de cas effectuée -MessageSubject.EVENT_PARTICIPANT_CASE_CLASSIFICATION_CONFIRMED = Participant à l'événement identifié comme un cas confirmé %s -MessageSubject.EVENT_PARTICIPANT_RELATED_TO_OTHER_EVENTS = Participant à l'événement lié à d'autres événements -MessageSubject.LAB_RESULT_ARRIVED = Résultat du laboratoire arrivé -MessageSubject.LAB_SAMPLE_SHIPPED = Échantillon de laboratoire expédié -MessageSubject.CONTACT_SYMPTOMATIC = Le contact est devenu symptomatique -MessageSubject.TASK_START = Tâche à démarrer -MessageSubject.TASK_DUE = Tâche en retard -MessageSubject.TASK_UPDATED_ASSIGNEE = Responsable de tâche mis à jour -MessageSubject.VISIT_COMPLETED = Visite de suivi terminée -MessageSubject.DISEASE_CHANGED = Maladie de cas modifiée -MessageSubject.EVENT_GROUP_CREATED = Groupe d'événements créé -MessageSubject.EVENT_ADDED_TO_EVENT_GROUP = Événement ajouté au groupe d'événements -MessageSubject.EVENT_REMOVED_FROM_EVENT_GROUP = Événement retiré du groupe d'événements - +MessageSubject.CASE_CLASSIFICATION_CHANGED=Classification de cas modifiée +MessageSubject.CASE_INVESTIGATION_DONE=Enquête de cas effectuée +MessageSubject.EVENT_PARTICIPANT_CASE_CLASSIFICATION_CONFIRMED=Participant à l'événement identifié comme un cas confirmé %s +MessageSubject.EVENT_PARTICIPANT_RELATED_TO_OTHER_EVENTS=Participant à l'événement lié à d'autres événements +MessageSubject.LAB_RESULT_ARRIVED=Résultat du laboratoire arrivé +MessageSubject.LAB_SAMPLE_SHIPPED=Échantillon de laboratoire expédié +MessageSubject.CONTACT_SYMPTOMATIC=Le contact est devenu symptomatique +MessageSubject.TASK_START=Tâche à démarrer +MessageSubject.TASK_DUE=Tâche en retard +MessageSubject.TASK_UPDATED_ASSIGNEE=Responsable de tâche mis à jour +MessageSubject.VISIT_COMPLETED=Visite de suivi terminée +MessageSubject.DISEASE_CHANGED=Maladie de cas modifiée +MessageSubject.EVENT_GROUP_CREATED=Groupe d'événements créé +MessageSubject.EVENT_ADDED_TO_EVENT_GROUP=Événement ajouté au groupe d'événements +MessageSubject.EVENT_REMOVED_FROM_EVENT_GROUP=Événement retiré du groupe d'événements # Month -Month.JANUARY = Janvier -Month.FEBRUARY = Février -Month.MARCH = Mars -Month.APRIL = Avril -Month.MAY = Mai -Month.JUNE = Juin -Month.JULY = Juillet -Month.AUGUST = Août -Month.SEPTEMBER = Septembre -Month.OCTOBER = Octobre -Month.NOVEMBER = Novembre -Month.DECEMBER = Décembre - +Month.JANUARY=Janvier +Month.FEBRUARY=Février +Month.MARCH=Mars +Month.APRIL=Avril +Month.MAY=Mai +Month.JUNE=Juin +Month.JULY=Juillet +Month.AUGUST=Août +Month.SEPTEMBER=Septembre +Month.OCTOBER=Octobre +Month.NOVEMBER=Novembre +Month.DECEMBER=Décembre # NewCaseDateType -NewCaseDateType.MOST_RELEVANT = La date la plus récente -NewCaseDateType.ONSET = Date de début du symptôme -NewCaseDateType.REPORT = Date du rapport de cas - +NewCaseDateType.MOST_RELEVANT=La date la plus récente +NewCaseDateType.ONSET=Date de début du symptôme +NewCaseDateType.REPORT=Date du rapport de cas # OccupationType # Temporarily necessary for data migration of older systems; can be removed at a later point in time -OccupationType.BUSINESSMAN_WOMAN = Businessman / femme -OccupationType.BUTCHER = Boucher -OccupationType.CHILD = Enfant -OccupationType.FARMER = Fermier -OccupationType.HEALTHCARE_WORKER = Professionnel de santé -OccupationType.HOUSEWIFE = La ménagère -OccupationType.HUNTER_MEAT_TRADER = Chasseur / vendeur de viande de gibier -OccupationType.MINER = Mineur -OccupationType.OTHER = Autres -OccupationType.PUPIL_STUDENT = Élèves / Étudiants -OccupationType.RELIGIOUS_LEADER = Leader religieux -OccupationType.TRADITIONAL_SPIRITUAL_HEALER = Guérisseur traditionnel / spirituel -OccupationType.TRANSPORTER = Transporteur -OccupationType.WORKING_WITH_ANIMALS = Travaille avec des animaux -OccupationType.LABORATORY_STAFF = Personnel de laboratoire -OccupationType.UNKNOWN = Inconnu - -OccupationType.AGRICULTURE = A. Agriculture & foresterie, pêches -OccupationType.MINING = B. Mines & carrières -OccupationType.MANUFACTURING = C. Industrie manufacturière /fabrication de biens -OccupationType.ENERGY_SUPPLY = D. Alimentation en énergie -OccupationType.WATER_SUPPLY_AND_WASTE = E. Approvisionnement en eau; évacuation des eaux usées et traitement des déchets -OccupationType.CONSTRUCTION = F. Industrie de la construction / bâtiment -OccupationType.RETAIL_AND_REPAIR_SERVICE = G. Commerce de gros et commerce de détail; services de réparation -OccupationType.TRANSPORT_AND_STORAGE = H. Transport et stockage -OccupationType.ACCOMMODATION_AND_FOOD_SERVICES = I. Hôtels et restaurants / hébergement & gastronomie -OccupationType.INFORMATION_AND_COMMUNICATION = Information, Communication -OccupationType.FINANCE_AND_INSURANCE = K. Finance & Assurance -OccupationType.REAL_ESTATE = L. Immobilier et logement -OccupationType.PROFESSIONAL_SCIENTIFIC_AND_TECHNICAL = M. Service \: freelance, scientifique, technique -OccupationType.ADMINISTRATIVE_AND_SUPPORT = N. Service \: autres activités économiques -OccupationType.PUBLIC_ADMINISTRATION_AND_DEFENCE = O. Administration publique et défense; services sociaux/sécurité -OccupationType.EDUCATION = P. Education & enseignement -OccupationType.HEALTH_AND_SOCIAL = Santé & Services Sociaux -OccupationType.ARTS_ENTERTAINMENT_AND_RECREATION = R. Arts, spectacles et loisirs -OccupationType.SERVICE_OTHER = S. Service \: autre -OccupationType.PRIVATE_HOUSEHOLD = T. Les ménages privés avec le personnel domestique -OccupationType.EXTRATERRITORIAL_ORGANIZATIONS = U. Organisations & organismes extraterritoriaux - +OccupationType.BUSINESSMAN_WOMAN=Businessman / femme +OccupationType.BUTCHER=Boucher +OccupationType.CHILD=Enfant +OccupationType.FARMER=Fermier +OccupationType.HEALTHCARE_WORKER=Professionnel de santé +OccupationType.HOUSEWIFE=La ménagère +OccupationType.HUNTER_MEAT_TRADER=Chasseur / vendeur de viande de gibier +OccupationType.MINER=Mineur +OccupationType.OTHER=Autres +OccupationType.PUPIL_STUDENT=Élèves / Étudiants +OccupationType.RELIGIOUS_LEADER=Leader religieux +OccupationType.TRADITIONAL_SPIRITUAL_HEALER=Guérisseur traditionnel / spirituel +OccupationType.TRANSPORTER=Transporteur +OccupationType.WORKING_WITH_ANIMALS=Travaille avec des animaux +OccupationType.LABORATORY_STAFF=Personnel de laboratoire +OccupationType.UNKNOWN=Inconnu +OccupationType.AGRICULTURE=A. Agriculture & foresterie, pêches +OccupationType.MINING=B. Mines & carrières +OccupationType.MANUFACTURING=C. Industrie manufacturière /fabrication de biens +OccupationType.ENERGY_SUPPLY=D. Alimentation en énergie +OccupationType.WATER_SUPPLY_AND_WASTE=E. Approvisionnement en eau; évacuation des eaux usées et traitement des déchets +OccupationType.CONSTRUCTION=F. Industrie de la construction / bâtiment +OccupationType.RETAIL_AND_REPAIR_SERVICE=G. Commerce de gros et commerce de détail; services de réparation +OccupationType.TRANSPORT_AND_STORAGE=H. Transport et stockage +OccupationType.ACCOMMODATION_AND_FOOD_SERVICES=I. Hôtels et restaurants / hébergement & gastronomie +OccupationType.INFORMATION_AND_COMMUNICATION=Information, Communication +OccupationType.FINANCE_AND_INSURANCE=K. Finance & Assurance +OccupationType.REAL_ESTATE=L. Immobilier et logement +OccupationType.PROFESSIONAL_SCIENTIFIC_AND_TECHNICAL=M. Service \: freelance, scientifique, technique +OccupationType.ADMINISTRATIVE_AND_SUPPORT=N. Service \: autres activités économiques +OccupationType.PUBLIC_ADMINISTRATION_AND_DEFENCE=O. Administration publique et défense; services sociaux/sécurité +OccupationType.EDUCATION=P. Education & enseignement +OccupationType.HEALTH_AND_SOCIAL=Santé & Services Sociaux +OccupationType.ARTS_ENTERTAINMENT_AND_RECREATION=R. Arts, spectacles et loisirs +OccupationType.SERVICE_OTHER=S. Service \: autre +OccupationType.PRIVATE_HOUSEHOLD=T. Les ménages privés avec le personnel domestique +OccupationType.EXTRATERRITORIAL_ORGANIZATIONS=U. Organisations & organismes extraterritoriaux # PathogenTestResultType -PathogenTestResultType.INDETERMINATE = Indéterminé -PathogenTestResultType.NEGATIVE = Négatif -PathogenTestResultType.PENDING = En attente -PathogenTestResultType.POSITIVE = Positif -PathogenTestResultType.NOT_DONE = Non terminé - +PathogenTestResultType.INDETERMINATE=Indéterminé +PathogenTestResultType.NEGATIVE=Négatif +PathogenTestResultType.PENDING=En attente +PathogenTestResultType.POSITIVE=Positif +PathogenTestResultType.NOT_DONE=Non terminé # PathogenTestType -PathogenTestType.ANTIGEN_DETECTION = Test de détection antigène -PathogenTestType.CULTURE = Culture  -PathogenTestType.DENGUE_FEVER_ANTIBODIES = Anticorps neutralisants de la dengue -PathogenTestType.DENGUE_FEVER_IGM = Anticorps sériques IgM de la dengue -PathogenTestType.DNA_MICROARRAY = Microtableau ADN -PathogenTestType.HISTOPATHOLOGY = Histopathologie -PathogenTestType.IGG_SERUM_ANTIBODY = Anticorps du sérum d'IgG -PathogenTestType.IGM_SERUM_ANTIBODY = Anticorps du sérum d'IgM -PathogenTestType.IGA_SERUM_ANTIBODY = Anticorps du sérum d'IgG -PathogenTestType.ISOLATION = Isolation -PathogenTestType.MICROSCOPY = Microscopie -PathogenTestType.NEUTRALIZING_ANTIBODIES = Anticorps neutralisants -PathogenTestType.OTHER = Autres -PathogenTestType.PCR_RT_PCR = PCR / RT-PCR -PathogenTestType.RAPID_TEST = Test de détection d'antigène (test rapide) -PathogenTestType.WEST_NILE_FEVER_ANTIBODIES = Anticorps neutralisants de la fièvre de l'ouest du Nil -PathogenTestType.WEST_NILE_FEVER_IGM = Anticorps sériques IgM de la fièvre du Nil occidental -PathogenTestType.YELLOW_FEVER_ANTIBODIES = Anticorps neutralisants de la fièvre jaune -PathogenTestType.YELLOW_FEVER_IGM = Anticorps sériques IgM de la fièvre jaune -PathogenTestType.YERSINIA_PESTIS_ANTIGEN = Test d'antigène de Yersinia pestis -PathogenTestType.ANTIBODY_DETECTION = Détection d'anticorps -PathogenTestType.INCUBATION_TIME = Temps d'incubation -PathogenTestType.INDIRECT_FLUORESCENT_ANTIBODY = Anticorps fluorescent indirect (AFI) -PathogenTestType.DIRECT_FLUORESCENT_ANTIBODY = Anticorps Fluorescent Direct (AFD) -PathogenTestType.GRAM_STAIN = Coloration de Gram -PathogenTestType.LATEX_AGGLUTINATION = Test d'agglutination au latex -PathogenTestType.CQ_VALUE_DETECTION = Détection de valeur CQ -PathogenTestType.SEQUENCING = Séquençage -PathogenTestType.TMA = Amplification génique par TMA - -PCRTestSpecification.VARIANT_SPECIFIC = Variante spécifique -PCRTestSpecification.N501Y_MUTATION_DETECTION = Détection de mutation N501Y - -PersonContactDetailType.PHONE = Téléphone -PersonContactDetailType.EMAIL = Email -PersonContactDetailType.OTHER = Autre - -PhoneNumberType.LANDLINE = Téléphone fixe -PhoneNumberType.MOBILE = Portable -PhoneNumberType.WORK = Travail -PhoneNumberType.OTHER = Autre - -ExposureRole.PASSENGER = Passager -ExposureRole.STAFF = Personnel -ExposureRole.NURSING_STAFF = Personnel infirmier -ExposureRole.MEDICAL_STAFF = Personnel Médical -ExposureRole.VISITOR = Visiteur -ExposureRole.GUEST = Visiteur -ExposureRole.CUSTOMER = Client -ExposureRole.CONSERVATEE = Conservateur -ExposureRole.PATIENT = Patient -ExposureRole.EDUCATOR = Éducateur -ExposureRole.TRAINEE_TEACHER = Enseignant du stagiaire -ExposureRole.PUPIL = Élève -ExposureRole.STUDENT = Étudiant -ExposureRole.PARENT = Parent -ExposureRole.TEACHER = Enseignant -ExposureRole.UNKNOWN = Inconnu -ExposureRole.OTHER = Autres - +PathogenTestType.ANTIGEN_DETECTION=Test de détection antigène +PathogenTestType.CULTURE=Culture  +PathogenTestType.DENGUE_FEVER_ANTIBODIES=Anticorps neutralisants de la dengue +PathogenTestType.DENGUE_FEVER_IGM=Anticorps sériques IgM de la dengue +PathogenTestType.DNA_MICROARRAY=Microtableau ADN +PathogenTestType.HISTOPATHOLOGY=Histopathologie +PathogenTestType.IGG_SERUM_ANTIBODY=Anticorps du sérum d'IgG +PathogenTestType.IGM_SERUM_ANTIBODY=Anticorps du sérum d'IgM +PathogenTestType.IGA_SERUM_ANTIBODY=Anticorps du sérum d'IgG +PathogenTestType.ISOLATION=Isolation +PathogenTestType.MICROSCOPY=Microscopie +PathogenTestType.NEUTRALIZING_ANTIBODIES=Anticorps neutralisants +PathogenTestType.OTHER=Autres +PathogenTestType.PCR_RT_PCR=PCR / RT-PCR +PathogenTestType.RAPID_TEST=Test de détection d'antigène (test rapide) +PathogenTestType.WEST_NILE_FEVER_ANTIBODIES=Anticorps neutralisants de la fièvre de l'ouest du Nil +PathogenTestType.WEST_NILE_FEVER_IGM=Anticorps sériques IgM de la fièvre du Nil occidental +PathogenTestType.YELLOW_FEVER_ANTIBODIES=Anticorps neutralisants de la fièvre jaune +PathogenTestType.YELLOW_FEVER_IGM=Anticorps sériques IgM de la fièvre jaune +PathogenTestType.YERSINIA_PESTIS_ANTIGEN=Test d'antigène de Yersinia pestis +PathogenTestType.ANTIBODY_DETECTION=Détection d'anticorps +PathogenTestType.INCUBATION_TIME=Temps d'incubation +PathogenTestType.INDIRECT_FLUORESCENT_ANTIBODY=Anticorps fluorescent indirect (AFI) +PathogenTestType.DIRECT_FLUORESCENT_ANTIBODY=Anticorps Fluorescent Direct (AFD) +PathogenTestType.GRAM_STAIN=Coloration de Gram +PathogenTestType.LATEX_AGGLUTINATION=Test d'agglutination au latex +PathogenTestType.CQ_VALUE_DETECTION=Détection de valeur CQ +PathogenTestType.SEQUENCING=Séquençage +PathogenTestType.TMA=Amplification génique par TMA +PCRTestSpecification.VARIANT_SPECIFIC=Variante spécifique +PCRTestSpecification.N501Y_MUTATION_DETECTION=Détection de mutation N501Y +PersonContactDetailType.PHONE=Téléphone +PersonContactDetailType.EMAIL=Email +PersonContactDetailType.OTHER=Autre +PhoneNumberType.LANDLINE=Téléphone fixe +PhoneNumberType.MOBILE=Portable +PhoneNumberType.WORK=Travail +PhoneNumberType.OTHER=Autre +ExposureRole.PASSENGER=Passager +ExposureRole.STAFF=Personnel +ExposureRole.NURSING_STAFF=Personnel infirmier +ExposureRole.MEDICAL_STAFF=Personnel Médical +ExposureRole.VISITOR=Visiteur +ExposureRole.GUEST=Visiteur +ExposureRole.CUSTOMER=Client +ExposureRole.CONSERVATEE=Conservateur +ExposureRole.PATIENT=Patient +ExposureRole.EDUCATOR=Éducateur +ExposureRole.TRAINEE_TEACHER=Enseignant du stagiaire +ExposureRole.PUPIL=Élève +ExposureRole.STUDENT=Étudiant +ExposureRole.PARENT=Parent +ExposureRole.TEACHER=Enseignant +ExposureRole.UNKNOWN=Inconnu +ExposureRole.OTHER=Autres #SymptomJournalStatus -SymptomJournalStatus.UNREGISTERED = Non enregistré -SymptomJournalStatus.REGISTERED = Enregistré -SymptomJournalStatus.ACCEPTED = Accepté -SymptomJournalStatus.REJECTED = Rejeté -SymptomJournalStatus.DELETED = Supprimé - +SymptomJournalStatus.UNREGISTERED=Non enregistré +SymptomJournalStatus.REGISTERED=Enregistré +SymptomJournalStatus.ACCEPTED=Accepté +SymptomJournalStatus.REJECTED=Rejeté +SymptomJournalStatus.DELETED=Supprimé # PlagueType -PlagueType.BUBONIC = Peste bubonique -PlagueType.PNEUMONIC = Peste Pneumonique -PlagueType.SEPTICAEMIC = Peste septicémique - +PlagueType.BUBONIC=Peste bubonique +PlagueType.PNEUMONIC=Peste Pneumonique +PlagueType.SEPTICAEMIC=Peste septicémique # PersonAddressType -PersonAddressType.HOME = Domicile -PersonAddressType.PLACE_OF_RESIDENCE = Lieu de résidence -PersonAddressType.PLACE_OF_EXPOSURE = Lieu d'exposition -PersonAddressType.PLACE_OF_WORK = Lieu de travail -PersonAddressType.PLACE_OF_ISOLATION = Lieu d'isolement -PersonAddressType.EVENT_LOCATION = Lieu de l’événement -PersonAddressType.OTHER_ADDRESS = Autre Adresse - +PersonAddressType.HOME=Domicile +PersonAddressType.PLACE_OF_RESIDENCE=Lieu de résidence +PersonAddressType.PLACE_OF_EXPOSURE=Lieu d'exposition +PersonAddressType.PLACE_OF_WORK=Lieu de travail +PersonAddressType.PLACE_OF_ISOLATION=Lieu d'isolement +PersonAddressType.EVENT_LOCATION=Lieu de l’événement +PersonAddressType.OTHER_ADDRESS=Autre Adresse # PointOfEntryType -PointOfEntryType.AIRPORT = Aéroport -PointOfEntryType.SEAPORT = Port maritime -PointOfEntryType.GROUND_CROSSING = Frontière terrestre -PointOfEntryType.OTHER = Autres - +PointOfEntryType.AIRPORT=Aéroport +PointOfEntryType.SEAPORT=Port maritime +PointOfEntryType.GROUND_CROSSING=Frontière terrestre +PointOfEntryType.OTHER=Autres # PresentCondition PresentCondition.ALIVE=Vivant PresentCondition.BURIED=Enterré PresentCondition.DEAD=Mort PresentCondition.UNKNOWN=Inconnu - # QuarantineType -QuarantineType.HOME = Domicile -QuarantineType.INSTITUTIONELL = Institutionnel -QuarantineType.NONE = Aucun -QuarantineType.UNKNOWN = Inconnu -QuarantineType.OTHER = Autre - -QuarantineType.HOSPITAL = Hôpital -QuarantineType.HOTEL = Hôtel -QuarantineType.ASYLUM_ACCOMMODATION = Logement en Asile - +QuarantineType.HOME=Domicile +QuarantineType.INSTITUTIONELL=Institutionnel +QuarantineType.NONE=Aucun +QuarantineType.UNKNOWN=Inconnu +QuarantineType.OTHER=Autre +QuarantineType.HOSPITAL=Hôpital +QuarantineType.HOTEL=Hôtel +QuarantineType.ASYLUM_ACCOMMODATION=Logement en Asile # ReportingType -ReportingType.NOT_RAISED = Non soulevé -ReportingType.OTHER = Autre -ReportingType.DOCTOR = Médecin -ReportingType.LABORATORY = Laboratoire -ReportingType.OWN_DETERMINATION = Détermination personnelle -ReportingType.HOSPITAL_OR_STATIONARY_CARE = Soins hospitaliers ou stationnaires -ReportingType.NOT_DETERMINABLE = Indéterminable -ReportingType.FORWARDING = Transférer -ReportingType.COMMUNITY_FACILITY = Etablissement communautaire -ReportingType.COMMUNITY_FACILITY_IFSG_ARTICLE_34 = Etablissement communautaire (§ 34 IfSG) - +ReportingType.NOT_RAISED=Non soulevé +ReportingType.OTHER=Autre +ReportingType.DOCTOR=Médecin +ReportingType.LABORATORY=Laboratoire +ReportingType.OWN_DETERMINATION=Détermination personnelle +ReportingType.HOSPITAL_OR_STATIONARY_CARE=Soins hospitaliers ou stationnaires +ReportingType.NOT_DETERMINABLE=Indéterminable +ReportingType.FORWARDING=Transférer +ReportingType.COMMUNITY_FACILITY=Etablissement communautaire +ReportingType.COMMUNITY_FACILITY_IFSG_ARTICLE_34=Etablissement communautaire (§ 34 IfSG) # RiskLevel -RiskLevel.LOW = Faible risque -RiskLevel.MODERATE = Risque modéré -RiskLevel.HIGH = Risque élevé -RiskLevel.UNKNOWN = Inconnu - +RiskLevel.LOW=Faible risque +RiskLevel.MODERATE=Risque modéré +RiskLevel.HIGH=Risque élevé +RiskLevel.UNKNOWN=Inconnu # SampleMaterial -SampleMaterial.BLOOD = Le sang -SampleMaterial.CEREBROSPINAL_FLUID = Flux de Cerebrospinal -SampleMaterial.CRUST = Croûte -SampleMaterial.NASAL_SWAB = Écouvillon nasal -SampleMaterial.NP_SWAB = Écouvillon nasopharyngé -SampleMaterial.OTHER = Autres -SampleMaterial.RECTAL_SWAB = Écouvillon rectal -SampleMaterial.SERA = Sérum -SampleMaterial.STOOL = Selle -SampleMaterial.THROAT_SWAB = Écouvillon de gorge -SampleMaterial.TISSUE = Tissu -SampleMaterial.URINE = Urine +SampleMaterial.BLOOD=Le sang +SampleMaterial.CEREBROSPINAL_FLUID=Flux de Cerebrospinal +SampleMaterial.CRUST=Croûte +SampleMaterial.NASAL_SWAB=Écouvillon nasal +SampleMaterial.NP_SWAB=Écouvillon nasopharyngé +SampleMaterial.OTHER=Autres +SampleMaterial.RECTAL_SWAB=Écouvillon rectal +SampleMaterial.SERA=Sérum +SampleMaterial.STOOL=Selle +SampleMaterial.THROAT_SWAB=Écouvillon de gorge +SampleMaterial.TISSUE=Tissu +SampleMaterial.URINE=Urine SampleMaterial.CORNEA_PM=Cornea p.m SampleMaterial.SALIVA=Salive SampleMaterial.URINE_PM=Urine p.m @@ -1191,180 +1083,158 @@ ShipmentStatus.Short.SHIPPED=Envoyé SimpleTestResultType.POSITIVE=Positif SimpleTestResultType.NEGATIVE=Negatif SimpleTestResultType.INDETERMINATE=Indéterminé - # SpecimenCondition -SpecimenCondition.ADEQUATE = Conforme -SpecimenCondition.NOT_ADEQUATE = Non conforme - +SpecimenCondition.ADEQUATE=Conforme +SpecimenCondition.NOT_ADEQUATE=Non conforme # StatisticsCaseAttribute -StatisticsCaseAttribute.AGE_INTERVAL_1_YEAR= Stratification de l'âge \: intervalles de 1 an -StatisticsCaseAttribute.AGE_INTERVAL_5_YEARS= Stratification de l'âge \: intervalles de 5 ans -StatisticsCaseAttribute.AGE_INTERVAL_BASIC= Stratification de l'âge \: basique -StatisticsCaseAttribute.AGE_INTERVAL_CHILDREN_COARSE= Stratification de l'âge \: enfants grossiers -StatisticsCaseAttribute.AGE_INTERVAL_CHILDREN_FINE= Stratification de l'âge \: enfants fins -StatisticsCaseAttribute.AGE_INTERVAL_CHILDREN_MEDIUM= Stratification de l'âge \: enfant moyen -StatisticsCaseAttribute.CLASSIFICATION = Classification -StatisticsCaseAttribute.DISEASE = Maladie -StatisticsCaseAttribute.ONSET_TIME = Début -StatisticsCaseAttribute.OUTCOME = Issue -StatisticsCaseAttribute.OUTCOME_TIME = Heure du résultat -StatisticsCaseAttribute.JURISDICTION = Région / District / Communauté / Établissement de santé -StatisticsCaseAttribute.REPORT_TIME = Heure du rapport -StatisticsCaseAttribute.REPORTING_USER_ROLE = Rôle du rapporteur -StatisticsCaseAttribute.SEX = Sexe -StatisticsCaseAttribute.PLACE_OF_RESIDENCE = Lieu de résidence - +StatisticsCaseAttribute.AGE_INTERVAL_1_YEAR=Stratification de l'âge \: intervalles de 1 an +StatisticsCaseAttribute.AGE_INTERVAL_5_YEARS=Stratification de l'âge \: intervalles de 5 ans +StatisticsCaseAttribute.AGE_INTERVAL_BASIC=Stratification de l'âge \: basique +StatisticsCaseAttribute.AGE_INTERVAL_CHILDREN_COARSE=Stratification de l'âge \: enfants grossiers +StatisticsCaseAttribute.AGE_INTERVAL_CHILDREN_FINE=Stratification de l'âge \: enfants fins +StatisticsCaseAttribute.AGE_INTERVAL_CHILDREN_MEDIUM=Stratification de l'âge \: enfant moyen +StatisticsCaseAttribute.CLASSIFICATION=Classification +StatisticsCaseAttribute.DISEASE=Maladie +StatisticsCaseAttribute.ONSET_TIME=Début +StatisticsCaseAttribute.OUTCOME=Issue +StatisticsCaseAttribute.OUTCOME_TIME=Heure du résultat +StatisticsCaseAttribute.JURISDICTION=Région / District / Communauté / Établissement de santé +StatisticsCaseAttribute.REPORT_TIME=Heure du rapport +StatisticsCaseAttribute.REPORTING_USER_ROLE=Rôle du rapporteur +StatisticsCaseAttribute.SEX=Sexe +StatisticsCaseAttribute.PLACE_OF_RESIDENCE=Lieu de résidence # StatisticsCaseAttributeGroup -StatisticsCaseAttributeGroup.CASE = Cas -StatisticsCaseAttributeGroup.PERSON = Personne -StatisticsCaseAttributeGroup.PLACE = Place -StatisticsCaseAttributeGroup.TIME = Heure - +StatisticsCaseAttributeGroup.CASE=Cas +StatisticsCaseAttributeGroup.PERSON=Personne +StatisticsCaseAttributeGroup.PLACE=Place +StatisticsCaseAttributeGroup.TIME=Heure # StatisticsCaseSubAttribute -StatisticsCaseSubAttribute.DATE_RANGE = Intervalle de dates -StatisticsCaseSubAttribute.DISTRICT = Département -StatisticsCaseSubAttribute.EPI_WEEK = Semaine de l’Epi -StatisticsCaseSubAttribute.EPI_WEEK_OF_YEAR = Semaine épi de l'année -StatisticsCaseSubAttribute.MONTH = Mois -StatisticsCaseSubAttribute.MONTH_OF_YEAR = Mois de l'année -StatisticsCaseSubAttribute.QUARTER = Trimestre -StatisticsCaseSubAttribute.QUARTER_OF_YEAR = Trimestre de l'année -StatisticsCaseSubAttribute.REGION = Région -StatisticsCaseSubAttribute.YEAR = Année -StatisticsCaseSubAttribute.COMMUNITY = Communauté -StatisticsCaseSubAttribute.FACILITY = Établissement -StatisticsCaseSubAttribute.PERSON_REGION = Région de la personne -StatisticsCaseSubAttribute.PERSON_DISTRICT = District de la personne -StatisticsCaseSubAttribute.PERSON_COMMUNITY = Communauté de la personne -StatisticsCaseSubAttribute.PERSON_CITY = Ville de la personne -StatisticsCaseSubAttribute.PERSON_POSTCODE = Code postal de la personne -StatisticsCaseSubAttribute.PERSON_ADDRESS = Adresse de la personne - +StatisticsCaseSubAttribute.DATE_RANGE=Intervalle de dates +StatisticsCaseSubAttribute.DISTRICT=Département +StatisticsCaseSubAttribute.EPI_WEEK=Semaine de l’Epi +StatisticsCaseSubAttribute.EPI_WEEK_OF_YEAR=Semaine épi de l'année +StatisticsCaseSubAttribute.MONTH=Mois +StatisticsCaseSubAttribute.MONTH_OF_YEAR=Mois de l'année +StatisticsCaseSubAttribute.QUARTER=Trimestre +StatisticsCaseSubAttribute.QUARTER_OF_YEAR=Trimestre de l'année +StatisticsCaseSubAttribute.REGION=Région +StatisticsCaseSubAttribute.YEAR=Année +StatisticsCaseSubAttribute.COMMUNITY=Communauté +StatisticsCaseSubAttribute.FACILITY=Établissement +StatisticsCaseSubAttribute.PERSON_REGION=Région de la personne +StatisticsCaseSubAttribute.PERSON_DISTRICT=District de la personne +StatisticsCaseSubAttribute.PERSON_COMMUNITY=Communauté de la personne +StatisticsCaseSubAttribute.PERSON_CITY=Ville de la personne +StatisticsCaseSubAttribute.PERSON_POSTCODE=Code postal de la personne +StatisticsCaseSubAttribute.PERSON_ADDRESS=Adresse de la personne # StatisticsVisualizationChartType -StatisticsVisualizationChartType.COLUMN = Colonne -StatisticsVisualizationChartType.LINE = Ligne -StatisticsVisualizationChartType.PIE = Camembert -StatisticsVisualizationChartType.STACKED_COLUMN = Colonne empilée - +StatisticsVisualizationChartType.COLUMN=Colonne +StatisticsVisualizationChartType.LINE=Ligne +StatisticsVisualizationChartType.PIE=Camembert +StatisticsVisualizationChartType.STACKED_COLUMN=Colonne empilée # StatisticsVisualizationElementType -StatisticsVisualizationElementType.COLUMNS = Colonnes -StatisticsVisualizationElementType.Chart.COLUMNS = Axe-X -StatisticsVisualizationElementType.Chart.ROWS = Séries -StatisticsVisualizationElementType.ROWS = Lignes - +StatisticsVisualizationElementType.COLUMNS=Colonnes +StatisticsVisualizationElementType.Chart.COLUMNS=Axe-X +StatisticsVisualizationElementType.Chart.ROWS=Séries +StatisticsVisualizationElementType.ROWS=Lignes # StatisticsVisualizationType -StatisticsVisualizationType.CHART = Diagramme -StatisticsVisualizationMapType.DISTRICTS = Départements -StatisticsVisualizationType.MAP = Carte -StatisticsVisualizationMapType.REGIONS = Régions -StatisticsVisualizationType.TABLE = Tableau - -SurveillanceEpiCurveMode.CASE_STATUS = Statut du cas -SurveillanceEpiCurveMode.ALIVE_OR_DEAD = Vivant ou mort - +StatisticsVisualizationType.CHART=Diagramme +StatisticsVisualizationMapType.DISTRICTS=Départements +StatisticsVisualizationType.MAP=Carte +StatisticsVisualizationMapType.REGIONS=Régions +StatisticsVisualizationType.TABLE=Tableau +SurveillanceEpiCurveMode.CASE_STATUS=Statut du cas +SurveillanceEpiCurveMode.ALIVE_OR_DEAD=Vivant ou mort # SymptomState -SymptomState.NO = Non -SymptomState.UNKNOWN = Inconnu -SymptomState.YES = Oui - +SymptomState.NO=Non +SymptomState.UNKNOWN=Inconnu +SymptomState.YES=Oui # TaskAssignee -TaskAssignee.ALL = Toutes les tâches -TaskAssignee.CURRENT_USER = Tâches qui me sont assignées -TaskAssignee.OTHER_USERS = Tâches que j'ai créées - +TaskAssignee.ALL=Toutes les tâches +TaskAssignee.CURRENT_USER=Tâches qui me sont assignées +TaskAssignee.OTHER_USERS=Tâches que j'ai créées # TaskContext -TaskContext.CASE = Cas -TaskContext.CONTACT = Contact -TaskContext.EVENT = Événement -TaskContext.GENERAL = Général -TaskContext.TRAVEL_ENTRY = Entrée de voyage -TaskContext.ENVIRONMENT = Environment - +TaskContext.CASE=Cas +TaskContext.CONTACT=Contact +TaskContext.EVENT=Événement +TaskContext.GENERAL=Général +TaskContext.TRAVEL_ENTRY=Entrée de voyage +TaskContext.ENVIRONMENT=Environment # TaskDateType -TaskDateType.SUGGESTED_START_DATE = Date de début suggérée -TaskDateType.DUE_DATE = Date d’échéance - +TaskDateType.SUGGESTED_START_DATE=Date de début suggérée +TaskDateType.DUE_DATE=Date d’échéance # TaskPriority -TaskPriority.HIGH = Élevée -TaskPriority.LOW = Basse -TaskPriority.NORMAL = Normale - +TaskPriority.HIGH=Élevée +TaskPriority.LOW=Basse +TaskPriority.NORMAL=Normale # TaskStatus -TaskStatus.DONE = terminé -TaskStatus.NOT_EXECUTABLE = non exécutable -TaskStatus.PENDING = en attente -TaskStatus.IN_PROGRESS = En cours -TaskStatus.REMOVED = supprimé - +TaskStatus.DONE=terminé +TaskStatus.NOT_EXECUTABLE=non exécutable +TaskStatus.PENDING=en attente +TaskStatus.IN_PROGRESS=En cours +TaskStatus.REMOVED=supprimé # TaskType -TaskType.ACTIVE_SEARCH_FOR_OTHER_CASES = recherche active d'autres cas, par exemple dans le foyer ou le lieu de travail -TaskType.ANIMAL_DEPOPULATION = dépeuplement des animaux -TaskType.ANIMAL_TESTING = tests d'animaux -TaskType.CASE_BURIAL = enterrement/ crémation sans danger -TaskType.CASE_INVESTIGATION = enquête de cas -TaskType.CASE_ISOLATION = isolement de cas -TaskType.CASE_MANAGEMENT = gestion de cas -TaskType.CONTACT_FOLLOW_UP = suivi du contact -TaskType.CONTACT_INVESTIGATION = enquête de contact -TaskType.CONTACT_MANAGEMENT = Gestion des contacts -TaskType.CONTACT_TRACING = tracé du contact -TaskType.DAILY_REPORT_GENERATION = générer un rapport quotidien -TaskType.DECONTAMINATION_DISINFECTION_ACTIVITIES = activités de décontamination / désinfection -TaskType.ENVIRONMENTAL_HEALTH_ACTIVITIES = activités de santé environnementale -TaskType.EVENT_INVESTIGATION = enquêter sur l'événement -TaskType.EVENT_CONTINUE_INVESTIGATION = poursuivre l'enquête à la suite d'un changement dans l'événement -TaskType.EVENT_REQUEST_ADDITIONAL_INFORMATION = demander un rapport d'enquête / un résumé / des informations supplémentaires à collecter -TaskType.OTHER = autre tâche décrite dans les commentaires -TaskType.QUARANTINE_MANAGEMENT = Gestion de la quarantaine -TaskType.QUARANTINE_ORDER_SEND = Envoyer une commande de quarantaine -TaskType.QUARANTINE_PLACE = Lieu de quarantaine -TaskType.SAMPLE_COLLECTION = Collection d'échantillons -TaskType.SOURCECASE_TRACING = Suivi du cas source -TaskType.SURVEILLANCE_REPORT_GENERATION = Générer un rapport de surveillance -TaskType.TREATMENT_CENTER_ESTABLISHMENT = Établissement du centre de traitement local -TaskType.VACCINATION_ACTIVITIES = Activités de vaccination -TaskType.WEEKLY_REPORT_GENERATION = Générer un rapport hebdomadaire -TaskType.ENVIRONMENT_INVESTIGATION = environment investigation - +TaskType.ACTIVE_SEARCH_FOR_OTHER_CASES=recherche active d'autres cas, par exemple dans le foyer ou le lieu de travail +TaskType.ANIMAL_DEPOPULATION=dépeuplement des animaux +TaskType.ANIMAL_TESTING=tests d'animaux +TaskType.CASE_BURIAL=enterrement/ crémation sans danger +TaskType.CASE_INVESTIGATION=enquête de cas +TaskType.CASE_ISOLATION=isolement de cas +TaskType.CASE_MANAGEMENT=gestion de cas +TaskType.CONTACT_FOLLOW_UP=suivi du contact +TaskType.CONTACT_INVESTIGATION=enquête de contact +TaskType.CONTACT_MANAGEMENT=Gestion des contacts +TaskType.CONTACT_TRACING=tracé du contact +TaskType.DAILY_REPORT_GENERATION=générer un rapport quotidien +TaskType.DECONTAMINATION_DISINFECTION_ACTIVITIES=activités de décontamination / désinfection +TaskType.ENVIRONMENTAL_HEALTH_ACTIVITIES=activités de santé environnementale +TaskType.EVENT_INVESTIGATION=enquêter sur l'événement +TaskType.EVENT_CONTINUE_INVESTIGATION=poursuivre l'enquête à la suite d'un changement dans l'événement +TaskType.EVENT_REQUEST_ADDITIONAL_INFORMATION=demander un rapport d'enquête / un résumé / des informations supplémentaires à collecter +TaskType.OTHER=autre tâche décrite dans les commentaires +TaskType.QUARANTINE_MANAGEMENT=Gestion de la quarantaine +TaskType.QUARANTINE_ORDER_SEND=Envoyer une commande de quarantaine +TaskType.QUARANTINE_PLACE=Lieu de quarantaine +TaskType.SAMPLE_COLLECTION=Collection d'échantillons +TaskType.SOURCECASE_TRACING=Suivi du cas source +TaskType.SURVEILLANCE_REPORT_GENERATION=Générer un rapport de surveillance +TaskType.TREATMENT_CENTER_ESTABLISHMENT=Établissement du centre de traitement local +TaskType.VACCINATION_ACTIVITIES=Activités de vaccination +TaskType.WEEKLY_REPORT_GENERATION=Générer un rapport hebdomadaire +TaskType.ENVIRONMENT_INVESTIGATION=environment investigation # TemperatureSource TemperatureSource.AXILLARY=Axillaire -TemperatureSource.NON_CONTACT = Sans contact (infrarouge) +TemperatureSource.NON_CONTACT=Sans contact (infrarouge) TemperatureSource.ORAL=Oral TemperatureSource.RECTAL=rectale - #TracingApp -TracingApp.CORONA_WARN_APP = Application d'alerte Corona -TracingApp.OTHER = Autre -TracingApp.UNKNOWN = Inconnu - +TracingApp.CORONA_WARN_APP=Application d'alerte Corona +TracingApp.OTHER=Autre +TracingApp.UNKNOWN=Inconnu # TravelType -TravelType.ABROAD = À l'étranger -TravelType.WITHIN_COUNTRY = Dans le pays - +TravelType.ABROAD=À l'étranger +TravelType.WITHIN_COUNTRY=Dans le pays # TreatmentRoute -TreatmentRoute.ORAL = Oral -TreatmentRoute.IV = IV -TreatmentRoute.RECTAL = Rectale -TreatmentRoute.TOPICAL = Topique -TreatmentRoute.OTHER = Autres - +TreatmentRoute.ORAL=Oral +TreatmentRoute.IV=IV +TreatmentRoute.RECTAL=Rectale +TreatmentRoute.TOPICAL=Topique +TreatmentRoute.OTHER=Autres # TreatmentType -TreatmentType.DRUG_INTAKE = Prise de médicaments -TreatmentType.ORAL_REHYDRATION_SALTS = Sels de réhydratation Oral -TreatmentType.BLOOD_TRANSFUSION = Transfusion sanguine -TreatmentType.RENAL_REPLACEMENT_THERAPY = Thérapie de remplacement rénal -TreatmentType.IV_FLUID_THERAPY = Thérapie liquidienne IV -TreatmentType.OXYGEN_THERAPY = Thérapie de l'oxygène -TreatmentType.INVASIVE_MECHANICAL_VENTILATION = Ventilation mécanique invasive -TreatmentType.VASOPRESSORS_INOTROPES = Vasopresseurs/Inotropes -TreatmentType.OTHER = Autres - +TreatmentType.DRUG_INTAKE=Prise de médicaments +TreatmentType.ORAL_REHYDRATION_SALTS=Sels de réhydratation Oral +TreatmentType.BLOOD_TRANSFUSION=Transfusion sanguine +TreatmentType.RENAL_REPLACEMENT_THERAPY=Thérapie de remplacement rénal +TreatmentType.IV_FLUID_THERAPY=Thérapie liquidienne IV +TreatmentType.OXYGEN_THERAPY=Thérapie de l'oxygène +TreatmentType.INVASIVE_MECHANICAL_VENTILATION=Ventilation mécanique invasive +TreatmentType.VASOPRESSORS_INOTROPES=Vasopresseurs/Inotropes +TreatmentType.OTHER=Autres # Trimester -Trimester.FIRST = Premier -Trimester.SECOND = Seconde -Trimester.THIRD = Troisième -Trimester.UNKNOWN = Inconnu - +Trimester.FIRST=Premier +Trimester.SECOND=Seconde +Trimester.THIRD=Troisième +Trimester.UNKNOWN=Inconnu TypeOfAnimal.BAT=Chauve-souris ou ses excréments TypeOfAnimal.POULTRY=Volaille ou oiseau sauvage TypeOfAnimal.CAMEL=Chameau @@ -1380,243 +1250,240 @@ TypeOfAnimal.RODENT=Rongeur ou ses excréments TypeOfAnimal.FLEA=Puce TypeOfAnimal.TICK=Cocher TypeOfAnimal.OTHER=Autre - # TypeOfDrug -TypeOfDrug.ANTIMICROBIAL = Antimicrobien -TypeOfDrug.ANTIVIRAL = Antiviral -TypeOfDrug.OTHER = Autres - +TypeOfDrug.ANTIMICROBIAL=Antimicrobien +TypeOfDrug.ANTIVIRAL=Antiviral +TypeOfDrug.OTHER=Autres # TypeOfPlace -TypeOfPlace.FACILITY = Établissement -TypeOfPlace.FACILITY_23_IFSG = Etablissement (§ 23 IfSG) -TypeOfPlace.COMMUNITY_FACILITY = Etablissement communautaire (§ 33 IfSG) -TypeOfPlace.FACILITY_36_IFSG = Etablissement (§ 36 IfSG) -TypeOfPlace.FESTIVITIES = Fêtes -TypeOfPlace.HOME = Sphère privée -TypeOfPlace.HOSPITAL = Hôpitaux -TypeOfPlace.MEANS_OF_TRANSPORT = Moyens de transport -TypeOfPlace.OTHER = Autre -TypeOfPlace.PUBLIC_PLACE = Lieu public -TypeOfPlace.UNKNOWN = Inconnu -TypeOfPlace.SCATTERED = Dispersé - +TypeOfPlace.FACILITY=Établissement +TypeOfPlace.FACILITY_23_IFSG=Etablissement (§ 23 IfSG) +TypeOfPlace.COMMUNITY_FACILITY=Etablissement communautaire (§ 33 IfSG) +TypeOfPlace.FACILITY_36_IFSG=Etablissement (§ 36 IfSG) +TypeOfPlace.FESTIVITIES=Fêtes +TypeOfPlace.HOME=Sphère privée +TypeOfPlace.HOSPITAL=Hôpitaux +TypeOfPlace.MEANS_OF_TRANSPORT=Moyens de transport +TypeOfPlace.OTHER=Autre +TypeOfPlace.PUBLIC_PLACE=Lieu public +TypeOfPlace.UNKNOWN=Inconnu +TypeOfPlace.SCATTERED=Dispersé # UserRight -UserRight.CASE_ARCHIVE = Cas archivés -UserRight.CASE_CHANGE_DISEASE = Modifier la maladie de cas -UserRight.CASE_CHANGE_EPID_NUMBER = Modifier le numéro d'épidémie de cas -UserRight.CASE_CLASSIFY = Modifier la classification et l'issue du cas -UserRight.CASE_CREATE = Créer de nouveaux cas -UserRight.CASE_DELETE = Supprimer les cas du système -UserRight.CASE_EDIT = Modifier les cas existants -UserRight.CASE_EXPORT = Exporter des cas de SORMAS -UserRight.CASE_IMPORT = Importer des cas dans SORMAS -UserRight.CASE_INVESTIGATE = Modifier le statut de l'enquête de cas -UserRight.CASE_TRANSFER = Transférer des cas vers une autre région/département/établissement -UserRight.CASE_REFER_FROM_POE = Référez le cas à partir du point d'entrée -UserRight.CASE_RESPONSIBLE = Peut être responsable d'un cas -UserRight.CASE_VIEW = Voir les cas existants -UserRight.CASE_VIEW_ARCHIVED = View archived cases -UserRight.CONTACT_ASSIGN = Attribuer des contacts aux officiers -UserRight.CONTACT_CLASSIFY = Modifier la classification des contacts -UserRight.CONTACT_CONVERT = Créer les cas résultant des contacts -UserRight.CONTACT_CREATE = Créer de nouveaux contacts -UserRight.CONTACT_IMPORT = Importer des contacts -UserRight.CONTACT_DELETE = Supprimer les contacts du système -UserRight.CONTACT_EDIT = Modifier les contacts existants -UserRight.CONTACT_EXPORT = Exporter les contacts de SORMAS -UserRight.CONTACT_RESPONSIBLE = Peut être responsable d'un contact -UserRight.CONTACT_VIEW = Voir les contacts existants -UserRight.CONTACT_VIEW_ARCHIVED = View archived contacts -UserRight.CONTACT_ARCHIVE = Archiver les contacts -UserRight.DASHBOARD_CONTACT_VIEW = Accéder au tableau de bord du superviseur de contacts -UserRight.DASHBOARD_SURVEILLANCE_VIEW = Accéder au tableau de bord du superviseur de surveillance -UserRight.DASHBOARD_SAMPLES_VIEW = Accéder au tableau de bord des échantillons -UserRight.DATABASE_EXPORT_ACCESS = Exporter toute la base de données -UserRight.EVENT_ARCHIVE = Archiver les événements -UserRight.EVENT_CREATE = Créer un nouvel évènement -UserRight.EVENT_EDIT = Modifier des événements existants -UserRight.EVENT_EXPORT = Exporter les événements de SORMAS -UserRight.EVENT_RESPONSIBLE = Peut-être responsable d'un événement -UserRight.EVENT_VIEW = Modifier des événements existants -UserRight.EVENT_VIEW_ARCHIVED = View archived events -UserRight.EVENTPARTICIPANT_CREATE = Créer de nouveaux participants à l'événement -UserRight.EVENTPARTICIPANT_EDIT = Modifier les participants de l'événement existant -UserRight.EVENTPARTICIPANT_ARCHIVE = Archives des participants à l'événement -UserRight.EVENTPARTICIPANT_VIEW = Afficher les participants à l'événement existant -UserRight.EVENTPARTICIPANT_VIEW_ARCHIVED = View archived event participants -UserRight.INFRASTRUCTURE_CREATE = Créer de nouvelles régions/départements/communautés/établissements de santé -UserRight.INFRASTRUCTURE_EDIT = Créer des régions/départements/communautés/établissements de santé -UserRight.INFRASTRUCTURE_VIEW = Voir les régions/départements/communautés/établissements de santé du système -UserRight.INFRASTRUCTURE_VIEW_ARCHIVED = View archived infrastructure data -UserRight.PERFORM_BULK_OPERATIONS = Effectuer des opérations en bloc dans des listes -UserRight.SAMPLE_CREATE = Créer de nouveaux échantillons -UserRight.SAMPLE_EDIT = Modifier les échantillons existants -UserRight.SAMPLE_EXPORT = Exporter les échantillons de SORMAS -UserRight.SAMPLE_DELETE = Supprimer les échantillons du système -UserRight.SAMPLE_SEE_ARCHIVED = Afficher les échantillons archivés -UserRight.SAMPLE_TRANSFER = Transférer des échantillons dans un autre laboratoire -UserRight.SAMPLE_VIEW = Afficher les échantillons existants -UserRight.SAMPLETEST_CREATE = Créer de nouveaux tests d'échantillons -UserRight.SAMPLETEST_EDIT = Modifier les tests d'échantillons existants -UserRight.STATISTICS_EXPORT = Exporter les statistiques détaillées de SORMAS -UserRight.TASK_ASSIGN = Attribuer des tâches aux utilisateurs -UserRight.TASK_CREATE = Créer une nouvelle tâche -UserRight.TASK_EDIT = Modifier les tâches existantes -UserRight.TASK_SEE_ARCHIVED = Afficher les tâches archivées -UserRight.TASK_VIEW = Modifier les tâches existantes -UserRight.TASK_VIEW_ARCHIVED = View archived tasks -UserRight.USER_CREATE = Créer nouvel utilisateur -UserRight.USER_EDIT = Modifier les utilisateurs existants -UserRight.USER_VIEW = Afficher les utilisateurs existants -UserRight.USER_ROLE_EDIT = Modifier les rôles d'utilisateur existants -UserRight.USER_ROLE_DELETE = Supprimer les rôles d'utilisateur du système -UserRight.USER_ROLE_VIEW = Afficher les rôles d'utilisateur existants -UserRight.VISIT_CREATE = Créer une nouvelle visite -UserRight.VISIT_EDIT = Modifier les visites existantes -UserRight.WEEKLYREPORT_CREATE = Créer des rapports hebdomadaires -UserRight.WEEKLYREPORT_VIEW = Voir les rapports hebdomadaires -UserRight.CASE_MERGE = Fusionner les cas -UserRight.PERSON_VIEW = Voir les personnes existantes -UserRight.PERSON_EDIT = Modifier les personnes existantes -UserRight.PERSON_DELETE = Supprimer des personnes du système -UserRight.PERSON_CONTACT_DETAILS_DELETE = Supprimer les coordonnées de la personne -UserRight.SAMPLE_EDIT_NOT_OWNED = Modifier les échantillons signalés par d'autres utilisateurs -UserRight.PATHOGEN_TEST_CREATE = Créer de nouveaux tests de pathogène -UserRight.PATHOGEN_TEST_EDIT = Modifier les tests pathogènes existants -UserRight.PATHOGEN_TEST_DELETE = Supprimer les tests d'agent pathogène du système -UserRight.ADDITIONAL_TEST_VIEW = Voir les tests supplémentaires existants -UserRight.ADDITIONAL_TEST_CREATE = Créer de nouveaux tests supplémentaires -UserRight.ADDITIONAL_TEST_EDIT = Modifier les tests supplémentaires existants -UserRight.ADDITIONAL_TEST_DELETE = Supprimer les tests supplémentaires du système -UserRight.CONTACT_REASSIGN_CASE = Réassigner la casse source des contacts -UserRight.MANAGE_EXTERNAL_SYMPTOM_JOURNAL = Gérer le journal de symptômes externe -UserRight.VISIT_DELETE = Supprimer les visites du système -UserRight.VISIT_EXPORT = Exporter les visites depuis SORMAS -UserRight.TASK_DELETE = Supprimer les tâches du système -UserRight.TASK_EXPORT = Exporter les tâches depuis SORMAS -UserRight.TASK_ARCHIVE = Tâches d'archivage -UserRight.ACTION_CREATE = Créer de nouvelles actions -UserRight.ACTION_DELETE = Supprimer les actions du système -UserRight.ACTION_EDIT = Modifier les actions existantes -UserRight.EVENT_IMPORT = Importer des événements -UserRight.EVENT_DELETE = Supprimer les événements du système -UserRight.EVENTPARTICIPANT_DELETE = Supprimer les participants de l'événement du système -UserRight.EVENTPARTICIPANT_IMPORT = Importer les participants à l'événement -UserRight.SEND_MANUAL_EXTERNAL_MESSAGES = Envoyer des messages externes manuels -UserRight.STATISTICS_ACCESS = Statistiques d'accès -UserRight.MANAGE_PUBLIC_EXPORT_CONFIGURATION = Gérer les configurations d'exportation publiques -UserRight.INFRASTRUCTURE_EXPORT = Exporter les données d'infrastructure depuis SORMAS -UserRight.INFRASTRUCTURE_IMPORT = Importer des données d'infrastructure -UserRight.INFRASTRUCTURE_ARCHIVE = Archiver les données d'infrastructure -UserRight.DASHBOARD_CONTACT_VIEW_TRANSMISSION_CHAINS = Afficher les chaînes de transmission des contacts sur le tableau de bord -UserRight.DASHBOARD_CAMPAIGNS_VIEW = Accéder au tableau de bord des campagnes -UserRight.CASE_CLINICIAN_VIEW = Accéder aux sections de cas concernées par le clinicien -UserRight.THERAPY_VIEW = Voir les thérapies existantes -UserRight.PRESCRIPTION_CREATE = Créer de nouvelles ordonnances -UserRight.PRESCRIPTION_EDIT = Modifier les ordonnances existantes -UserRight.PRESCRIPTION_DELETE = Supprimer les ordonnances du système -UserRight.TREATMENT_CREATE = Créer de nouveaux traitements -UserRight.TREATMENT_EDIT = Modifier les traitements existants -UserRight.TREATMENT_DELETE = Supprimer les traitements du système -UserRight.CLINICAL_COURSE_VIEW = Voir le cours clinique des cas -UserRight.CLINICAL_COURSE_EDIT = Modifier le cours clinique des cas -UserRight.CLINICAL_VISIT_CREATE = Créer de nouvelles visites cliniques -UserRight.CLINICAL_VISIT_EDIT = Modifier les consultations cliniques existantes -UserRight.CLINICAL_VISIT_DELETE = Supprimer les visites cliniques du système -UserRight.PORT_HEALTH_INFO_VIEW = Voir les informations sur la santé du port -UserRight.PORT_HEALTH_INFO_EDIT = Modifier les informations existantes sur la santé du port -UserRight.POPULATION_MANAGE = Gérer les données de la population -UserRight.DOCUMENT_TEMPLATE_MANAGEMENT = Gérer les modèles de document -UserRight.QUARANTINE_ORDER_CREATE = Créer de nouvelles commandes de quarantaine -UserRight.LINE_LISTING_CONFIGURE = Configurer la liste de lignes -UserRight.AGGREGATE_REPORT_VIEW = Créer un nouveau rapport agrégé -UserRight.AGGREGATE_REPORT_EXPORT = Exporter les rapports agrégés depuis SORMAS -UserRight.AGGREGATE_REPORT_EDIT = Modifier les rapports agrégés existants -UserRight.SEE_PERSONAL_DATA_IN_JURISDICTION = Voir les données personnelles dans la juridiction -UserRight.SEE_PERSONAL_DATA_OUTSIDE_JURISDICTION = Voir les données personnelles en dehors de la juridiction -UserRight.SEE_SENSITIVE_DATA_IN_JURISDICTION = Voir les données sensibles dans la juridiction -UserRight.SEE_SENSITIVE_DATA_OUTSIDE_JURISDICTION = Voir les données sensibles hors juridiction -UserRight.CAMPAIGN_VIEW = Voir les campagnes existantes -UserRight.CAMPAIGN_VIEW_ARCHIVED = View archived campaigns -UserRight.CAMPAIGN_EDIT = Modifier les campagnes existantes -UserRight.CAMPAIGN_ARCHIVE = Campagnes archivées -UserRight.CAMPAIGN_DELETE = Supprimer les actions du système -UserRight.CAMPAIGN_FORM_DATA_VIEW = Afficher les données du formulaire de campagne existant -UserRight.CAMPAIGN_FORM_DATA_VIEW_ARCHIVED = View archived campaign form data -UserRight.CAMPAIGN_FORM_DATA_EDIT = Modifier les données du formulaire de campagne existant -UserRight.CAMPAIGN_FORM_DATA_ARCHIVE = Archiver les données du formulaire de campagne -UserRight.CAMPAIGN_FORM_DATA_DELETE = Supprimer les données du formulaire de campagne du système -UserRight.CAMPAIGN_FORM_DATA_EXPORT = Exporter les données du formulaire de campagne depuis SORMAS -UserRight.BAG_EXPORT = Effectuer l'exportation BAG -UserRight.SORMAS_TO_SORMAS_SHARE = Partager des données d'une instance SORMAS à une autre -UserRight.SORMAS_TO_SORMAS_PROCESS = Partages de processus -UserRight.EXTERNAL_SURVEILLANCE_SHARE = Envoyer des données à un outil de surveillance externe -UserRight.EXTERNAL_SURVEILLANCE_DELETE = Supprimer les données dans l'outil de surveillance externe -UserRight.EXTERNAL_MESSAGE_VIEW = Afficher et récupérer des messages -UserRight.EXTERNAL_MESSAGE_PROCESS = Travailler avec les messages -UserRight.EXTERNAL_MESSAGE_PUSH = Push external messages to the system -UserRight.EXTERNAL_MESSAGE_DELETE = Supprimer messages des personnes du système -UserRight.CASE_SHARE = Partagez des cas avec tout le pays -UserRight.IMMUNIZATION_VIEW = Voir les immunisations et vaccinations existantes -UserRight.IMMUNIZATION_VIEW_ARCHIVED = View archived immunizations and vaccinations -UserRight.IMMUNIZATION_CREATE = Créer des nouvelles immunisations et vaccinations -UserRight.IMMUNIZATION_EDIT = Modifier les immunisations et vaccinations existantes -UserRight.IMMUNIZATION_DELETE = Supprimer les immunisations et les vaccinations du système -UserRight.IMMUNIZATION_ARCHIVE = Archiver les vaccinations -UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_VIEW = View existing adverse events following immunization -UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_CREATE = Create new adverse event following immunization -UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_EDIT = Edit existing adverse event following immunization -UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_DELETE = Delete adverse events following immunization from the system -UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_ARCHIVE = Archive adverse events following immunization -UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_EXPORT = Export adverse events following immunization -UserRight.PERSON_EXPORT = Exporter des personnes -UserRight.CONTACT_MERGE = Fusionner les contacts -UserRight.EVENTGROUP_CREATE = Créer de nouveaux groupes d'événements -UserRight.EVENTGROUP_EDIT = Modifier les groupes d'événements existants -UserRight.EVENTGROUP_LINK = Lier des événements à des groupes d'événements -UserRight.EVENTGROUP_ARCHIVE = Archiver des groupes d'événements -UserRight.EVENTGROUP_DELETE = Supprimer des groupes d'événements du système -UserRight.EVENTGROUP_VIEW_ARCHIVED = View archived event groups from the system -UserRight.TRAVEL_ENTRY_MANAGEMENT_ACCESS = Accéder à l'annuaire des entrées de voyage -UserRight.TRAVEL_ENTRY_VIEW = Voir les entrées de voyage existantes -UserRight.TRAVEL_ENTRY_VIEW_ARCHIVED = View archived travel entries -UserRight.TRAVEL_ENTRY_CREATE = Créer de nouvelles entrées de voyage -UserRight.TRAVEL_ENTRY_EDIT = Modifier les entrées de voyage existantes -UserRight.TRAVEL_ENTRY_DELETE = Supprimer les entrées de voyage du système -UserRight.TRAVEL_ENTRY_ARCHIVE = Archiver les entrées de voyage -UserRight.EXPORT_DATA_PROTECTION_DATA = Exporter les données de protection des données -UserRight.OUTBREAK_VIEW = Voir les éclosions -UserRight.OUTBREAK_EDIT = Modifier les éclosions -UserRight.PERFORM_BULK_OPERATIONS_PSEUDONYM = Effectuer une pseudonomisation en masse -UserRight.SORMAS_TO_SORMAS_CLIENT = Client Sormas à Sormas -UserRight.SORMAS_REST = Accéder à Sormas REST -UserRight.EXTERNAL_VISITS = Visites externes -UserRight.SORMAS_UI = Accéder à l'interface utilisateur de Sormas -UserRight.DEV_MODE = Accéder aux options de développement -UserRight.CUSTOMIZABLE_ENUM_MANAGEMENT = Gérer les enums personnalisables -UserRight.DOCUMENT_VIEW = Afficher les documents existants -UserRight.DOCUMENT_UPLOAD = Charger des documents -UserRight.DOCUMENT_DELETE = Supprimer les documents du système -UserRight.PERSON_MERGE = Fusionner des personnes -UserRight.ENVIRONMENT_VIEW = View existing environments -UserRight.ENVIRONMENT_CREATE = Create new environments -UserRight.ENVIRONMENT_EDIT = Edit existing environments -UserRight.ENVIRONMENT_ARCHIVE = Archive environments -UserRight.ENVIRONMENT_VIEW_ARCHIVED = View archived environments -UserRight.ENVIRONMENT_DELETE = Delete environments from the system -UserRight.ENVIRONMENT_IMPORT = Import environments -UserRight.ENVIRONMENT_EXPORT = Export environments -UserRight.ENVIRONMENT_SAMPLE_VIEW = View existing environment samples -UserRight.ENVIRONMENT_SAMPLE_CREATE = Create new environment samples -UserRight.ENVIRONMENT_SAMPLE_EDIT = Edit existing environment samples -UserRight.ENVIRONMENT_SAMPLE_EDIT_DISPATCH = Edit environment samples dispatch information -UserRight.ENVIRONMENT_SAMPLE_EDIT_RECEIVAL = Edit environment samples receival information -UserRight.ENVIRONMENT_SAMPLE_DELETE = Delete environment samples from the system -UserRight.ENVIRONMENT_SAMPLE_IMPORT = Import environment samples -UserRight.ENVIRONMENT_SAMPLE_EXPORT = Export environment samples -UserRight.ENVIRONMENT_PATHOGEN_TEST_CREATE = Create environment sample pathogen tests -UserRight.ENVIRONMENT_PATHOGEN_TEST_EDIT = Edit environment sample pathogen tests -UserRight.ENVIRONMENT_PATHOGEN_TEST_DELETE = Delete environment sample pathogen tests +UserRight.CASE_ARCHIVE=Cas archivés +UserRight.CASE_CHANGE_DISEASE=Modifier la maladie de cas +UserRight.CASE_CHANGE_EPID_NUMBER=Modifier le numéro d'épidémie de cas +UserRight.CASE_CLASSIFY=Modifier la classification et l'issue du cas +UserRight.CASE_CREATE=Créer de nouveaux cas +UserRight.CASE_DELETE=Supprimer les cas du système +UserRight.CASE_EDIT=Modifier les cas existants +UserRight.CASE_EXPORT=Exporter des cas de SORMAS +UserRight.CASE_IMPORT=Importer des cas dans SORMAS +UserRight.CASE_INVESTIGATE=Modifier le statut de l'enquête de cas +UserRight.CASE_TRANSFER=Transférer des cas vers une autre région/département/établissement +UserRight.CASE_REFER_FROM_POE=Référez le cas à partir du point d'entrée +UserRight.CASE_RESPONSIBLE=Peut être responsable d'un cas +UserRight.CASE_VIEW=Voir les cas existants +UserRight.CASE_VIEW_ARCHIVED=View archived cases +UserRight.CONTACT_ASSIGN=Attribuer des contacts aux officiers +UserRight.CONTACT_CLASSIFY=Modifier la classification des contacts +UserRight.CONTACT_CONVERT=Créer les cas résultant des contacts +UserRight.CONTACT_CREATE=Créer de nouveaux contacts +UserRight.CONTACT_IMPORT=Importer des contacts +UserRight.CONTACT_DELETE=Supprimer les contacts du système +UserRight.CONTACT_EDIT=Modifier les contacts existants +UserRight.CONTACT_EXPORT=Exporter les contacts de SORMAS +UserRight.CONTACT_RESPONSIBLE=Peut être responsable d'un contact +UserRight.CONTACT_VIEW=Voir les contacts existants +UserRight.CONTACT_VIEW_ARCHIVED=View archived contacts +UserRight.CONTACT_ARCHIVE=Archiver les contacts +UserRight.DASHBOARD_CONTACT_VIEW=Accéder au tableau de bord du superviseur de contacts +UserRight.DASHBOARD_SURVEILLANCE_VIEW=Accéder au tableau de bord du superviseur de surveillance +UserRight.DASHBOARD_SAMPLES_VIEW=Accéder au tableau de bord des échantillons +UserRight.DATABASE_EXPORT_ACCESS=Exporter toute la base de données +UserRight.EVENT_ARCHIVE=Archiver les événements +UserRight.EVENT_CREATE=Créer un nouvel évènement +UserRight.EVENT_EDIT=Modifier des événements existants +UserRight.EVENT_EXPORT=Exporter les événements de SORMAS +UserRight.EVENT_RESPONSIBLE=Peut-être responsable d'un événement +UserRight.EVENT_VIEW=Modifier des événements existants +UserRight.EVENT_VIEW_ARCHIVED=View archived events +UserRight.EVENTPARTICIPANT_CREATE=Créer de nouveaux participants à l'événement +UserRight.EVENTPARTICIPANT_EDIT=Modifier les participants de l'événement existant +UserRight.EVENTPARTICIPANT_ARCHIVE=Archives des participants à l'événement +UserRight.EVENTPARTICIPANT_VIEW=Afficher les participants à l'événement existant +UserRight.EVENTPARTICIPANT_VIEW_ARCHIVED=View archived event participants +UserRight.INFRASTRUCTURE_CREATE=Créer de nouvelles régions/départements/communautés/établissements de santé +UserRight.INFRASTRUCTURE_EDIT=Créer des régions/départements/communautés/établissements de santé +UserRight.INFRASTRUCTURE_VIEW=Voir les régions/départements/communautés/établissements de santé du système +UserRight.INFRASTRUCTURE_VIEW_ARCHIVED=View archived infrastructure data +UserRight.PERFORM_BULK_OPERATIONS=Effectuer des opérations en bloc dans des listes +UserRight.SAMPLE_CREATE=Créer de nouveaux échantillons +UserRight.SAMPLE_EDIT=Modifier les échantillons existants +UserRight.SAMPLE_EXPORT=Exporter les échantillons de SORMAS +UserRight.SAMPLE_DELETE=Supprimer les échantillons du système +UserRight.SAMPLE_SEE_ARCHIVED=Afficher les échantillons archivés +UserRight.SAMPLE_TRANSFER=Transférer des échantillons dans un autre laboratoire +UserRight.SAMPLE_VIEW=Afficher les échantillons existants +UserRight.SAMPLETEST_CREATE=Créer de nouveaux tests d'échantillons +UserRight.SAMPLETEST_EDIT=Modifier les tests d'échantillons existants +UserRight.STATISTICS_EXPORT=Exporter les statistiques détaillées de SORMAS +UserRight.TASK_ASSIGN=Attribuer des tâches aux utilisateurs +UserRight.TASK_CREATE=Créer une nouvelle tâche +UserRight.TASK_EDIT=Modifier les tâches existantes +UserRight.TASK_SEE_ARCHIVED=Afficher les tâches archivées +UserRight.TASK_VIEW=Modifier les tâches existantes +UserRight.TASK_VIEW_ARCHIVED=View archived tasks +UserRight.USER_CREATE=Créer nouvel utilisateur +UserRight.USER_EDIT=Modifier les utilisateurs existants +UserRight.USER_VIEW=Afficher les utilisateurs existants +UserRight.USER_ROLE_EDIT=Modifier les rôles d'utilisateur existants +UserRight.USER_ROLE_DELETE=Supprimer les rôles d'utilisateur du système +UserRight.USER_ROLE_VIEW=Afficher les rôles d'utilisateur existants +UserRight.VISIT_CREATE=Créer une nouvelle visite +UserRight.VISIT_EDIT=Modifier les visites existantes +UserRight.WEEKLYREPORT_CREATE=Créer des rapports hebdomadaires +UserRight.WEEKLYREPORT_VIEW=Voir les rapports hebdomadaires +UserRight.CASE_MERGE=Fusionner les cas +UserRight.PERSON_VIEW=Voir les personnes existantes +UserRight.PERSON_EDIT=Modifier les personnes existantes +UserRight.PERSON_DELETE=Supprimer des personnes du système +UserRight.PERSON_CONTACT_DETAILS_DELETE=Supprimer les coordonnées de la personne +UserRight.SAMPLE_EDIT_NOT_OWNED=Modifier les échantillons signalés par d'autres utilisateurs +UserRight.PATHOGEN_TEST_CREATE=Créer de nouveaux tests de pathogène +UserRight.PATHOGEN_TEST_EDIT=Modifier les tests pathogènes existants +UserRight.PATHOGEN_TEST_DELETE=Supprimer les tests d'agent pathogène du système +UserRight.ADDITIONAL_TEST_VIEW=Voir les tests supplémentaires existants +UserRight.ADDITIONAL_TEST_CREATE=Créer de nouveaux tests supplémentaires +UserRight.ADDITIONAL_TEST_EDIT=Modifier les tests supplémentaires existants +UserRight.ADDITIONAL_TEST_DELETE=Supprimer les tests supplémentaires du système +UserRight.CONTACT_REASSIGN_CASE=Réassigner la casse source des contacts +UserRight.MANAGE_EXTERNAL_SYMPTOM_JOURNAL=Gérer le journal de symptômes externe +UserRight.VISIT_DELETE=Supprimer les visites du système +UserRight.VISIT_EXPORT=Exporter les visites depuis SORMAS +UserRight.TASK_DELETE=Supprimer les tâches du système +UserRight.TASK_EXPORT=Exporter les tâches depuis SORMAS +UserRight.TASK_ARCHIVE=Tâches d'archivage +UserRight.ACTION_CREATE=Créer de nouvelles actions +UserRight.ACTION_DELETE=Supprimer les actions du système +UserRight.ACTION_EDIT=Modifier les actions existantes +UserRight.EVENT_IMPORT=Importer des événements +UserRight.EVENT_DELETE=Supprimer les événements du système +UserRight.EVENTPARTICIPANT_DELETE=Supprimer les participants de l'événement du système +UserRight.EVENTPARTICIPANT_IMPORT=Importer les participants à l'événement +UserRight.SEND_MANUAL_EXTERNAL_MESSAGES=Envoyer des messages externes manuels +UserRight.STATISTICS_ACCESS=Statistiques d'accès +UserRight.MANAGE_PUBLIC_EXPORT_CONFIGURATION=Gérer les configurations d'exportation publiques +UserRight.INFRASTRUCTURE_EXPORT=Exporter les données d'infrastructure depuis SORMAS +UserRight.INFRASTRUCTURE_IMPORT=Importer des données d'infrastructure +UserRight.INFRASTRUCTURE_ARCHIVE=Archiver les données d'infrastructure +UserRight.DASHBOARD_CONTACT_VIEW_TRANSMISSION_CHAINS=Afficher les chaînes de transmission des contacts sur le tableau de bord +UserRight.DASHBOARD_CAMPAIGNS_VIEW=Accéder au tableau de bord des campagnes +UserRight.CASE_CLINICIAN_VIEW=Accéder aux sections de cas concernées par le clinicien +UserRight.THERAPY_VIEW=Voir les thérapies existantes +UserRight.PRESCRIPTION_CREATE=Créer de nouvelles ordonnances +UserRight.PRESCRIPTION_EDIT=Modifier les ordonnances existantes +UserRight.PRESCRIPTION_DELETE=Supprimer les ordonnances du système +UserRight.TREATMENT_CREATE=Créer de nouveaux traitements +UserRight.TREATMENT_EDIT=Modifier les traitements existants +UserRight.TREATMENT_DELETE=Supprimer les traitements du système +UserRight.CLINICAL_COURSE_VIEW=Voir le cours clinique des cas +UserRight.CLINICAL_COURSE_EDIT=Modifier le cours clinique des cas +UserRight.CLINICAL_VISIT_CREATE=Créer de nouvelles visites cliniques +UserRight.CLINICAL_VISIT_EDIT=Modifier les consultations cliniques existantes +UserRight.CLINICAL_VISIT_DELETE=Supprimer les visites cliniques du système +UserRight.PORT_HEALTH_INFO_VIEW=Voir les informations sur la santé du port +UserRight.PORT_HEALTH_INFO_EDIT=Modifier les informations existantes sur la santé du port +UserRight.POPULATION_MANAGE=Gérer les données de la population +UserRight.DOCUMENT_TEMPLATE_MANAGEMENT=Gérer les modèles de document +UserRight.QUARANTINE_ORDER_CREATE=Créer de nouvelles commandes de quarantaine +UserRight.LINE_LISTING_CONFIGURE=Configurer la liste de lignes +UserRight.AGGREGATE_REPORT_VIEW=Créer un nouveau rapport agrégé +UserRight.AGGREGATE_REPORT_EXPORT=Exporter les rapports agrégés depuis SORMAS +UserRight.AGGREGATE_REPORT_EDIT=Modifier les rapports agrégés existants +UserRight.SEE_PERSONAL_DATA_IN_JURISDICTION=Voir les données personnelles dans la juridiction +UserRight.SEE_PERSONAL_DATA_OUTSIDE_JURISDICTION=Voir les données personnelles en dehors de la juridiction +UserRight.SEE_SENSITIVE_DATA_IN_JURISDICTION=Voir les données sensibles dans la juridiction +UserRight.SEE_SENSITIVE_DATA_OUTSIDE_JURISDICTION=Voir les données sensibles hors juridiction +UserRight.CAMPAIGN_VIEW=Voir les campagnes existantes +UserRight.CAMPAIGN_VIEW_ARCHIVED=View archived campaigns +UserRight.CAMPAIGN_EDIT=Modifier les campagnes existantes +UserRight.CAMPAIGN_ARCHIVE=Campagnes archivées +UserRight.CAMPAIGN_DELETE=Supprimer les actions du système +UserRight.CAMPAIGN_FORM_DATA_VIEW=Afficher les données du formulaire de campagne existant +UserRight.CAMPAIGN_FORM_DATA_VIEW_ARCHIVED=View archived campaign form data +UserRight.CAMPAIGN_FORM_DATA_EDIT=Modifier les données du formulaire de campagne existant +UserRight.CAMPAIGN_FORM_DATA_ARCHIVE=Archiver les données du formulaire de campagne +UserRight.CAMPAIGN_FORM_DATA_DELETE=Supprimer les données du formulaire de campagne du système +UserRight.CAMPAIGN_FORM_DATA_EXPORT=Exporter les données du formulaire de campagne depuis SORMAS +UserRight.BAG_EXPORT=Effectuer l'exportation BAG +UserRight.SORMAS_TO_SORMAS_SHARE=Partager des données d'une instance SORMAS à une autre +UserRight.SORMAS_TO_SORMAS_PROCESS=Partages de processus +UserRight.EXTERNAL_SURVEILLANCE_SHARE=Envoyer des données à un outil de surveillance externe +UserRight.EXTERNAL_SURVEILLANCE_DELETE=Supprimer les données dans l'outil de surveillance externe +UserRight.EXTERNAL_MESSAGE_VIEW=Afficher et récupérer des messages +UserRight.EXTERNAL_MESSAGE_PROCESS=Travailler avec les messages +UserRight.EXTERNAL_MESSAGE_PUSH=Push external messages to the system +UserRight.EXTERNAL_MESSAGE_DELETE=Supprimer messages des personnes du système +UserRight.CASE_SHARE=Partagez des cas avec tout le pays +UserRight.IMMUNIZATION_VIEW=Voir les immunisations et vaccinations existantes +UserRight.IMMUNIZATION_VIEW_ARCHIVED=View archived immunizations and vaccinations +UserRight.IMMUNIZATION_CREATE=Créer des nouvelles immunisations et vaccinations +UserRight.IMMUNIZATION_EDIT=Modifier les immunisations et vaccinations existantes +UserRight.IMMUNIZATION_DELETE=Supprimer les immunisations et les vaccinations du système +UserRight.IMMUNIZATION_ARCHIVE=Archiver les vaccinations +UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_VIEW=View existing adverse events following immunization +UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_CREATE=Create new adverse event following immunization +UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_EDIT=Edit existing adverse event following immunization +UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_DELETE=Delete adverse events following immunization from the system +UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_ARCHIVE=Archive adverse events following immunization +UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_EXPORT=Export adverse events following immunization +UserRight.PERSON_EXPORT=Exporter des personnes +UserRight.CONTACT_MERGE=Fusionner les contacts +UserRight.EVENTGROUP_CREATE=Créer de nouveaux groupes d'événements +UserRight.EVENTGROUP_EDIT=Modifier les groupes d'événements existants +UserRight.EVENTGROUP_LINK=Lier des événements à des groupes d'événements +UserRight.EVENTGROUP_ARCHIVE=Archiver des groupes d'événements +UserRight.EVENTGROUP_DELETE=Supprimer des groupes d'événements du système +UserRight.EVENTGROUP_VIEW_ARCHIVED=View archived event groups from the system +UserRight.TRAVEL_ENTRY_MANAGEMENT_ACCESS=Accéder à l'annuaire des entrées de voyage +UserRight.TRAVEL_ENTRY_VIEW=Voir les entrées de voyage existantes +UserRight.TRAVEL_ENTRY_VIEW_ARCHIVED=View archived travel entries +UserRight.TRAVEL_ENTRY_CREATE=Créer de nouvelles entrées de voyage +UserRight.TRAVEL_ENTRY_EDIT=Modifier les entrées de voyage existantes +UserRight.TRAVEL_ENTRY_DELETE=Supprimer les entrées de voyage du système +UserRight.TRAVEL_ENTRY_ARCHIVE=Archiver les entrées de voyage +UserRight.EXPORT_DATA_PROTECTION_DATA=Exporter les données de protection des données +UserRight.OUTBREAK_VIEW=Voir les éclosions +UserRight.OUTBREAK_EDIT=Modifier les éclosions +UserRight.PERFORM_BULK_OPERATIONS_PSEUDONYM=Effectuer une pseudonomisation en masse +UserRight.SORMAS_TO_SORMAS_CLIENT=Client Sormas à Sormas +UserRight.SORMAS_REST=Accéder à Sormas REST +UserRight.EXTERNAL_VISITS=Visites externes +UserRight.SORMAS_UI=Accéder à l'interface utilisateur de Sormas +UserRight.DEV_MODE=Accéder aux options de développement +UserRight.CUSTOMIZABLE_ENUM_MANAGEMENT=Gérer les enums personnalisables +UserRight.DOCUMENT_VIEW=Afficher les documents existants +UserRight.DOCUMENT_UPLOAD=Charger des documents +UserRight.DOCUMENT_DELETE=Supprimer les documents du système +UserRight.PERSON_MERGE=Fusionner des personnes +UserRight.ENVIRONMENT_VIEW=View existing environments +UserRight.ENVIRONMENT_CREATE=Create new environments +UserRight.ENVIRONMENT_EDIT=Edit existing environments +UserRight.ENVIRONMENT_ARCHIVE=Archive environments +UserRight.ENVIRONMENT_VIEW_ARCHIVED=View archived environments +UserRight.ENVIRONMENT_DELETE=Delete environments from the system +UserRight.ENVIRONMENT_IMPORT=Import environments +UserRight.ENVIRONMENT_EXPORT=Export environments +UserRight.ENVIRONMENT_SAMPLE_VIEW=View existing environment samples +UserRight.ENVIRONMENT_SAMPLE_CREATE=Create new environment samples +UserRight.ENVIRONMENT_SAMPLE_EDIT=Edit existing environment samples +UserRight.ENVIRONMENT_SAMPLE_EDIT_DISPATCH=Edit environment samples dispatch information +UserRight.ENVIRONMENT_SAMPLE_EDIT_RECEIVAL=Edit environment samples receival information +UserRight.ENVIRONMENT_SAMPLE_DELETE=Delete environment samples from the system +UserRight.ENVIRONMENT_SAMPLE_IMPORT=Import environment samples +UserRight.ENVIRONMENT_SAMPLE_EXPORT=Export environment samples +UserRight.ENVIRONMENT_PATHOGEN_TEST_CREATE=Create environment sample pathogen tests +UserRight.ENVIRONMENT_PATHOGEN_TEST_EDIT=Edit environment sample pathogen tests +UserRight.ENVIRONMENT_PATHOGEN_TEST_DELETE=Delete environment sample pathogen tests UserRight.EMAIL_TEMPLATE_MANAGEMENT=Gérer les modèles d'e-mail UserRight.EXTERNAL_EMAIL_SEND=Envoyer des e-mails externes UserRight.EXTERNAL_EMAIL_ATTACH_DOCUMENTS=Joindre des documents aux e-mails externes @@ -1629,216 +1496,215 @@ UserRight.SELF_REPORT_EXPORT=Export self reports UserRight.SELF_REPORT_IMPORT=Import self reports UserRight.SELF_REPORT_PROCESS=Process self reports UserRight.SELF_REPORT_VIEW=View self reports - # UserRight descriptions -UserRight.Desc.CASE_ARCHIVE = Capable d'archiver les cas -UserRight.Desc.CASE_CHANGE_DISEASE = Capable de modifier l'épidémie de cas -UserRight.Desc.CASE_CHANGE_EPID_NUMBER = Capable de modifier le numéro d'épidémie de cas -UserRight.Desc.CASE_CLASSIFY = Modifier la classification et l'issue du cas -UserRight.Desc.CASE_CREATE = En mesure de créer de nouveaux cas -UserRight.Desc.CASE_DELETE = Capable de supprimer des cas du système -UserRight.Desc.CASE_EDIT = Capable de modifier les cas existants -UserRight.Desc.CASE_EXPORT = Capable d'exporter des cas depuis SORMAS -UserRight.Desc.CASE_IMPORT = Capable d'importer des cas dans SORMAS -UserRight.Desc.CASE_INVESTIGATE = Capable de modifier le statut de l'enquête de cas -UserRight.Desc.CASE_TRANSFER = Capable de transférer des cas dans une autre région/district/établissement -UserRight.Desc.CASE_REFER_FROM_POE = Référez le cas à partir du point d'entrée -UserRight.Desc.CASE_RESPONSIBLE = Peut être responsable d'un cas -UserRight.Desc.CASE_VIEW = Capable de voir les cas existants -UserRight.Desc.CASE_VIEW_ARCHIVED = Able to view archived cases -UserRight.Desc.CONTACT_ASSIGN = Capable d'assigner des contacts aux officiers -UserRight.Desc.CONTACT_CLASSIFY = Permet de modifier la classification des contacts -UserRight.Desc.CONTACT_CONVERT = Capable de créer les cas résultant des contacts -UserRight.Desc.CONTACT_CREATE = Capable de créer de nouveaux contacts -UserRight.Desc.CONTACT_IMPORT = Capable d'importer les contacts -UserRight.Desc.CONTACT_DELETE = Capable de supprimer des contacts du système -UserRight.Desc.CONTACT_EDIT = Capable de modifier les contacts existants -UserRight.Desc.CONTACT_EXPORT = Capable d'exporter des contacts depuis SORMAS -UserRight.Desc.CONTACT_RESPONSIBLE = Peut-être responsable d'un contact -UserRight.Desc.CONTACT_VIEW = Capable de voir les contacts existants -UserRight.Desc.CONTACT_VIEW_ARCHIVED = Able to view archived contacts -UserRight.Desc.CONTACT_ARCHIVE = Capable d'archiver les contacts -UserRight.Desc.DASHBOARD_CONTACT_VIEW = Capable d'accéder au tableau de bord du superviseur de contact -UserRight.Desc.DASHBOARD_SURVEILLANCE_VIEW = Capable d'accéder au tableau de bord du superviseur de surveillance -UserRight.Desc.DATABASE_EXPORT_ACCESS = Capable d'exporter toute la base de données -UserRight.Desc.EVENT_ARCHIVE = Capable d'archiver des événements -UserRight.Desc.EVENT_CREATE = Capable de créer de nouveaux événements -UserRight.Desc.EVENT_EDIT = Capable de modifier des événements existants -UserRight.Desc.EVENT_EXPORT = Capable d'exporter des événements depuis SORMAS -UserRight.Desc.EVENT_RESPONSIBLE = Peut être responsable d'un événement -UserRight.Desc.EVENT_VIEW = Capable de voir les événements existants -UserRight.Desc.EVENT_VIEW_ARCHIVED = Able to view archived events -UserRight.Desc.EVENTPARTICIPANT_CREATE = Capable de créer de nouveaux participants à l'événement -UserRight.Desc.EVENTPARTICIPANT_EDIT = Capable de modifier les participants à un événement existant -UserRight.Desc.EVENTPARTICIPANT_ARCHIVE = Capable d'archiver les participants à l'événement -UserRight.Desc.EVENTPARTICIPANT_VIEW = Capable de voir les participants à un événement existant -UserRight.Desc.EVENTPARTICIPANT_VIEW_ARCHIVED = Able to view archived event participants -UserRight.Desc.INFRASTRUCTURE_CREATE = Capable de créer de nouvelles régions/départements/communautés/établissements de santé -UserRight.Desc.INFRASTRUCTURE_EDIT = Capable de modifier de nouvelles régions/départements/communautés/établissements de santé -UserRight.Desc.INFRASTRUCTURE_VIEW = Capable de voir les régions/départements/communautés/établissements de santé du système -UserRight.Desc.INFRASTRUCTURE_VIEW_ARCHIVED = Able to view archived infrastructure data -UserRight.Desc.PERFORM_BULK_OPERATIONS = Capable d'effectuer des opérations en bloc dans les listes -UserRight.Desc.SAMPLE_CREATE = Capable de créer de nouveaux échantillons -UserRight.Desc.SAMPLE_EDIT = Capable d'éditer des échantillons existants -UserRight.Desc.SAMPLE_EXPORT = Capable d'exporter des échantillons de SORMAS -UserRight.Desc.SAMPLE_DELETE = Capable de supprimer des échantillons du système -UserRight.Desc.SAMPLE_TRANSFER = Capable de transférer des échantillons vers un autre laboratoire -UserRight.Desc.SAMPLE_VIEW = Able to view existing samples -UserRight.Desc.SAMPLETEST_CREATE = Capable de créer de nouveaux exemples de tests -UserRight.Desc.SAMPLETEST_EDIT = Capable de modifier des exemples de tests existants -UserRight.Desc.STATISTICS_EXPORT = Capable d'exporter des statistiques détaillées depuis SORMAS -UserRight.Desc.TASK_ASSIGN = Capable d'attribuer des tâches aux utilisateurs -UserRight.Desc.TASK_CREATE = Capable de créer de nouvelles tâches -UserRight.Desc.TASK_EDIT = Capable de modifier des tâches existantes -UserRight.Desc.TASK_VIEW = Capable d'afficher les tâches existantes -UserRight.Desc.TASK_VIEW_ARCHIVED = Able to view archived tasks -UserRight.Desc.TASK_ARCHIVE = Capable d'archiver les tâches -UserRight.Desc.USER_CREATE = Capable de créer de nouveaux utilisateurs -UserRight.Desc.USER_EDIT = Capable de modifier les utilisateurs existants -UserRight.Desc.USER_VIEW = Capable de voir les utilisateurs existants -UserRight.Desc.VISIT_CREATE = Capable de créer de nouvelles visites -UserRight.Desc.VISIT_EDIT = Capable de modifier des visites existantes -UserRight.Desc.WEEKLYREPORT_CREATE = Capable de créer les rapports hebdomadaires -UserRight.Desc.WEEKLYREPORT_VIEW = Capable de voir les rapports hebdomadaires -UserRight.Desc.CASE_MERGE = Capable de fusionner les cas -UserRight.Desc.PERSON_VIEW = Capable de voir les personnes existantes -UserRight.Desc.PERSON_EDIT = Capable de modifier les personnes existantes -UserRight.Desc.PERSON_DELETE = Capable de supprimer des personnes du système -UserRight.Desc.PERSON_CONTACT_DETAILS_DELETE = Capable de supprimer les coordonnées de la personne -UserRight.Desc.SAMPLE_EDIT_NOT_OWNED = Capable de modifier les échantillons signalés par d'autres utilisateurs -UserRight.Desc.PATHOGEN_TEST_CREATE = Capable de créer de nouveaux tests de pathogène -UserRight.Desc.PATHOGEN_TEST_EDIT = Capable de modifier les tests pathogènes existants -UserRight.Desc.PATHOGEN_TEST_DELETE = Capable de supprimer les tests d'agent pathogène du système -UserRight.Desc.ADDITIONAL_TEST_VIEW = Capable de voir les tests supplémentaires existants -UserRight.Desc.ADDITIONAL_TEST_CREATE = Capable de créer de nouveaux tests supplémentaires -UserRight.Desc.ADDITIONAL_TEST_EDIT = Capable de modifier les tests supplémentaires existants -UserRight.Desc.ADDITIONAL_TEST_DELETE = Capable de supprimer les tests supplémentaires du système -UserRight.Desc.CONTACT_REASSIGN_CASE = Capable de réaffecter le cas source des contacts -UserRight.Desc.MANAGE_EXTERNAL_SYMPTOM_JOURNAL = Capable de gérer le journal de symptômes externe -UserRight.Desc.VISIT_DELETE = Capable de supprimer des visites du système -UserRight.Desc.VISIT_EXPORT = Capable d'exporter des visites depuis SORMAS -UserRight.Desc.TASK_DELETE = Capable de supprimer des tâches du système -UserRight.Desc.TASK_EXPORT = Capable d'exporter des tâches depuis SORMAS -UserRight.Desc.ACTION_CREATE = Capable de créer de nouvelles actions -UserRight.Desc.ACTION_DELETE = Capable de supprimer des actions du système -UserRight.Desc.ACTION_EDIT = Capable de modifier les actions existantes -UserRight.Desc.EVENT_IMPORT = Capable d'importer des événements -UserRight.Desc.EVENT_DELETE = Capable de supprimer des événements du système -UserRight.Desc.EVENTPARTICIPANT_DELETE = Capable de supprimer les participants de l'événement du système -UserRight.Desc.EVENTPARTICIPANT_IMPORT = Capable d'importer les participants à l'événement -UserRight.Desc.SEND_MANUAL_EXTERNAL_MESSAGES = Capable d'envoyer des messages externes manuels -UserRight.Desc.STATISTICS_ACCESS = Capable d'accéder aux statistiques -UserRight.Desc.MANAGE_PUBLIC_EXPORT_CONFIGURATION = Capable de gérer les configurations d'exportation publiques -UserRight.Desc.INFRASTRUCTURE_EXPORT = Capable d'exporter les données d'infrastructure depuis SORMAS -UserRight.Desc.INFRASTRUCTURE_IMPORT = Capable d'importer des données d'infrastructure -UserRight.Desc.INFRASTRUCTURE_ARCHIVE = Capable d'archiver des données d'infrastructure -UserRight.Desc.DASHBOARD_CONTACT_VIEW_TRANSMISSION_CHAINS = Capable de voir les chaînes de transmission des contacts sur le tableau de bord -UserRight.Desc.DASHBOARD_CAMPAIGNS_VIEW = Capable d'accéder au tableau de bord des campagnes -UserRight.Desc.CASE_CLINICIAN_VIEW = Capable d'accéder aux sections de cas concernées par le clinicien -UserRight.Desc.THERAPY_VIEW = Capable de voir les thérapies existantes -UserRight.Desc.PRESCRIPTION_CREATE = Capable de créer de nouvelles ordonnances -UserRight.Desc.PRESCRIPTION_EDIT = Capable de modifier les ordonnances existantes -UserRight.Desc.PRESCRIPTION_DELETE = Capable de supprimer les ordonnances du système -UserRight.Desc.TREATMENT_CREATE = Capable de créer de nouveaux traitements -UserRight.Desc.TREATMENT_EDIT = Capable de modifier les traitements existants -UserRight.Desc.TREATMENT_DELETE = Capable de supprimer les traitements du système -UserRight.Desc.CLINICAL_COURSE_VIEW = Capable de voir le cours clinique des cas -UserRight.Desc.CLINICAL_COURSE_EDIT = Capable de modifier le cours clinique des cas -UserRight.Desc.CLINICAL_VISIT_CREATE = Capable de créer de nouvelles visites cliniques -UserRight.Desc.CLINICAL_VISIT_EDIT = Capable de modifier des visites cliniques existantes -UserRight.Desc.CLINICAL_VISIT_DELETE = Capable de supprimer les visites cliniques du système -UserRight.Desc.PORT_HEALTH_INFO_VIEW = Capable de voir les informations sur la santé du port -UserRight.Desc.PORT_HEALTH_INFO_EDIT = Capable de modifier les informations sur la santé du port existantes -UserRight.Desc.POPULATION_MANAGE = Capable de gérer les données de la population -UserRight.Desc.DOCUMENT_TEMPLATE_MANAGEMENT = Capable de gérer les modèles de document -UserRight.Desc.QUARANTINE_ORDER_CREATE = Capable de créer de nouvelles commandes de quarantaine -UserRight.Desc.LINE_LISTING_CONFIGURE = Capable de configurer la liste de lignes -UserRight.Desc.AGGREGATE_REPORT_VIEW = Capable de créer des nouveaux rapports agrégés -UserRight.Desc.AGGREGATE_REPORT_EXPORT = Capable d'exporter les rapports agrégés depuis SORMAS -UserRight.Desc.AGGREGATE_REPORT_EDIT = Capable de modifier les rapports agrégés existants -UserRight.Desc.SEE_PERSONAL_DATA_IN_JURISDICTION = Capable de voir les données personnelles dans la juridiction -UserRight.Desc.SEE_PERSONAL_DATA_OUTSIDE_JURISDICTION = Capable de voir les données personnelles en dehors de la juridiction -UserRight.Desc.SEE_SENSITIVE_DATA_IN_JURISDICTION = Capable de voir les données sensibles dans la juridiction -UserRight.Desc.SEE_SENSITIVE_DATA_OUTSIDE_JURISDICTION = Capable de voir les données sensibles hors juridiction -UserRight.Desc.CAMPAIGN_VIEW = Capable de voir les campagnes existantes -UserRight.Desc.CAMPAIGN_VIEW_ARCHIVED = Able to view archived campaigns -UserRight.Desc.CAMPAIGN_EDIT = Capable de modifier les campagnes existantes -UserRight.Desc.CAMPAIGN_ARCHIVE = Capable d'archiver les campagnes -UserRight.Desc.CAMPAIGN_DELETE = Capable de supprimer des campagnes du système -UserRight.Desc.CAMPAIGN_FORM_DATA_VIEW = Capable de voir les données du formulaire de campagne existant -UserRight.Desc.CAMPAIGN_FORM_DATA_VIEW_ARCHIVED = Able to view archived campaign form data -UserRight.Desc.CAMPAIGN_FORM_DATA_EDIT = Capable de modifier les données du formulaire de campagne existant -UserRight.Desc.CAMPAIGN_FORM_DATA_ARCHIVE = Capable d'archiver les données du formulaire de campagne -UserRight.Desc.CAMPAIGN_FORM_DATA_DELETE = Capable de supprimer les données du formulaire de campagne du système -UserRight.Desc.CAMPAIGN_FORM_DATA_EXPORT = Capable d'exporter les données du formulaire de campagne depuis SORMAS -UserRight.Desc.BAG_EXPORT = Capable d'effectuer l'exportation BAG -UserRight.Desc.SORMAS_TO_SORMAS_SHARE = Les utilisateurs avec ce droit peuvent initier un partage vers une autre instance SORMAS -UserRight.Desc.SORMAS_TO_SORMAS_PROCESS = Seuls les utilisateurs ayant ce droit sont autorisés à voir et à utiliser le répertoire de partage. -UserRight.Desc.EXTERNAL_SURVEILLANCE_SHARE = Permet de partager des cas ou des événements avec des outils de surveillance externes. Pour ce faire, le droit d'utilisateur de modification associé est également nécessaire. -UserRight.Desc.EXTERNAL_SURVEILLANCE_DELETE = Permet de supprimer des cas ou des événements avec des outils de surveillance externes. Pour ce faire, le droit d'utilisateur de modification associé est également nécessaire. -UserRight.Desc.EXTERNAL_MESSAGE_VIEW = Capable de voir et récupérer des messages -UserRight.Desc.EXTERNAL_MESSAGE_PROCESS = Capable de travailler avec les messages -UserRight.Desc.EXTERNAL_MESSAGE_PUSH = Able to push external messages to the system -UserRight.Desc.EXTERNAL_MESSAGE_DELETE = Capable de supprimer les messages -UserRight.Desc.CASE_SHARE = Capable de partager des cas avec tout le pays -UserRight.Desc.IMMUNIZATION_VIEW = Capable de voir les immunisations et vaccinations existantes -UserRight.Desc.IMMUNIZATION_VIEW_ARCHIVED = Able to view arhived immunizations and vaccinations -UserRight.Desc.IMMUNIZATION_CREATE = Capable de créer des nouvelles immunisations et vaccinations -UserRight.Desc.IMMUNIZATION_EDIT = Capable de modifier les immunisations et vaccinations existantes -UserRight.Desc.IMMUNIZATION_DELETE = Capable de supprimer les immunisations et les vaccinations du système -UserRight.Desc.IMMUNIZATION_ARCHIVE = Capable d'archiver les immunisations -UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_VIEW = Able to view existing adverse events following immunization -UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_CREATE = Able to create new adverse event following immunization -UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_EDIT = Able to edit existing adverse events following immunization -UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_DELETE = Able to delete adverse events following immunization from the system -UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_ARCHIVE = Able to archive adverse events following immunization -UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_EXPORT = Able to export adverse events following immunization -UserRight.Desc.PERSON_EXPORT = Capable d'exporter des personnes -UserRight.Desc.CONTACT_MERGE = Capable de fusionner les contacts -UserRight.Desc.EVENTGROUP_CREATE = Capable de créer de nouveaux groupes d'événements -UserRight.Desc.EVENTGROUP_EDIT = Capable de modifier des groupes d'événements existants -UserRight.Desc.EVENTGROUP_LINK = Capable de lier des événements à des groupes d'événements -UserRight.Desc.EVENTGROUP_ARCHIVE = Capable d'archiver des groupes d'événements -UserRight.Desc.EVENTGROUP_DELETE = Capable de supprimer des groupes d'événements du système -UserRight.Desc.EVENTGROUP_VIEW_ARCHIVED = Able to view archived event groups from the system -UserRight.Desc.TRAVEL_ENTRY_MANAGEMENT_ACCESS = Capable d'accéder au répertoire des entrées de voyage -UserRight.Desc.TRAVEL_ENTRY_VIEW = Capable de voir les entrées de voyage existantes -UserRight.Desc.TRAVEL_ENTRY_VIEW_ARCHIVED = Able to view archived travel entries -UserRight.Desc.TRAVEL_ENTRY_CREATE = Capable de créer de nouvelles entrées de voyage -UserRight.Desc.TRAVEL_ENTRY_EDIT = Capable de modifier les entrées de voyage existantes -UserRight.Desc.TRAVEL_ENTRY_DELETE = Capable de supprimer les entrées de voyage du système -UserRight.Desc.TRAVEL_ENTRY_ARCHIVE = Capable d'archiver les entrées de voyage -UserRight.Desc.EXPORT_DATA_PROTECTION_DATA = Capable d'exporter des données de protection des données -UserRight.Desc.OUTBREAK_VIEW = Capable de voir les épidémies -UserRight.Desc.OUTBREAK_EDIT = Capable de modifier les épidémies -UserRight.Desc.PERFORM_BULK_OPERATIONS_PSEUDONYM = Capable d'effectuer une pseudonomisation en masse -UserRight.Desc.SORMAS_TO_SORMAS_CLIENT = Droit d'utilisation technique pour l'interface SORMAS vers SORMAS -UserRight.Desc.SORMAS_REST = Accès à l'interface REST SORMAS -UserRight.Desc.EXTERNAL_VISITS = Capable d'accéder aux points de terminaison REST des visites externes -UserRight.Desc.SORMAS_UI = Accès à l'interface graphique SORMAS -UserRight.Desc.DEV_MODE = Possibilité d'accéder aux options du développeur dans le répertoire de configuration -UserRight.Desc.CUSTOMIZABLE_ENUM_MANAGEMENT = Capable de créer, modifier et supprimer des valeurs personnalisables -UserRight.Desc.DOCUMENT_VIEW = Capable de voir les documents existants -UserRight.Desc.DOCUMENT_UPLOAD = Capable de télécharger des documents -UserRight.Desc.DOCUMENT_DELETE = Capable de supprimer les documents du système -UserRight.Desc.PERSON_MERGE = Capable de fusionner les personnes -UserRight.Desc.ENVIRONMENT_CREATE = Able to create new environments -UserRight.Desc.ENVIRONMENT_EDIT = Able to edit existing environments -UserRight.Desc.ENVIRONMENT_ARCHIVE = Able to archive environments -UserRight.Desc.ENVIRONMENT_DELETE = Able to delete environments from the system -UserRight.Desc.ENVIRONMENT_IMPORT = Able to import environments -UserRight.Desc.ENVIRONMENT_EXPORT = Able to export environments -UserRight.Desc.ENVIRONMENT_SAMPLE_VIEW = Able to view existing environment samples -UserRight.Desc.ENVIRONMENT_SAMPLE_CREATE = Able to create new environment samples -UserRight.Desc.ENVIRONMENT_SAMPLE_EDIT = Able to edit existing environment samples -UserRight.Desc.ENVIRONMENT_SAMPLE_EDIT_DISPATCH = Able to edit environment samples dispatch information -UserRight.Desc.ENVIRONMENT_SAMPLE_EDIT_RECEIVAL = Able to edit environment samples receival information -UserRight.Desc.ENVIRONMENT_SAMPLE_DELETE = Able to delete environment samples from the system -UserRight.Desc.ENVIRONMENT_SAMPLE_IMPORT = Able to import environment samples -UserRight.Desc.ENVIRONMENT_SAMPLE_EXPORT = Able to export environment samples -UserRight.Desc.ENVIRONMENT_PATHOGEN_TEST_CREATE = Able to create environment sample pathogen tests -UserRight.Desc.ENVIRONMENT_PATHOGEN_TEST_EDIT = Able to edit environment sample pathogen tests -UserRight.Desc.ENVIRONMENT_PATHOGEN_TEST_DELETE = Able to delete environment sample pathogen tests +UserRight.Desc.CASE_ARCHIVE=Capable d'archiver les cas +UserRight.Desc.CASE_CHANGE_DISEASE=Capable de modifier l'épidémie de cas +UserRight.Desc.CASE_CHANGE_EPID_NUMBER=Capable de modifier le numéro d'épidémie de cas +UserRight.Desc.CASE_CLASSIFY=Modifier la classification et l'issue du cas +UserRight.Desc.CASE_CREATE=En mesure de créer de nouveaux cas +UserRight.Desc.CASE_DELETE=Capable de supprimer des cas du système +UserRight.Desc.CASE_EDIT=Capable de modifier les cas existants +UserRight.Desc.CASE_EXPORT=Capable d'exporter des cas depuis SORMAS +UserRight.Desc.CASE_IMPORT=Capable d'importer des cas dans SORMAS +UserRight.Desc.CASE_INVESTIGATE=Capable de modifier le statut de l'enquête de cas +UserRight.Desc.CASE_TRANSFER=Capable de transférer des cas dans une autre région/district/établissement +UserRight.Desc.CASE_REFER_FROM_POE=Référez le cas à partir du point d'entrée +UserRight.Desc.CASE_RESPONSIBLE=Peut être responsable d'un cas +UserRight.Desc.CASE_VIEW=Capable de voir les cas existants +UserRight.Desc.CASE_VIEW_ARCHIVED=Able to view archived cases +UserRight.Desc.CONTACT_ASSIGN=Capable d'assigner des contacts aux officiers +UserRight.Desc.CONTACT_CLASSIFY=Permet de modifier la classification des contacts +UserRight.Desc.CONTACT_CONVERT=Capable de créer les cas résultant des contacts +UserRight.Desc.CONTACT_CREATE=Capable de créer de nouveaux contacts +UserRight.Desc.CONTACT_IMPORT=Capable d'importer les contacts +UserRight.Desc.CONTACT_DELETE=Capable de supprimer des contacts du système +UserRight.Desc.CONTACT_EDIT=Capable de modifier les contacts existants +UserRight.Desc.CONTACT_EXPORT=Capable d'exporter des contacts depuis SORMAS +UserRight.Desc.CONTACT_RESPONSIBLE=Peut-être responsable d'un contact +UserRight.Desc.CONTACT_VIEW=Capable de voir les contacts existants +UserRight.Desc.CONTACT_VIEW_ARCHIVED=Able to view archived contacts +UserRight.Desc.CONTACT_ARCHIVE=Capable d'archiver les contacts +UserRight.Desc.DASHBOARD_CONTACT_VIEW=Capable d'accéder au tableau de bord du superviseur de contact +UserRight.Desc.DASHBOARD_SURVEILLANCE_VIEW=Capable d'accéder au tableau de bord du superviseur de surveillance +UserRight.Desc.DATABASE_EXPORT_ACCESS=Capable d'exporter toute la base de données +UserRight.Desc.EVENT_ARCHIVE=Capable d'archiver des événements +UserRight.Desc.EVENT_CREATE=Capable de créer de nouveaux événements +UserRight.Desc.EVENT_EDIT=Capable de modifier des événements existants +UserRight.Desc.EVENT_EXPORT=Capable d'exporter des événements depuis SORMAS +UserRight.Desc.EVENT_RESPONSIBLE=Peut être responsable d'un événement +UserRight.Desc.EVENT_VIEW=Capable de voir les événements existants +UserRight.Desc.EVENT_VIEW_ARCHIVED=Able to view archived events +UserRight.Desc.EVENTPARTICIPANT_CREATE=Capable de créer de nouveaux participants à l'événement +UserRight.Desc.EVENTPARTICIPANT_EDIT=Capable de modifier les participants à un événement existant +UserRight.Desc.EVENTPARTICIPANT_ARCHIVE=Capable d'archiver les participants à l'événement +UserRight.Desc.EVENTPARTICIPANT_VIEW=Capable de voir les participants à un événement existant +UserRight.Desc.EVENTPARTICIPANT_VIEW_ARCHIVED=Able to view archived event participants +UserRight.Desc.INFRASTRUCTURE_CREATE=Capable de créer de nouvelles régions/départements/communautés/établissements de santé +UserRight.Desc.INFRASTRUCTURE_EDIT=Capable de modifier de nouvelles régions/départements/communautés/établissements de santé +UserRight.Desc.INFRASTRUCTURE_VIEW=Capable de voir les régions/départements/communautés/établissements de santé du système +UserRight.Desc.INFRASTRUCTURE_VIEW_ARCHIVED=Able to view archived infrastructure data +UserRight.Desc.PERFORM_BULK_OPERATIONS=Capable d'effectuer des opérations en bloc dans les listes +UserRight.Desc.SAMPLE_CREATE=Capable de créer de nouveaux échantillons +UserRight.Desc.SAMPLE_EDIT=Capable d'éditer des échantillons existants +UserRight.Desc.SAMPLE_EXPORT=Capable d'exporter des échantillons de SORMAS +UserRight.Desc.SAMPLE_DELETE=Capable de supprimer des échantillons du système +UserRight.Desc.SAMPLE_TRANSFER=Capable de transférer des échantillons vers un autre laboratoire +UserRight.Desc.SAMPLE_VIEW=Able to view existing samples +UserRight.Desc.SAMPLETEST_CREATE=Capable de créer de nouveaux exemples de tests +UserRight.Desc.SAMPLETEST_EDIT=Capable de modifier des exemples de tests existants +UserRight.Desc.STATISTICS_EXPORT=Capable d'exporter des statistiques détaillées depuis SORMAS +UserRight.Desc.TASK_ASSIGN=Capable d'attribuer des tâches aux utilisateurs +UserRight.Desc.TASK_CREATE=Capable de créer de nouvelles tâches +UserRight.Desc.TASK_EDIT=Capable de modifier des tâches existantes +UserRight.Desc.TASK_VIEW=Capable d'afficher les tâches existantes +UserRight.Desc.TASK_VIEW_ARCHIVED=Able to view archived tasks +UserRight.Desc.TASK_ARCHIVE=Capable d'archiver les tâches +UserRight.Desc.USER_CREATE=Capable de créer de nouveaux utilisateurs +UserRight.Desc.USER_EDIT=Capable de modifier les utilisateurs existants +UserRight.Desc.USER_VIEW=Capable de voir les utilisateurs existants +UserRight.Desc.VISIT_CREATE=Capable de créer de nouvelles visites +UserRight.Desc.VISIT_EDIT=Capable de modifier des visites existantes +UserRight.Desc.WEEKLYREPORT_CREATE=Capable de créer les rapports hebdomadaires +UserRight.Desc.WEEKLYREPORT_VIEW=Capable de voir les rapports hebdomadaires +UserRight.Desc.CASE_MERGE=Capable de fusionner les cas +UserRight.Desc.PERSON_VIEW=Capable de voir les personnes existantes +UserRight.Desc.PERSON_EDIT=Capable de modifier les personnes existantes +UserRight.Desc.PERSON_DELETE=Capable de supprimer des personnes du système +UserRight.Desc.PERSON_CONTACT_DETAILS_DELETE=Capable de supprimer les coordonnées de la personne +UserRight.Desc.SAMPLE_EDIT_NOT_OWNED=Capable de modifier les échantillons signalés par d'autres utilisateurs +UserRight.Desc.PATHOGEN_TEST_CREATE=Capable de créer de nouveaux tests de pathogène +UserRight.Desc.PATHOGEN_TEST_EDIT=Capable de modifier les tests pathogènes existants +UserRight.Desc.PATHOGEN_TEST_DELETE=Capable de supprimer les tests d'agent pathogène du système +UserRight.Desc.ADDITIONAL_TEST_VIEW=Capable de voir les tests supplémentaires existants +UserRight.Desc.ADDITIONAL_TEST_CREATE=Capable de créer de nouveaux tests supplémentaires +UserRight.Desc.ADDITIONAL_TEST_EDIT=Capable de modifier les tests supplémentaires existants +UserRight.Desc.ADDITIONAL_TEST_DELETE=Capable de supprimer les tests supplémentaires du système +UserRight.Desc.CONTACT_REASSIGN_CASE=Capable de réaffecter le cas source des contacts +UserRight.Desc.MANAGE_EXTERNAL_SYMPTOM_JOURNAL=Capable de gérer le journal de symptômes externe +UserRight.Desc.VISIT_DELETE=Capable de supprimer des visites du système +UserRight.Desc.VISIT_EXPORT=Capable d'exporter des visites depuis SORMAS +UserRight.Desc.TASK_DELETE=Capable de supprimer des tâches du système +UserRight.Desc.TASK_EXPORT=Capable d'exporter des tâches depuis SORMAS +UserRight.Desc.ACTION_CREATE=Capable de créer de nouvelles actions +UserRight.Desc.ACTION_DELETE=Capable de supprimer des actions du système +UserRight.Desc.ACTION_EDIT=Capable de modifier les actions existantes +UserRight.Desc.EVENT_IMPORT=Capable d'importer des événements +UserRight.Desc.EVENT_DELETE=Capable de supprimer des événements du système +UserRight.Desc.EVENTPARTICIPANT_DELETE=Capable de supprimer les participants de l'événement du système +UserRight.Desc.EVENTPARTICIPANT_IMPORT=Capable d'importer les participants à l'événement +UserRight.Desc.SEND_MANUAL_EXTERNAL_MESSAGES=Capable d'envoyer des messages externes manuels +UserRight.Desc.STATISTICS_ACCESS=Capable d'accéder aux statistiques +UserRight.Desc.MANAGE_PUBLIC_EXPORT_CONFIGURATION=Capable de gérer les configurations d'exportation publiques +UserRight.Desc.INFRASTRUCTURE_EXPORT=Capable d'exporter les données d'infrastructure depuis SORMAS +UserRight.Desc.INFRASTRUCTURE_IMPORT=Capable d'importer des données d'infrastructure +UserRight.Desc.INFRASTRUCTURE_ARCHIVE=Capable d'archiver des données d'infrastructure +UserRight.Desc.DASHBOARD_CONTACT_VIEW_TRANSMISSION_CHAINS=Capable de voir les chaînes de transmission des contacts sur le tableau de bord +UserRight.Desc.DASHBOARD_CAMPAIGNS_VIEW=Capable d'accéder au tableau de bord des campagnes +UserRight.Desc.CASE_CLINICIAN_VIEW=Capable d'accéder aux sections de cas concernées par le clinicien +UserRight.Desc.THERAPY_VIEW=Capable de voir les thérapies existantes +UserRight.Desc.PRESCRIPTION_CREATE=Capable de créer de nouvelles ordonnances +UserRight.Desc.PRESCRIPTION_EDIT=Capable de modifier les ordonnances existantes +UserRight.Desc.PRESCRIPTION_DELETE=Capable de supprimer les ordonnances du système +UserRight.Desc.TREATMENT_CREATE=Capable de créer de nouveaux traitements +UserRight.Desc.TREATMENT_EDIT=Capable de modifier les traitements existants +UserRight.Desc.TREATMENT_DELETE=Capable de supprimer les traitements du système +UserRight.Desc.CLINICAL_COURSE_VIEW=Capable de voir le cours clinique des cas +UserRight.Desc.CLINICAL_COURSE_EDIT=Capable de modifier le cours clinique des cas +UserRight.Desc.CLINICAL_VISIT_CREATE=Capable de créer de nouvelles visites cliniques +UserRight.Desc.CLINICAL_VISIT_EDIT=Capable de modifier des visites cliniques existantes +UserRight.Desc.CLINICAL_VISIT_DELETE=Capable de supprimer les visites cliniques du système +UserRight.Desc.PORT_HEALTH_INFO_VIEW=Capable de voir les informations sur la santé du port +UserRight.Desc.PORT_HEALTH_INFO_EDIT=Capable de modifier les informations sur la santé du port existantes +UserRight.Desc.POPULATION_MANAGE=Capable de gérer les données de la population +UserRight.Desc.DOCUMENT_TEMPLATE_MANAGEMENT=Capable de gérer les modèles de document +UserRight.Desc.QUARANTINE_ORDER_CREATE=Capable de créer de nouvelles commandes de quarantaine +UserRight.Desc.LINE_LISTING_CONFIGURE=Capable de configurer la liste de lignes +UserRight.Desc.AGGREGATE_REPORT_VIEW=Capable de créer des nouveaux rapports agrégés +UserRight.Desc.AGGREGATE_REPORT_EXPORT=Capable d'exporter les rapports agrégés depuis SORMAS +UserRight.Desc.AGGREGATE_REPORT_EDIT=Capable de modifier les rapports agrégés existants +UserRight.Desc.SEE_PERSONAL_DATA_IN_JURISDICTION=Capable de voir les données personnelles dans la juridiction +UserRight.Desc.SEE_PERSONAL_DATA_OUTSIDE_JURISDICTION=Capable de voir les données personnelles en dehors de la juridiction +UserRight.Desc.SEE_SENSITIVE_DATA_IN_JURISDICTION=Capable de voir les données sensibles dans la juridiction +UserRight.Desc.SEE_SENSITIVE_DATA_OUTSIDE_JURISDICTION=Capable de voir les données sensibles hors juridiction +UserRight.Desc.CAMPAIGN_VIEW=Capable de voir les campagnes existantes +UserRight.Desc.CAMPAIGN_VIEW_ARCHIVED=Able to view archived campaigns +UserRight.Desc.CAMPAIGN_EDIT=Capable de modifier les campagnes existantes +UserRight.Desc.CAMPAIGN_ARCHIVE=Capable d'archiver les campagnes +UserRight.Desc.CAMPAIGN_DELETE=Capable de supprimer des campagnes du système +UserRight.Desc.CAMPAIGN_FORM_DATA_VIEW=Capable de voir les données du formulaire de campagne existant +UserRight.Desc.CAMPAIGN_FORM_DATA_VIEW_ARCHIVED=Able to view archived campaign form data +UserRight.Desc.CAMPAIGN_FORM_DATA_EDIT=Capable de modifier les données du formulaire de campagne existant +UserRight.Desc.CAMPAIGN_FORM_DATA_ARCHIVE=Capable d'archiver les données du formulaire de campagne +UserRight.Desc.CAMPAIGN_FORM_DATA_DELETE=Capable de supprimer les données du formulaire de campagne du système +UserRight.Desc.CAMPAIGN_FORM_DATA_EXPORT=Capable d'exporter les données du formulaire de campagne depuis SORMAS +UserRight.Desc.BAG_EXPORT=Capable d'effectuer l'exportation BAG +UserRight.Desc.SORMAS_TO_SORMAS_SHARE=Les utilisateurs avec ce droit peuvent initier un partage vers une autre instance SORMAS +UserRight.Desc.SORMAS_TO_SORMAS_PROCESS=Seuls les utilisateurs ayant ce droit sont autorisés à voir et à utiliser le répertoire de partage. +UserRight.Desc.EXTERNAL_SURVEILLANCE_SHARE=Permet de partager des cas ou des événements avec des outils de surveillance externes. Pour ce faire, le droit d'utilisateur de modification associé est également nécessaire. +UserRight.Desc.EXTERNAL_SURVEILLANCE_DELETE=Permet de supprimer des cas ou des événements avec des outils de surveillance externes. Pour ce faire, le droit d'utilisateur de modification associé est également nécessaire. +UserRight.Desc.EXTERNAL_MESSAGE_VIEW=Capable de voir et récupérer des messages +UserRight.Desc.EXTERNAL_MESSAGE_PROCESS=Capable de travailler avec les messages +UserRight.Desc.EXTERNAL_MESSAGE_PUSH=Able to push external messages to the system +UserRight.Desc.EXTERNAL_MESSAGE_DELETE=Capable de supprimer les messages +UserRight.Desc.CASE_SHARE=Capable de partager des cas avec tout le pays +UserRight.Desc.IMMUNIZATION_VIEW=Capable de voir les immunisations et vaccinations existantes +UserRight.Desc.IMMUNIZATION_VIEW_ARCHIVED=Able to view arhived immunizations and vaccinations +UserRight.Desc.IMMUNIZATION_CREATE=Capable de créer des nouvelles immunisations et vaccinations +UserRight.Desc.IMMUNIZATION_EDIT=Capable de modifier les immunisations et vaccinations existantes +UserRight.Desc.IMMUNIZATION_DELETE=Capable de supprimer les immunisations et les vaccinations du système +UserRight.Desc.IMMUNIZATION_ARCHIVE=Capable d'archiver les immunisations +UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_VIEW=Able to view existing adverse events following immunization +UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_CREATE=Able to create new adverse event following immunization +UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_EDIT=Able to edit existing adverse events following immunization +UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_DELETE=Able to delete adverse events following immunization from the system +UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_ARCHIVE=Able to archive adverse events following immunization +UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_EXPORT=Able to export adverse events following immunization +UserRight.Desc.PERSON_EXPORT=Capable d'exporter des personnes +UserRight.Desc.CONTACT_MERGE=Capable de fusionner les contacts +UserRight.Desc.EVENTGROUP_CREATE=Capable de créer de nouveaux groupes d'événements +UserRight.Desc.EVENTGROUP_EDIT=Capable de modifier des groupes d'événements existants +UserRight.Desc.EVENTGROUP_LINK=Capable de lier des événements à des groupes d'événements +UserRight.Desc.EVENTGROUP_ARCHIVE=Capable d'archiver des groupes d'événements +UserRight.Desc.EVENTGROUP_DELETE=Capable de supprimer des groupes d'événements du système +UserRight.Desc.EVENTGROUP_VIEW_ARCHIVED=Able to view archived event groups from the system +UserRight.Desc.TRAVEL_ENTRY_MANAGEMENT_ACCESS=Capable d'accéder au répertoire des entrées de voyage +UserRight.Desc.TRAVEL_ENTRY_VIEW=Capable de voir les entrées de voyage existantes +UserRight.Desc.TRAVEL_ENTRY_VIEW_ARCHIVED=Able to view archived travel entries +UserRight.Desc.TRAVEL_ENTRY_CREATE=Capable de créer de nouvelles entrées de voyage +UserRight.Desc.TRAVEL_ENTRY_EDIT=Capable de modifier les entrées de voyage existantes +UserRight.Desc.TRAVEL_ENTRY_DELETE=Capable de supprimer les entrées de voyage du système +UserRight.Desc.TRAVEL_ENTRY_ARCHIVE=Capable d'archiver les entrées de voyage +UserRight.Desc.EXPORT_DATA_PROTECTION_DATA=Capable d'exporter des données de protection des données +UserRight.Desc.OUTBREAK_VIEW=Capable de voir les épidémies +UserRight.Desc.OUTBREAK_EDIT=Capable de modifier les épidémies +UserRight.Desc.PERFORM_BULK_OPERATIONS_PSEUDONYM=Capable d'effectuer une pseudonomisation en masse +UserRight.Desc.SORMAS_TO_SORMAS_CLIENT=Droit d'utilisation technique pour l'interface SORMAS vers SORMAS +UserRight.Desc.SORMAS_REST=Accès à l'interface REST SORMAS +UserRight.Desc.EXTERNAL_VISITS=Capable d'accéder aux points de terminaison REST des visites externes +UserRight.Desc.SORMAS_UI=Accès à l'interface graphique SORMAS +UserRight.Desc.DEV_MODE=Possibilité d'accéder aux options du développeur dans le répertoire de configuration +UserRight.Desc.CUSTOMIZABLE_ENUM_MANAGEMENT=Capable de créer, modifier et supprimer des valeurs personnalisables +UserRight.Desc.DOCUMENT_VIEW=Capable de voir les documents existants +UserRight.Desc.DOCUMENT_UPLOAD=Capable de télécharger des documents +UserRight.Desc.DOCUMENT_DELETE=Capable de supprimer les documents du système +UserRight.Desc.PERSON_MERGE=Capable de fusionner les personnes +UserRight.Desc.ENVIRONMENT_CREATE=Able to create new environments +UserRight.Desc.ENVIRONMENT_EDIT=Able to edit existing environments +UserRight.Desc.ENVIRONMENT_ARCHIVE=Able to archive environments +UserRight.Desc.ENVIRONMENT_DELETE=Able to delete environments from the system +UserRight.Desc.ENVIRONMENT_IMPORT=Able to import environments +UserRight.Desc.ENVIRONMENT_EXPORT=Able to export environments +UserRight.Desc.ENVIRONMENT_SAMPLE_VIEW=Able to view existing environment samples +UserRight.Desc.ENVIRONMENT_SAMPLE_CREATE=Able to create new environment samples +UserRight.Desc.ENVIRONMENT_SAMPLE_EDIT=Able to edit existing environment samples +UserRight.Desc.ENVIRONMENT_SAMPLE_EDIT_DISPATCH=Able to edit environment samples dispatch information +UserRight.Desc.ENVIRONMENT_SAMPLE_EDIT_RECEIVAL=Able to edit environment samples receival information +UserRight.Desc.ENVIRONMENT_SAMPLE_DELETE=Able to delete environment samples from the system +UserRight.Desc.ENVIRONMENT_SAMPLE_IMPORT=Able to import environment samples +UserRight.Desc.ENVIRONMENT_SAMPLE_EXPORT=Able to export environment samples +UserRight.Desc.ENVIRONMENT_PATHOGEN_TEST_CREATE=Able to create environment sample pathogen tests +UserRight.Desc.ENVIRONMENT_PATHOGEN_TEST_EDIT=Able to edit environment sample pathogen tests +UserRight.Desc.ENVIRONMENT_PATHOGEN_TEST_DELETE=Able to delete environment sample pathogen tests UserRight.Desc.EMAIL_TEMPLATE_MANAGEMENT=Capable de gérer les modèles d'e-mail UserRight.Desc.EXTERNAL_EMAIL_SEND=Capable d'envoyer des e-mails externes UserRight.Desc.EXTERNAL_EMAIL_ATTACH_DOCUMENTS=Capable de joindre des documents à des e-mails externes @@ -1851,131 +1717,114 @@ UserRight.Desc.SELF_REPORT_EXPORT=Able to export self reports UserRight.Desc.SELF_REPORT_IMPORT=Able to import self reports UserRight.Desc.SELF_REPORT_PROCESS=Able to process self reports UserRight.Desc.SELF_REPORT_VIEW=Able to view self reports - # UserRightGroup -UserRightGroup.GENERAL = Général -UserRightGroup.DATA_PROTECTION = Protection des données -UserRightGroup.PERSON = Personnes -UserRightGroup.CASE = Surveillance des cas -UserRightGroup.CASE_MANAGEMENT = Gestion de cas -UserRightGroup.PORT_HEALTH = Santé portuaire -UserRightGroup.CONTACT = Surveillance des contacts -UserRightGroup.VISIT = Suivi -UserRightGroup.SAMPLE = Exemple de test -UserRightGroup.IMMUNIZATION = Immunisation -UserRightGroup.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION = Adverse Events Following Immunization -UserRightGroup.TRAVEL_ENTRY = Entrées de voyage -UserRightGroup.TASK = Tâches -UserRightGroup.EVENT = Évènements -UserRightGroup.AGGREGATED_REPORTING = Rapports agrégés -UserRightGroup.CAMPAIGN = Campagnes -UserRightGroup.DASHBOARD = Tableau de bord -UserRightGroup.STATISTICS = Statistiques  -UserRightGroup.EXPORT = Exporter -UserRightGroup.EXTERNAL = Système externe -UserRightGroup.USER = Utilisateurs -UserRightGroup.INFRASTRUCTURE = Infrastructure -UserRightGroup.CONFIGURATION = Configuration -UserRightGroup.DOCUMENT = Documents +UserRightGroup.GENERAL=Général +UserRightGroup.DATA_PROTECTION=Protection des données +UserRightGroup.PERSON=Personnes +UserRightGroup.CASE=Surveillance des cas +UserRightGroup.CASE_MANAGEMENT=Gestion de cas +UserRightGroup.PORT_HEALTH=Santé portuaire +UserRightGroup.CONTACT=Surveillance des contacts +UserRightGroup.VISIT=Suivi +UserRightGroup.SAMPLE=Exemple de test +UserRightGroup.IMMUNIZATION=Immunisation +UserRightGroup.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION=Adverse Events Following Immunization +UserRightGroup.TRAVEL_ENTRY=Entrées de voyage +UserRightGroup.TASK=Tâches +UserRightGroup.EVENT=Évènements +UserRightGroup.AGGREGATED_REPORTING=Rapports agrégés +UserRightGroup.CAMPAIGN=Campagnes +UserRightGroup.DASHBOARD=Tableau de bord +UserRightGroup.STATISTICS=Statistiques  +UserRightGroup.EXPORT=Exporter +UserRightGroup.EXTERNAL=Système externe +UserRightGroup.USER=Utilisateurs +UserRightGroup.INFRASTRUCTURE=Infrastructure +UserRightGroup.CONFIGURATION=Configuration +UserRightGroup.DOCUMENT=Documents UserRightGroup.EXTERNAL_EMAILS=Emails externes -UserRightGroup.ENVIRONMENT = Environments +UserRightGroup.ENVIRONMENT=Environments UserRightGroup.SELF_REPORT=Self Reports - # Vaccination -VaccinationStatus.UNKNOWN = Inconnu -VaccinationStatus.UNVACCINATED = Non vacciné -VaccinationStatus.VACCINATED = Vacciné - +VaccinationStatus.UNKNOWN=Inconnu +VaccinationStatus.UNVACCINATED=Non vacciné +VaccinationStatus.VACCINATED=Vacciné # VaccinationInfoSource -VaccinationInfoSource.ORAL_COMMUNICATION = Communication orale -VaccinationInfoSource.VACCINATION_CARD = Carte de vaccination -VaccinationInfoSource.NO_EVIDENCE = Aucune preuve -VaccinationInfoSource.UNKNOWN = Inconnu - +VaccinationInfoSource.ORAL_COMMUNICATION=Communication orale +VaccinationInfoSource.VACCINATION_CARD=Carte de vaccination +VaccinationInfoSource.NO_EVIDENCE=Aucune preuve +VaccinationInfoSource.UNKNOWN=Inconnu # ValueSeparator -ValueSeparator.DEFAULT = Par défaut (%s) -ValueSeparator.COMMA = Virgule -ValueSeparator.SEMICOLON = Point-virgule -ValueSeparator.TAB = Tabulatrice - +ValueSeparator.DEFAULT=Par défaut (%s) +ValueSeparator.COMMA=Virgule +ValueSeparator.SEMICOLON=Point-virgule +ValueSeparator.TAB=Tabulatrice # ViewMode -ViewMode.NORMAL = Vue normale -ViewMode.SIMPLE = Vue simple - -VisitResult.NOT_SYMPTOMATIC = Vu (pas de signes) -VisitResult.SYMPTOMATIC = Vu avec des signes -VisitResult.UNAVAILABLE = Non disponible -VisitResult.UNCOOPERATIVE = Non coopératif -VisitResult.NOT_PERFORMED = Non effectué - +ViewMode.NORMAL=Vue normale +ViewMode.SIMPLE=Vue simple +VisitResult.NOT_SYMPTOMATIC=Vu (pas de signes) +VisitResult.SYMPTOMATIC=Vu avec des signes +VisitResult.UNAVAILABLE=Non disponible +VisitResult.UNCOOPERATIVE=Non coopératif +VisitResult.NOT_PERFORMED=Non effectué # VisitStatus -VisitStatus.COOPERATIVE = Disponible et coopératif -VisitStatus.UNAVAILABLE = Non disponible -VisitStatus.UNCOOPERATIVE = Disponible, mais non coopératif -VisitStatus.Short.COOPERATIVE = Coopérative -VisitStatus.Short.UNAVAILABLE = Non disponible -VisitStatus.Short.UNCOOPERATIVE = Non coopératif - +VisitStatus.COOPERATIVE=Disponible et coopératif +VisitStatus.UNAVAILABLE=Non disponible +VisitStatus.UNCOOPERATIVE=Disponible, mais non coopératif +VisitStatus.Short.COOPERATIVE=Coopérative +VisitStatus.Short.UNAVAILABLE=Non disponible +VisitStatus.Short.UNCOOPERATIVE=Non coopératif # VisitOrigin -VisitOrigin.USER = Créé par utilisateur -VisitOrigin.EXTERNAL_JOURNAL = Journal des symptômes externes - +VisitOrigin.USER=Créé par utilisateur +VisitOrigin.EXTERNAL_JOURNAL=Journal des symptômes externes # WaterSource -WaterSource.COMMUNITY_BOREHOLE_WELL = Communauté forage/puits -WaterSource.OTHER = Autre -WaterSource.PIPE_NETWORK = Réseau de tuyaux -WaterSource.PRIVATE_BOREHOLE_WELL = Forage privé/puits -WaterSource.STREAM = Cours d'eau - +WaterSource.COMMUNITY_BOREHOLE_WELL=Communauté forage/puits +WaterSource.OTHER=Autre +WaterSource.PIPE_NETWORK=Réseau de tuyaux +WaterSource.PRIVATE_BOREHOLE_WELL=Forage privé/puits +WaterSource.STREAM=Cours d'eau # WaterType -WaterType.WASTEWATER = Wastewater -WaterType.GROUNDWATER = Groundwater -WaterType.SURFACE_WATER = Surface water (lakes, rivers, runoff, etc.) -WaterType.PRECIPITATION = Precipitation (rain or snow) -WaterType.OTHER = Other -WaterType.UNKNOWN = Unknown - +WaterType.WASTEWATER=Wastewater +WaterType.GROUNDWATER=Groundwater +WaterType.SURFACE_WATER=Surface water (lakes, rivers, runoff, etc.) +WaterType.PRECIPITATION=Precipitation (rain or snow) +WaterType.OTHER=Other +WaterType.UNKNOWN=Unknown # WaterUse -WaterUse.DRINKING_HOUSEHOLD_NEEDS = Drinking and household needs -WaterUse.RECREATION = Recreation -WaterUse.INDUSTRY_COMMERCE = Industry and commerce -WaterUse.AGRICULTURE = Agriculture (plants or livestock) -WaterUse.THERMOELECTRICITY_ENERGY = Thermoelectricity/Energy -WaterUse.OTHER = Other -WaterUse.UNKNOWN = Unknown - +WaterUse.DRINKING_HOUSEHOLD_NEEDS=Drinking and household needs +WaterUse.RECREATION=Recreation +WaterUse.INDUSTRY_COMMERCE=Industry and commerce +WaterUse.AGRICULTURE=Agriculture (plants or livestock) +WaterUse.THERMOELECTRICITY_ENERGY=Thermoelectricity/Energy +WaterUse.OTHER=Other +WaterUse.UNKNOWN=Unknown # Work environment -WorkEnvironment.UNKNOWN = Inconnu -WorkEnvironment.OPEN_SPACE_OFFICE = Espace de bureau ouvert -WorkEnvironment.FOOD_SECTOR = Secteur alimentaire -WorkEnvironment.BUILDING_SECTOR = Secteur de construction -WorkEnvironment.LOGISTICS_CENTER = Centre logistique -WorkEnvironment.OTHER = Autres - +WorkEnvironment.UNKNOWN=Inconnu +WorkEnvironment.OPEN_SPACE_OFFICE=Espace de bureau ouvert +WorkEnvironment.FOOD_SECTOR=Secteur alimentaire +WorkEnvironment.BUILDING_SECTOR=Secteur de construction +WorkEnvironment.LOGISTICS_CENTER=Centre logistique +WorkEnvironment.OTHER=Autres # YesNoUnknown -YesNoUnknown.NO = Non -YesNoUnknown.UNKNOWN = Inconnu -YesNoUnknown.YES = Oui - +YesNoUnknown.NO=Non +YesNoUnknown.UNKNOWN=Inconnu +YesNoUnknown.YES=Oui #SamplePurpose -SamplePurpose.EXTERNAL = Tests de laboratoire externes -SamplePurpose.INTERNAL = Tests internes - +SamplePurpose.EXTERNAL=Tests de laboratoire externes +SamplePurpose.INTERNAL=Tests internes #JurisdictionLevel -JurisdictionLevel.NONE = Vide -JurisdictionLevel.NATION = Pays -JurisdictionLevel.REGION = Région -JurisdictionLevel.DISTRICT = Canton -JurisdictionLevel.COMMUNITY = Commune -JurisdictionLevel.HEALTH_FACILITY = Établissement -JurisdictionLevel.LABORATORY = Laboratoire -JurisdictionLevel.POINT_OF_ENTRY = Point d'entrée -JurisdictionLevel.EXTERNAL_LABORATORY = Laboratoire externe - +JurisdictionLevel.NONE=Vide +JurisdictionLevel.NATION=Pays +JurisdictionLevel.REGION=Région +JurisdictionLevel.DISTRICT=Canton +JurisdictionLevel.COMMUNITY=Commune +JurisdictionLevel.HEALTH_FACILITY=Établissement +JurisdictionLevel.LABORATORY=Laboratoire +JurisdictionLevel.POINT_OF_ENTRY=Point d'entrée +JurisdictionLevel.EXTERNAL_LABORATORY=Laboratoire externe #CampaignFormElementImportance -CampaignFormElementImportance.ALL = Toutes les colonnes -CampaignFormElementImportance.IMPORTANT = Important - +CampaignFormElementImportance.ALL=Toutes les colonnes +CampaignFormElementImportance.IMPORTANT=Important SamplingReason.PRESENCE_OF_SYMPTOMS=Présence de symptômes SamplingReason.OUTBREAK=Exposé à une zone d'épidémie SamplingReason.SCREENING=Dépistage @@ -2006,7 +1855,6 @@ EndOfQuarantineReason.ASYMPTOMATIC=Asymptomatique après 10 jours EndOfQuarantineReason.ISOLATED_AS_CASE=Isolé en tant que cas EndOfQuarantineReason.LOST_TO_FOLLOWUP=Perdu au suivi EndOfQuarantineReason.OTHER=Autres - #InfectionSetting InfectionSetting.UNKNOWN=Inconnu InfectionSetting.AMBULATORY=Ambulatoire @@ -2027,7 +1875,6 @@ InfectionSetting.OTHER_STATION=Autre station InfectionSetting.NURSING_HOME=Clinique InfectionSetting.REHAB_FACILITY=Etablissement de Rehabilitation InfectionSetting.OTHER_STATIONARY_FACILITY=Autre établissement hospitalier - SymptomGroup.GENERAL=Général SymptomGroup.RESPIRATORY=Respiratoire SymptomGroup.CARDIOVASCULAR=Cardiovasculaire @@ -2036,7 +1883,6 @@ SymptomGroup.URINARY=Urinaire SymptomGroup.NERVOUS_SYSTEM=Système nerveux SymptomGroup.SKIN=Peau SymptomGroup.OTHER=Autres - #Salutation Salutation.MR=Cher Monsieur Salutation.MRS=Chère Madame @@ -2044,7 +1890,6 @@ Salutation.MR_AND_MRS=Cher monsieur et Madame Salutation.FAMILY=Chère famille Salutation.GUARDIAN_OF_MINOR=Cher gardien d'enfant Salutation.OTHER=Autre - #PersonAssociation PersonAssociation.ALL=Tout PersonAssociation.CASE=Cas @@ -2052,26 +1897,22 @@ PersonAssociation.CONTACT=Contact PersonAssociation.EVENT_PARTICIPANT=Participant à l'événement PersonAssociation.IMMUNIZATION=Immunisation PersonAssociation.TRAVEL_ENTRY=Entrées de voyage - -ReinfectionDetail.GENOME_SEQUENCE_PREVIOUS_INFECTION_KNOWN = La séquence de génome du virus provenant d'une infection antérieure du SARS-CoV-2 est connue -ReinfectionDetail.GENOME_SEQUENCE_CURRENT_INFECTION_KNOWN = La séquence du génome du virus de l'infection actuelle par le SRAS-CoV-2 est connue -ReinfectionDetail.GENOME_SEQUENCES_NOT_MATCHING = Les séquences génomiques des virus des infections SARS-CoV-2 précédentes et actuelles ne correspondent pas -ReinfectionDetail.GENOME_COPY_NUMBER_ABOVE_THRESHOLD = Numéro de copie du génome SARS-CoV-2 dans la détection actuelle de PCR >\= 10^6/ml ou Ct valeur < 30 -ReinfectionDetail.GENOME_COPY_NUMBER_BELOW_THRESHOLD = Individu testé positif pour le SARS-CoV-2 par PCR, mais nombre de copies du génome du SARS-CoV-2 dans la détection PCR actuelle < 10^6/ml ou valeur Ct >\= 30, ou les deux inconnus -ReinfectionDetail.ACUTE_RESPIRATORY_ILLNESS_OVERCOME = La personne a surmonté une maladie respiratoire aiguë suite à une infection confirmée par le SRAS-CoV-2 -ReinfectionDetail.PREVIOUS_ASYMPTOMATIC_INFECTION = Une personne avait une infection asymptomatique du SARS-CoV-2 -ReinfectionDetail.TESTED_NEGATIVE_AFTER_PREVIOUS_INFECTION = Une personne a testé de manière concluante négative par PCR au moins une fois après l'infection du SARS-CoV-2 -ReinfectionDetail.LAST_PCR_DETECTION_NOT_RECENT = La dernière détection PCR positive de l'infection précédente a été il y a plus de 3 mois - -ReinfectionDetailGroup.GENOME_SEQUENCE = -ReinfectionDetailGroup.PRECEDING_INFECTION = Informations sur l'infection précédente -ReinfectionDetailGroup.REINFECTION_EVALUATION = Plus d'informations sur l'évaluation de la réinfection -ReinfectionDetailGroup.PREVIOUS_INFECTION_COMPLETED = Infection précédente terminée - -ReinfectionStatus.CONFIRMED = Réinfection confirmée -ReinfectionStatus.PROBABLE = Réinfection probable -ReinfectionStatus.POSSIBLE = Réinfection possible - +ReinfectionDetail.GENOME_SEQUENCE_PREVIOUS_INFECTION_KNOWN=La séquence de génome du virus provenant d'une infection antérieure du SARS-CoV-2 est connue +ReinfectionDetail.GENOME_SEQUENCE_CURRENT_INFECTION_KNOWN=La séquence du génome du virus de l'infection actuelle par le SRAS-CoV-2 est connue +ReinfectionDetail.GENOME_SEQUENCES_NOT_MATCHING=Les séquences génomiques des virus des infections SARS-CoV-2 précédentes et actuelles ne correspondent pas +ReinfectionDetail.GENOME_COPY_NUMBER_ABOVE_THRESHOLD=Numéro de copie du génome SARS-CoV-2 dans la détection actuelle de PCR >\= 10^6/ml ou Ct valeur < 30 +ReinfectionDetail.GENOME_COPY_NUMBER_BELOW_THRESHOLD=Individu testé positif pour le SARS-CoV-2 par PCR, mais nombre de copies du génome du SARS-CoV-2 dans la détection PCR actuelle < 10^6/ml ou valeur Ct >\= 30, ou les deux inconnus +ReinfectionDetail.ACUTE_RESPIRATORY_ILLNESS_OVERCOME=La personne a surmonté une maladie respiratoire aiguë suite à une infection confirmée par le SRAS-CoV-2 +ReinfectionDetail.PREVIOUS_ASYMPTOMATIC_INFECTION=Une personne avait une infection asymptomatique du SARS-CoV-2 +ReinfectionDetail.TESTED_NEGATIVE_AFTER_PREVIOUS_INFECTION=Une personne a testé de manière concluante négative par PCR au moins une fois après l'infection du SARS-CoV-2 +ReinfectionDetail.LAST_PCR_DETECTION_NOT_RECENT=La dernière détection PCR positive de l'infection précédente a été il y a plus de 3 mois +ReinfectionDetailGroup.GENOME_SEQUENCE= +ReinfectionDetailGroup.PRECEDING_INFECTION=Informations sur l'infection précédente +ReinfectionDetailGroup.REINFECTION_EVALUATION=Plus d'informations sur l'évaluation de la réinfection +ReinfectionDetailGroup.PREVIOUS_INFECTION_COMPLETED=Infection précédente terminée +ReinfectionStatus.CONFIRMED=Réinfection confirmée +ReinfectionStatus.PROBABLE=Réinfection probable +ReinfectionStatus.POSSIBLE=Réinfection possible # Vaccine Vaccine.COMIRNATY=vaccin Pfizer-BioNTech COVID-19 Vaccine.MRNA_1273=Vaccin Moderna COVID-19 @@ -2093,7 +1934,6 @@ Vaccine.LC_16=LC-16 Vaccine.MVA_BN=JYNNEOS Vaccine.UNKNOWN=Inconnu Vaccine.OTHER=Autres - # VaccineManufacturer VaccineManufacturer.BIONTECH_PFIZER=BioNTech/Pfizer VaccineManufacturer.PFIZER=Pfizer @@ -2110,13 +1950,11 @@ VaccineManufacturer.ASTRA_ZENECA_MODERNA=AstraZeneca & Moderna VaccineManufacturer.VALNEVA=Valneva VaccineManufacturer.UNKNOWN=Inconnu VaccineManufacturer.OTHER=Autres - # InfectionPathCertainty InfectionPathCertainty.SUSPECT=Suspect InfectionPathCertainty.PROBABLE=Probable InfectionPathCertainty.CONFIRMED=Confirmé InfectionPathCertainty.UNKNOWN=Inconnu - # HumanTransmissionMode HumanTransmissionMode.FECAL_ORAL_SMEAR_INFECTION=Infection de Fecal-oral/frottis HumanTransmissionMode.PARENTERAL=parentéral @@ -2125,7 +1963,6 @@ HumanTransmissionMode.RESPIRATORY=Respiratoire HumanTransmissionMode.SEXUAL=Sexuel HumanTransmissionMode.CONNATAL=Connatal HumanTransmissionMode.OTHER=Autre - # ParenteralTransmissionMode ParenteralTransmissionMode.INTRAVENOUS_DRUG_USE=Consommation de drogues par voie intraveineuse ParenteralTransmissionMode.HOUSEHOLD_CONTACT=Contact familial @@ -2133,46 +1970,38 @@ ParenteralTransmissionMode.MEDICALLY_ASSOCIATED=Associé médicalement ParenteralTransmissionMode.TATTOOING_PIERCING=Tatouage/piercing ParenteralTransmissionMode.PEDICURE_MANICURE=Pédicure/manucure ParenteralTransmissionMode.OTHER=Autre - # MedicallyAssociatedTransmissionMode MedicallyAssociatedTransmissionMode.OPERATIVE_OR_DIAGNOSTIC_PROCEDURE=Procédure opératoire ou diagnostique MedicallyAssociatedTransmissionMode.BLOOD_PRODUCTS=Produits sanguins MedicallyAssociatedTransmissionMode.ORGAN_TRANSPLANTATION=Transplantation d'organes MedicallyAssociatedTransmissionMode.DIALYSIS=Dialyse MedicallyAssociatedTransmissionMode.INJECTION_FOR_MEDICAL_PURPOSES=Injection à des fins médicales - # ExternalShareDateType -ExternalShareDateType.LAST_EXTERNAL_SURVEILLANCE_TOOL_SHARE = Dernier partage avec l'outil de rapport - +ExternalShareDateType.LAST_EXTERNAL_SURVEILLANCE_TOOL_SHARE=Dernier partage avec l'outil de rapport # ExternalShareStatus ExternalShareStatus.SHARED=Partagé ExternalShareStatus.DELETED=Supprimé - # ExternalMessageStatus ExternalMessageStatus.UNPROCESSED=Non traité ExternalMessageStatus.PROCESSED=Traitement effectué ExternalMessageStatus.FORWARDED=Transféré ExternalMessageStatus.UNCLEAR=Non effacé - # ExternalMessageType ExternalMessageType.LAB_MESSAGE=Message de laboratoire ExternalMessageType.PHYSICIANS_REPORT=Rapport du médecin - +ExternalMessageType.SURVEY_RESPONSE=Réponse à un sondage # ShareRequestDataType -ShareRequestDataType.CASE = Cas -ShareRequestDataType.CONTACT = Contact -ShareRequestDataType.EVENT = Évènement - +ShareRequestDataType.CASE=Cas +ShareRequestDataType.CONTACT=Contact +ShareRequestDataType.EVENT=Évènement # ShareRequestStatus -ShareRequestStatus.PENDING = En attente -ShareRequestStatus.ACCEPTED = Accepté -ShareRequestStatus.REJECTED = Rejeté -ShareRequestStatus.REVOKED = Révoqué - +ShareRequestStatus.PENDING=En attente +ShareRequestStatus.ACCEPTED=Accepté +ShareRequestStatus.REJECTED=Rejeté +ShareRequestStatus.REVOKED=Révoqué # EventCriteriaDateType -EventCriteriaDateType.EVENT_DATE = Date de l'événement -EventCriteriaDateType.REPORT_DATE = Date du rapport - +EventCriteriaDateType.EVENT_DATE=Date de l'événement +EventCriteriaDateType.REPORT_DATE=Date du rapport #EpidemiologicalEvidenceDetail EpidemiologicalEvidenceDetail.STUDY=Étude EpidemiologicalEvidenceDetail.CASE_CONTROL_STUDY=Étude de contrôle de cas @@ -2187,7 +2016,6 @@ EpidemiologicalEvidenceDetail.DIRECT_OCCURENCE=Personne\: les cas étaient en co EpidemiologicalEvidenceDetail.SUSPICION=Suspicion EpidemiologicalEvidenceDetail.EXPRESSED_BY_DISEASED=Exprimé par la personne malade EpidemiologicalEvidenceDetail.EXPRESSED_BY_HEALTH_DEPARTMENT=Exprimé par le service de santé - #LaboratoryDiagnosticEvidenceDetail LaboratoryDiagnosticEvidenceDetail.VERIFICATION_OF_AT_LEAST_TWO_INFECTED=Vérification d'au moins deux personnes infectées ou malades LaboratoryDiagnosticEvidenceDetail.COMPLIANT_PATHOGEN_FINE_TYPING=Typage fin conforme de l'agent pathogène @@ -2196,131 +2024,116 @@ LaboratoryDiagnosticEvidenceDetail.IMPRESSION_TEST=Test d'impression LaboratoryDiagnosticEvidenceDetail.WATER_SAMPLE=Échantillon d'eau LaboratoryDiagnosticEvidenceDetail.OTHER=Autre LaboratoryDiagnosticEvidenceDetail.PATHOGEN_FINE_TYPING_COMPLIANT_WITH_CASE=Typage fin de l'agent pathogène cohérent avec l'un des cas - #ImmunizationStatus -ImmunizationStatus.PENDING = En attente -ImmunizationStatus.ACQUIRED = Acquis -ImmunizationStatus.NOT_ACQUIRED = Non acquis -ImmunizationStatus.EXPIRED = Expiré - +ImmunizationStatus.PENDING=En attente +ImmunizationStatus.ACQUIRED=Acquis +ImmunizationStatus.NOT_ACQUIRED=Non acquis +ImmunizationStatus.EXPIRED=Expiré #ImmunizationManagementStatus -ImmunizationManagementStatus.SCHEDULED = Planifié -ImmunizationManagementStatus.ONGOING = En cours -ImmunizationManagementStatus.COMPLETED = Terminé -ImmunizationManagementStatus.CANCELED = Annulé - +ImmunizationManagementStatus.SCHEDULED=Planifié +ImmunizationManagementStatus.ONGOING=En cours +ImmunizationManagementStatus.COMPLETED=Terminé +ImmunizationManagementStatus.CANCELED=Annulé #MeansOfImmunization -MeansOfImmunization.VACCINATION = Vaccination -MeansOfImmunization.RECOVERY = Récupération -MeansOfImmunization.VACCINATION_RECOVERY = Vaccination/Récupération -MeansOfImmunization.OTHER = Autres - +MeansOfImmunization.VACCINATION=Vaccination +MeansOfImmunization.RECOVERY=Récupération +MeansOfImmunization.VACCINATION_RECOVERY=Vaccination/Récupération +MeansOfImmunization.OTHER=Autres #EnumColumn -EnumColumn.TYPE = Type -EnumColumn.VALUE = Valeur -EnumColumn.CAPTION = Légende -EnumColumn.DESCRIPTION = Description -EnumColumn.SHORT = Courte - +EnumColumn.TYPE=Type +EnumColumn.VALUE=Valeur +EnumColumn.CAPTION=Légende +EnumColumn.DESCRIPTION=Description +EnumColumn.SHORT=Courte #NotificationType -NotificationType.CASE_CLASSIFICATION_CHANGED = Classification de cas modifiée -NotificationType.Desc.CASE_CLASSIFICATION_CHANGED = Envoyé à tous les utilisateurs associés à la région ou à la région responsable d'un cas. -NotificationType.CASE_INVESTIGATION_DONE = Enquête de cas effectuée -NotificationType.Desc.CASE_INVESTIGATION_DONE = Envoyé à tous les utilisateurs associés à la région ou à la région responsable d'un cas. -NotificationType.EVENT_PARTICIPANT_CASE_CLASSIFICATION_CONFIRMED = Confirmation de la classification des cas des participants à l'événement -NotificationType.Desc.EVENT_PARTICIPANT_CASE_CLASSIFICATION_CONFIRMED = Lorsqu'un dossier est défini sur une classification confirmée, celle-ci est envoyée à tous les utilisateurs responsables des événements actifs auxquels la personne du dossier a participé et qui ont eu lieu au plus tôt 30 jours avant la classification du dossier. -NotificationType.EVENT_PARTICIPANT_RELATED_TO_OTHER_EVENTS = Participant à l'événement lié à d'autres événements -NotificationType.Desc.EVENT_PARTICIPANT_RELATED_TO_OTHER_EVENTS = Lorsqu'un nouveau participant à un événement est créé, celui-ci est envoyé à tous les utilisateurs responsables des événements actifs auxquels la personne a également participé et qui ont eu lieu au plus tôt 30 jours auparavant. -NotificationType.CASE_LAB_RESULT_ARRIVED = Le résultat du laboratoire de cas est arrivé -NotificationType.Desc.CASE_LAB_RESULT_ARRIVED = Envoyé à tous les utilisateurs associés à la région ou à la région responsable d'un cas lorsqu'un résultat de test d'agent pathogène est entré ou modifié (non en attente). -NotificationType.CONTACT_LAB_RESULT_ARRIVED = Le résultat du laboratoire de contact est arrivé -NotificationType.Desc.CONTACT_LAB_RESULT_ARRIVED = Envoyé à tous les utilisateurs associés à la région d'un contact lorsqu'un résultat de test pathogène est saisi ou modifié (non en attente). Si le contact n'a pas de région, la région du cas source est utilisée. -NotificationType.EVENT_PARTICIPANT_LAB_RESULT_ARRIVED = Le résultat du laboratoire des participants à l'événement est arrivé -NotificationType.Desc.EVENT_PARTICIPANT_LAB_RESULT_ARRIVED = Envoyé à tous les utilisateurs associés à la région d'un participant à l'événement lorsqu'un résultat de test d'agent pathogène est saisi ou modifié (non en attente). -NotificationType.LAB_SAMPLE_SHIPPED = Échantillon de laboratoire expédié -NotificationType.Desc.LAB_SAMPLE_SHIPPED = Envoyé à tous les utilisateurs d'un laboratoire lorsqu'un échantillon de ce laboratoire est expédié. -NotificationType.CONTACT_SYMPTOMATIC = symptomatique du contact -NotificationType.Desc.CONTACT_SYMPTOMATIC = Envoyé à tous les utilisateurs associés à la région d'un contact lorsqu'une nouvelle visite symptomatique est créée et que le contact était auparavant asymptomatique. Si le contact n'a pas de région, la région du cas source est utilisée. -NotificationType.TASK_START= Démarrage de la tâche -NotificationType.Desc.TASK_START= Envoyé au destinataire d'une tâche et à tous les utilisateurs observateurs lorsque la date de début de la tâche se situe dans les 10 dernières minutes. -NotificationType.TASK_DUE = Tâche due -NotificationType.Desc.TASK_DUE = Envoyé au destinataire d'une tâche et à tous les utilisateurs observateurs lorsque la date d'échéance de la tâche se situe dans les 10 dernières minutes. -NotificationType.TASK_UPDATED_ASSIGNEE = Destinataire de la tâche mis à jour -NotificationType.Desc.TASK_UPDATED_ASSIGNEE = Envoyé à l'ancien et au nouveau destinataire d'une tâche. -NotificationType.CONTACT_VISIT_COMPLETED = Visite de contact terminée -NotificationType.Desc.CONTACT_VISIT_COMPLETED = Envoyé à tous les utilisateurs associés à la région d'un contact et à tous les utilisateurs observateurs lorsqu'une tâche "Suivi de contact" est terminée. Si le contact n'a pas de région, la région du cas source est utilisée. -NotificationType.CASE_DISEASE_CHANGED = Maladie de cas modifiée -NotificationType.Desc.CASE_DISEASE_CHANGED = Envoyé à tous les utilisateurs associés à la région ou à la région responsable d'un cas lorsque la maladie était précédemment définie sur "VHF non spécifiée". -NotificationType.EVENT_GROUP_CREATED = Groupe d'événements créé -NotificationType.Desc.EVENT_GROUP_CREATED = Envoyé à tous les utilisateurs responsables des événements qui font partie d'un groupe d'événements nouvellement créé. -NotificationType.EVENT_ADDED_TO_EVENT_GROUP = Événement ajouté au groupe d'événements -NotificationType.Desc.EVENT_ADDED_TO_EVENT_GROUP = Envoyé à tous les utilisateurs responsables des événements qui font partie du groupe d'événements modifié. -NotificationType.EVENT_REMOVED_FROM_EVENT_GROUP = Événement retiré du groupe d'événements -NotificationType.Desc.EVENT_REMOVED_FROM_EVENT_GROUP = Envoyé à tous les utilisateurs responsables de l'événement supprimé et des événements faisant partie du groupe d'événements modifié. - +NotificationType.CASE_CLASSIFICATION_CHANGED=Classification de cas modifiée +NotificationType.Desc.CASE_CLASSIFICATION_CHANGED=Envoyé à tous les utilisateurs associés à la région ou à la région responsable d'un cas. +NotificationType.CASE_INVESTIGATION_DONE=Enquête de cas effectuée +NotificationType.Desc.CASE_INVESTIGATION_DONE=Envoyé à tous les utilisateurs associés à la région ou à la région responsable d'un cas. +NotificationType.EVENT_PARTICIPANT_CASE_CLASSIFICATION_CONFIRMED=Confirmation de la classification des cas des participants à l'événement +NotificationType.Desc.EVENT_PARTICIPANT_CASE_CLASSIFICATION_CONFIRMED=Lorsqu'un dossier est défini sur une classification confirmée, celle-ci est envoyée à tous les utilisateurs responsables des événements actifs auxquels la personne du dossier a participé et qui ont eu lieu au plus tôt 30 jours avant la classification du dossier. +NotificationType.EVENT_PARTICIPANT_RELATED_TO_OTHER_EVENTS=Participant à l'événement lié à d'autres événements +NotificationType.Desc.EVENT_PARTICIPANT_RELATED_TO_OTHER_EVENTS=Lorsqu'un nouveau participant à un événement est créé, celui-ci est envoyé à tous les utilisateurs responsables des événements actifs auxquels la personne a également participé et qui ont eu lieu au plus tôt 30 jours auparavant. +NotificationType.CASE_LAB_RESULT_ARRIVED=Le résultat du laboratoire de cas est arrivé +NotificationType.Desc.CASE_LAB_RESULT_ARRIVED=Envoyé à tous les utilisateurs associés à la région ou à la région responsable d'un cas lorsqu'un résultat de test d'agent pathogène est entré ou modifié (non en attente). +NotificationType.CONTACT_LAB_RESULT_ARRIVED=Le résultat du laboratoire de contact est arrivé +NotificationType.Desc.CONTACT_LAB_RESULT_ARRIVED=Envoyé à tous les utilisateurs associés à la région d'un contact lorsqu'un résultat de test pathogène est saisi ou modifié (non en attente). Si le contact n'a pas de région, la région du cas source est utilisée. +NotificationType.EVENT_PARTICIPANT_LAB_RESULT_ARRIVED=Le résultat du laboratoire des participants à l'événement est arrivé +NotificationType.Desc.EVENT_PARTICIPANT_LAB_RESULT_ARRIVED=Envoyé à tous les utilisateurs associés à la région d'un participant à l'événement lorsqu'un résultat de test d'agent pathogène est saisi ou modifié (non en attente). +NotificationType.LAB_SAMPLE_SHIPPED=Échantillon de laboratoire expédié +NotificationType.Desc.LAB_SAMPLE_SHIPPED=Envoyé à tous les utilisateurs d'un laboratoire lorsqu'un échantillon de ce laboratoire est expédié. +NotificationType.CONTACT_SYMPTOMATIC=symptomatique du contact +NotificationType.Desc.CONTACT_SYMPTOMATIC=Envoyé à tous les utilisateurs associés à la région d'un contact lorsqu'une nouvelle visite symptomatique est créée et que le contact était auparavant asymptomatique. Si le contact n'a pas de région, la région du cas source est utilisée. +NotificationType.TASK_START=Démarrage de la tâche +NotificationType.Desc.TASK_START=Envoyé au destinataire d'une tâche et à tous les utilisateurs observateurs lorsque la date de début de la tâche se situe dans les 10 dernières minutes. +NotificationType.TASK_DUE=Tâche due +NotificationType.Desc.TASK_DUE=Envoyé au destinataire d'une tâche et à tous les utilisateurs observateurs lorsque la date d'échéance de la tâche se situe dans les 10 dernières minutes. +NotificationType.TASK_UPDATED_ASSIGNEE=Destinataire de la tâche mis à jour +NotificationType.Desc.TASK_UPDATED_ASSIGNEE=Envoyé à l'ancien et au nouveau destinataire d'une tâche. +NotificationType.CONTACT_VISIT_COMPLETED=Visite de contact terminée +NotificationType.Desc.CONTACT_VISIT_COMPLETED=Envoyé à tous les utilisateurs associés à la région d'un contact et à tous les utilisateurs observateurs lorsqu'une tâche "Suivi de contact" est terminée. Si le contact n'a pas de région, la région du cas source est utilisée. +NotificationType.CASE_DISEASE_CHANGED=Maladie de cas modifiée +NotificationType.Desc.CASE_DISEASE_CHANGED=Envoyé à tous les utilisateurs associés à la région ou à la région responsable d'un cas lorsque la maladie était précédemment définie sur "VHF non spécifiée". +NotificationType.EVENT_GROUP_CREATED=Groupe d'événements créé +NotificationType.Desc.EVENT_GROUP_CREATED=Envoyé à tous les utilisateurs responsables des événements qui font partie d'un groupe d'événements nouvellement créé. +NotificationType.EVENT_ADDED_TO_EVENT_GROUP=Événement ajouté au groupe d'événements +NotificationType.Desc.EVENT_ADDED_TO_EVENT_GROUP=Envoyé à tous les utilisateurs responsables des événements qui font partie du groupe d'événements modifié. +NotificationType.EVENT_REMOVED_FROM_EVENT_GROUP=Événement retiré du groupe d'événements +NotificationType.Desc.EVENT_REMOVED_FROM_EVENT_GROUP=Envoyé à tous les utilisateurs responsables de l'événement supprimé et des événements faisant partie du groupe d'événements modifié. #NotificationTypeGroup -NotificationTypeGroup.CASES = Cas -NotificationTypeGroup.CONTACTS = Contacts -NotificationTypeGroup.EVENTS = Évènements -NotificationTypeGroup.SAMPLES = Échantillons -NotificationTypeGroup.TASKS = Tâches - +NotificationTypeGroup.CASES=Cas +NotificationTypeGroup.CONTACTS=Contacts +NotificationTypeGroup.EVENTS=Évènements +NotificationTypeGroup.SAMPLES=Échantillons +NotificationTypeGroup.TASKS=Tâches #S2SOwnershipStatusFilter S2SOwnershipStatusFilter.OWNED=Avec la propriété S2SOwnershipStatusFilter.NOT_OWNED=Pour voir S2SOwnershipStatusFilter.ALL=Tout - #ShareRequestViewType ShareRequestViewType.INCOMING=Entrant ShareRequestViewType.OUTGOING=Sortant - # SampleDashboardFilterDateType SampleDashboardFilterDateType.SAMPLE_DATE_TIME=Date à laquelle l'échantillon a été prélevé SampleDashboardFilterDateType.ASSOCIATED_ENTITY_REPORT_DATE=Date du rapport de l'entité associée SampleDashboardFilterDateType.MOST_RELEVANT=La date la plus récente - #SampleDashboardCustomDiseaseFilter -SampleDashboardCustomDiseaseFilter.NO_DISEASE = Aucune maladie - +SampleDashboardCustomDiseaseFilter.NO_DISEASE=Aucune maladie #SampleShipmentStatus SampleShipmentStatus.SHIPPED=Shipped SampleShipmentStatus.NOT_SHIPPED=Not shipped SampleShipmentStatus.RECEIVED=Received - #Pathogen Customizable enum -Pathogen.CAMPYLOBACTER_JEJUNI = Campylobacter jejuni -Pathogen.ESCHERICHIA_COLI = Escherichia coli -Pathogen.SALMONELLA_SPP = Salmonella spp. -Pathogen.SHIGELLA_SPP = Shigella spp. -Pathogen.VIBRIO_CHOLERAE = Vibrio cholerae -Pathogen.YERSINIA_SPP = Yersinia spp. -Pathogen.SARS_COV_2 = SARS-CoV-2 -Pathogen.ADENOVIRUS = Adenovirus -Pathogen.ASTROVIRUS = Astrovirus -Pathogen.COXSACKIE_VIRUS = Coxsackie virus -Pathogen.ECHOVIRUS = Echovirus -Pathogen.HEPATITIS_A_VIRUS = Hepatitis A virus -Pathogen.HEPATITIS_E_VIRUS = Hepatitis E virus -Pathogen.HUMAN_CALICIVIRUS = Human calicivirus -Pathogen.POLIO_VIRUS = Polio virus 2 -Pathogen.REOVIRUS = Reovirus -Pathogen.ROTAVIRUS = Rotavirus -Pathogen.TT_HEPATITIS = TT hepatitis -Pathogen.OTHER = Other - +Pathogen.CAMPYLOBACTER_JEJUNI=Campylobacter jejuni +Pathogen.ESCHERICHIA_COLI=Escherichia coli +Pathogen.SALMONELLA_SPP=Salmonella spp. +Pathogen.SHIGELLA_SPP=Shigella spp. +Pathogen.VIBRIO_CHOLERAE=Vibrio cholerae +Pathogen.YERSINIA_SPP=Yersinia spp. +Pathogen.SARS_COV_2=SARS-CoV-2 +Pathogen.ADENOVIRUS=Adenovirus +Pathogen.ASTROVIRUS=Astrovirus +Pathogen.COXSACKIE_VIRUS=Coxsackie virus +Pathogen.ECHOVIRUS=Echovirus +Pathogen.HEPATITIS_A_VIRUS=Hepatitis A virus +Pathogen.HEPATITIS_E_VIRUS=Hepatitis E virus +Pathogen.HUMAN_CALICIVIRUS=Human calicivirus +Pathogen.POLIO_VIRUS=Polio virus 2 +Pathogen.REOVIRUS=Reovirus +Pathogen.ROTAVIRUS=Rotavirus +Pathogen.TT_HEPATITIS=TT hepatitis +Pathogen.OTHER=Other # EnvironmentSampleMaterial -EnvironmentSampleMaterial.WATER = Water -EnvironmentSampleMaterial.SOIL = Soil -EnvironmentSampleMaterial.AIR = Air -EnvironmentSampleMaterial.VECTORS = Vectors -EnvironmentSampleMaterial.OTHER = Other - +EnvironmentSampleMaterial.WATER=Water +EnvironmentSampleMaterial.SOIL=Soil +EnvironmentSampleMaterial.AIR=Air +EnvironmentSampleMaterial.VECTORS=Vectors +EnvironmentSampleMaterial.OTHER=Other # WeatherCondition -WeatherCondition.SUNNY = Sunny -WeatherCondition.CLOUDY = Cloudy -WeatherCondition.RAINING = Raining -WeatherCondition.WINDY = Windy - +WeatherCondition.SUNNY=Sunny +WeatherCondition.CLOUDY=Cloudy +WeatherCondition.RAINING=Raining +WeatherCondition.WINDY=Windy #Pathogen Customizable enum # SelfReportType SelfReportType.CASE=Case @@ -2333,18 +2146,15 @@ SelfReportInvestigationStatus.REJECTED=Rejected # SelfReportProcessingStatus SelfReportProcessingStatus.UNPROCESSED=Unprocessed SelfReportProcessingStatus.PROCESSED=Processed - # AefiAgeGroup -AefiAgeGroup.ZERO_TO_ONE = 0 < 1 year -AefiAgeGroup.ONE_TO_FIVE = 1- 5 years -AefiAgeGroup.FIVE_TO_EIGHTEEN = > 5 years - 18 years -AefiAgeGroup.EIGHTEEN_TO_SIXTY = > 18 years - 60 years -AefiAgeGroup.SIXY_AND_ABOVE = > 60 years - +AefiAgeGroup.ZERO_TO_ONE=0 < 1 year +AefiAgeGroup.ONE_TO_FIVE=1- 5 years +AefiAgeGroup.FIVE_TO_EIGHTEEN=> 5 years - 18 years +AefiAgeGroup.EIGHTEEN_TO_SIXTY=> 18 years - 60 years +AefiAgeGroup.SIXY_AND_ABOVE=> 60 years # SeizureType SeizureType.FEBRILE=Febrile SeizureType.AFEBRILE=Afebrile - # SeriousAefiReason SeriousAefiReason.DEATH=Death SeriousAefiReason.LIFE_THREATENING=Life threatening @@ -2352,7 +2162,6 @@ SeriousAefiReason.DISABILITY=Disability SeriousAefiReason.HOSPITALIZATION=Hospitalization SeriousAefiReason.CONGENITAL_ANOMALY=Congenital anomaly SeriousAefiReason.OTHER=Other - # AefiOutcome AefiOutcome.RECOVERING=Recovering AefiOutcome.RECOVERED=Recovered @@ -2360,104 +2169,84 @@ AefiOutcome.RECOVERED_WITH_SEQUELAE=Recovered with sequelae AefiOutcome.NOT_RECOVERED=Not Recovered AefiOutcome.UNKNOWN=Unknown AefiOutcome.DIED=Died - # AefiType AefiType.SERIOUS=Serious AefiType.NON_SERIOUS=Non-serious - # AefiDateType AefiDateType.REPORT_DATE=Date of report AefiDateType.START_DATE=Date of onset AefiDateType.VACCINATION_DATE=Date of vaccination - # AefiDashboardFilterDateType AefiDashboardFilterDateType.REPORT_DATE=Date of report AefiDashboardFilterDateType.START_DATE=Date of onset - # AefiInvestigationDateType AefiInvestigationDateType.REPORT_DATE=Date of report AefiInvestigationDateType.INVESTIGATION_DATE=Date of investigation AefiInvestigationDateType.VACCINATION_DATE=Date of vaccination - # PlaceOfVaccination PlaceOfVaccination.GOVERNMENT_HEALTH_FACILITY=Government health facility PlaceOfVaccination.PRIVATE_HEALTH_FACILITY=Private health facility PlaceOfVaccination.OTHER=Other - # VaccinationActivity VaccinationActivity.CAMPAIGN=Campaign VaccinationActivity.ROUTINE=Routine VaccinationActivity.OTHER=Other - # AefiInvestigationStage AefiInvestigationStage.FIRST=First AefiInvestigationStage.INTERIM=Interim AefiInvestigationStage.FINAL=Final - # VaccinationSite VaccinationSite.FIXED=Fixed VaccinationSite.MOBILE=Mobile VaccinationSite.OUTREACH=Outreach VaccinationSite.OTHER=Other - # PatientStatusAtAefiInvestigation PatientStatusAtAefiInvestigation.DIED=Died PatientStatusAtAefiInvestigation.DISABLED=Disabled PatientStatusAtAefiInvestigation.RECOVERED=Recovering PatientStatusAtAefiInvestigation.RECOVERED_COMPLETELY=Recovered completely PatientStatusAtAefiInvestigation.UNKNOWN=Unknown - # BirthTerm BirthTerm.FULL_TERM=Full-term BirthTerm.PRE_TERM=Pre-term BirthTerm.POST_TERM=Post-term - # DeliveryProcedure DeliveryProcedure.NORMAL=Normal DeliveryProcedure.CAESAREAN=Caesarean DeliveryProcedure.ASSISTED=Assisted (forceps, vacuum etc.) DeliveryProcedure.WITH_COMPLICATION=with complication - # SeriousAefiInfoSource SeriousAefiInfoSource.EXAMINATION=Examination by the investigator SeriousAefiInfoSource.DOCUMENTS=Documents SeriousAefiInfoSource.VERBAL_AUTOPSY=Verbal autopsy SeriousAefiInfoSource.OTHER=Other - # AefiImmunizationPeriod AefiImmunizationPeriod.WITHIN_FIRST_VACCINATIONS=Within the first vaccinations of the session AefiImmunizationPeriod.WITHIN_LAST_VACCINATIONS=Within the last vaccinations of the session AefiImmunizationPeriod.UNKNOWN=Unknown - # AefiVaccinationPeriod AefiVaccinationPeriod.WITHIN_FIRST_FEW_DOSES=Within the first few doses of the vial administered AefiVaccinationPeriod.WITHIN_LAST_DOSES=Within the last doses of the vial administered AefiVaccinationPeriod.UNKNOWN=Unknown - # SyringeType SyringeType.GLASS=Glass SyringeType.DISPOSABLE=Disposable SyringeType.RECYCLED_DISPOSABLE=Recycled disposable SyringeType.OTHER=Other - # VaccineCarrier VaccineCarrier.SHORT_RANGE=Short range VaccineCarrier.LONG_RANGE=Long range VaccineCarrier.OTHER=Other - # AefiInvestigationStatus AefiInvestigationStatus.DONE=Done AefiInvestigationStatus.DISCARDED=Discarded - # AefiCausality AefiCausality.CONFIRMED=Confirmed AefiCausality.INCONCLUSIVE=Inconclusive - # AefiClassification AefiClassification.RELATED_TO_VACCINE_OR_VACCINATION=Related to vaccine or vaccination AefiClassification.COINCIDENTAL_ADVERSE_EVENT=Coincidental adverse event AefiClassification.UNDETERMINED=Undetermined - # AefiClassificationSubType AefiClassificationSubType.VACCINE_PRODUCT_RELATED=Vaccine product related AefiClassificationSubType.VACCINE_QUALITY_DEFECT_RELATED=Vaccine quality defect related diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessage.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessage.java index 10316f62a01..388dfedc538 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessage.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessage.java @@ -227,6 +227,10 @@ public class ExternalMessage extends AbstractDomainObject { private Boolean tuberculosisMdrXdrTuberculosis; private Boolean tuberculosisBeijingLineage; + private ExternalMessageAdditionalDataType additionalDataType; + + private String additionalData; + @Enumerated(EnumType.STRING) public ExternalMessageType getType() { return type; @@ -931,4 +935,25 @@ public Boolean getTuberculosisBeijingLineage() { public void setTuberculosisBeijingLineage(Boolean tuberculosisBeijingLineage) { this.tuberculosisBeijingLineage = tuberculosisBeijingLineage; } + + @Enumerated(EnumType.STRING) + public ExternalMessageAdditionalDataType getAdditionalDataType() { + return additionalDataType; + } + + public ExternalMessage setAdditionalDataType(ExternalMessageAdditionalDataType additionalDataType) { + this.additionalDataType = additionalDataType; + return this; + } + + @Column(columnDefinition = "jsonb") + @Type(type = "jsonb") + public String getAdditionalData() { + return additionalData; + } + + public ExternalMessage setAdditionalData(String additionalData) { + this.additionalData = additionalData; + return this; + } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageAdditionalDataType.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageAdditionalDataType.java new file mode 100644 index 00000000000..72a974374f5 --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageAdditionalDataType.java @@ -0,0 +1,22 @@ +package de.symeda.sormas.backend.externalmessage; + +import de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseWrapper; + +/** + * Allows to detach the actual type name from the DB. + * Avoids to handle things like: "class-injection" or breaking behavior when changing className. + */ +public enum ExternalMessageAdditionalDataType { + + SURVEY_RESPONSE_WRAPPER(ExternalMessageSurveyResponseWrapper.class); + + private final Class dataClass; + + ExternalMessageAdditionalDataType(Class dataClass) { + this.dataClass = dataClass; + } + + public Class getDataClass() { + return dataClass; + } +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java index 070a3f0cf5d..2f4dbf63000 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java @@ -31,6 +31,7 @@ import javax.ejb.EJB; import javax.ejb.LocalBean; import javax.ejb.Stateless; +import javax.inject.Inject; import javax.naming.CannotProceedException; import javax.naming.InitialContext; import javax.naming.NamingException; @@ -54,6 +55,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.fasterxml.jackson.core.JsonProcessingException; + +import de.symeda.sormas.api.EntityDto; import de.symeda.sormas.api.ReferenceDto; import de.symeda.sormas.api.caze.CaseReferenceDto; import de.symeda.sormas.api.caze.surveillancereport.SurveillanceReportReferenceDto; @@ -77,6 +81,7 @@ import de.symeda.sormas.api.externalmessage.NewMessagesState; import de.symeda.sormas.api.externalmessage.labmessage.SampleReportDto; import de.symeda.sormas.api.externalmessage.processing.ExternalMessageProcessingResult; +import de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseWrapper; import de.symeda.sormas.api.feature.FeatureType; import de.symeda.sormas.api.feature.FeatureTypeProperty; import de.symeda.sormas.api.i18n.Captions; @@ -102,11 +107,14 @@ import de.symeda.sormas.backend.externalmessage.labmessage.SampleReport; import de.symeda.sormas.backend.externalmessage.labmessage.SampleReportFacadeEjb; import de.symeda.sormas.backend.externalmessage.labmessage.TestReport; +import de.symeda.sormas.backend.externalmessage.survey.AutomaticSurveyResponseProcessor; +import de.symeda.sormas.backend.externalmessage.survey.SurveyResponseProcessingResultWrapper; import de.symeda.sormas.backend.feature.FeatureConfigurationFacadeEjb.FeatureConfigurationFacadeEjbLocal; import de.symeda.sormas.backend.infrastructure.country.CountryFacadeEjb; import de.symeda.sormas.backend.infrastructure.country.CountryService; import de.symeda.sormas.backend.infrastructure.facility.FacilityFacadeEjb; import de.symeda.sormas.backend.infrastructure.facility.FacilityService; +import de.symeda.sormas.backend.json.ObjectMapperProvider; import de.symeda.sormas.backend.sample.SampleService; import de.symeda.sormas.backend.symptoms.SymptomsFacadeEjb; import de.symeda.sormas.backend.systemevent.sync.SyncFacadeEjb; @@ -157,6 +165,8 @@ public class ExternalMessageFacadeEjb implements ExternalMessageFacade { private AutomaticLabMessageProcessor automaticLabMessageProcessor; @EJB private FeatureConfigurationFacadeEjbLocal featureConfigurationFacade; + @Inject + private AutomaticSurveyResponseProcessor automaticSurveyResponseProcessor; ExternalMessage fillOrBuildEntity(@NotNull ExternalMessageDto source, ExternalMessage target, boolean checkChangeDate) { @@ -306,6 +316,33 @@ public ExternalMessageDto saveAndProcessLabmessage(@Valid ExternalMessageDto lab return getByUuid(labMessage.getUuid()); } + @Override + public List saveAndProcessSurveyResponses(List dtos) { + try { + List processingResults = automaticSurveyResponseProcessor.processSurveyResponses(dtos); + + processingResults.forEach(wrapper -> { + ProcessingResult result = wrapper.getResult(); + if (result.getStatus().isCanceled()) { + logger.error("Processing of surveyResponse with UUID {} has been canceled", wrapper.getExternalMessage().getUuid()); + } + }); + } catch (InterruptedException e) { + logger.error("Could not process lab message with UUID [{}]", extractUuids(dtos), e); + Thread.currentThread().interrupt(); + } catch (ExecutionException e) { + logger.error("Could not process survey responses with UUID [{}]", extractUuids(dtos), e); + } finally { + dtos.forEach(this::save); + } + + return externalMessageService.getByUuids(dtos.stream().map(EntityDto::getUuid).collect(toList())).stream().map(this::toDto).collect(toList()); + } + + private List extractUuids(List dtos) { + return dtos.stream().map(EntityDto::getUuid).filter(Objects::nonNull).collect(toList()); + } + private boolean checkAutomaticProcessingAllowed() { return featureConfigurationFacade.isPropertyValueTrue(FeatureType.EXTERNAL_MESSAGES, FeatureTypeProperty.FORCE_AUTOMATIC_PROCESSING) || !featureConfigurationFacade.isAnyFeatureEnabled(FeatureType.CONTACT_TRACING, FeatureType.EVENT_SURVEILLANCE); @@ -316,6 +353,10 @@ public ExternalMessageDto save(@Valid ExternalMessageDto dto, boolean checkChang validate(dto); + if (ExternalMessageType.SURVEY_RESPONSE.equals(externalMessage.getType())) { + // TODO: fill missing holes from person: fetch the entities: case -> person + } + externalMessage = fillOrBuildEntity(dto, externalMessage, checkChangeDate); // If it is a LabMessage and it has not set a DiseaseVariant, an attempt is made to determine this from the attached TestReports. @@ -473,6 +514,25 @@ public ExternalMessageDto toDto(ExternalMessage source) { target.setTuberculosisDirectlyObservedTreatment(source.getTuberculosisDirectlyObservedTreatment()); target.setTuberculosisMdrXdrTuberculosis(source.getTuberculosisMdrXdrTuberculosis()); target.setTuberculosisBeijingLineage(source.getTuberculosisBeijingLineage()); + + ExternalMessageAdditionalDataType additionalDataType = source.getAdditionalDataType(); + String additionalData = source.getAdditionalData(); + if (additionalDataType != null && additionalData != null) { + try { + Object additionalDataInstance = ObjectMapperProvider.getInstance().readValue(additionalData, additionalDataType.getDataClass()); + if (additionalDataInstance instanceof ExternalMessageSurveyResponseWrapper) { + target.setSurveyResponseWrapper((ExternalMessageSurveyResponseWrapper) additionalDataInstance); + } else { + throw new IllegalStateException( + String.format( + "Unexpected additionalDataType: [%s], cannot be mapped into the DTO", + additionalDataInstance.getClass().getName())); + } + } catch (JsonProcessingException e) { + throw new RuntimeException(e); + } + } + return target; } @@ -484,7 +544,8 @@ public ExternalMessageDto getByUuid(String uuid) { @Override @RightsAllowed({ UserRight._EXTERNAL_MESSAGE_LABORATORY_DELETE, - UserRight._EXTERNAL_MESSAGE_DOCTOR_DECLARATION_DELETE }) + UserRight._EXTERNAL_MESSAGE_DOCTOR_DECLARATION_DELETE, + UserRight._EXTERNAL_MESSAGE_SURVEY_RESPONSE_DELETE, }) public void delete(String uuid) { externalMessageService.deletePermanent(externalMessageService.getByUuid(uuid)); } @@ -492,7 +553,8 @@ public void delete(String uuid) { @Override @RightsAllowed({ UserRight._EXTERNAL_MESSAGE_LABORATORY_DELETE, - UserRight._EXTERNAL_MESSAGE_DOCTOR_DECLARATION_DELETE }) + UserRight._EXTERNAL_MESSAGE_DOCTOR_DECLARATION_DELETE, + UserRight._EXTERNAL_MESSAGE_SURVEY_RESPONSE_DELETE, }) public List delete(List uuids) { List processedExternalMessages = new ArrayList<>(); List externalMessagesToBeDeleted = externalMessageService.getByUuids(uuids); @@ -718,7 +780,8 @@ public Page getIndexPage( UserRight._SYSTEM, UserRight._EXTERNAL_MESSAGE_ACCESS, UserRight._EXTERNAL_MESSAGE_LABORATORY_VIEW, - UserRight._EXTERNAL_MESSAGE_DOCTOR_DECLARATION_VIEW }) + UserRight._EXTERNAL_MESSAGE_DOCTOR_DECLARATION_VIEW, + UserRight._EXTERNAL_MESSAGE_SURVEY_RESPONSE_VIEW }) public ExternalMessageFetchResult fetchAndSaveExternalMessages(Date since) { SystemEventDto currentSync = syncFacadeEjb.startSyncFor(SystemEventType.FETCH_EXTERNAL_MESSAGES); @@ -738,6 +801,7 @@ public ExternalMessageFetchResult fetchAndSaveExternalMessages(Date since) { } protected ExternalMessageFetchResult fetchAndSaveExternalMessages(SystemEventDto currentSync, Date since) throws NamingException { + // TODO: survey responses should be added here. if (since == null) { since = syncFacadeEjb.findLastSyncDateFor(SystemEventType.FETCH_EXTERNAL_MESSAGES); } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java new file mode 100644 index 00000000000..3c74b8705cb --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java @@ -0,0 +1,20 @@ +package de.symeda.sormas.backend.externalmessage.survey; + +import java.util.List; +import java.util.concurrent.ExecutionException; + +import javax.enterprise.context.ApplicationScoped; +import javax.transaction.Transactional; + +import de.symeda.sormas.api.externalmessage.ExternalMessageDto; + +@ApplicationScoped +public class AutomaticSurveyResponseProcessor { + + @Transactional(Transactional.TxType.REQUIRES_NEW) + public List processSurveyResponses(List externalMessage) + throws InterruptedException, ExecutionException { + + return List.of(); + } +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/SurveyResponseProcessingResultWrapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/SurveyResponseProcessingResultWrapper.java new file mode 100644 index 00000000000..bbcca240da1 --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/SurveyResponseProcessingResultWrapper.java @@ -0,0 +1,62 @@ +package de.symeda.sormas.backend.externalmessage.survey; + +import java.util.Objects; + +import de.symeda.sormas.api.externalmessage.ExternalMessageDto; +import de.symeda.sormas.api.externalmessage.processing.ExternalMessageProcessingResult; +import de.symeda.sormas.api.utils.dataprocessing.ProcessingResult; + +public class SurveyResponseProcessingResultWrapper { + + private ExternalMessageDto externalMessage; + private ProcessingResult result; + private RuntimeException runtimeException; + + public ExternalMessageDto getExternalMessage() { + return externalMessage; + } + + public SurveyResponseProcessingResultWrapper setExternalMessage(ExternalMessageDto externalMessage) { + this.externalMessage = externalMessage; + return this; + } + + public ProcessingResult getResult() { + return result; + } + + public SurveyResponseProcessingResultWrapper setResult(ProcessingResult result) { + this.result = result; + return this; + } + + public RuntimeException getRuntimeException() { + return runtimeException; + } + + public SurveyResponseProcessingResultWrapper setRuntimeException(RuntimeException runtimeException) { + this.runtimeException = runtimeException; + return this; + } + + @Override + public boolean equals(Object o) { + if (o == null || getClass() != o.getClass()) + return false; + SurveyResponseProcessingResultWrapper that = (SurveyResponseProcessingResultWrapper) o; + return Objects.equals(externalMessage, that.externalMessage) + && Objects.equals(result, that.result) + && Objects.equals(runtimeException, that.runtimeException); + } + + @Override + public int hashCode() { + return Objects.hash(externalMessage, result, runtimeException); + } + + @Override + public String toString() { + return "SurveyResponseProcessingResultWrapper{" + "externalMessage=" + externalMessage + ", result=" + result + ", runtimeException=" + + runtimeException + '}'; + } +} diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/ExternalMessageController.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/ExternalMessageController.java index da60b16c9eb..192d2bc8416 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/ExternalMessageController.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/ExternalMessageController.java @@ -151,6 +151,36 @@ public void showExternalMessage(String messageUuid, boolean withActions, Runnabl form.setValue(newDto); } + public void processSurveyResponse(String surveyResponseMessageUuid) { + ExternalMessageDto labMessage = FacadeProvider.getExternalMessageFacade().getByUuid(surveyResponseMessageUuid); + ExternalMessageProcessingFacade processingFacade = getExternalMessageProcessingFacade(); + ExternalMessageMapper mapper = new ExternalMessageMapper(labMessage, processingFacade); + RelatedLabMessageHandler relatedLabMessageHandler = new RelatedLabMessageHandler(UiUtil.getUser(), processingFacade, mapper); + LabMessageProcessingFlow flow = new LabMessageProcessingFlow(labMessage, mapper, processingFacade, relatedLabMessageHandler); + + flow.run().handle((BiFunction, Throwable, Void>) (result, exception) -> { + if (exception != null) { + logger.error("Unexpected exception while processing lab message", exception); + + Notification.show( + I18nProperties.getString(Strings.errorOccurred, I18nProperties.getString(Strings.errorOccurred)), + I18nProperties.getString(Strings.errorWasReported), + Notification.Type.ERROR_MESSAGE); + + return null; + } + + ProcessingResultStatus status = result.getStatus(); + if (status == ProcessingResultStatus.CANCELED_WITH_CORRECTIONS) { + showCorrectionsSavedPopup(); + } else if (status == ProcessingResultStatus.DONE) { + SormasUI.get().getNavigator().navigateTo(ExternalMessagesView.VIEW_NAME); + } + + return null; + }); + } + public void processLabMessage(String labMessageUuid) { ExternalMessageDto labMessage = FacadeProvider.getExternalMessageFacade().getByUuid(labMessageUuid); ExternalMessageProcessingFacade processingFacade = getExternalMessageProcessingFacade(); @@ -510,6 +540,9 @@ private void bulkEditAssignee(Collection selectedRows, if (UiUtil.permitted(UserRight.EXTERNAL_MESSAGE_DOCTOR_DECLARATION_PROCESS)) { types.add(ExternalMessageType.PHYSICIANS_REPORT); } + if (UiUtil.permitted(UserRight.EXTERNAL_MESSAGE_SURVEY_RESPONSE_PROCESS)) { + types.add(ExternalMessageType.SURVEY_RESPONSE); + } components.syncUsersForMessageType(types); components.getAssignMeButton().addClickListener(e -> { diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/ExternalMessageGrid.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/ExternalMessageGrid.java index bd07b1f0d53..45beb95bdb6 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/ExternalMessageGrid.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/ExternalMessageGrid.java @@ -186,7 +186,10 @@ private HorizontalLayout buildAssigneeLayout(ExternalMessageIndexDto externalMes final boolean canAssignDoctorDeclaration = ExternalMessageType.PHYSICIANS_REPORT.equals(externalMessage.getType()) && UiUtil.permitted(UserRight.EXTERNAL_MESSAGE_DOCTOR_DECLARATION_PROCESS); - if (canAssignLabMessage || canAssignDoctorDeclaration) { + final boolean canAssignSurveyResponse = ExternalMessageType.SURVEY_RESPONSE.equals(externalMessage.getType()) + && UiUtil.permitted(UserRight.EXTERNAL_MESSAGE_SURVEY_RESPONSE_PROCESS); + + if (canAssignLabMessage || canAssignDoctorDeclaration || canAssignSurveyResponse) { Button button = new Button(); CssStyles.style(button, ValoTheme.BUTTON_LINK, CssStyles.BUTTON_COMPACT); if (externalMessage.getAssignee() == null) { @@ -210,7 +213,11 @@ private Component buildProcessComponent(ExternalMessageIndexDto indexDto) { && UiUtil.permitted(UserRight.EXTERNAL_MESSAGE_DOCTOR_DECLARATION_PROCESS) && UiUtil.permitted(UserRight.CASE_CREATE, UserRight.CASE_EDIT); - if ((canAssignLabMessage || canAssignDoctorDeclaration) && indexDto.getStatus().isProcessable()) { + final boolean canAssignSurveyResponse = ExternalMessageType.SURVEY_RESPONSE.equals(indexDto.getType()) + && UiUtil.permitted(UserRight.EXTERNAL_MESSAGE_SURVEY_RESPONSE_PROCESS) + && UiUtil.permitted(UserRight.CASE_CREATE, UserRight.CASE_EDIT); + + if ((canAssignLabMessage || canAssignDoctorDeclaration || canAssignSurveyResponse) && indexDto.getStatus().isProcessable()) { // build process button return ButtonHelper.createButton(Captions.externalMessageProcess, e -> { if (ExternalMessageType.LAB_MESSAGE == indexDto.getType()) { From 4a14b430cf895f18d0e44b74d7201e9aabfcdc23 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Wed, 11 Mar 2026 14:29:38 +0100 Subject: [PATCH 046/134] =?UTF-8?q?=E2=9C=85=20broken=20tests=20due=20to?= =?UTF-8?q?=20missing=20permission?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sormas/api/user/DefaultUserRole.java | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/user/DefaultUserRole.java b/sormas-api/src/main/java/de/symeda/sormas/api/user/DefaultUserRole.java index a2677d75db1..8bd8761e9de 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/user/DefaultUserRole.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/user/DefaultUserRole.java @@ -1479,7 +1479,16 @@ public Set getDefaultUserRights() { EXTERNAL_EMAIL_SEND, EXTERNAL_EMAIL_ATTACH_DOCUMENTS, SORMAS_REST, - SORMAS_UI)); + SORMAS_UI, + SURVEY_VIEW, + SURVEY_CREATE, + SURVEY_EDIT, + SURVEY_DELETE, + SURVEY_TOKEN_VIEW, + SURVEY_TOKEN_CREATE, + SURVEY_TOKEN_EDIT, + SURVEY_TOKEN_DELETE, + SURVEY_TOKEN_IMPORT)); break; case POE_INFORMANT: userRights.addAll( @@ -1813,6 +1822,7 @@ public Set getDefaultUserRights() { CONTACT_CONVERT, CONTACT_EXPORT, CONTACT_REASSIGN_CASE, + DOCUMENT_DELETE, MANAGE_EXTERNAL_SYMPTOM_JOURNAL, VISIT_EXPORT, VISIT_DELETE, @@ -1891,7 +1901,16 @@ public Set getDefaultUserRights() { EXTERNAL_EMAIL_SEND, EXTERNAL_EMAIL_ATTACH_DOCUMENTS, SORMAS_REST, - SORMAS_UI)); + SORMAS_UI, + SURVEY_VIEW, + SURVEY_CREATE, + SURVEY_EDIT, + SURVEY_DELETE, + SURVEY_TOKEN_VIEW, + SURVEY_TOKEN_CREATE, + SURVEY_TOKEN_EDIT, + SURVEY_TOKEN_DELETE, + SURVEY_TOKEN_IMPORT)); break; default: throw new IllegalArgumentException(this.toString()); From d90510008a220b7b01b07f5bdc4a732ec3e34de0 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Thu, 12 Mar 2026 10:17:16 +0100 Subject: [PATCH 047/134] Preparing partial retrieve. --- .../externalmessage/ExternalMessageDto.java | 16 +-- .../ExternalMessageFacade.java | 12 ++ .../ExternalMessageSurveyResponseRequest.java | 64 ++++++++- .../ExternalMessageSurveyResponseResult.java | 20 +-- .../survey/ExternalSurveyResponseData.java | 70 ++++++++++ .../patch/partial_retrieval/FieldInfo.java | 49 +++++++ .../PartialRetrievalRequest.java | 37 ++++++ .../sormas/api/survey/SurveyFacade.java | 27 ++-- .../sormas/api/survey/SurveyTokenFacade.java | 3 + .../ExternalMessageAdditionalDataType.java | 6 +- .../ExternalMessageFacadeEjb.java | 20 +-- .../AutomaticSurveyResponseProcessor.java | 117 ++++++++++++++++- ...va => SurveyResponseProcessingResult.java} | 27 ++-- .../backend/patch/BusinessDtoFacade.java | 51 ++++++-- .../sormas/backend/patch/DataPatcherImpl.java | 11 +- .../backend/patch/PatchFieldHelper.java | 13 +- .../backend/patch/PathFailureCause.java | 32 +++++ .../backend/patch/PropertyAccessor.java | 61 ++++++--- .../backend/patch/alias/PathAliasHelper.java | 10 +- .../PartialRetrieverImpl.java | 83 ++++++++++++ .../symeda/sormas/backend/survey/Survey.java | 1 + .../backend/survey/SurveyFacadeEjb.java | 11 ++ .../backend/survey/SurveyTokenFacadeEjb.java | 13 +- .../backend/survey/SurveyTokenService.java | 24 ++++ .../sormas/backend/util/CollectorUtils.java | 13 ++ .../patch/alias/PathAliasHelperTest.java | 123 ++++++++++++++++-- 26 files changed, 790 insertions(+), 124 deletions(-) create mode 100644 sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalSurveyResponseData.java rename sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/{SurveyResponseProcessingResultWrapper.java => SurveyResponseProcessingResult.java} (52%) create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PathFailureCause.java diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageDto.java index af9a9aa7932..58d5a52b050 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageDto.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageDto.java @@ -34,7 +34,7 @@ import de.symeda.sormas.api.clinicalcourse.ComplianceWithTreatment; import de.symeda.sormas.api.disease.DiseaseVariant; import de.symeda.sormas.api.externalmessage.labmessage.SampleReportDto; -import de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseWrapper; +import de.symeda.sormas.api.externalmessage.survey.ExternalSurveyResponseData; import de.symeda.sormas.api.feature.FeatureType; import de.symeda.sormas.api.i18n.Validations; import de.symeda.sormas.api.infrastructure.country.CountryReferenceDto; @@ -266,7 +266,7 @@ public class ExternalMessageDto extends SormasToSormasShareableDto { private Boolean tuberculosisBeijingLineage; @Nullable - private ExternalMessageSurveyResponseWrapper surveyResponseWrapper; + private ExternalSurveyResponseData surveyResponseData; public ExternalMessageType getType() { return type; @@ -946,12 +946,12 @@ public void setTuberculosisBeijingLineage(Boolean tuberculosisBeijingLineage) { this.tuberculosisBeijingLineage = tuberculosisBeijingLineage; } - public ExternalMessageSurveyResponseWrapper getSurveyResponseWrapper() { - return surveyResponseWrapper; + public ExternalSurveyResponseData getSurveyResponseData() { + return surveyResponseData; } - public ExternalMessageDto setSurveyResponseWrapper(ExternalMessageSurveyResponseWrapper surveyResponseWrapper) { - this.surveyResponseWrapper = surveyResponseWrapper; + public ExternalMessageDto setSurveyResponseData(ExternalSurveyResponseData surveyResponseData) { + this.surveyResponseData = surveyResponseData; return this; } @@ -1040,7 +1040,7 @@ public boolean equals(Object o) { && Objects.equals(tuberculosisDirectlyObservedTreatment, that.tuberculosisDirectlyObservedTreatment) && Objects.equals(tuberculosisMdrXdrTuberculosis, that.tuberculosisMdrXdrTuberculosis) && Objects.equals(tuberculosisBeijingLineage, that.tuberculosisBeijingLineage) - && Objects.equals(surveyResponseWrapper, that.surveyResponseWrapper); + && Objects.equals(surveyResponseData, that.surveyResponseData); } @Override @@ -1125,6 +1125,6 @@ public int hashCode() { tuberculosisDirectlyObservedTreatment, tuberculosisMdrXdrTuberculosis, tuberculosisBeijingLineage, - surveyResponseWrapper); + surveyResponseData); } } diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageFacade.java b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageFacade.java index 187e4c33c31..6802e5640ba 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageFacade.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageFacade.java @@ -7,6 +7,8 @@ import javax.naming.NamingException; import javax.validation.Valid; +import org.apache.commons.collections4.CollectionUtils; + import de.symeda.sormas.api.PermanentlyDeletableFacade; import de.symeda.sormas.api.ReferenceDto; import de.symeda.sormas.api.caze.surveillancereport.SurveillanceReportReferenceDto; @@ -22,6 +24,16 @@ public interface ExternalMessageFacade extends PermanentlyDeletableFacade { ExternalMessageDto saveAndProcessLabmessage(@Valid ExternalMessageDto dto); + default ExternalMessageDto saveAndProcessSurveyResponse(@Valid ExternalMessageDto dto) { + List dtos = saveAndProcessSurveyResponses(List.of(dto)); + + if (CollectionUtils.size(dtos) != 1) { + throw new IllegalStateException(String.format("Expecting a single response but got [%s]", dtos)); + } + + return dtos.get(0); + } + List saveAndProcessSurveyResponses(@Valid List dtos); void validate(ExternalMessageDto dto); diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseRequest.java b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseRequest.java index 51ccbffe03c..9356e255884 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseRequest.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseRequest.java @@ -1,5 +1,6 @@ package de.symeda.sormas.api.externalmessage.survey; +import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; @@ -22,6 +23,10 @@ public class ExternalMessageSurveyResponseRequest { private String token; private String externalSurveyId; + private String externalRespondentId; + + private Date responseReceivedDate; + private boolean patchedInCaseOfFailures = false; @NotNull @@ -50,6 +55,12 @@ public class ExternalMessageSurveyResponseRequest { @Nullable private List inputLanguages; + /** + * If true, for enumeration-like targetTypes the default value will be used. + * Mostly "OTHER". + */ + private boolean allowFallbackValues = true; + public String getToken() { return token; } @@ -68,6 +79,24 @@ public ExternalMessageSurveyResponseRequest setExternalSurveyId(String externalS return this; } + public String getExternalRespondentId() { + return externalRespondentId; + } + + public ExternalMessageSurveyResponseRequest setExternalRespondentId(String externalRespondentId) { + this.externalRespondentId = externalRespondentId; + return this; + } + + public Date getResponseReceivedDate() { + return responseReceivedDate; + } + + public ExternalMessageSurveyResponseRequest setResponseReceivedDate(Date responseReceivedDate) { + this.responseReceivedDate = responseReceivedDate; + return this; + } + public boolean isPatchedInCaseOfFailures() { return patchedInCaseOfFailures; } @@ -124,14 +153,26 @@ public ExternalMessageSurveyResponseRequest setInputLanguages(@Nullable List + * For versioning purposes a new entry can be added like: CURRENT_MEMBER_NAME_V2. */ public enum ExternalMessageAdditionalDataType { - SURVEY_RESPONSE_WRAPPER(ExternalMessageSurveyResponseWrapper.class); + SURVEY_RESPONSE_WRAPPER(ExternalSurveyResponseData.class); private final Class dataClass; diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java index 2f4dbf63000..5585a9202c5 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java @@ -81,7 +81,7 @@ import de.symeda.sormas.api.externalmessage.NewMessagesState; import de.symeda.sormas.api.externalmessage.labmessage.SampleReportDto; import de.symeda.sormas.api.externalmessage.processing.ExternalMessageProcessingResult; -import de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseWrapper; +import de.symeda.sormas.api.externalmessage.survey.ExternalSurveyResponseData; import de.symeda.sormas.api.feature.FeatureType; import de.symeda.sormas.api.feature.FeatureTypeProperty; import de.symeda.sormas.api.i18n.Captions; @@ -97,6 +97,7 @@ import de.symeda.sormas.api.utils.SortProperty; import de.symeda.sormas.api.utils.ValidationRuntimeException; import de.symeda.sormas.api.utils.dataprocessing.ProcessingResult; +import de.symeda.sormas.api.utils.dataprocessing.ProcessingResultStatus; import de.symeda.sormas.backend.caze.surveillancereport.SurveillanceReport; import de.symeda.sormas.backend.caze.surveillancereport.SurveillanceReportFacadeEjb; import de.symeda.sormas.backend.caze.surveillancereport.SurveillanceReportService; @@ -108,7 +109,7 @@ import de.symeda.sormas.backend.externalmessage.labmessage.SampleReportFacadeEjb; import de.symeda.sormas.backend.externalmessage.labmessage.TestReport; import de.symeda.sormas.backend.externalmessage.survey.AutomaticSurveyResponseProcessor; -import de.symeda.sormas.backend.externalmessage.survey.SurveyResponseProcessingResultWrapper; +import de.symeda.sormas.backend.externalmessage.survey.SurveyResponseProcessingResult; import de.symeda.sormas.backend.feature.FeatureConfigurationFacadeEjb.FeatureConfigurationFacadeEjbLocal; import de.symeda.sormas.backend.infrastructure.country.CountryFacadeEjb; import de.symeda.sormas.backend.infrastructure.country.CountryService; @@ -318,12 +319,13 @@ public ExternalMessageDto saveAndProcessLabmessage(@Valid ExternalMessageDto lab @Override public List saveAndProcessSurveyResponses(List dtos) { + List savedDtos; try { - List processingResults = automaticSurveyResponseProcessor.processSurveyResponses(dtos); + List processingResults = automaticSurveyResponseProcessor.processSurveyResponses(dtos); processingResults.forEach(wrapper -> { - ProcessingResult result = wrapper.getResult(); - if (result.getStatus().isCanceled()) { + ProcessingResultStatus result = wrapper.getResultStatus(); + if (result.isCanceled()) { logger.error("Processing of surveyResponse with UUID {} has been canceled", wrapper.getExternalMessage().getUuid()); } }); @@ -333,10 +335,10 @@ public List saveAndProcessSurveyResponses(List extractUuids(List dtos) { @@ -520,8 +522,8 @@ public ExternalMessageDto toDto(ExternalMessage source) { if (additionalDataType != null && additionalData != null) { try { Object additionalDataInstance = ObjectMapperProvider.getInstance().readValue(additionalData, additionalDataType.getDataClass()); - if (additionalDataInstance instanceof ExternalMessageSurveyResponseWrapper) { - target.setSurveyResponseWrapper((ExternalMessageSurveyResponseWrapper) additionalDataInstance); + if (additionalDataInstance instanceof ExternalSurveyResponseData) { + target.setSurveyResponseData((ExternalSurveyResponseData) additionalDataInstance); } else { throw new IllegalStateException( String.format( diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java index 3c74b8705cb..03aa0f9bac6 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java @@ -1,20 +1,133 @@ package de.symeda.sormas.backend.externalmessage.survey; +import java.util.ArrayList; import java.util.List; +import java.util.Map; +import java.util.Optional; import java.util.concurrent.ExecutionException; +import java.util.stream.Collectors; +import javax.ejb.EJB; import javax.enterprise.context.ApplicationScoped; +import javax.inject.Inject; import javax.transaction.Transactional; +import org.jetbrains.annotations.NotNull; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import de.symeda.sormas.api.externalmessage.ExternalMessageDto; +import de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseRequest; +import de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseResult; +import de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseWrapper; +import de.symeda.sormas.api.externalmessage.survey.ExternalSurveyResponseData; +import de.symeda.sormas.api.patch.CaseDataPatchRequest; +import de.symeda.sormas.api.patch.DataPatchResponse; +import de.symeda.sormas.api.patch.DataPatcher; +import de.symeda.sormas.api.survey.SurveyReferenceDto; +import de.symeda.sormas.api.survey.SurveyTokenDto; +import de.symeda.sormas.api.utils.Tuple; +import de.symeda.sormas.api.utils.dataprocessing.ProcessingResultStatus; +import de.symeda.sormas.backend.survey.SurveyFacadeEjb; +import de.symeda.sormas.backend.survey.SurveyTokenFacadeEjb; +import de.symeda.sormas.backend.util.CollectorUtils; @ApplicationScoped public class AutomaticSurveyResponseProcessor { + private final Logger logger = LoggerFactory.getLogger(getClass()); + + @Inject + private DataPatcher dataPatcher; + + @EJB + private SurveyFacadeEjb.SurveyFacadeEjbLocal surveyFacade; + + @EJB + private SurveyTokenFacadeEjb.SurveyTokenFacadeEjbLocal surveyTokenFacade; + @Transactional(Transactional.TxType.REQUIRES_NEW) - public List processSurveyResponses(List externalMessage) + public List processSurveyResponses(List externalMessages) throws InterruptedException, ExecutionException { - return List.of(); + List surveyResponseWrappers = + externalMessages.stream().map(ExternalMessageDto::getSurveyResponseData).collect(Collectors.toList()); + + Map tokenByExternalTokenIdDictionary = surveyResponseWrappers.stream().map(responseData -> { + ExternalMessageSurveyResponseRequest request = responseData.getLatest().getRequest(); + return new Tuple<>(request.getExternalSurveyId(), request.getToken()); + }).collect(CollectorUtils.toOrderedNullSafeMap(Tuple::getFirst, Tuple::getSecond)); + + List externalSurveyIds = new ArrayList<>(tokenByExternalTokenIdDictionary.keySet()); + + List> collect = surveyFacade.getByExternalIdsAsReference(externalSurveyIds) + .stream() + .map(survey -> new Tuple<>(survey.toReference(), tokenByExternalTokenIdDictionary.get(survey.getExternalId()))) + .collect(Collectors.toList()); + + List surveyTokens = surveyTokenFacade.getBySurveyReferenceTokenTuples(collect); + + return externalMessages.stream() + .map((ExternalMessageDto externalMessage) -> tryProcessExternalMessage(externalMessage, surveyTokens)) + .collect(Collectors.toList()); + } + + private @NotNull SurveyResponseProcessingResult tryProcessExternalMessage(ExternalMessageDto externalMessage, List surveyTokens) { + SurveyResponseProcessingResult surveyResponseProcessingResult = new SurveyResponseProcessingResult().setExternalMessage(externalMessage); + + ExternalMessageSurveyResponseWrapper latestResponseWrapper = externalMessage.getSurveyResponseData().getLatest(); + ExternalMessageSurveyResponseRequest request = latestResponseWrapper.getRequest(); + + Optional surveyToken = + surveyTokens.stream().filter(tokenCandidate -> tokenCandidate.getToken().equals(request.getToken())).findAny(); + + if (surveyToken.isEmpty()) { + return surveyResponseProcessingResult.setResultStatus(ProcessingResultStatus.CANCELED); + } + + try { + SurveyTokenDto surveyTokenDto = surveyToken.orElseThrow(); + surveyTokenDto.setResponseReceived(true); + surveyTokenDto.setResponseReceivedDate(request.getResponseReceivedDate()); + surveyTokenDto.setExternalRespondentId(request.getExternalRespondentId()); + + surveyTokenFacade.save(surveyTokenDto); + + CaseDataPatchRequest dataPatchRequest = from(request, surveyTokenDto); + + DataPatchResponse response = dataPatcher.patch(dataPatchRequest); + logger.debug("Patch: request: [{}], response: [{}]", request, response); + + latestResponseWrapper + .setResult(new ExternalMessageSurveyResponseResult().setPatchResponse(response).setCaseUuid(dataPatchRequest.getCaseUuid())); + + if (response.isApplied()) { + return surveyResponseProcessingResult.setResultStatus(ProcessingResultStatus.CANCELED); + } + + } catch (RuntimeException e) { + logger.error( + "Exception while patching survey response for external message: [{}]. Processing will continue for other messages", + externalMessage.getUuid(), + e); + surveyResponseProcessingResult.setRuntimeException(e); + } + + return surveyResponseProcessingResult; + } + + private static @NotNull CaseDataPatchRequest from(ExternalMessageSurveyResponseRequest request, SurveyTokenDto surveyTokenDto) { + CaseDataPatchRequest caseDataPatchRequest = new CaseDataPatchRequest(); + + caseDataPatchRequest.setEmptyValueBehavior(request.getEmptyValueBehavior()); + caseDataPatchRequest.setReplacementStrategy(request.getReplacementStrategy()); + caseDataPatchRequest.setPatchedInCaseOfFailures(request.isPatchedInCaseOfFailures()); + caseDataPatchRequest.setOrigin(request.getOrigin()); + caseDataPatchRequest.setInputLanguages(request.getInputLanguages()); + caseDataPatchRequest.setCaseUuid(surveyTokenDto.getCaseAssignedTo().getUuid()); + caseDataPatchRequest.setPatchDictionary(request.getPatchDictionary()); + caseDataPatchRequest.setAllowFallbackValues(request.isAllowFallbackValues()); + + return caseDataPatchRequest; } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/SurveyResponseProcessingResultWrapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/SurveyResponseProcessingResult.java similarity index 52% rename from sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/SurveyResponseProcessingResultWrapper.java rename to sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/SurveyResponseProcessingResult.java index bbcca240da1..3656d17a606 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/SurveyResponseProcessingResultWrapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/SurveyResponseProcessingResult.java @@ -3,30 +3,29 @@ import java.util.Objects; import de.symeda.sormas.api.externalmessage.ExternalMessageDto; -import de.symeda.sormas.api.externalmessage.processing.ExternalMessageProcessingResult; -import de.symeda.sormas.api.utils.dataprocessing.ProcessingResult; +import de.symeda.sormas.api.utils.dataprocessing.ProcessingResultStatus; -public class SurveyResponseProcessingResultWrapper { +public class SurveyResponseProcessingResult { private ExternalMessageDto externalMessage; - private ProcessingResult result; + private ProcessingResultStatus resultStatus; private RuntimeException runtimeException; public ExternalMessageDto getExternalMessage() { return externalMessage; } - public SurveyResponseProcessingResultWrapper setExternalMessage(ExternalMessageDto externalMessage) { + public SurveyResponseProcessingResult setExternalMessage(ExternalMessageDto externalMessage) { this.externalMessage = externalMessage; return this; } - public ProcessingResult getResult() { - return result; + public ProcessingResultStatus getResultStatus() { + return resultStatus; } - public SurveyResponseProcessingResultWrapper setResult(ProcessingResult result) { - this.result = result; + public SurveyResponseProcessingResult setResultStatus(ProcessingResultStatus resultStatus) { + this.resultStatus = resultStatus; return this; } @@ -34,7 +33,7 @@ public RuntimeException getRuntimeException() { return runtimeException; } - public SurveyResponseProcessingResultWrapper setRuntimeException(RuntimeException runtimeException) { + public SurveyResponseProcessingResult setRuntimeException(RuntimeException runtimeException) { this.runtimeException = runtimeException; return this; } @@ -43,20 +42,20 @@ public SurveyResponseProcessingResultWrapper setRuntimeException(RuntimeExceptio public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) return false; - SurveyResponseProcessingResultWrapper that = (SurveyResponseProcessingResultWrapper) o; + SurveyResponseProcessingResult that = (SurveyResponseProcessingResult) o; return Objects.equals(externalMessage, that.externalMessage) - && Objects.equals(result, that.result) + && Objects.equals(resultStatus, that.resultStatus) && Objects.equals(runtimeException, that.runtimeException); } @Override public int hashCode() { - return Objects.hash(externalMessage, result, runtimeException); + return Objects.hash(externalMessage, resultStatus, runtimeException); } @Override public String toString() { - return "SurveyResponseProcessingResultWrapper{" + "externalMessage=" + externalMessage + ", result=" + result + ", runtimeException=" + return "SurveyResponseProcessingResultWrapper{" + "externalMessage=" + externalMessage + ", result=" + resultStatus + ", runtimeException=" + runtimeException + '}'; } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java index 3e3b855bb91..336b6b0b210 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java @@ -1,6 +1,8 @@ package de.symeda.sormas.backend.patch; +import java.util.Collections; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Optional; import java.util.function.Function; @@ -35,13 +37,26 @@ public class BusinessDtoFacade { private final Map, Function> dtoRetrieverDictionary = new HashMap<>(); + private final Map>> dtoRetrieverByI18nDictionary = new HashMap<>(); + @PostConstruct private void init() { registerSaveOperations(); - getRegisterFetchOperations(); + registerFetchOperations(); + registerFetchByI18nOperations(); + } + + private void registerSaveOperations() { + registerSave(CaseDataDto.class, caseDataDto -> caseFacade.save(caseDataDto)); + registerSave(PersonDto.class, personDto -> personFacade.save(personDto)); + registerSave(ImmunizationDto.class, immunizationDto -> immunizationFacade.save(immunizationDto)); } - private void getRegisterFetchOperations() { + private void registerSave(Class dtoClass, Function consumer) { + dtoSaveDictionary.put(dtoClass, consumer); + } + + private void registerFetchOperations() { registerFetch(PersonDto.class, caseDataDto -> personFacade.getByUuid(caseDataDto.getPerson().getUuid())); } @@ -49,20 +64,31 @@ private void registerFetch(Class dtoClass, Function caseFacade.save(caseDataDto)); - registerSave(PersonDto.class, personDto -> personFacade.save(personDto)); - registerSave(ImmunizationDto.class, immunizationDto -> immunizationFacade.save(immunizationDto)); + private void registerFetchByI18nOperations() { + registerFetchByI18n( + PersonDto.I18N_PREFIX, + caseDataDto -> Collections.singletonList(personFacade.getByUuid(caseDataDto.getPerson().getUuid()))); + registerFetchByI18n( + ImmunizationDto.I18N_PREFIX, + caseDataDto -> immunizationFacade.getByPersonUuids(Collections.singletonList(caseDataDto.getPerson().getUuid()))); + } - private void registerSave(Class dtoClass, Function consumer) { - dtoSaveDictionary.put(dtoClass, consumer); + private void registerFetchByI18n(String i18nName, Function> fct) { + dtoRetrieverByI18nDictionary.put(i18nName, fct); } - public CaseDataDto getCaseDataDto(String caseUuid) { + @Nullable + public CaseDataDto getCaseDataDtoNullable(String caseUuid) { return caseFacade.getByUuid(caseUuid); } + @NotNull + public CaseDataDto getCaseDataDto(String caseUuid) { + return Optional.ofNullable(getCaseDataDtoNullable(caseUuid)) + .orElseThrow(() -> new IllegalStateException(String.format("No CaseDataDto found for [%s]", caseUuid))); + } + @Nullable public T fetch(@NotNull Class entityClass, CaseDataDto caseDataDto) { return Optional.ofNullable((Function) dtoRetrieverDictionary.get(entityClass)) @@ -70,6 +96,13 @@ public T fetch(@NotNull Class entityClass, CaseDataDto .apply(caseDataDto); } + @Nullable + public List fetchByI18nName(@NotNull String i18nName, CaseDataDto caseDataDto) { + return Optional.ofNullable(dtoRetrieverByI18nDictionary.get(i18nName)) + .orElseThrow(() -> new IllegalStateException(String.format("No fetch function defined for: [%s]", i18nName))) + .apply(caseDataDto); + } + public T save(@NotNull EntityDto entityDto) { Class entityDtoClass = entityDto.getClass(); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java index dfc4648346f..0bb20cad64c 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java @@ -389,12 +389,15 @@ private List>> computePatchin .flatMap(originalEntry -> { String path = originalEntry.getKey(); - DataPatchFailureCause pathFailureCause = patchFieldHelper.checkIfPathIsInvalid(path); + PathFailureCause pathFailureCause = patchFieldHelper.checkIfPathIsInvalid(path); - Tuple unAliasedTuple = patchFieldHelper.resolveAlias(path); + Tuple unAliasedTuple = patchFieldHelper.resolveAlias(path); Map.Entry entry = toMapEntry(unAliasedTuple.getFirst(), originalEntry.getValue()); - DataPatchFailureCause dataPatchFailureCause = Optional.ofNullable(pathFailureCause).orElseGet(unAliasedTuple::getSecond); + DataPatchFailureCause dataPatchFailureCause = Optional.ofNullable(pathFailureCause) + .map(PathFailureCause::getRelatedPatchFailureCause) + .or(() -> Optional.ofNullable(unAliasedTuple.getSecond()).map(PathFailureCause::getRelatedPatchFailureCause)) + .orElse(null); if (dataPatchFailureCause != null) { return Stream.of(buildMapTupleEntryFrom(entry, dataPatchFailureCause)); @@ -453,7 +456,7 @@ private Tuple> buildMapTupleEntryFr private @NotNull CaseDataDto getCaseDataDto(CaseDataPatchRequest request) { String caseUuid = request.getCaseUuid(); - CaseDataDto caseData = businessDtoFacade.getCaseDataDto(caseUuid); + CaseDataDto caseData = businessDtoFacade.getCaseDataDtoNullable(caseUuid); if (caseData == null) { throw new IllegalStateException(String.format("No case found for uuid: [%s]", caseUuid)); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java index 4bd612414ed..b12a5974d43 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java @@ -10,7 +10,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.symeda.sormas.api.patch.DataPatchFailureCause; import de.symeda.sormas.api.utils.Tuple; import de.symeda.sormas.backend.patch.alias.PathAliasHelper; @@ -43,21 +42,21 @@ public PatchFieldHelper(PathAliasHelper pathAliasHelper) { } @Nullable - public DataPatchFailureCause checkIfPathIsInvalid(String path) { - DataPatchFailureCause dataPatchFailureCause = null; + public PathFailureCause checkIfPathIsInvalid(String path) { + PathFailureCause dataPatchFailureCause = null; if (!startsWithAllowedPrefix(path)) { - dataPatchFailureCause = DataPatchFailureCause.UNSUPPORTED_PREFIX; + dataPatchFailureCause = PathFailureCause.UNSUPPORTED_PREFIX; } else if (fieldIsForbidden(path)) { - dataPatchFailureCause = DataPatchFailureCause.FORBIDDEN_FIELD; + dataPatchFailureCause = PathFailureCause.FORBIDDEN_FIELD; } else if (fieldIsInvalidMultiField(path)) { - dataPatchFailureCause = DataPatchFailureCause.INVALID_MULTIPLE_FIELDS_FORMAT; + dataPatchFailureCause = PathFailureCause.INVALID_MULTIPLE_FIELDS_FORMAT; } return dataPatchFailureCause; } @NotNull - public Tuple resolveAlias(String pathWithPotentialAlias) { + public Tuple resolveAlias(String pathWithPotentialAlias) { return pathAliasHelper.resolveAlias(pathWithPotentialAlias); } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PathFailureCause.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PathFailureCause.java new file mode 100644 index 00000000000..2815d7a615f --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PathFailureCause.java @@ -0,0 +1,32 @@ +package de.symeda.sormas.backend.patch; + +import javax.validation.constraints.NotNull; + +import de.symeda.sormas.api.patch.DataPatchFailureCause; +import de.symeda.sormas.api.patch.partial_retrieval.PartialRetrievalFailureCause; + +public enum PathFailureCause { + + FORBIDDEN_NON_UNIQUE_ALIAS(DataPatchFailureCause.FORBIDDEN_NON_UNIQUE_ALIAS, PartialRetrievalFailureCause.FORBIDDEN_NON_UNIQUE_ALIAS), + UNSUPPORTED_PREFIX(DataPatchFailureCause.UNSUPPORTED_PREFIX, PartialRetrievalFailureCause.UNSUPPORTED_PREFIX), + FORBIDDEN_FIELD(DataPatchFailureCause.FORBIDDEN_FIELD, PartialRetrievalFailureCause.FORBIDDEN_FIELD), + INVALID_MULTIPLE_FIELDS_FORMAT(DataPatchFailureCause.INVALID_MULTIPLE_FIELDS_FORMAT, PartialRetrievalFailureCause.INVALID_MULTIPLE_FIELDS_FORMAT); + + @NotNull + private final DataPatchFailureCause relatedPatchFailureCause; + @NotNull + private final PartialRetrievalFailureCause relatedRetrieveFailureCause; + + PathFailureCause(DataPatchFailureCause relatedPatchFailureCause, PartialRetrievalFailureCause relatedRetrieveFailureCause) { + this.relatedPatchFailureCause = relatedPatchFailureCause; + this.relatedRetrieveFailureCause = relatedRetrieveFailureCause; + } + + public DataPatchFailureCause getRelatedPatchFailureCause() { + return relatedPatchFailureCause; + } + + public PartialRetrievalFailureCause getRelatedRetrieveFailureCause() { + return relatedRetrieveFailureCause; + } +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessor.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessor.java index 64abe0453f4..389180b4661 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessor.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessor.java @@ -29,26 +29,25 @@ public class PropertyAccessor { private PropertyAccessor() { } -// public static Tuple getNestedPropertyAndType( -// final Object bean, -// final String fieldName, -// FieldVisibilityCheckers fieldVisibilityCheckers) { -// if (bean == null || fieldName == null || fieldName.isEmpty()) { -// return INVALID_INPUT; -// } -// -// boolean notNestedPath = fieldName.indexOf(PATH_SEPARATOR) == fieldName.lastIndexOf(PATH_SEPARATOR); -// -// if (notNestedPath) { -// return getPropertyType(bean, fieldName, fieldVisibilityCheckers); -// } -// -// String leafPath = fieldName.substring(fieldName.lastIndexOf(PATH_SEPARATOR) + 1); -// -// return Optional.ofNullable(getNestedProperty(bean, fieldName)) -// .map(leafParent -> getPropertyType(leafParent, leafPath, fieldVisibilityCheckers)) -// .orElse(FIELD_DOES_NOT_EXIST); -// } + public static Tuple, Object>, PropertyAccessFailure> getNestedPropertyAndType( + final Object bean, + final String fieldName, + FieldVisibilityCheckers fieldVisibilityCheckers) { + if (bean == null || fieldName == null || fieldName.isEmpty()) { + return new Tuple<>(null, PropertyAccessFailure.INVALID_INPUT); + } + + boolean notNestedPath = fieldName.indexOf(PATH_SEPARATOR) == fieldName.lastIndexOf(PATH_SEPARATOR); + + if (notNestedPath) { + return getPropertyTypeAndValue(bean, fieldName, fieldVisibilityCheckers); + } + + String leafPath = fieldName.substring(fieldName.lastIndexOf(PATH_SEPARATOR) + 1); + + return getNestedProperty(bean, fieldName).map(leafParent -> getPropertyTypeAndValue(leafParent, leafPath, fieldVisibilityCheckers)) + .orElseGet(() -> new Tuple<>(null, PropertyAccessFailure.FIELD_DOES_NOT_EXIST)); + } public static Tuple, PropertyAccessFailure> getNestedPropertyType( final Object bean, @@ -71,6 +70,28 @@ public static Tuple, PropertyAccessFailure> getNestedPropertyType( .orElse(FIELD_DOES_NOT_EXIST); } + public static Tuple, Object>, PropertyAccessFailure> getPropertyTypeAndValue( + final Object bean, + final String fieldName, + FieldVisibilityCheckers fieldVisibilityCheckers) { + try { + return Optional.ofNullable(PropertyUtils.getPropertyType(bean, fieldName)) + ., Object>, PropertyAccessFailure>> map(propertyType -> { + boolean visible = fieldVisibilityCheckers.isVisible(bean.getClass(), fieldName); + + if (!visible) { + return Tuple.of(null, PropertyAccessFailure.UNSUPPORTED_FIELD_FOR_DISEASE_OR_COUNTRY_OR_FEATURE); + } + + return Tuple.of(Tuple.of(propertyType, getNestedProperty(bean, fieldName).orElse(null)), null); + }) + .orElseGet(() -> Tuple.of(null, PropertyAccessFailure.FIELD_DOES_NOT_EXIST)); + } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) { + logger.info("Could not get property type for [{}], [{}]", fieldName, bean.getClass().getSimpleName(), e); + return null; + } + } + public static Tuple, PropertyAccessFailure> getPropertyType( final Object bean, final String fieldName, diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java index a30d4770723..ee64c0af1ec 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java @@ -17,9 +17,9 @@ import org.slf4j.LoggerFactory; import de.symeda.sormas.api.caze.CaseDataDto; -import de.symeda.sormas.api.patch.DataPatchFailureCause; import de.symeda.sormas.api.person.PersonDto; import de.symeda.sormas.api.utils.Tuple; +import de.symeda.sormas.backend.patch.PathFailureCause; /** * Users want to be able to use multiple root objects, to avoid drilling through properties. @@ -63,7 +63,7 @@ public class PathAliasHelper { } @NotNull - public Tuple resolveAlias(String pathWithPotentialAlias) { + public Tuple resolveAlias(String pathWithPotentialAlias) { int firstPathSeparatorIndex = pathWithPotentialAlias.indexOf(PATH_SEPARATOR); if (firstPathSeparatorIndex == -1) { @@ -75,7 +75,7 @@ public Tuple resolveAlias(String pathWithPotentia Set collisions = DEFAULT_FORBIDDEN_ALIASES_DICTIONARY.get(aliasCandidate); if (CollectionUtils.isNotEmpty(collisions)) { logger.info("Alias [{}] with collisions: [{}] used for path as [{}]", pathWithPotentialAlias, collisions, aliasCandidate); - return tupleWithFailure(DataPatchFailureCause.FORBIDDEN_NON_UNIQUE_ALIAS); + return tupleWithFailure(PathFailureCause.FORBIDDEN_NON_UNIQUE_ALIAS); } // TODO: refactor this @@ -120,11 +120,11 @@ public static String toAliasPath(String pathWithoutAlias) { return pathWithoutAlias; } - private static @NotNull Tuple tupleWithFailure(DataPatchFailureCause forbiddenNonUniqueAlias) { + private static @NotNull Tuple tupleWithFailure(PathFailureCause forbiddenNonUniqueAlias) { return new Tuple<>(null, forbiddenNonUniqueAlias); } - private static @NotNull Tuple tupleWithoutFailure(String pathWithPotentialAlias) { + private static @NotNull Tuple tupleWithoutFailure(String pathWithPotentialAlias) { return new Tuple<>(pathWithPotentialAlias, null); } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java index 8408a77d00c..4d3bafaa502 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java @@ -1,13 +1,46 @@ package de.symeda.sormas.backend.patch.partial_retrieval; +import java.util.Set; + +import javax.ejb.EJB; +import javax.enterprise.context.ApplicationScoped; +import javax.inject.Inject; + +import de.symeda.sormas.api.Disease; +import de.symeda.sormas.api.caze.CaseDataDto; +import de.symeda.sormas.api.patch.partial_retrieval.FieldInfo; +import de.symeda.sormas.api.patch.partial_retrieval.PartialRetrievalFailureCause; import de.symeda.sormas.api.patch.partial_retrieval.PartialRetrievalRequest; import de.symeda.sormas.api.patch.partial_retrieval.PartialRetrievalResponse; import de.symeda.sormas.api.patch.partial_retrieval.PartialRetriever; +import de.symeda.sormas.api.utils.Tuple; +import de.symeda.sormas.api.utils.fieldvisibility.FieldVisibilityCheckers; +import de.symeda.sormas.backend.common.ConfigFacadeEjb; +import de.symeda.sormas.backend.feature.FeatureConfigurationFacadeEjb; +import de.symeda.sormas.backend.patch.BusinessDtoFacade; +import de.symeda.sormas.backend.patch.PatchFieldHelper; +@ApplicationScoped public class PartialRetrieverImpl implements PartialRetriever { + @Inject + private BusinessDtoFacade businessDtoFacade; + + @Inject + private PatchFieldHelper patchFieldHelper; + + @EJB + private FeatureConfigurationFacadeEjb.FeatureConfigurationFacadeEjbLocal featureConfigurationFacade; + + @EJB + private ConfigFacadeEjb.ConfigFacadeEjbLocal configFacade; + @Override public PartialRetrievalResponse retrievePartial(PartialRetrievalRequest request) { + + CaseDataDto caseData = businessDtoFacade.getCaseDataDtoNullable(request.getCaseUuid()); + Disease disease = caseData.getDisease(); + /* * Implementation steps: * - Iterate over fields @@ -17,6 +50,56 @@ public PartialRetrievalResponse retrievePartial(PartialRetrievalRequest request) * - Get type * - Get value */ + + Set fieldsToRetrieve = request.getFieldsToRetrieve(); + + Tuple> targetType = Tuple.of(null, new Tuple<>(null, null)); +// fieldsToRetrieve.stream() +// .flatMap(originalFieldName -> { +// +// PathFailureCause pathFailureCause = patchFieldHelper.checkIfPathIsInvalid(originalFieldName); +// +// Tuple unAliasedTuple = patchFieldHelper.resolveAlias(originalFieldName); +// +// +// PartialRetrievalFailureCause failureCause = Optional.ofNullable(pathFailureCause) +// .map(PathFailureCause::getRelatedRetrieveFailureCause) +// .or(() -> Optional.ofNullable(unAliasedTuple.getSecond()).map(PathFailureCause::getRelatedRetrieveFailureCause)) +// .orElse(null); +// +// if (failureCause != null) { +// return Stream.of(Tuple.of(originalFieldName, new Tuple<>(null, failureCause) )); +// } +// +// String physicalPathName = unAliasedTuple.getFirst(); +// +//// if (!patchFieldHelper.isMultipleFieldFormat(physicalPathName)) { +//// return Stream.of(PropertyAccessor.getNestedPropertyAndType()); +//// } +// +// return splitMultipleFieldsPath(physicalPathName); +// +// +// }).collect(Collectors.toList()); + return null; } + +// @NotNull +// private Tuple> splitMultipleFieldsPath(String path) { +// int openingParenthesisIndex = path.indexOf("("); +// String prefix = path.substring(0, openingParenthesisIndex); +// +// int closeParen = path.indexOf(')'); +// +// String restPath = path.substring(openingParenthesisIndex + 1, closeParen); +// +// return Arrays.stream(restPath.split("\\|")).map(suffix -> Tuple.of(prefix + suffix, Tuple.of(null)); +// } + + private FieldVisibilityCheckers getFieldVisibilityCheckers(Disease disease) { + return FieldVisibilityCheckers.withCountry(configFacade.getCountryLocale()) + .andWithDisease(disease) + .andWithFeatureType(featureConfigurationFacade.getActiveServerFeatureConfigurations()); + } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/Survey.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/Survey.java index 72734809718..e3b82704022 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/Survey.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/Survey.java @@ -36,6 +36,7 @@ public class Survey extends AbstractDomainObject { public static final String DISEASE = "disease"; public static final String DOCUMENT_TEMPLATE = "documentTemplate"; public static final String EMAIL_TEMPLATE = "emailTemplate"; + public static final String EXTERNAL_ID = "externalId"; private String name; private Disease disease; diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyFacadeEjb.java index 7c44a9ce7b0..81e4c5fb7e3 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyFacadeEjb.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyFacadeEjb.java @@ -221,6 +221,17 @@ public SurveyDto getByUuid(String uuid) { return toDto(surveyService.getByUuid(uuid)); } + @Override + public List getByExternalIdsAsReference(List externalId) { + CriteriaBuilder cb = em.getCriteriaBuilder(); + CriteriaQuery cq = cb.createQuery(Survey.class); + Root from = cq.from(Survey.class); + cq.where(cb.equal(from.get(Survey.EXTERNAL_ID), externalId)); + cq.orderBy(cb.desc(from.get(Survey.NAME))); + + return em.createQuery(cq).getResultList().stream().map(this::toDto).collect(Collectors.toList()); + } + @Override @RightsAllowed(UserRight._SURVEY_VIEW) public long count(SurveyCriteria criteria) { diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyTokenFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyTokenFacadeEjb.java index 998015d91d5..ceb98d118ec 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyTokenFacadeEjb.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyTokenFacadeEjb.java @@ -212,6 +212,12 @@ public SurveyTokenDto getBySurveyAndToken(SurveyReferenceDto survey, String toke return toDto(surveyTokenService.getBySurveyAndToken(survey, token)); } + @Override + public List getBySurveyReferenceTokenTuples( + List> surveyReferenceTokenTuples) { + return surveyTokenService.getBySurveyReferenceTokenTuples(surveyReferenceTokenTuples).stream().map(this::toDto).collect(Collectors.toList()); + } + private String getImportTemplateFilePath(String baseFilename) { java.nio.file.Path exportDirectory = Paths.get(configFacade.getGeneratedFilesPath()); return exportDirectory.resolve(getImportTemplateFileName(baseFilename)).toString(); @@ -222,7 +228,12 @@ private String getImportTemplateFileName(String baseFilename) { return instanceName + "_" + baseFilename; } - private List> sortBy(List sortProperties, Root root, CriteriaBuilder cb, CriteriaQuery cq, SurveyTokenJoins joins) { + private List> sortBy( + List sortProperties, + Root root, + CriteriaBuilder cb, + CriteriaQuery cq, + SurveyTokenJoins joins) { List> selections = new ArrayList<>(); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyTokenService.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyTokenService.java index 2d06684deb5..3c8104a047e 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyTokenService.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyTokenService.java @@ -15,6 +15,8 @@ package de.symeda.sormas.backend.survey; +import java.util.List; + import javax.ejb.LocalBean; import javax.ejb.Stateless; import javax.persistence.criteria.CriteriaBuilder; @@ -26,6 +28,7 @@ import de.symeda.sormas.api.survey.SurveyReferenceDto; import de.symeda.sormas.api.survey.SurveyTokenCriteria; +import de.symeda.sormas.api.utils.Tuple; import de.symeda.sormas.backend.caze.Case; import de.symeda.sormas.backend.common.BaseAdoService; import de.symeda.sormas.backend.common.CriteriaBuilderHelper; @@ -113,4 +116,25 @@ public SurveyToken getBySurveyAndToken(SurveyReferenceDto survey, String token) return QueryHelper.getFirstResult(em, cq); } + public List getBySurveyReferenceTokenTuples(List> surveyReferenceTokenTuples) { + CriteriaBuilder cb = em.getCriteriaBuilder(); + CriteriaQuery cq = cb.createQuery(SurveyToken.class); + Root root = cq.from(SurveyToken.class); + SurveyTokenJoins joins = new SurveyTokenJoins(root); + + cq.select(root); + + cq.where( + CriteriaBuilderHelper.or( + cb, + surveyReferenceTokenTuples.stream() + .map( + tuple -> CriteriaBuilderHelper.and( + cb, + cb.equal(joins.getSurvey().get(Survey.UUID), tuple.getFirst().getUuid()), + cb.equal(root.get(SurveyToken.TOKEN), tuple.getSecond()))) + .toArray(Predicate[]::new))); + + return QueryHelper.getResultList(em, cq, 0, 500); + } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/util/CollectorUtils.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/util/CollectorUtils.java index 40c7b51bc78..77a4a30b3b8 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/util/CollectorUtils.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/util/CollectorUtils.java @@ -1,6 +1,7 @@ package de.symeda.sormas.backend.util; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; import java.util.function.Function; import java.util.stream.Collector; @@ -24,4 +25,16 @@ private CollectorUtils() { }); } + public static Collector> toOrderedNullSafeMap( + @NotNull Function keyMapper, + @NotNull Function valueMapper) { + return Collector.of( + LinkedHashMap::new, + (m, item) -> m.put(keyMapper.apply(item), valueMapper.apply(item)), // handles nulls + (map1, map2) -> { + map1.putAll(map2); + return map1; + }); + } + } diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/alias/PathAliasHelperTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/alias/PathAliasHelperTest.java index e812c1efb55..84c6c583e2e 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/alias/PathAliasHelperTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/alias/PathAliasHelperTest.java @@ -5,9 +5,9 @@ import org.junit.jupiter.api.Test; -import de.symeda.sormas.api.patch.DataPatchFailureCause; import de.symeda.sormas.api.utils.Tuple; import de.symeda.sormas.backend.AbstractUnitTest; +import de.symeda.sormas.backend.patch.PathFailureCause; class PathAliasHelperTest extends AbstractUnitTest { @@ -19,7 +19,7 @@ void resolveAlias_noAlias_noDot_returnsOriginalPath() { String path = "some.field"; // EXECUTE - Tuple result = victim.resolveAlias(path); + Tuple result = victim.resolveAlias(path); // CHECK assertEquals(path, result.getFirst()); @@ -32,7 +32,7 @@ void resolveAlias_validAlias_caseDataPerson() { String aliasPath = "CaseData.person.firstName"; // EXECUTE - Tuple result = victim.resolveAlias(aliasPath); + Tuple result = victim.resolveAlias(aliasPath); // CHECK assertEquals("Person.firstName", result.getFirst()); @@ -45,7 +45,7 @@ void resolveAlias_validAlias_symptoms() { String aliasPath = "Symptoms.cough"; // EXECUTE - Tuple result = victim.resolveAlias(aliasPath); + Tuple result = victim.resolveAlias(aliasPath); // CHECK assertEquals("CaseData.symptoms.cough", result.getFirst()); @@ -58,7 +58,7 @@ void resolveAlias_validAlias_nestedPreviousHospitalization() { String aliasPath = "PreviousHospitalization.admissionDate"; // EXECUTE - Tuple result = victim.resolveAlias(aliasPath); + Tuple result = victim.resolveAlias(aliasPath); // CHECK assertEquals("CaseData.hospitalization.previousHospitalizations.admissionDate", result.getFirst()); @@ -71,7 +71,7 @@ void resolveAlias_unknownAlias_returnsOriginalPath() { String aliasPath = "UnknownAlias.field"; // EXECUTE - Tuple result = victim.resolveAlias(aliasPath); + Tuple result = victim.resolveAlias(aliasPath); // CHECK assertEquals(aliasPath, result.getFirst()); @@ -84,11 +84,11 @@ void resolveAlias_forbiddenCollision_location() { String aliasPath = "Location.region"; // EXECUTE - Tuple result = victim.resolveAlias(aliasPath); + Tuple result = victim.resolveAlias(aliasPath); // CHECK assertNull(result.getFirst()); - assertEquals(DataPatchFailureCause.FORBIDDEN_NON_UNIQUE_ALIAS, result.getSecond()); + assertEquals(PathFailureCause.FORBIDDEN_NON_UNIQUE_ALIAS, result.getSecond()); } @Test @@ -97,11 +97,11 @@ void resolveAlias_forbiddenCollision_address() { String aliasPath = "Location.street"; // EXECUTE - Tuple result = victim.resolveAlias(aliasPath); + Tuple result = victim.resolveAlias(aliasPath); // CHECK assertNull(result.getFirst()); - assertEquals(DataPatchFailureCause.FORBIDDEN_NON_UNIQUE_ALIAS, result.getSecond()); + assertEquals(PathFailureCause.FORBIDDEN_NON_UNIQUE_ALIAS, result.getSecond()); } @Test @@ -110,7 +110,7 @@ void resolveAlias_noDotInPath_returnsOriginal() { String path = "justAlias"; // EXECUTE - Tuple result = victim.resolveAlias(path); + Tuple result = victim.resolveAlias(path); // CHECK assertEquals(path, result.getFirst()); @@ -123,10 +123,109 @@ void resolveAlias_multipleDots_usesFirstDot() { String aliasPath = "Facility.name.somethingElse"; // EXECUTE - Tuple result = victim.resolveAlias(aliasPath); + Tuple result = victim.resolveAlias(aliasPath); // CHECK assertEquals("CaseData.healthFacility.name.somethingElse", result.getFirst()); assertNull(result.getSecond()); } + + @Test + void toAliasPath_symptomsPath_isMappedToSymptomsAlias() { + // PREPARE + String pathWithoutAlias = "CaseData.symptoms.cough"; + + // EXECUTE + String result = PathAliasHelper.toAliasPath(pathWithoutAlias); + + // CHECK + assertEquals("Symptoms.cough", result); + } + + @Test + void toAliasPath_nestedPreviousHospitalization_isMappedToAlias() { + // PREPARE + String pathWithoutAlias = "CaseData.hospitalization.previousHospitalizations.admissionDate"; + + // EXECUTE + String result = PathAliasHelper.toAliasPath(pathWithoutAlias); + + // CHECK + assertEquals("PreviousHospitalization.admissionDate", result); + } + + @Test + void toAliasPath_healthFacility_isMappedToFacilityAlias() { + // PREPARE + String pathWithoutAlias = "CaseData.healthFacility.name"; + + // EXECUTE + String result = PathAliasHelper.toAliasPath(pathWithoutAlias); + + // CHECK + assertEquals("Facility.name", result); + } + + @Test + void toAliasPath_birthCountry_isMappedToCountryAlias() { + // PREPARE + String pathWithoutAlias = "Person.birthCountry.name"; + + // EXECUTE + String result = PathAliasHelper.toAliasPath(pathWithoutAlias); + + // CHECK + assertEquals("Country.name", result); + } + + @Test + void toAliasPath_addressSubcontinent_isMappedToSubcontinentAlias() { + // PREPARE + String pathWithoutAlias = "Person.address.subcontinent"; + + // EXECUTE + String result = PathAliasHelper.toAliasPath(pathWithoutAlias); + + // CHECK + assertEquals("Location.subcontinent", result); + } + + @Test + void toAliasPath_addressContinent_isMappedToContinentAlias() { + // PREPARE + String pathWithoutAlias = "Person.address.continent"; + + // EXECUTE + String result = PathAliasHelper.toAliasPath(pathWithoutAlias); + + // CHECK + assertEquals("Location.continent", result); + } + + @Test + void toAliasPath_locationForbiddenAliases_areMappedToLocationAlias() { + // PREPARE + String personAddressPath = "Person.address"; + String exposureLocationPath = "Exposure.location"; + + // EXECUTE + String personResult = PathAliasHelper.toAliasPath(personAddressPath); + String exposureResult = PathAliasHelper.toAliasPath(exposureLocationPath); + + // CHECK + assertEquals("Location", personResult); + assertEquals("Location", exposureResult); + } + + @Test + void toAliasPath_unknownPath_isReturnedUnchanged() { + // PREPARE + String pathWithoutAlias = "SomeUnknown.path"; + + // EXECUTE + String result = PathAliasHelper.toAliasPath(pathWithoutAlias); + + // CHECK + assertEquals(pathWithoutAlias, result); + } } From 896d7e055f2ec137e57b931a5baf2632fc7458d2 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Thu, 12 Mar 2026 15:43:52 +0100 Subject: [PATCH 048/134] =?UTF-8?q?=F0=9F=9A=A7=20preparing=20partial=20re?= =?UTF-8?q?trieval.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now creating structure to display it. --- .../DisplayableFieldInfo.java | 46 +++++ .../DisplayablePartialRetrievalResponse.java | 47 +++++ .../PartialRetrievalFailureCause.java | 3 + .../PartialRetrievalResponse.java | 37 ++++ .../partial_retrieval/PartialRetriever.java | 2 + .../labmessage/TestReport.java | 1 + .../sormas/backend/patch/DataPatcherImpl.java | 15 +- .../backend/patch/PropertyAccessFailure.java | 31 ++- .../backend/patch/PropertyAccessor.java | 3 + .../backend/patch/alias/PathAliasHelper.java | 2 +- .../PartialRetrieverImpl.java | 177 ++++++++++++++---- .../TypeToDisplayRegistry.java | 48 +++++ .../TypeToDisplayValueMapper.java | 32 ++++ .../impl/ObjectTypeToDisplayValueMapper.java | 28 +++ .../PrimitiveTypeToDisplayValueMapper.java | 58 ++++++ .../sormas/backend/AbstractBeanTest.java | 6 + .../patch/alias/PathAliasHelperTest.java | 18 +- .../PartialRetrieverImplTest.java | 110 +++++++++++ 18 files changed, 598 insertions(+), 66 deletions(-) create mode 100644 sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/DisplayableFieldInfo.java create mode 100644 sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/DisplayablePartialRetrievalResponse.java create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/TypeToDisplayRegistry.java create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/TypeToDisplayValueMapper.java create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/ObjectTypeToDisplayValueMapper.java create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/PrimitiveTypeToDisplayValueMapper.java create mode 100644 sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImplTest.java diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/DisplayableFieldInfo.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/DisplayableFieldInfo.java new file mode 100644 index 00000000000..c7ea2373a88 --- /dev/null +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/DisplayableFieldInfo.java @@ -0,0 +1,46 @@ +package de.symeda.sormas.api.patch.partial_retrieval; + +import java.util.Objects; + +public class DisplayableFieldInfo { + + private String translatedFieldName; + private String translatedFieldValue; + + public String getTranslatedFieldName() { + return translatedFieldName; + } + + public DisplayableFieldInfo setTranslatedFieldName(String translatedFieldName) { + this.translatedFieldName = translatedFieldName; + return this; + } + + public String getTranslatedFieldValue() { + return translatedFieldValue; + } + + public DisplayableFieldInfo setTranslatedFieldValue(String translatedFieldValue) { + this.translatedFieldValue = translatedFieldValue; + return this; + } + + @Override + public boolean equals(Object o) { + if (o == null || getClass() != o.getClass()) + return false; + DisplayableFieldInfo that = (DisplayableFieldInfo) o; + return Objects.equals(translatedFieldName, that.translatedFieldName) && Objects.equals(translatedFieldValue, that.translatedFieldValue); + } + + @Override + public int hashCode() { + return Objects.hash(translatedFieldName, translatedFieldValue); + } + + @Override + public String toString() { + return "DisplayableFieldInfo{" + "translatedFieldName='" + translatedFieldName + '\'' + ", translatedFieldValue='" + translatedFieldValue + + '\'' + '}'; + } +} diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/DisplayablePartialRetrievalResponse.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/DisplayablePartialRetrievalResponse.java new file mode 100644 index 00000000000..403a84c6d24 --- /dev/null +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/DisplayablePartialRetrievalResponse.java @@ -0,0 +1,47 @@ +package de.symeda.sormas.api.patch.partial_retrieval; + +import java.util.Map; +import java.util.Objects; + +public class DisplayablePartialRetrievalResponse { + + private Map fieldInfoDictionary; + + private Map failuresDescriptions; + + public Map getFieldInfoDictionary() { + return fieldInfoDictionary; + } + + public DisplayablePartialRetrievalResponse setFieldInfoDictionary(Map fieldInfoDictionary) { + this.fieldInfoDictionary = fieldInfoDictionary; + return this; + } + + public Map getFailuresDescriptions() { + return failuresDescriptions; + } + + public DisplayablePartialRetrievalResponse setFailuresDescriptions(Map failuresDescriptions) { + this.failuresDescriptions = failuresDescriptions; + return this; + } + + @Override + public boolean equals(Object o) { + if (o == null || getClass() != o.getClass()) + return false; + DisplayablePartialRetrievalResponse that = (DisplayablePartialRetrievalResponse) o; + return Objects.equals(fieldInfoDictionary, that.fieldInfoDictionary) && Objects.equals(failuresDescriptions, that.failuresDescriptions); + } + + @Override + public int hashCode() { + return Objects.hash(fieldInfoDictionary, failuresDescriptions); + } + + @Override + public String toString() { + return "DisplayablePartialResponse{" + "fieldInfoDictionary=" + fieldInfoDictionary + ", failuresDescriptions=" + failuresDescriptions + '}'; + } +} diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetrievalFailureCause.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetrievalFailureCause.java index 7a59a828261..13a3978bea6 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetrievalFailureCause.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetrievalFailureCause.java @@ -1,6 +1,9 @@ package de.symeda.sormas.api.patch.partial_retrieval; public enum PartialRetrievalFailureCause { + + ENTITY_COULD_NOT_BE_FOUND, + /** * Occurs if input tries to use multiple fields approach: CaseData.(symptoms.onsetDate|hospitalization.admissionDate). */ diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetrievalResponse.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetrievalResponse.java index f64127c03b5..4e16be6dd6b 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetrievalResponse.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetrievalResponse.java @@ -1,10 +1,47 @@ package de.symeda.sormas.api.patch.partial_retrieval; import java.util.Map; +import java.util.Objects; public class PartialRetrievalResponse { private Map fieldInfoDictionary; private Map failuresDictionary; + + public Map getFieldInfoDictionary() { + return fieldInfoDictionary; + } + + public PartialRetrievalResponse setFieldInfoDictionary(Map fieldInfoDictionary) { + this.fieldInfoDictionary = fieldInfoDictionary; + return this; + } + + public Map getFailuresDictionary() { + return failuresDictionary; + } + + public PartialRetrievalResponse setFailuresDictionary(Map failuresDictionary) { + this.failuresDictionary = failuresDictionary; + return this; + } + + @Override + public boolean equals(Object o) { + if (o == null || getClass() != o.getClass()) + return false; + PartialRetrievalResponse that = (PartialRetrievalResponse) o; + return Objects.equals(fieldInfoDictionary, that.fieldInfoDictionary) && Objects.equals(failuresDictionary, that.failuresDictionary); + } + + @Override + public int hashCode() { + return Objects.hash(fieldInfoDictionary, failuresDictionary); + } + + @Override + public String toString() { + return "PartialRetrievalResponse{" + "fieldInfoDictionary=" + fieldInfoDictionary + ", failuresDictionary=" + failuresDictionary + '}'; + } } diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetriever.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetriever.java index ee37150393e..02a7de8cd24 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetriever.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetriever.java @@ -13,4 +13,6 @@ public interface PartialRetriever { * @return */ PartialRetrievalResponse retrievePartial(PartialRetrievalRequest request); + + DisplayablePartialRetrievalResponse retrievePartialForDisplay(PartialRetrievalRequest request); } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/labmessage/TestReport.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/labmessage/TestReport.java index 9b230b2f889..50346358400 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/labmessage/TestReport.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/labmessage/TestReport.java @@ -128,6 +128,7 @@ public class TestReport extends AbstractDomainObject { private RsvSubtype rsvSubtype; private PathogenSpecie specie; + private Float tubeNil; private Boolean tubeNilGT10; private Float tubeAgTb1; diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java index 0bb20cad64c..54ed0d594ec 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java @@ -63,16 +63,6 @@ public class DataPatcherImpl implements DataPatcher { private final static Logger logger = LoggerFactory.getLogger(DataPatcherImpl.class); - private static final Map PROPERTY_FAILURE_TO_DATA_PATCH_FAILURE = Map.of( - PropertyAccessFailure.INVALID_INPUT, - DataPatchFailureCause.TECHNICAL, - - PropertyAccessFailure.FIELD_DOES_NOT_EXIST, - DataPatchFailureCause.FIELD_DOES_NOT_EXIST, - - PropertyAccessFailure.UNSUPPORTED_FIELD_FOR_DISEASE_OR_COUNTRY_OR_FEATURE, - DataPatchFailureCause.UNSUPPORTED_FIELD_FOR_DISEASE_OR_COUNTRY_OR_FEATURE); - @Inject private PatchFieldHelper patchFieldHelper; @@ -271,10 +261,7 @@ private boolean anyFieldPatchedWithPrefix(Map validPatchDictiona PropertyAccessFailure propertyAccessFailure = nestedPropertyTypeTuple.getSecond(); if (propertyAccessFailure != null) { logger.info("Missing field: [{}] on target: [{}]", relativeFieldName, target); - return singlePatchResult.setFailure( - buildFailure( - PROPERTY_FAILURE_TO_DATA_PATCH_FAILURE.getOrDefault(propertyAccessFailure, DataPatchFailureCause.TECHNICAL), - untypedTargetValue)); + return singlePatchResult.setFailure(buildFailure(propertyAccessFailure.getRelatedPatchFailureCause(), untypedTargetValue)); } Class targetType = nestedPropertyTypeTuple.getFirst(); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessFailure.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessFailure.java index 8b0e547de4d..0a3bc02d356 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessFailure.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessFailure.java @@ -1,7 +1,32 @@ package de.symeda.sormas.backend.patch; +import javax.validation.constraints.NotNull; + +import de.symeda.sormas.api.patch.DataPatchFailureCause; +import de.symeda.sormas.api.patch.partial_retrieval.PartialRetrievalFailureCause; + public enum PropertyAccessFailure { - INVALID_INPUT, - FIELD_DOES_NOT_EXIST, - UNSUPPORTED_FIELD_FOR_DISEASE_OR_COUNTRY_OR_FEATURE + + INVALID_INPUT(DataPatchFailureCause.TECHNICAL, PartialRetrievalFailureCause.TECHNICAL), + FIELD_DOES_NOT_EXIST(DataPatchFailureCause.FIELD_DOES_NOT_EXIST, PartialRetrievalFailureCause.FIELD_DOES_NOT_EXIST), + UNSUPPORTED_FIELD_FOR_DISEASE_OR_COUNTRY_OR_FEATURE(DataPatchFailureCause.UNSUPPORTED_FIELD_FOR_DISEASE_OR_COUNTRY_OR_FEATURE, + PartialRetrievalFailureCause.UNSUPPORTED_FIELD_FOR_DISEASE_OR_COUNTRY_OR_FEATURE); + + @NotNull + private final DataPatchFailureCause relatedPatchFailureCause; + @NotNull + private final PartialRetrievalFailureCause relatedRetrieveFailureCause; + + PropertyAccessFailure(DataPatchFailureCause relatedPatchFailureCause, PartialRetrievalFailureCause relatedRetrieveFailureCause) { + this.relatedPatchFailureCause = relatedPatchFailureCause; + this.relatedRetrieveFailureCause = relatedRetrieveFailureCause; + } + + public DataPatchFailureCause getRelatedPatchFailureCause() { + return relatedPatchFailureCause; + } + + public PartialRetrievalFailureCause getRelatedRetrieveFailureCause() { + return relatedRetrieveFailureCause; + } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessor.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessor.java index 389180b4661..143ffffdb17 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessor.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessor.java @@ -3,6 +3,8 @@ import java.lang.reflect.InvocationTargetException; import java.util.Optional; +import javax.validation.constraints.NotNull; + import org.apache.commons.beanutils.PropertyUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -70,6 +72,7 @@ public static Tuple, PropertyAccessFailure> getNestedPropertyType( .orElse(FIELD_DOES_NOT_EXIST); } + @NotNull public static Tuple, Object>, PropertyAccessFailure> getPropertyTypeAndValue( final Object bean, final String fieldName, diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java index ee64c0af1ec..a80f68d5e66 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java @@ -101,7 +101,7 @@ public Tuple resolveAlias(String pathWithPotentialAlia * @param pathWithoutAlias * @return */ - public static String toAliasPath(String pathWithoutAlias) { + public String toAliasPath(String pathWithoutAlias) { Set> reduce = Stream.concat( DEFAULT_ALIAS_DICTIONARY.entrySet().stream(), DEFAULT_FORBIDDEN_ALIASES_DICTIONARY.entrySet() diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java index 4d3bafaa502..21010380f27 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java @@ -1,13 +1,29 @@ package de.symeda.sormas.backend.patch.partial_retrieval; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Optional; import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; import javax.ejb.EJB; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; +import javax.validation.constraints.NotNull; + +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import de.symeda.sormas.api.Disease; +import de.symeda.sormas.api.EntityDto; import de.symeda.sormas.api.caze.CaseDataDto; +import de.symeda.sormas.api.i18n.I18nProperties; +import de.symeda.sormas.api.patch.partial_retrieval.DisplayableFieldInfo; +import de.symeda.sormas.api.patch.partial_retrieval.DisplayablePartialRetrievalResponse; import de.symeda.sormas.api.patch.partial_retrieval.FieldInfo; import de.symeda.sormas.api.patch.partial_retrieval.PartialRetrievalFailureCause; import de.symeda.sormas.api.patch.partial_retrieval.PartialRetrievalRequest; @@ -19,16 +35,28 @@ import de.symeda.sormas.backend.feature.FeatureConfigurationFacadeEjb; import de.symeda.sormas.backend.patch.BusinessDtoFacade; import de.symeda.sormas.backend.patch.PatchFieldHelper; +import de.symeda.sormas.backend.patch.PathFailureCause; +import de.symeda.sormas.backend.patch.PropertyAccessFailure; +import de.symeda.sormas.backend.patch.PropertyAccessor; +import de.symeda.sormas.backend.patch.alias.PathAliasHelper; @ApplicationScoped public class PartialRetrieverImpl implements PartialRetriever { + private final static Logger logger = LoggerFactory.getLogger(PartialRetrieverImpl.class); + @Inject private BusinessDtoFacade businessDtoFacade; @Inject private PatchFieldHelper patchFieldHelper; + @Inject + private PathAliasHelper pathAliasHelper; + + @Inject + private TypeToDisplayRegistry typeToDisplayRegistry; + @EJB private FeatureConfigurationFacadeEjb.FeatureConfigurationFacadeEjbLocal featureConfigurationFacade; @@ -39,7 +67,6 @@ public class PartialRetrieverImpl implements PartialRetriever { public PartialRetrievalResponse retrievePartial(PartialRetrievalRequest request) { CaseDataDto caseData = businessDtoFacade.getCaseDataDtoNullable(request.getCaseUuid()); - Disease disease = caseData.getDisease(); /* * Implementation steps: @@ -54,48 +81,120 @@ public PartialRetrievalResponse retrievePartial(PartialRetrievalRequest request) Set fieldsToRetrieve = request.getFieldsToRetrieve(); Tuple> targetType = Tuple.of(null, new Tuple<>(null, null)); -// fieldsToRetrieve.stream() -// .flatMap(originalFieldName -> { -// -// PathFailureCause pathFailureCause = patchFieldHelper.checkIfPathIsInvalid(originalFieldName); -// -// Tuple unAliasedTuple = patchFieldHelper.resolveAlias(originalFieldName); -// -// -// PartialRetrievalFailureCause failureCause = Optional.ofNullable(pathFailureCause) -// .map(PathFailureCause::getRelatedRetrieveFailureCause) -// .or(() -> Optional.ofNullable(unAliasedTuple.getSecond()).map(PathFailureCause::getRelatedRetrieveFailureCause)) -// .orElse(null); -// -// if (failureCause != null) { -// return Stream.of(Tuple.of(originalFieldName, new Tuple<>(null, failureCause) )); -// } -// -// String physicalPathName = unAliasedTuple.getFirst(); -// -//// if (!patchFieldHelper.isMultipleFieldFormat(physicalPathName)) { -//// return Stream.of(PropertyAccessor.getNestedPropertyAndType()); -//// } -// -// return splitMultipleFieldsPath(physicalPathName); -// + List>> results = fieldsToRetrieve.stream().flatMap(originalFieldName -> { + + PathFailureCause pathFailureCause = patchFieldHelper.checkIfPathIsInvalid(originalFieldName); + + Tuple unAliasedTuple = patchFieldHelper.resolveAlias(originalFieldName); + + PartialRetrievalFailureCause failureCause = Optional.ofNullable(pathFailureCause) + .map(PathFailureCause::getRelatedRetrieveFailureCause) + .or(() -> Optional.ofNullable(unAliasedTuple.getSecond()).map(PathFailureCause::getRelatedRetrieveFailureCause)) + .orElse(null); + + if (failureCause != null) { + return Stream.of(Tuple.of(originalFieldName, new Tuple<>((FieldInfo) null, failureCause))); + } + + String pathWithoutAlias = unAliasedTuple.getFirst(); + String physicalPathName = pathWithoutAlias.substring(pathWithoutAlias.indexOf('.') + 1); + + // TODO: handle multiple path format. +// if (!patchFieldHelper.isMultipleFieldFormat(physicalPathName)) { + + String aliasPath = pathAliasHelper.toAliasPath(physicalPathName); + Optional adequateBean = getAdequateBean(pathWithoutAlias, caseData); + + if (adequateBean.isEmpty()) { + return Stream.of(Tuple.of(originalFieldName, new Tuple<>((FieldInfo) null, PartialRetrievalFailureCause.ENTITY_COULD_NOT_BE_FOUND))); + } + + Tuple, Object>, PropertyAccessFailure> propertyType = PropertyAccessor + .getPropertyTypeAndValue(adequateBean.orElseThrow(), physicalPathName, getFieldVisibilityCheckers(caseData.getDisease())); + + PropertyAccessFailure propertyAccessFailure = propertyType.getSecond(); + if (propertyAccessFailure != null) { + return Stream.of(Tuple.of(originalFieldName, new Tuple<>((FieldInfo) null, propertyAccessFailure.getRelatedRetrieveFailureCause()))); + } + + Tuple, Object> fieldInfo = propertyType.getFirst(); + + String translatedFieldName = I18nProperties.getCaption(pathWithoutAlias, physicalPathName); + + return Stream.of( + Tuple.of( + originalFieldName, + new Tuple<>( + new FieldInfo().setFieldType(fieldInfo.getFirst()) + .setFieldValue(fieldInfo.getSecond()) + .setTranslatedFieldName(translatedFieldName), + (PartialRetrievalFailureCause) null))); +// } // -// }).collect(Collectors.toList()); +// return splitMultipleFieldsPath(physicalPathName).map(a -> ); + + }).collect(Collectors.toList()); - return null; + Map successes = results.stream() + .filter(tuple -> tuple.getSecond().getSecond() == null) + .collect(Collectors.toMap(Tuple::getFirst, a -> a.getSecond().getFirst())); + + Map failures = results.stream() + .filter(a -> a.getSecond().getSecond() != null) + .collect(Collectors.toMap(Tuple::getFirst, a -> a.getSecond().getSecond())); + + return new PartialRetrievalResponse().setFailuresDictionary(failures).setFieldInfoDictionary(successes); } -// @NotNull -// private Tuple> splitMultipleFieldsPath(String path) { -// int openingParenthesisIndex = path.indexOf("("); -// String prefix = path.substring(0, openingParenthesisIndex); -// -// int closeParen = path.indexOf(')'); -// -// String restPath = path.substring(openingParenthesisIndex + 1, closeParen); -// -// return Arrays.stream(restPath.split("\\|")).map(suffix -> Tuple.of(prefix + suffix, Tuple.of(null)); -// } + @Override + public DisplayablePartialRetrievalResponse retrievePartialForDisplay(PartialRetrievalRequest request) { + PartialRetrievalResponse partialRetrievalResponse = retrievePartial(request); + + // TODO: translate failures. + return new DisplayablePartialRetrievalResponse().setFieldInfoDictionary( + partialRetrievalResponse.getFieldInfoDictionary().entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, entry -> { + FieldInfo fieldInfo = entry.getValue(); + return new DisplayableFieldInfo().setTranslatedFieldName(fieldInfo.getTranslatedFieldName()) + .setTranslatedFieldValue(typeToDisplayRegistry.toDisplayValue(fieldInfo.getFieldValue())); + }))); + } + + private Optional getAdequateBean(@NotNull String aliasPath, @NotNull CaseDataDto caseData) { + + int i = aliasPath.indexOf("."); + + String prefix = StringUtils.substring(aliasPath, 0, i); + + if (CaseDataDto.I18N_PREFIX.equals(prefix)) { + return Optional.of(caseData); + } else { + List entityDtos = businessDtoFacade.fetchByI18nName(prefix, caseData); + + int entitiesSize = CollectionUtils.size(entityDtos); + + if (entitiesSize == 0) { + return Optional.empty(); + } + + if (entitiesSize != 1) { + logger.warn("Only first element is supported for now: [{}], was: [{}]", aliasPath, entitiesSize); + } + + return Optional.ofNullable(entityDtos).map(actualEntities -> actualEntities.get(0)); + } + } + + @NotNull + private Stream splitMultipleFieldsPath(String path) { + int openingParenthesisIndex = path.indexOf("("); + String prefix = path.substring(0, openingParenthesisIndex); + + int closeParen = path.indexOf(')'); + + String restPath = path.substring(openingParenthesisIndex + 1, closeParen); + + return Arrays.stream(restPath.split("\\|")).map(suffix -> prefix + suffix); + } private FieldVisibilityCheckers getFieldVisibilityCheckers(Disease disease) { return FieldVisibilityCheckers.withCountry(configFacade.getCountryLocale()) diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/TypeToDisplayRegistry.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/TypeToDisplayRegistry.java new file mode 100644 index 00000000000..8315ef3378f --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/TypeToDisplayRegistry.java @@ -0,0 +1,48 @@ +package de.symeda.sormas.backend.patch.partial_retrieval; + +import java.util.List; +import java.util.stream.Collectors; + +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Instance; +import javax.inject.Inject; +import javax.validation.constraints.NotNull; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +@ApplicationScoped +public class TypeToDisplayRegistry { + + private final static Logger logger = LoggerFactory.getLogger(TypeToDisplayRegistry.class); + + private List orderedInstances; + + @Inject + private Instance instances; + + public TypeToDisplayRegistry() { + } + + public TypeToDisplayRegistry(Instance instances) { + orderedInstances = instances.stream().sorted().collect(Collectors.toList()); + } + + @NotNull + public String toDisplayValue(@NotNull Object value) { + Class valueType = value.getClass(); + TypeToDisplayValueMapper matchingMapper = orderedInstances.stream() + .filter(mapper -> mapper.supportedTypes().contains(valueType)) + .findAny() + .orElseThrow( + (() -> new IllegalStateException( + String.format( + "No mapper found: [%s], Must not occur, default mapper is Object#toString(). Any registered mappers ? [%s]", + valueType, + orderedInstances)))); + + logger.debug("Value [{}] will be mapped with mapper: [{}]", value, matchingMapper); + + return matchingMapper.toDisplayValue(value); + } +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/TypeToDisplayValueMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/TypeToDisplayValueMapper.java new file mode 100644 index 00000000000..a61e80c9e95 --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/TypeToDisplayValueMapper.java @@ -0,0 +1,32 @@ +package de.symeda.sormas.backend.patch.partial_retrieval; + +import java.util.Set; + +import javax.validation.constraints.NotNull; + +public interface TypeToDisplayValueMapper extends Comparable { + + int HIGH_PRECEDENCE = Integer.MIN_VALUE; + + int LOW_PRECEDENCE = Integer.MAX_VALUE; + + String toDisplayValue(@NotNull Object value); + + Set> supportedTypes(); + + /** + * Allows you to override default mappers. + * {@link #HIGH_PRECEDENCE} means this mapper will be used (among) first. + * {@link #LOW_PRECEDENCE} means this mapper will be used (among) last. + * + * @return defaults to LOW_PRECEDENCE + */ + default int getOrder() { + return LOW_PRECEDENCE; + } + + @Override + default int compareTo(TypeToDisplayValueMapper o) { + return Integer.compare(this.getOrder(), o.getOrder()); + } +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/ObjectTypeToDisplayValueMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/ObjectTypeToDisplayValueMapper.java new file mode 100644 index 00000000000..257cb7bc822 --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/ObjectTypeToDisplayValueMapper.java @@ -0,0 +1,28 @@ +package de.symeda.sormas.backend.patch.partial_retrieval.impl; + +import java.util.Set; + +import javax.enterprise.context.ApplicationScoped; + +import de.symeda.sormas.backend.patch.partial_retrieval.TypeToDisplayValueMapper; + +@ApplicationScoped +public class ObjectTypeToDisplayValueMapper implements TypeToDisplayValueMapper { + + public static final Set> SUPPORTED_TYPES = Set.of(Object.class); + + @Override + public String toDisplayValue(Object value) { + return value.toString(); + } + + @Override + public Set> supportedTypes() { + return SUPPORTED_TYPES; + } + + @Override + public int getOrder() { + return TypeToDisplayValueMapper.super.getOrder(); + } +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/PrimitiveTypeToDisplayValueMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/PrimitiveTypeToDisplayValueMapper.java new file mode 100644 index 00000000000..cc199c1cee4 --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/PrimitiveTypeToDisplayValueMapper.java @@ -0,0 +1,58 @@ +package de.symeda.sormas.backend.patch.partial_retrieval.impl; + +import java.math.BigDecimal; +import java.util.Set; + +import javax.enterprise.context.ApplicationScoped; + +import de.symeda.sormas.api.i18n.I18nProperties; +import de.symeda.sormas.api.utils.YesNoUnknown; +import de.symeda.sormas.backend.patch.partial_retrieval.TypeToDisplayValueMapper; + +@ApplicationScoped +public class PrimitiveTypeToDisplayValueMapper implements TypeToDisplayValueMapper { + + private static final Set> SUPPORTED_TYPES = Set.of( + String.class, + int.class, + Integer.class, + long.class, + Long.class, + BigDecimal.class, + double.class, + Double.class, + float.class, + Float.class, + Boolean.class, + boolean.class); + + @Override + public Set> supportedTypes() { + return SUPPORTED_TYPES; + } + + @Override + public String toDisplayValue(Object value) { + + if (value instanceof Number) { + return numToString((Number) value); + } + + if (value instanceof Boolean) { + YesNoUnknown yes = YesNoUnknown.YES; + return (Boolean) value ? I18nProperties.getEnumCaption(yes) : I18nProperties.getEnumCaption(YesNoUnknown.NO); + } + + return value.toString(); + } + + private static String numToString(Number num) { + if (num instanceof BigDecimal) { + return ((BigDecimal) num).toPlainString(); + } + if (num instanceof Double || num instanceof Float) { + return num.toString(); + } + return String.valueOf(num.longValue()); + } +} diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/AbstractBeanTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/AbstractBeanTest.java index e8611c67fec..4eb9f9555ea 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/backend/AbstractBeanTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/AbstractBeanTest.java @@ -99,6 +99,7 @@ import de.symeda.sormas.api.manualmessagelog.ManualMessageLogFacade; import de.symeda.sormas.api.outbreak.OutbreakFacade; import de.symeda.sormas.api.patch.DataPatcher; +import de.symeda.sormas.api.patch.partial_retrieval.PartialRetriever; import de.symeda.sormas.api.person.notifier.NotifierFacade; import de.symeda.sormas.api.referencedata.ReferenceDataValueInstanceProvider; import de.symeda.sormas.api.report.AggregateReportFacade; @@ -221,6 +222,7 @@ import de.symeda.sormas.backend.manualmessagelog.ManualMessageLogService; import de.symeda.sormas.backend.outbreak.OutbreakFacadeEjb.OutbreakFacadeEjbLocal; import de.symeda.sormas.backend.patch.DataPatcherImpl; +import de.symeda.sormas.backend.patch.partial_retrieval.PartialRetrieverImpl; import de.symeda.sormas.backend.person.PersonFacadeEjb.PersonFacadeEjbLocal; import de.symeda.sormas.backend.person.PersonService; import de.symeda.sormas.backend.person.notifier.NotifierEjb; @@ -1159,6 +1161,10 @@ public DataPatcher getCaseDataPatcher() { return getBean(DataPatcherImpl.class); } + public PartialRetriever getPartialRetriever() { + return getBean(PartialRetrieverImpl.class); + } + public ReferenceDataValueInstanceProvider getReferenceDataValueInstanceProvider() { return getBean(ReferenceDataValueInstanceProviderImpl.class); } diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/alias/PathAliasHelperTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/alias/PathAliasHelperTest.java index 84c6c583e2e..3465ea8a015 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/alias/PathAliasHelperTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/alias/PathAliasHelperTest.java @@ -136,7 +136,7 @@ void toAliasPath_symptomsPath_isMappedToSymptomsAlias() { String pathWithoutAlias = "CaseData.symptoms.cough"; // EXECUTE - String result = PathAliasHelper.toAliasPath(pathWithoutAlias); + String result = victim.toAliasPath(pathWithoutAlias); // CHECK assertEquals("Symptoms.cough", result); @@ -148,7 +148,7 @@ void toAliasPath_nestedPreviousHospitalization_isMappedToAlias() { String pathWithoutAlias = "CaseData.hospitalization.previousHospitalizations.admissionDate"; // EXECUTE - String result = PathAliasHelper.toAliasPath(pathWithoutAlias); + String result = victim.toAliasPath(pathWithoutAlias); // CHECK assertEquals("PreviousHospitalization.admissionDate", result); @@ -160,7 +160,7 @@ void toAliasPath_healthFacility_isMappedToFacilityAlias() { String pathWithoutAlias = "CaseData.healthFacility.name"; // EXECUTE - String result = PathAliasHelper.toAliasPath(pathWithoutAlias); + String result = victim.toAliasPath(pathWithoutAlias); // CHECK assertEquals("Facility.name", result); @@ -172,7 +172,7 @@ void toAliasPath_birthCountry_isMappedToCountryAlias() { String pathWithoutAlias = "Person.birthCountry.name"; // EXECUTE - String result = PathAliasHelper.toAliasPath(pathWithoutAlias); + String result = victim.toAliasPath(pathWithoutAlias); // CHECK assertEquals("Country.name", result); @@ -184,7 +184,7 @@ void toAliasPath_addressSubcontinent_isMappedToSubcontinentAlias() { String pathWithoutAlias = "Person.address.subcontinent"; // EXECUTE - String result = PathAliasHelper.toAliasPath(pathWithoutAlias); + String result = victim.toAliasPath(pathWithoutAlias); // CHECK assertEquals("Location.subcontinent", result); @@ -196,7 +196,7 @@ void toAliasPath_addressContinent_isMappedToContinentAlias() { String pathWithoutAlias = "Person.address.continent"; // EXECUTE - String result = PathAliasHelper.toAliasPath(pathWithoutAlias); + String result = victim.toAliasPath(pathWithoutAlias); // CHECK assertEquals("Location.continent", result); @@ -209,8 +209,8 @@ void toAliasPath_locationForbiddenAliases_areMappedToLocationAlias() { String exposureLocationPath = "Exposure.location"; // EXECUTE - String personResult = PathAliasHelper.toAliasPath(personAddressPath); - String exposureResult = PathAliasHelper.toAliasPath(exposureLocationPath); + String personResult = victim.toAliasPath(personAddressPath); + String exposureResult = victim.toAliasPath(exposureLocationPath); // CHECK assertEquals("Location", personResult); @@ -223,7 +223,7 @@ void toAliasPath_unknownPath_isReturnedUnchanged() { String pathWithoutAlias = "SomeUnknown.path"; // EXECUTE - String result = PathAliasHelper.toAliasPath(pathWithoutAlias); + String result = victim.toAliasPath(pathWithoutAlias); // CHECK assertEquals(pathWithoutAlias, result); diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImplTest.java new file mode 100644 index 00000000000..6acfe0dc227 --- /dev/null +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImplTest.java @@ -0,0 +1,110 @@ +package de.symeda.sormas.backend.patch.partial_retrieval; + +import java.util.Set; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +import de.symeda.sormas.api.Disease; +import de.symeda.sormas.api.Language; +import de.symeda.sormas.api.caze.CaseDataDto; +import de.symeda.sormas.api.i18n.I18nProperties; +import de.symeda.sormas.api.patch.partial_retrieval.FieldInfo; +import de.symeda.sormas.api.patch.partial_retrieval.PartialRetrievalRequest; +import de.symeda.sormas.api.patch.partial_retrieval.PartialRetrievalResponse; +import de.symeda.sormas.api.patch.partial_retrieval.PartialRetriever; +import de.symeda.sormas.api.person.PersonDto; +import de.symeda.sormas.api.person.PersonReferenceDto; +import de.symeda.sormas.api.symptoms.SymptomsDto; +import de.symeda.sormas.backend.AbstractBeanTest; + +class PartialRetrieverImplTest extends AbstractBeanTest { + + @Test + void retrievePartial_german() { + // PREPARE + I18nProperties.setUserLanguage(Language.DE); + + Disease disease = Disease.PERTUSSIS; + CaseDataDto originalCase = creator.createUnclassifiedCase(disease); + + // EXECUTE + String caseDiseaseFieldName = toFieldName(CaseDataDto.I18N_PREFIX, CaseDataDto.DISEASE); + String symptomsAbdominalPain = toFieldName(SymptomsDto.I18N_PREFIX, SymptomsDto.ABDOMINAL_PAIN); + PartialRetrievalResponse actual = victim().retrievePartial( + new PartialRetrievalRequest().setCaseUuid(originalCase.getUuid()) + .setFieldsToRetrieve(Set.of(caseDiseaseFieldName, symptomsAbdominalPain))); + + // CHECK + System.out.println("actual = " + actual); + + FieldInfo caseDiseaseFieldInfo = actual.getFieldInfoDictionary().get(caseDiseaseFieldName); + FieldInfo symptomsAbdominalPainFieldInfo = actual.getFieldInfoDictionary().get(symptomsAbdominalPain); + Assertions.assertAll( + () -> Assertions.assertTrue(actual.getFailuresDictionary().isEmpty()), + + () -> Assertions.assertTrue(actual.getFieldInfoDictionary().containsKey(caseDiseaseFieldName)), + () -> Assertions.assertEquals("Krankheit", caseDiseaseFieldInfo.getTranslatedFieldName()), + () -> Assertions.assertEquals(disease, caseDiseaseFieldInfo.getFieldValue()), + + () -> Assertions.assertTrue(actual.getFieldInfoDictionary().containsKey(symptomsAbdominalPain)), + () -> Assertions.assertEquals("Krankheit", symptomsAbdominalPainFieldInfo.getTranslatedFieldName()), + () -> Assertions.assertEquals(originalCase.getSymptoms().getAbdominalPain(), symptomsAbdominalPainFieldInfo.getFieldValue())); + } + + @Test + void retrievePartial_person() { + // PREPARE + Disease disease = Disease.PERTUSSIS; + CaseDataDto originalCase = creator.createUnclassifiedCase(disease); + + PersonReferenceDto personRef = originalCase.getPerson(); + + PersonDto person = getPersonFacade().getByUuid(personRef.getUuid()); + + // EXECUTE + String personFirstNameFieldName = toFieldName(PersonDto.I18N_PREFIX, PersonDto.FIRST_NAME); + PartialRetrievalResponse actual = victim() + .retrievePartial(new PartialRetrievalRequest().setCaseUuid(originalCase.getUuid()).setFieldsToRetrieve(Set.of(personFirstNameFieldName))); + + // CHECK + System.out.println("actual = " + actual); + + FieldInfo personFirstNameFieldInfo = actual.getFieldInfoDictionary().get(personFirstNameFieldName); + Assertions.assertAll( + () -> Assertions.assertTrue(actual.getFailuresDictionary().isEmpty()), + () -> Assertions.assertTrue(actual.getFieldInfoDictionary().containsKey(personFirstNameFieldName)), + () -> Assertions.assertEquals("First name", personFirstNameFieldInfo.getTranslatedFieldName()), + () -> Assertions.assertEquals(person.getFirstName(), personFirstNameFieldInfo.getFieldValue())); + } + + @Test + void retrievePartial_null_value() { + // PREPARE + Disease disease = Disease.DENGUE; + CaseDataDto originalCase = creator.createUnclassifiedCase(disease); + + // EXECUTE + String caseClassificationDateFieldName = toFieldName(CaseDataDto.I18N_PREFIX, CaseDataDto.CLASSIFICATION_DATE); + PartialRetrievalResponse actual = victim().retrievePartial( + new PartialRetrievalRequest().setCaseUuid(originalCase.getUuid()).setFieldsToRetrieve(Set.of(caseClassificationDateFieldName))); + + // CHECK + System.out.println("actual = " + actual); + + FieldInfo classificationDateFieldInfo = actual.getFieldInfoDictionary().get(caseClassificationDateFieldName); + Assertions.assertAll( + () -> Assertions.assertTrue(actual.getFailuresDictionary().isEmpty()), + () -> Assertions.assertTrue(actual.getFieldInfoDictionary().containsKey(caseClassificationDateFieldName)), + () -> Assertions.assertEquals("Date of classification", classificationDateFieldInfo.getTranslatedFieldName()), + () -> Assertions.assertNull(classificationDateFieldInfo.getFieldValue())); + } + + private static String toFieldName(String prefix, String fieldName) { + return prefix + '.' + fieldName; + } + + private PartialRetriever victim() { + return getPartialRetriever(); + } +} From da97e951a1adcf7a19c121d6301322a6c25cfa5a Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Thu, 12 Mar 2026 15:53:13 +0100 Subject: [PATCH 049/134] =?UTF-8?q?=E2=9C=A8=20added=20TypeToDisplayValueM?= =?UTF-8?q?appers.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomizableEnumToDisplayValueMapper.java | 29 ++++++++++++++++++ .../impl/DateToDisplayValueMapper.java | 30 +++++++++++++++++++ .../impl/EnumToDisplayValueMapperImpl.java | 29 ++++++++++++++++++ ...r.java => ObjectToDisplayValueMapper.java} | 7 +---- ...va => PrimitivesToDisplayValueMapper.java} | 7 ++++- .../ReferenceDtoToDisplayValueMapper.java | 29 ++++++++++++++++++ 6 files changed, 124 insertions(+), 7 deletions(-) create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/CustomizableEnumToDisplayValueMapper.java create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/DateToDisplayValueMapper.java create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/EnumToDisplayValueMapperImpl.java rename sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/{ObjectTypeToDisplayValueMapper.java => ObjectToDisplayValueMapper.java} (73%) rename sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/{PrimitiveTypeToDisplayValueMapper.java => PrimitivesToDisplayValueMapper.java} (90%) create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/ReferenceDtoToDisplayValueMapper.java diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/CustomizableEnumToDisplayValueMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/CustomizableEnumToDisplayValueMapper.java new file mode 100644 index 00000000000..66eb1040e1b --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/CustomizableEnumToDisplayValueMapper.java @@ -0,0 +1,29 @@ +package de.symeda.sormas.backend.patch.partial_retrieval.impl; + +import java.util.Set; + +import javax.enterprise.context.ApplicationScoped; + +import de.symeda.sormas.api.customizableenum.CustomizableEnum; +import de.symeda.sormas.backend.patch.partial_retrieval.TypeToDisplayValueMapper; + +@ApplicationScoped +public class CustomizableEnumToDisplayValueMapper implements TypeToDisplayValueMapper { + + public static final Set> SUPPORTED_TYPES = Set.of(CustomizableEnum.class); + + @Override + public String toDisplayValue(Object value) { + return ((CustomizableEnum) value).getCaption(); + } + + @Override + public Set> supportedTypes() { + return SUPPORTED_TYPES; + } + + @Override + public int getOrder() { + return HIGH_PRECEDENCE; + } +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/DateToDisplayValueMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/DateToDisplayValueMapper.java new file mode 100644 index 00000000000..8db48969513 --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/DateToDisplayValueMapper.java @@ -0,0 +1,30 @@ +package de.symeda.sormas.backend.patch.partial_retrieval.impl; + +import java.util.Date; +import java.util.Set; + +import javax.enterprise.context.ApplicationScoped; + +import de.symeda.sormas.api.utils.DateFormatHelper; +import de.symeda.sormas.backend.patch.partial_retrieval.TypeToDisplayValueMapper; + +@ApplicationScoped +public class DateToDisplayValueMapper implements TypeToDisplayValueMapper { + + public static final Set> SUPPORTED_TYPES = Set.of(Date.class); + + @Override + public String toDisplayValue(Object value) { + return DateFormatHelper.formatDate((Date) value); + } + + @Override + public Set> supportedTypes() { + return SUPPORTED_TYPES; + } + + @Override + public int getOrder() { + return HIGH_PRECEDENCE; + } +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/EnumToDisplayValueMapperImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/EnumToDisplayValueMapperImpl.java new file mode 100644 index 00000000000..fe36a8a362a --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/EnumToDisplayValueMapperImpl.java @@ -0,0 +1,29 @@ +package de.symeda.sormas.backend.patch.partial_retrieval.impl; + +import java.util.Set; + +import javax.enterprise.context.ApplicationScoped; + +import de.symeda.sormas.api.i18n.I18nProperties; +import de.symeda.sormas.backend.patch.partial_retrieval.TypeToDisplayValueMapper; + +@ApplicationScoped +public class EnumToDisplayValueMapperImpl implements TypeToDisplayValueMapper { + + public static final Set> SUPPORTED_TYPES = Set.of(Enum.class); + + @Override + public String toDisplayValue(Object value) { + return I18nProperties.getEnumCaption((Enum) value); + } + + @Override + public Set> supportedTypes() { + return SUPPORTED_TYPES; + } + + @Override + public int getOrder() { + return HIGH_PRECEDENCE; + } +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/ObjectTypeToDisplayValueMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/ObjectToDisplayValueMapper.java similarity index 73% rename from sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/ObjectTypeToDisplayValueMapper.java rename to sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/ObjectToDisplayValueMapper.java index 257cb7bc822..288ec569223 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/ObjectTypeToDisplayValueMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/ObjectToDisplayValueMapper.java @@ -7,7 +7,7 @@ import de.symeda.sormas.backend.patch.partial_retrieval.TypeToDisplayValueMapper; @ApplicationScoped -public class ObjectTypeToDisplayValueMapper implements TypeToDisplayValueMapper { +public class ObjectToDisplayValueMapper implements TypeToDisplayValueMapper { public static final Set> SUPPORTED_TYPES = Set.of(Object.class); @@ -20,9 +20,4 @@ public String toDisplayValue(Object value) { public Set> supportedTypes() { return SUPPORTED_TYPES; } - - @Override - public int getOrder() { - return TypeToDisplayValueMapper.super.getOrder(); - } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/PrimitiveTypeToDisplayValueMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/PrimitivesToDisplayValueMapper.java similarity index 90% rename from sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/PrimitiveTypeToDisplayValueMapper.java rename to sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/PrimitivesToDisplayValueMapper.java index cc199c1cee4..2e878a6f285 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/PrimitiveTypeToDisplayValueMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/PrimitivesToDisplayValueMapper.java @@ -10,7 +10,7 @@ import de.symeda.sormas.backend.patch.partial_retrieval.TypeToDisplayValueMapper; @ApplicationScoped -public class PrimitiveTypeToDisplayValueMapper implements TypeToDisplayValueMapper { +public class PrimitivesToDisplayValueMapper implements TypeToDisplayValueMapper { private static final Set> SUPPORTED_TYPES = Set.of( String.class, @@ -55,4 +55,9 @@ private static String numToString(Number num) { } return String.valueOf(num.longValue()); } + + @Override + public int getOrder() { + return 0; + } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/ReferenceDtoToDisplayValueMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/ReferenceDtoToDisplayValueMapper.java new file mode 100644 index 00000000000..b2e519b5d70 --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/ReferenceDtoToDisplayValueMapper.java @@ -0,0 +1,29 @@ +package de.symeda.sormas.backend.patch.partial_retrieval.impl; + +import java.util.Set; + +import javax.enterprise.context.ApplicationScoped; + +import de.symeda.sormas.api.ReferenceDto; +import de.symeda.sormas.backend.patch.partial_retrieval.TypeToDisplayValueMapper; + +@ApplicationScoped +public class ReferenceDtoToDisplayValueMapper implements TypeToDisplayValueMapper { + + public static final Set> SUPPORTED_TYPES = Set.of(ReferenceDto.class); + + @Override + public String toDisplayValue(Object value) { + return ((ReferenceDto) value).getCaption(); + } + + @Override + public Set> supportedTypes() { + return SUPPORTED_TYPES; + } + + @Override + public int getOrder() { + return HIGH_PRECEDENCE; + } +} From 458f1341d00cea0d9a9db007f4747ca2da5cedd7 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Fri, 13 Mar 2026 07:51:16 +0100 Subject: [PATCH 050/134] =?UTF-8?q?=F0=9F=90=9B=20Displaying=20values=20in?= =?UTF-8?q?=20nice=20format=20works=20now.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DisplayablePartialRetrievalResponse.java | 5 +- .../src/main/resources/captions.properties | 467 +++++++++--------- .../main/resources/captions_de-CH.properties | 285 +++++------ .../main/resources/captions_de-DE.properties | 285 +++++------ .../main/resources/captions_en-AF.properties | 285 +++++------ .../main/resources/captions_en-GH.properties | 285 +++++------ .../main/resources/captions_en-GM.properties | 285 +++++------ .../main/resources/captions_en-KE.properties | 285 +++++------ .../main/resources/captions_en-LR.properties | 285 +++++------ .../main/resources/captions_en-NG.properties | 285 +++++------ .../main/resources/captions_es-ES.properties | 211 ++++---- .../main/resources/captions_fa-AF.properties | 285 +++++------ .../main/resources/captions_fil-PH.properties | 211 ++++---- .../main/resources/captions_fj-FJ.properties | 211 ++++---- .../main/resources/captions_fr-CD.properties | 211 ++++---- .../main/resources/captions_haw-US.properties | 191 ++----- .../main/resources/captions_hi-IN.properties | 211 ++++---- .../main/resources/captions_hr-HR.properties | 211 ++++---- .../main/resources/captions_ja-JP.properties | 211 ++++---- .../main/resources/captions_ks-PK.properties | 191 ++----- .../main/resources/captions_ku-TR.properties | 252 +++------- .../main/resources/captions_la-LA.properties | 191 ++----- .../main/resources/captions_lv-LV.properties | 211 ++++---- .../main/resources/captions_mt-MT.properties | 191 ++----- .../main/resources/captions_ne-NP.properties | 211 ++++---- .../main/resources/captions_nl-NL.properties | 211 ++++---- .../main/resources/captions_no-NO.properties | 211 ++++---- .../main/resources/captions_pt-BR.properties | 285 +++++------ .../main/resources/captions_pt-CV.properties | 285 +++++------ .../main/resources/captions_pt-PT.properties | 211 ++++---- .../main/resources/captions_ro-RO.properties | 211 ++++---- .../main/resources/captions_ru-RU.properties | 285 +++++------ .../main/resources/captions_sv-SE.properties | 211 ++++---- .../main/resources/captions_sw-KE.properties | 211 ++++---- .../main/resources/captions_tr-TR.properties | 211 ++++---- .../main/resources/captions_uk-UA.properties | 211 ++++---- .../main/resources/captions_zh-CN.properties | 285 +++++------ .../main/resources/captions_zu-ZA.properties | 191 ++----- .../backend/patch/PatchFieldHelper.java | 1 + .../backend/patch/alias/PathAliasHelper.java | 4 + .../PartialRetrieverImpl.java | 10 +- .../TypeToDisplayRegistry.java | 15 +- .../TypeToDisplayValueMapper.java | 24 +- .../CustomizableEnumToDisplayValueMapper.java | 2 +- .../impl/DateToDisplayValueMapper.java | 2 +- .../impl/EnumToDisplayValueMapperImpl.java | 2 +- .../impl/ObjectToDisplayValueMapper.java | 2 +- .../impl/PrimitivesToDisplayValueMapper.java | 2 +- .../ReferenceDtoToDisplayValueMapper.java | 2 +- .../PartialRetrieverImplTest.java | 59 ++- 50 files changed, 4042 insertions(+), 5054 deletions(-) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/DisplayablePartialRetrievalResponse.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/DisplayablePartialRetrievalResponse.java index 403a84c6d24..ed0415a0f07 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/DisplayablePartialRetrievalResponse.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/DisplayablePartialRetrievalResponse.java @@ -1,13 +1,14 @@ package de.symeda.sormas.api.patch.partial_retrieval; +import java.util.HashMap; import java.util.Map; import java.util.Objects; public class DisplayablePartialRetrievalResponse { - private Map fieldInfoDictionary; + private Map fieldInfoDictionary = new HashMap<>(); - private Map failuresDescriptions; + private Map failuresDescriptions = new HashMap<>(); public Map getFieldInfoDictionary() { return fieldInfoDictionary; diff --git a/sormas-api/src/main/resources/captions.properties b/sormas-api/src/main/resources/captions.properties index 18d37297bb4..57c02d09063 100644 --- a/sormas-api/src/main/resources/captions.properties +++ b/sormas-api/src/main/resources/captions.properties @@ -52,7 +52,7 @@ creationDate=Creation date changeDate=Date of last change notAvailableShort=NA inaccessibleValue=Confidential -includePartialBirthdates = Include partial birthdates +includePartialBirthdates=Include partial birthdates numberOfCharacters=Number of characters: %d / %d remove=Remove notTestedYet=Not tested yet @@ -189,17 +189,17 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge = Okay, and continue to merge overview -actionOkAndGoToContactDirectory = Okay, and continue to contact directory -actionOkAndGoToContactDetails = Okay, and continue to contact -actionOkAndGoToPersonDirectory = Okay, and continue to person directory -actionExecuteAutomaticDeletion = Execute automatic deletion -actionDone = Done -actionConfirmAction = Confirm action -actionAefiSelectPrimarySuspectVaccination = Select Suspect Vaccination -actionAefiAssignNewReportingIdNumber = "Assign New AEFI ID" -actionImportSurveyTokens = Import survey tokens -actionImportSurveyTokenResponses = Import survey token responses +actionOkAndGoToMerge=Okay, and continue to merge overview +actionOkAndGoToContactDirectory=Okay, and continue to contact directory +actionOkAndGoToContactDetails=Okay, and continue to contact +actionOkAndGoToPersonDirectory=Okay, and continue to person directory +actionExecuteAutomaticDeletion=Execute automatic deletion +actionDone=Done +actionConfirmAction=Confirm action +actionAefiSelectPrimarySuspectVaccination=Select Suspect Vaccination +actionAefiAssignNewReportingIdNumber="Assign New AEFI ID" +actionImportSurveyTokens=Import survey tokens +actionImportSurveyTokenResponses=Import survey token responses activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -253,10 +253,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows = Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups = Expired -aggregateReportNoAgeGroup = No age group -aggregateReportShowOnlyDuplicateReports = Display only duplicate reports +aggregateReportShowZeroRows=Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups=Expired +aggregateReportNoAgeGroup=No age group +aggregateReportShowOnlyDuplicateReports=Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -280,7 +280,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend = Send emails +bulkEmailSend=Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -422,7 +422,7 @@ CaseData.caseIdentificationSource=Case identification source CaseData.screeningType=Screening CaseData.clinicalConfirmation=Clinical confirmation CaseData.community=Community -CaseData.epidemiologicalConfirmation= An epidemiological link to a confirmed case +CaseData.epidemiologicalConfirmation=An epidemiological link to a confirmed case CaseData.laboratoryDiagnosticConfirmation=Laboratory diagnostic confirmation CaseData.caseConfirmationBasis=Basis for confirmation CaseData.caseOfficer=Case officer @@ -439,6 +439,7 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name +CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -578,8 +579,7 @@ CaseData.changeDate=Date of last change CaseData.creationDate=Creation date CaseData.radiographyCompatibility=Radiography CaseData.otherDiagnosticCriteria=Other diagnostic details - -CaseData.clinicalConfirmation.PERTUSSIS= Any person diagnosed as pertussis by a physician +CaseData.clinicalConfirmation.PERTUSSIS=Any person diagnosed as pertussis by a physician # CaseExport CaseExport.address=Address CaseExport.addressRegion=Address Region @@ -863,9 +863,9 @@ Contact.expectedFollowUpUntil=Expected follow-up until Contact.vaccinationStatus=Vaccination status Contact.changeDate=Date of last change Contact.creationDate=Creation date -Contact.prophylaxisPrescribed = Prophylaxis Prescribed -Contact.prescribedDrug = Prescribed Drug -Contact.prescribedDrugText = Specify Prescribed Drug +Contact.prophylaxisPrescribed=Prophylaxis Prescribed +Contact.prescribedDrug=Prescribed Drug +Contact.prescribedDrugText=Specify Prescribed Drug # ContactExport ContactExport.address=Address ContactExport.addressDistrict=Address District @@ -1061,7 +1061,6 @@ aefiDashboardAefiInvestigationDiscarded=Investigation Discarded aefiDashboardAefiClassificationRelatedToVaccination=Related to vaccine or vaccination aefiDashboardAefiClassificationCoincidentalAdverseEvent=Coincidental adverse event aefiDashboardAefiClassificationUndetermined=Undetermined - captionDefault=Default defaultRegion=Default Region defaultDistrict=Default District @@ -1153,18 +1152,18 @@ EpiData.clusterRelated=Cluster Related EpiData.clusterType=Cluster type EpiData.clusterTypeText=Specify cluster type text EpiData.modeOfTransmission=Suspected main mode of transmission -EpiData.modeOfTransmissionType= Specify mode of transmission -EpiData.infectionSource= Suspected vehicle or source of infection -EpiData.infectionSourceText= Specify source of infection -EpiData.importedCase= Imported Case -EpiData.country= Country of contamination +EpiData.modeOfTransmissionType=Specify mode of transmission +EpiData.infectionSource=Suspected vehicle or source of infection +EpiData.infectionSourceText=Specify source of infection +EpiData.importedCase=Imported Case +EpiData.country=Country of contamination #Therapy -Therapy.directlyObservedTreatment = Directly observed treatment -Therapy.mdrXdrTuberculosis = MDR/XDR tuberculosis -Therapy.beijingLineage = Beijing lineage -Therapy.treatmentStarted = Treatment started -Therapy.treatmentNotApplicable = Treatment not applicable -Therapy.treatmentStartedDate = Treatment started date +Therapy.directlyObservedTreatment=Directly observed treatment +Therapy.mdrXdrTuberculosis=MDR/XDR tuberculosis +Therapy.beijingLineage=Beijing lineage +Therapy.treatmentStarted=Treatment started +Therapy.treatmentNotApplicable=Treatment not applicable +Therapy.treatmentStartedDate=Treatment started date # Documents documentUploadDocument=New document documentNoDocuments=There are no documents for this %s @@ -1199,22 +1198,20 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities: - # Entity columns -EntityColumn.ENTITY = Entity -EntityColumn.FIELD_ID = Field ID -EntityColumn.FIELD = Field -EntityColumn.TYPE = Type -EntityColumn.DATA_PROTECTION = Data protection -EntityColumn.CAPTION = Caption -EntityColumn.DESCRIPTION = Description -EntityColumn.REQUIRED = Required -EntityColumn.NEW_DISEASE = New disease -EntityColumn.DISEASES = Diseases -EntityColumn.OUTBREAKS = Outbreaks -EntityColumn.IGNORED_COUNTRIES = Ignored countries -EntityColumn.EXCLUSIVE_COUNTRIES = Exclusive countries - +EntityColumn.ENTITY=Entity +EntityColumn.FIELD_ID=Field ID +EntityColumn.FIELD=Field +EntityColumn.TYPE=Type +EntityColumn.DATA_PROTECTION=Data protection +EntityColumn.CAPTION=Caption +EntityColumn.DESCRIPTION=Description +EntityColumn.REQUIRED=Required +EntityColumn.NEW_DISEASE=New disease +EntityColumn.DISEASES=Diseases +EntityColumn.OUTBREAKS=Outbreaks +EntityColumn.IGNORED_COUNTRIES=Ignored countries +EntityColumn.EXCLUSIVE_COUNTRIES=Exclusive countries # Environment Environment=Environment Environment.uuid=Environment ID @@ -1234,55 +1231,52 @@ Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location Environment.vectorType=Vector Type - environmentActiveEnvironments=Active environments -environmentArchivedEnvironments = Archived environments -environmentAllActiveAndArchivedEnvironments = All active and archived environments -environmentDeletedEnvironments = Deleted environments -environmentNewEnvironment= New environment +environmentArchivedEnvironments=Archived environments +environmentAllActiveAndArchivedEnvironments=All active and archived environments +environmentDeletedEnvironments=Deleted environments +environmentNewEnvironment=New environment environmentEnvironmentsList=Environments list - # EnvironmentSample -EnvironmentSample = Environment Sample -EnvironmentSample.uuid = Sample ID -EnvironmentSample.environment = Environment -EnvironmentSample.sampleDateTime = Date of sampling -EnvironmentSample.sampleMaterial = Sample material -EnvironmentSample.otherSampleMaterial = Specify sample material -EnvironmentSample.sampleVolume = Volume (in mL) -EnvironmentSample.fieldSampleId = Field sample ID -EnvironmentSample.turbidity = Turbidity (in NTU) -EnvironmentSample.phValue = pH of sample -EnvironmentSample.sampleTemperature = Temperature (in °C) -EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) -EnvironmentSample.laboratory = Laboratory -EnvironmentSample.laboratoryDetails = Laboratory details -EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested -EnvironmentSample.reportingUser = Reporting user -EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested -EnvironmentSample.weatherConditions = Weather conditions at time of sampling -EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched = Sent/dispatched -EnvironmentSample.dispatchDate = Dispatchment date -EnvironmentSample.dispatchDetails = Dispatchment details -EnvironmentSample.received = Received -EnvironmentSample.receivalDate = Receival date -EnvironmentSample.labSampleId = Lab sample ID -EnvironmentSample.specimenCondition = Specimen condition -EnvironmentSample.location = Location of sampling site -EnvironmentSample.generalComment = General comment -EnvironmentSample.positivePathogenTests = Positive pathogen tests -EnvironmentSample.latestPathogenTest = Latest pathogen test -EnvironmentSample.numberOfTests = Number of tests +EnvironmentSample=Environment Sample +EnvironmentSample.uuid=Sample ID +EnvironmentSample.environment=Environment +EnvironmentSample.sampleDateTime=Date of sampling +EnvironmentSample.sampleMaterial=Sample material +EnvironmentSample.otherSampleMaterial=Specify sample material +EnvironmentSample.sampleVolume=Volume (in mL) +EnvironmentSample.fieldSampleId=Field sample ID +EnvironmentSample.turbidity=Turbidity (in NTU) +EnvironmentSample.phValue=pH of sample +EnvironmentSample.sampleTemperature=Temperature (in °C) +EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) +EnvironmentSample.laboratory=Laboratory +EnvironmentSample.laboratoryDetails=Laboratory details +EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested +EnvironmentSample.reportingUser=Reporting user +EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested +EnvironmentSample.weatherConditions=Weather conditions at time of sampling +EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched=Sent/dispatched +EnvironmentSample.dispatchDate=Dispatchment date +EnvironmentSample.dispatchDetails=Dispatchment details +EnvironmentSample.received=Received +EnvironmentSample.receivalDate=Receival date +EnvironmentSample.labSampleId=Lab sample ID +EnvironmentSample.specimenCondition=Specimen condition +EnvironmentSample.location=Location of sampling site +EnvironmentSample.generalComment=General comment +EnvironmentSample.positivePathogenTests=Positive pathogen tests +EnvironmentSample.latestPathogenTest=Latest pathogen test +EnvironmentSample.numberOfTests=Number of tests EnvironmentSample.vectorType=Vector Type - # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents = Deleted events +eventDeletedEvents=Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1403,9 +1397,8 @@ Event.district=District Event.community=Community Event.changeDate=Date of last change Event.creationDate=Creation date - -Event.environmentMedia = Media -Event.environment.investigationStatus = Status +Event.environmentMedia=Media +Event.environment.investigationStatus=Status Event.environmentReportDate=Report Date # Event action EventAction.eventUuid=Event id @@ -1436,7 +1429,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants = Deleted event participants +eventParticipantDeletedEventParticipants=Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1449,7 +1442,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser = Reporting user +EventParticipant.reportingUser=Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1486,9 +1479,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink = Event participant ID -EventParticipantSelection.eventUuidLink = Event ID -EventParticipantSelection.resultingCaseUuidLink = Resulting case ID +EventParticipantSelection.eventParticipantUuidLink=Event participant ID +EventParticipantSelection.eventUuidLink=Event ID +EventParticipantSelection.resultingCaseUuidLink=Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1580,13 +1573,12 @@ Exposure.domesticSwimming=Swimming in Luxembourg Exposure.internationalSwimming=Swimming abroad Exposure.swimmingLocation=Swimming Location Exposure.swimmingLocationType=Specify swimming location -Exposure.animalLocation= Animal location -Exposure.animalLocationText= Specify animal location -Exposure.sexualExposureText= Specify sexual exposure - -Exposure.rawFoodContact= Contact with raw pet food -Exposure.rawFoodContactText= Specify contact with raw pet food -Exposure.symptomaticIndividualText= Specify contact with symptomatic individual +Exposure.animalLocation=Animal location +Exposure.animalLocationText=Specify animal location +Exposure.sexualExposureText=Specify sexual exposure +Exposure.rawFoodContact=Contact with raw pet food +Exposure.rawFoodContactText=Specify contact with raw pet food +Exposure.symptomaticIndividualText=Specify contact with symptomatic individual # Facility facilityActiveFacilities=Active facilities facilityArchivedFacilities=Archived facilities @@ -1730,7 +1722,6 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message - #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1741,7 +1732,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList = List of new event participants +lineListingNewEventParticipantsList=List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1822,7 +1813,7 @@ mainMenuUsers=Users mainMenuAggregateReports=Aggregate mainMenuShareRequests=Shares mainMenuSelfReports=Self Reports -mainMenuSurveys = Surveys +mainMenuSurveys=Surveys MaternalHistory.childrenNumber=Total number of children MaternalHistory.ageAtBirth=Mother's age at birth of infant patient MaternalHistory.conjunctivitis=Conjunctivitis @@ -1941,10 +1932,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples = See samples for this person -caseLinkToSamples = See samples for this case -contactLinkToSamples = See samples for this contact -eventParticipantLinkToSamples = See samples for this event participant +personLinkToSamples=See samples for this person +caseLinkToSamples=See samples for this case +contactLinkToSamples=See samples for this contact +eventParticipantLinkToSamples=See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning: This might replace coordinates which were intentionally set differently! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2265,9 +2256,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity = Community of event participant -SampleExport.eventParticipantDistrict = District of event participant -SampleExport.eventParticipantRegion = Region of event participant +SampleExport.eventParticipantCommunity=Community of event participant +SampleExport.eventParticipantDistrict=District of event participant +SampleExport.eventParticipantRegion=Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2326,7 +2317,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser = Reporting user +Immunization.reportingUser=Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2371,10 +2362,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations = Active immunizations -immunizationArchivedImmunizations = Archived immunizations -immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations -immunizationDeletedImmunizations = Deleted immunizations +immunizationActiveImmunizations=Active immunizations +immunizationArchivedImmunizations=Archived immunizations +immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations +immunizationDeletedImmunizations=Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2440,10 +2431,10 @@ aefiVaccinationsDiluentInformation=Diluent Information aefiVaccinationsDiluentBatchLotNumber=Batch/Lot number aefiVaccinationsDiluentExpiryDate=Expiry date aefiVaccinationsDiluentTimeOfReconstitution=Reconstitution time -aefiActiveAdverseEvents = Active adverse events -aefiArchivedAdverseEvents = Archived adverse events -aefiAllActiveAndArchivedAdverseEvents = All active and archived adverse events -aefiDeletedAdverseEvents = Deleted adverse events +aefiActiveAdverseEvents=Active adverse events +aefiArchivedAdverseEvents=Archived adverse events +aefiAllActiveAndArchivedAdverseEvents=All active and archived adverse events +aefiDeletedAdverseEvents=Deleted adverse events # Adverse Events AdverseEvents.severeLocalReaction=Severe local reaction AdverseEvents.severeLocalReactionMoreThanThreeDays=>3 days @@ -2694,13 +2685,13 @@ aefiInvestigationMedicalCareDetailsInstruction=**Instructions ? Attach copies of aefiInvestigationReconstitutionProcedure=Reconstitution procedure aefiInvestigationOfThoseAffected=Of those effected, how many are aefiAefiInvestigationList=Adverse Event Investigations -aefiNewAefiInvestigation = New Investigation +aefiNewAefiInvestigation=New Investigation aefiAefiInvestigationDataView=Adverse Event Investigation aefiNewAefiInvestigationStageTitle=Investigation -aefiActiveInvestigations = Active AEFI investigations -aefiArchivedInvestigations = Archived AEFI investigations -aefiAllActiveAndArchivedInvestigations = All active and archived AEFI investigations -aefiDeletedInvestigations = Deleted AEFI investigations +aefiActiveInvestigations=Active AEFI investigations +aefiArchivedInvestigations=Archived AEFI investigations +aefiAllActiveAndArchivedInvestigations=All active and archived AEFI investigations +aefiDeletedInvestigations=Deleted AEFI investigations titleAefiInvestigationBasicDetails=Section A: Basic details titleAefiInvestigationRelevantPatientInformation=Section B: Relevant patient information prior to immunization titleAefiInvestigationFirstExaminationDetails=Section C: Details of first examination** of serious AEFI case @@ -2969,7 +2960,7 @@ Symptoms.hemorrhagicRash=Hemorrhagic Rash Symptoms.arthritis=Septic Arthritis Symptoms.meningitis=Meningitis Symptoms.septicaemia=Septicaemia -Symptoms.nocturnalCough= Nocturnal Cough +Symptoms.nocturnalCough=Nocturnal Cough Symptoms.otherClinicalPresentation=Other Symptoms Symptoms.otherClinicalPresentationText=Specify Other Symptoms Symptoms.imi.shock=Septic Shock @@ -2995,14 +2986,13 @@ Symptoms.skinRash.lu-MEASLES=Any person not recently vaccinated Symptoms.eggyBurps=Eggy Burps Symptoms.weightLoss=Weight Loss Symptoms.weightLossAmount=Weight Loss Amount (kg) -Symptoms.symptomStatus= Symptom Status -Symptoms.reoccurrence= Reoccurrence -Symptoms.overnightStayRequired= Overnight hospitalization required -Symptoms.bloating= Bloating -Symptoms.symptomCurrentStatus= Symptom persistence -Symptoms.durationOfSymptoms= Duration of symptoms (days) +Symptoms.symptomStatus=Symptom Status +Symptoms.reoccurrence=Reoccurrence +Symptoms.overnightStayRequired=Overnight hospitalization required +Symptoms.bloating=Bloating +Symptoms.symptomCurrentStatus=Symptom persistence +Symptoms.durationOfSymptoms=Duration of symptoms (days) Symptoms.timeOffWorkDays.giardiasis=Duration of absence from work (days) - # Task taskMyTasks=My tasks taskNewTask=New task @@ -3021,7 +3011,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment = Associated environment +Task.environment=Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -3083,7 +3073,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser = Reporting user +TravelEntry.reportingUser=Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -3430,9 +3420,9 @@ cancelExternalFollowUpButton=Cancel external follow-up createSymptomJournalAccountButton=Create PIA Account registerInPatientDiaryButton=Register in CLIMEDO eDiary symptomJournalOptionsButton=PIA eDiary -surveyNewSurvey = New survey -surveySurveyList = Survey list -surveySurveyTokenList = Survey token list +surveyNewSurvey=New survey +surveySurveyList=Survey list +surveySurveyTokenList=Survey token list patientDiaryOptionsButton=CLIMEDO eDiary openInSymptomJournalButton=Open in PIA openInPatientDiaryButton=Open in CLIMEDO @@ -3465,22 +3455,19 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms = SMS -userRoleNotificationTypeEmail = EMAIL +userRoleNotificationTypeSms=SMS +userRoleNotificationTypeEmail=EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template - -Contact.vaccinationProposed = Vaccination proposed -Contact.immuneGlobulinProposed = Immune globulin proposed -Contact.vaccinationDoseOneDate = Vaccination dose one date -Contact.vaccinationDoseTwoDate = Vaccination dose two date - +Contact.vaccinationProposed=Vaccination proposed +Contact.immuneGlobulinProposed=Immune globulin proposed +Contact.vaccinationDoseOneDate=Vaccination dose one date +Contact.vaccinationDoseTwoDate=Vaccination dose two date notificationType=Notification type -notificationType.group = Group -notificationType.caption = Caption -notificationType.description = Description - +notificationType.group=Group +notificationType.caption=Caption +notificationType.description=Description SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -3515,10 +3502,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails = Person contact details -environmentSampleNotShipped = Not shipped -environmentSampleShipped = Shipped -environmentSampleReceived = Received +TaskExport.personOtherContactDetails=Person contact details +environmentSampleNotShipped=Not shipped +environmentSampleShipped=Shipped +environmentSampleReceived=Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -3535,85 +3522,75 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents -environmentNoEnvs = There are no environments for this event %s - +environmentNoEnvs=There are no environments for this event %s # SpecialCaseAccess SpecialCaseAccess=Special case access -caze = Case -assignedTo = Assigned to -assignedBy = Assigned by -endDateTime = Access until -assignmentDate = Date assigned - +caze=Case +assignedTo=Assigned to +assignedBy=Assigned by +endDateTime=Access until +assignmentDate=Date assigned specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case - # SelfReport -SelfReport = Self report -SelfReport.type = Type -SelfReport.reportDate = Report date -SelfReport.caseReference = Case reference number -SelfReport.disease = Disease -SelfReport.diseaseDetails = Disease details -SelfReport.diseaseVariant = Disease variant -SelfReport.diseaseVariantDetails = Disease variant details -SelfReport.firstName = First name -SelfReport.lastName = Last name -SelfReport.sex = Sex -SelfReport.birthDate = Birth date -SelfReport.birthdateDD = Day of birth -SelfReport.birthdateMM = Month of birth -SelfReport.birthdateYYYY = Year of birth -SelfReport.nationalHealthId = National health ID -SelfReport.email = Email -SelfReport.phoneNumber = Phone number -SelfReport.address = Address -SelfReport.dateOfTest = Date of test -SelfReport.dateOfSymptoms = Date of symptoms -SelfReport.workplace = Workplace -SelfReport.dateWorkplace = Date workplace -SelfReport.isolationDate = Date of isolation -SelfReport.contactDate = Date of contact -SelfReport.comment = Comment -SelfReport.responsibleUser = Responsible user -SelfReport.investigationStatus = Investigation status -SelfReport.processingStatus = Processing status +SelfReport=Self report +SelfReport.type=Type +SelfReport.reportDate=Report date +SelfReport.caseReference=Case reference number +SelfReport.disease=Disease +SelfReport.diseaseDetails=Disease details +SelfReport.diseaseVariant=Disease variant +SelfReport.diseaseVariantDetails=Disease variant details +SelfReport.firstName=First name +SelfReport.lastName=Last name +SelfReport.sex=Sex +SelfReport.birthDate=Birth date +SelfReport.birthdateDD=Day of birth +SelfReport.birthdateMM=Month of birth +SelfReport.birthdateYYYY=Year of birth +SelfReport.nationalHealthId=National health ID +SelfReport.email=Email +SelfReport.phoneNumber=Phone number +SelfReport.address=Address +SelfReport.dateOfTest=Date of test +SelfReport.dateOfSymptoms=Date of symptoms +SelfReport.workplace=Workplace +SelfReport.dateWorkplace=Date workplace +SelfReport.isolationDate=Date of isolation +SelfReport.contactDate=Date of contact +SelfReport.comment=Comment +SelfReport.responsibleUser=Responsible user +SelfReport.investigationStatus=Investigation status +SelfReport.processingStatus=Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports selfReportDeletedEnvironments=Deleted self reports selfReportSelfReportsList=Self reports list selfReportProcess=Process - confirmChangesField=Field: confirmChangesValue=Will be changed to: - # Survey surveyNew=New Survey surveyGenerate=Generate Document surveySend=Send Document - -SurveyToken = Survey token -SurveyToken.uuid = Token ID -SurveyToken.survey = Survey -SurveyToken.token = Token -SurveyToken.assignedCaseUuid = Case assigned to -SurveyToken.assignmentDate = Assignment date -SurveyToken.recipientEmail = Recipient email -SurveyToken.generatedDocument = Generated document -SurveyToken.responseReceived = Response received -SurveyToken.responseReceivedDate = Response received date -surveyTokenDeleteSurveyToken = Delete survey token -surveyTokenFilterResponseReceived = Response received -surveyTokenFilterTokenNotAssigned = Token not assigned yet - - -SurveyDocumentOptions.survey = Survey -SurveyDocumentOptions.recipientEmail = Recipient email - +SurveyToken=Survey token +SurveyToken.uuid=Token ID +SurveyToken.survey=Survey +SurveyToken.token=Token +SurveyToken.assignedCaseUuid=Case assigned to +SurveyToken.assignmentDate=Assignment date +SurveyToken.recipientEmail=Recipient email +SurveyToken.generatedDocument=Generated document +SurveyToken.responseReceived=Response received +SurveyToken.responseReceivedDate=Response received date +surveyTokenDeleteSurveyToken=Delete survey token +surveyTokenFilterResponseReceived=Response received +surveyTokenFilterTokenNotAssigned=Token not assigned yet +SurveyDocumentOptions.survey=Survey +SurveyDocumentOptions.recipientEmail=Recipient email # Disease configuration diseaseConfigurationReportingTypeFilter=Reporting Type - # DiseaseConfiguration DiseaseConfiguration.disease=Disease DiseaseConfiguration.active=Active @@ -3628,39 +3605,35 @@ DiseaseConfiguration.extendedClassification=Extended classification DiseaseConfiguration.extendedClassificationMulti=Extended classification multi DiseaseConfiguration.ageGroups=Age groups DiseaseConfiguration.automaticSampleAssignmentThreshold=Automatic sample assignment threshold - # System Configuration -SystemConfigurationValue.category = Category -SystemConfigurationValue.categoryName = Category -SystemConfigurationValue.encrytp = Encrypt -SystemConfigurationValue.key = Key -SystemConfigurationValue.pattern = Pattern -SystemConfigurationValue.value = Value -SystemConfigurationValue.General = General - +SystemConfigurationValue.category=Category +SystemConfigurationValue.categoryName=Category +SystemConfigurationValue.encrytp=Encrypt +SystemConfigurationValue.key=Key +SystemConfigurationValue.pattern=Pattern +SystemConfigurationValue.value=Value +SystemConfigurationValue.General=General # Notifier -Notifier.notification = Notification -Notification.dateOfNotification = Date of notification -Notification.noNotification = There are no notifications -Notification.reportingAgent = Reporting Health Agent: -Notification.registrationNumber = Registration Number -Notification.createNotification = Create Notification -Notification.editNotification = Edit Notification -Notification.viewNotification = View Notification -Notification.notificationTypeExternal = External notification -Notification.notificationTypePhone = Phone notification -Notification.notifierInformation = Notifier information - +Notifier.notification=Notification +Notification.dateOfNotification=Date of notification +Notification.noNotification=There are no notifications +Notification.reportingAgent=Reporting Health Agent: +Notification.registrationNumber=Registration Number +Notification.createNotification=Create Notification +Notification.editNotification=Edit Notification +Notification.viewNotification=View Notification +Notification.notificationTypeExternal=External notification +Notification.notificationTypePhone=Phone notification +Notification.notifierInformation=Notifier information # Diagnosis Criteria Lab Test Details -diagnosisCriteriaDetailTestResult = Result -diagnosisCriteriaDetailTestResultDate = Date -diagnosisCriteriaDetailTestTypeYes = Yes -diagnosisCriteriaDetailTestTypeNo = No -diagnosisCriteriaDetailTestTypeNotApplicable = N/A -diagnosisCriteriaDetailTestResultPos = Pos -diagnosisCriteriaDetailTestResultNeg = Neg -diagnosisCriteriaDetailTestResultOngoing = Ongoing - +diagnosisCriteriaDetailTestResult=Result +diagnosisCriteriaDetailTestResultDate=Date +diagnosisCriteriaDetailTestTypeYes=Yes +diagnosisCriteriaDetailTestTypeNo=No +diagnosisCriteriaDetailTestTypeNotApplicable=N/A +diagnosisCriteriaDetailTestResultPos=Pos +diagnosisCriteriaDetailTestResultNeg=Neg +diagnosisCriteriaDetailTestResultOngoing=Ongoing # Epipulse Export EpipulseExport.uuid=Export ID EpipulseExport.subjectCode=Disease diff --git a/sormas-api/src/main/resources/captions_de-CH.properties b/sormas-api/src/main/resources/captions_de-CH.properties index 94d20705a48..0686419237f 100644 --- a/sormas-api/src/main/resources/captions_de-CH.properties +++ b/sormas-api/src/main/resources/captions_de-CH.properties @@ -52,7 +52,7 @@ creationDate=Erstellungsdatum changeDate=Datum der letzten Änderung notAvailableShort=k. A inaccessibleValue=Vertraulich -includePartialBirthdates = Include partial birthdates +includePartialBirthdates=Include partial birthdates numberOfCharacters=Anzahl der Zeichen\: %d / %d remove=Entfernen notTestedYet=Noch nicht getestet @@ -189,15 +189,15 @@ actionDiscardAndContinue=Verwerfen und fortfahren actionNext=Weiter actionYesAll=Alle ja actionNoAll=Alle nein -actionOkAndGoToMerge = Okay, weiter zur Zusammenführungsübersicht -actionOkAndGoToContactDirectory = Okay, weiter zum Kontaktverzeichnis -actionOkAndGoToContactDetails = Okay, weiter zum Kontakt -actionOkAndGoToPersonDirectory = Okay, und weiter zum Personenverzeichnis -actionExecuteAutomaticDeletion = Automatisches Löschen ausführen -actionDone = Erledigt -actionConfirmAction = Confirm action -actionAefiSelectPrimarySuspectVaccination = Select Suspect Vaccination -actionAefiAssignNewReportingIdNumber = "Assign New AEFI ID" +actionOkAndGoToMerge=Okay, weiter zur Zusammenführungsübersicht +actionOkAndGoToContactDirectory=Okay, weiter zum Kontaktverzeichnis +actionOkAndGoToContactDetails=Okay, weiter zum Kontakt +actionOkAndGoToPersonDirectory=Okay, und weiter zum Personenverzeichnis +actionExecuteAutomaticDeletion=Automatisches Löschen ausführen +actionDone=Erledigt +actionConfirmAction=Confirm action +actionAefiSelectPrimarySuspectVaccination=Select Suspect Vaccination +actionAefiAssignNewReportingIdNumber="Assign New AEFI ID" activityAsCaseFlightNumber=Flugnummer ActivityAsCase=Betreuung/Unterbringung/Tätigkeit in Einrichtung ActivityAsCase.startDate=Start der Aktivität @@ -251,10 +251,10 @@ aggregateReportDiscardSelection=Auswahl abbrechen aggregateReportEditAggregateReport=Gesamtbericht bearbeiten aggregateReportEditReport=Bericht bearbeiten aggregateReportReportFound=Zusammenfassender Bericht gefunden -aggregateReportShowZeroRows = Zeige 0-Zeilen für Krankheit(en) -aggregateReportExpiredAgeGroups = Verfallen -aggregateReportNoAgeGroup = Keine Altersgruppe -aggregateReportShowOnlyDuplicateReports = Nur doppelte Berichte anzeigen +aggregateReportShowZeroRows=Zeige 0-Zeilen für Krankheit(en) +aggregateReportExpiredAgeGroups=Verfallen +aggregateReportNoAgeGroup=Keine Altersgruppe +aggregateReportShowOnlyDuplicateReports=Nur doppelte Berichte anzeigen aggregateReportNewAggregateReport=Neuer Gesamtbericht aggregateReportNewCasesShort=F aggregateReportThisWeek=Diese Woche @@ -278,7 +278,7 @@ days=Tage # Bulk actions bulkActions=Massenbearbeitung bulkEditAssignee=Zuweisung bearbeiten -bulkEmailSend = Send emails +bulkEmailSend=Send emails bulkCancelFollowUp=Nachverfolgung abbrechen bulkCaseClassification=Falldefinitionskategorie ändern bulkCaseOutcome=Verlauf der Erkrankung des Falls ändern @@ -437,6 +437,7 @@ CaseData.contactOfficer=(Gesundheitsamts-)Mitarbeiter*in CaseData.dengueFeverType=Dengue-Fieber Art CaseData.diseaseVariant=Krankheitsvariante CaseData.diseaseDetails=Name der Krankheit +CaseData.disease=Krankheit CaseData.district=Bezirk CaseData.districtLevelDate=Anfragedatum der klinischen Meldung CaseData.doses=Wie viele Dosen @@ -1036,7 +1037,6 @@ aefiDashboardAefiInvestigationDiscarded=Investigation Discarded aefiDashboardAefiClassificationRelatedToVaccination=Related to vaccine or vaccination aefiDashboardAefiClassificationCoincidentalAdverseEvent=Coincidental adverse event aefiDashboardAefiClassificationUndetermined=Undetermined - captionDefault=Standard defaultRegion=Voreingestellte Kantone defaultDistrict=Voreingestellter Bezirk @@ -1154,22 +1154,20 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Generierte Dokumente auch de DocumentTemplate.documentUploadWarning=Dokumenten-Upload Warnung DocumentTemplate.fileTooBig=Die Dokumente wurden erfolgreich generiert, aber mindestens ein Dokument konnte nicht in seine Entität hochgeladen werden, da die Dateigröße die spezifizierte Dateigrößengrenze von %dMB übersteigt DocumentTemplate.notUploaded=Dokumente konnten nicht in die folgenden Entitäten hochgeladen werden\: - # Entity columns -EntityColumn.ENTITY = Entity -EntityColumn.FIELD_ID = Field ID -EntityColumn.FIELD = Field -EntityColumn.TYPE = Type -EntityColumn.DATA_PROTECTION = Data protection -EntityColumn.CAPTION = Caption -EntityColumn.DESCRIPTION = Description -EntityColumn.REQUIRED = Required -EntityColumn.NEW_DISEASE = New disease -EntityColumn.DISEASES = Diseases -EntityColumn.OUTBREAKS = Outbreaks -EntityColumn.IGNORED_COUNTRIES = Ignored countries -EntityColumn.EXCLUSIVE_COUNTRIES = Exclusive countries - +EntityColumn.ENTITY=Entity +EntityColumn.FIELD_ID=Field ID +EntityColumn.FIELD=Field +EntityColumn.TYPE=Type +EntityColumn.DATA_PROTECTION=Data protection +EntityColumn.CAPTION=Caption +EntityColumn.DESCRIPTION=Description +EntityColumn.REQUIRED=Required +EntityColumn.NEW_DISEASE=New disease +EntityColumn.DISEASES=Diseases +EntityColumn.OUTBREAKS=Outbreaks +EntityColumn.IGNORED_COUNTRIES=Ignored countries +EntityColumn.EXCLUSIVE_COUNTRIES=Exclusive countries # Environment Environment=Environment Environment.uuid=Environment ID @@ -1188,54 +1186,51 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location - environmentActiveEnvironments=Active environments -environmentArchivedEnvironments = Archived environments -environmentAllActiveAndArchivedEnvironments = All active and archived environments -environmentDeletedEnvironments = Deleted environments -environmentNewEnvironment= New environment +environmentArchivedEnvironments=Archived environments +environmentAllActiveAndArchivedEnvironments=All active and archived environments +environmentDeletedEnvironments=Deleted environments +environmentNewEnvironment=New environment environmentEnvironmentsList=Environments list - # EnvironmentSample -EnvironmentSample = Environment Sample -EnvironmentSample.uuid = Sample ID -EnvironmentSample.environment = Environment -EnvironmentSample.sampleDateTime = Date of sampling -EnvironmentSample.sampleMaterial = Sample material -EnvironmentSample.otherSampleMaterial = Specify sample material -EnvironmentSample.sampleVolume = Volume (in mL) -EnvironmentSample.fieldSampleId = Field sample ID -EnvironmentSample.turbidity = Turbidity (in NTU) -EnvironmentSample.phValue = pH of sample -EnvironmentSample.sampleTemperature = Temperature (in °C) -EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) -EnvironmentSample.laboratory = Laboratory -EnvironmentSample.laboratoryDetails = Laboratory details -EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested -EnvironmentSample.reportingUser = Reporting user -EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested -EnvironmentSample.weatherConditions = Weather conditions at time of sampling -EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched = Sent/dispatched -EnvironmentSample.dispatchDate = Dispatchment date -EnvironmentSample.dispatchDetails = Dispatchment details -EnvironmentSample.received = Received -EnvironmentSample.receivalDate = Receival date -EnvironmentSample.labSampleId = Lab sample ID -EnvironmentSample.specimenCondition = Specimen condition -EnvironmentSample.location = Location of sampling site -EnvironmentSample.generalComment = General comment -EnvironmentSample.positivePathogenTests = Positive pathogen tests -EnvironmentSample.latestPathogenTest = Latest pathogen test -EnvironmentSample.numberOfTests = Number of tests - +EnvironmentSample=Environment Sample +EnvironmentSample.uuid=Sample ID +EnvironmentSample.environment=Environment +EnvironmentSample.sampleDateTime=Date of sampling +EnvironmentSample.sampleMaterial=Sample material +EnvironmentSample.otherSampleMaterial=Specify sample material +EnvironmentSample.sampleVolume=Volume (in mL) +EnvironmentSample.fieldSampleId=Field sample ID +EnvironmentSample.turbidity=Turbidity (in NTU) +EnvironmentSample.phValue=pH of sample +EnvironmentSample.sampleTemperature=Temperature (in °C) +EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) +EnvironmentSample.laboratory=Laboratory +EnvironmentSample.laboratoryDetails=Laboratory details +EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested +EnvironmentSample.reportingUser=Reporting user +EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested +EnvironmentSample.weatherConditions=Weather conditions at time of sampling +EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched=Sent/dispatched +EnvironmentSample.dispatchDate=Dispatchment date +EnvironmentSample.dispatchDetails=Dispatchment details +EnvironmentSample.received=Received +EnvironmentSample.receivalDate=Receival date +EnvironmentSample.labSampleId=Lab sample ID +EnvironmentSample.specimenCondition=Specimen condition +EnvironmentSample.location=Location of sampling site +EnvironmentSample.generalComment=General comment +EnvironmentSample.positivePathogenTests=Positive pathogen tests +EnvironmentSample.latestPathogenTest=Latest pathogen test +EnvironmentSample.numberOfTests=Number of tests # Event eventActiveEvents=Aktive Ereignisse eventArchivedEvents=Archivierte Ereignisse eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Aktive Gruppen eventArchivedGroups=Archivierte Gruppen -eventDeletedEvents = Deleted events +eventDeletedEvents=Deleted events eventAllGroups=Alle Gruppen eventEventActions=Ereignisaktionen eventEventParticipants=Ereignisteilnehmer @@ -1379,7 +1374,7 @@ eventParticipantAddPerson=Ereignisteilnehmer hinzufügen eventParticipantContactCountOnlyWithSourceCaseInEvent=Zählt nur Kontakte, deren Indexfall mit diesem Ereignis verbunden ist eventParticipantSelect=Ereignisteilnehmer auswählen eventParticipantCreateNew=Neuen Ereignisteilnehmer erstellen -eventParticipantDeletedEventParticipants = Deleted event participants +eventParticipantDeletedEventParticipants=Deleted event participants eventParticipantActiveEventParticipants=Aktive Ereignisteilnehmer eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archivierte Ereignisteilnehmer @@ -1392,7 +1387,7 @@ EventParticipant.caseUuid=Fall-ID EventParticipant.approximateAge=Alter EventParticipant.name=Name EventParticipant.sex=Geschlecht -EventParticipant.reportingUser = Reporting user +EventParticipant.reportingUser=Reporting user EventParticipant.responsibleRegion=Zuständiger Kanton EventParticipant.responsibleDistrict=Zuständiger Bezirk EventParticipant.personUuid=Personen-ID @@ -1429,9 +1424,9 @@ EventParticipantExport.personNationalHealthId=Nationale Gesundheits-ID der Perso EventParticipantExport.eventParticipantInvolvmentDescription=Beschreibung der Beteiligung EventParticipantExport.eventParticipantUuid=Ereignisteilnehmer ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink = Event participant ID -EventParticipantSelection.eventUuidLink = Event ID -EventParticipantSelection.resultingCaseUuidLink = Resulting case ID +EventParticipantSelection.eventParticipantUuidLink=Event participant ID +EventParticipantSelection.eventUuidLink=Event ID +EventParticipantSelection.resultingCaseUuidLink=Resulting case ID # Event Group EventGroup=Ereignisgruppe EventGroup.uuid=Gruppen-ID @@ -1651,7 +1646,6 @@ ExternalMessageCriteria.messageDateTo=... bis ExternalMessageCriteria.birthDateFrom=Geburtsdatum von... ExternalMessageCriteria.birthDateTo=... bis externalMessageValueNotSpecified=Value not specified in external message - #Physician report physiciansReportCaseImmunizations=Immunisierungen physiciansReportCaseAddVaccination=Impfung hinzufügen @@ -1662,7 +1656,7 @@ lineListingDiseaseOfSourceCase=Krankheit des Indexfalls lineListingInfrastructureData=Infrastrukturdaten der letzten Zeile übernehmen lineListingNewCasesList=Liste neuer Fälle lineListingNewContactsList=Liste neuer Kontakte -lineListingNewEventParticipantsList = List of new event participants +lineListingNewEventParticipantsList=List of new event participants lineListingSharedInformation=Weitergegebene Informationen lineListingEdit=Line Listing/Zeilenauflistung bearbeiten lineListingDisableAll=Alle Line Listing/Zeilenauflistungen deaktivieren @@ -1838,10 +1832,10 @@ personNoContactLinkedToPerson=Kein Kontakt mit Person verknüpft personLinkToEvents=Ereignisse für diese Person ansehen personLinkToCases=Fälle für diese Person ansehen personLinkToContacts=Kontakte für diese Person ansehen -personLinkToSamples = See samples for this person -caseLinkToSamples = See samples for this case -contactLinkToSamples = See samples for this contact -eventParticipantLinkToSamples = See samples for this event participant +personLinkToSamples=See samples for this person +caseLinkToSamples=See samples for this case +contactLinkToSamples=See samples for this contact +eventParticipantLinkToSamples=See samples for this event participant personsReplaceGeoCoordinates=Auch bestehende Koordinaten ersetzen. Warnung\: Dies könnte Koordinaten ersetzen, die absichtlich anders gesetzt wurden\! personsSetMissingGeoCoordinates=Fehlende Geo-Koordinaten generieren personsUpdated=Aktualisierte Personen @@ -2149,9 +2143,9 @@ SampleExport.caseReportDate=Fallmeldedatum SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity = Community of event participant -SampleExport.eventParticipantDistrict = District of event participant -SampleExport.eventParticipantRegion = Region of event participant +SampleExport.eventParticipantCommunity=Community of event participant +SampleExport.eventParticipantDistrict=District of event participant +SampleExport.eventParticipantRegion=Region of event participant SampleExport.personSex=Geschlecht des Falls/Kontakts/Ereignisteilnehmers/in SampleExport.caseUuid=Fall UUID (Universally Unique Identifier) SampleExport.contactUuid=Kontakt-UUID @@ -2210,7 +2204,7 @@ SampleExport.wbcCount=Anzahl an weissen Blutkörperchen beim letzten zusätzlich # Immunization Immunization=Immunisierung Immunization.reportDate=Meldedatum -Immunization.reportingUser = Reporting user +Immunization.reportingUser=Reporting user Immunization.externalId=Externe ID Immunization.country=Immunisierungs-Land Immunization.deletionReason=Grund des Löschens @@ -2253,10 +2247,10 @@ Immunization.district=Bezirk Immunization.community=Gemeinde Immunization.changeDate=Datum der letzten Änderung Immunization.creationDate=Erstellungsdatum -immunizationActiveImmunizations = Active immunizations -immunizationArchivedImmunizations = Archived immunizations -immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations -immunizationDeletedImmunizations = Deleted immunizations +immunizationActiveImmunizations=Active immunizations +immunizationArchivedImmunizations=Archived immunizations +immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations +immunizationDeletedImmunizations=Deleted immunizations immunizationImmunizationsList=Immunisierungsliste linkImmunizationToCaseButton=Fall verknüpfen openLinkedCaseToImmunizationButton=Fall öffnen @@ -2321,10 +2315,10 @@ aefiVaccinationsDiluentInformation=Diluent Information aefiVaccinationsDiluentBatchLotNumber=Batch/Lot number aefiVaccinationsDiluentExpiryDate=Expiry date aefiVaccinationsDiluentTimeOfReconstitution=Reconstitution time -aefiActiveAdverseEvents = Active adverse events -aefiArchivedAdverseEvents = Archived adverse events -aefiAllActiveAndArchivedAdverseEvents = All active and archived adverse events -aefiDeletedAdverseEvents = Deleted adverse events +aefiActiveAdverseEvents=Active adverse events +aefiArchivedAdverseEvents=Archived adverse events +aefiAllActiveAndArchivedAdverseEvents=All active and archived adverse events +aefiDeletedAdverseEvents=Deleted adverse events # Adverse Events AdverseEvents.severeLocalReaction=Severe local reaction AdverseEvents.severeLocalReactionMoreThanThreeDays=>3 days @@ -2575,13 +2569,13 @@ aefiInvestigationMedicalCareDetailsInstruction=**Instructions ? Attach copies of aefiInvestigationReconstitutionProcedure=Reconstitution procedure aefiInvestigationOfThoseAffected=Of those effected, how many are aefiAefiInvestigationList=Adverse Event Investigations -aefiNewAefiInvestigation = New Investigation +aefiNewAefiInvestigation=New Investigation aefiAefiInvestigationDataView=Adverse Event Investigation aefiNewAefiInvestigationStageTitle=Investigation -aefiActiveInvestigations = Active AEFI investigations -aefiArchivedInvestigations = Archived AEFI investigations -aefiAllActiveAndArchivedInvestigations = All active and archived AEFI investigations -aefiDeletedInvestigations = Deleted AEFI investigations +aefiActiveInvestigations=Active AEFI investigations +aefiArchivedInvestigations=Archived AEFI investigations +aefiAllActiveAndArchivedInvestigations=All active and archived AEFI investigations +aefiDeletedInvestigations=Deleted AEFI investigations titleAefiInvestigationBasicDetails=Section A\: Basic details titleAefiInvestigationRelevantPatientInformation=Section B\: Relevant patient information prior to immunization titleAefiInvestigationFirstExaminationDetails=Section C\: Details of first examination** of serious AEFI case @@ -2854,7 +2848,7 @@ Task.contextReference=Verknüpfter Link Task.creatorComment=Kommentare zur Aufgabe Task.creatorUser=Erstellt von Task.dueDate=Fälligkeitsdatum -Task.environment = Associated environment +Task.environment=Associated environment Task.event=Zugehöriges Ereignis Task.observerUsers=Beobachtet von Task.perceivedStart=Erfasster Start @@ -2907,7 +2901,7 @@ travelEntriesNoTravelEntriesForPerson=Es gibt keine Einreisen für diese Person TravelEntry=Einreise TravelEntry.person=Einreiseperson TravelEntry.reportDate=Meldedatum -TravelEntry.reportingUser = Reporting user +TravelEntry.reportingUser=Reporting user TravelEntry.uuid=Einreise-ID TravelEntry.externalId=Externe ID TravelEntry.personFirstName=Vorname der Person @@ -3278,17 +3272,15 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=Liste der Benutzerrollen userRoleNotifications=Benachrichtigungen -userRoleNotificationTypeSms = SMS -userRoleNotificationTypeEmail = E-Mail +userRoleNotificationTypeSms=SMS +userRoleNotificationTypeEmail=E-Mail userrole.main=Benutzerrolle userrole.notifications=Benachrichtigungen userrole.applyUserRoleTemplate=Benutzerrollenvorlage anwenden - notificationType=SMS-Benachrichtigungstypen -notificationType.group = Gruppe -notificationType.caption = Bezeichnung -notificationType.description = Beschreibung - +notificationType.group=Gruppe +notificationType.caption=Bezeichnung +notificationType.description=Beschreibung SormasToSormasShareRequest.uuid=Anfrage ID SormasToSormasShareRequest.creationDate=Datum der Übergabe SormasToSormasShareRequest.dataType=Typ @@ -3323,10 +3315,10 @@ TaskExport.personAddressPostalCode=Postleitzahl der Personenadresse TaskExport.personPhone=Telefonnummer der Person TaskExport.personPhoneOwner=Telefonbesitzer des Telefons der Person TaskExport.personEmailAddress=E-Mail Adresse der Person -TaskExport.personOtherContactDetails = Kontaktdetails der Person -environmentSampleNotShipped = Not shipped -environmentSampleShipped = Shipped -environmentSampleReceived = Received +TaskExport.personOtherContactDetails=Kontaktdetails der Person +environmentSampleNotShipped=Not shipped +environmentSampleShipped=Shipped +environmentSampleReceived=Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -3343,48 +3335,45 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents - # SpecialCaseAccess SpecialCaseAccess=Special case access -caze = Case -assignedTo = Assigned to -assignedBy = Assigned by -endDateTime = Access until -assignmentDate = Date assigned - +caze=Case +assignedTo=Assigned to +assignedBy=Assigned by +endDateTime=Access until +assignmentDate=Date assigned specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case - # SelfReport -SelfReport = Self report -SelfReport.type = Type -SelfReport.reportDate = Report date -SelfReport.caseReference = Case reference number -SelfReport.disease = Disease -SelfReport.diseaseDetails = Disease details -SelfReport.diseaseVariant = Disease variant -SelfReport.diseaseVariantDetails = Disease variant details -SelfReport.firstName = First name -SelfReport.lastName = Last name -SelfReport.sex = Sex -SelfReport.birthDate = Birth date -SelfReport.birthdateDD = Day of birth -SelfReport.birthdateMM = Month of birth -SelfReport.birthdateYYYY = Year of birth -SelfReport.nationalHealthId = National health ID -SelfReport.email = Email -SelfReport.phoneNumber = Phone number -SelfReport.address = Address -SelfReport.dateOfTest = Date of test -SelfReport.dateOfSymptoms = Date of symptoms -SelfReport.workplace = Workplace -SelfReport.dateWorkplace = Date workplace -SelfReport.isolationDate = Date of isolation -SelfReport.contactDate = Date of contact -SelfReport.comment = Comment -SelfReport.responsibleUser = Responsible user -SelfReport.investigationStatus = Investigation status -SelfReport.processingStatus = Processing status +SelfReport=Self report +SelfReport.type=Type +SelfReport.reportDate=Report date +SelfReport.caseReference=Case reference number +SelfReport.disease=Disease +SelfReport.diseaseDetails=Disease details +SelfReport.diseaseVariant=Disease variant +SelfReport.diseaseVariantDetails=Disease variant details +SelfReport.firstName=First name +SelfReport.lastName=Last name +SelfReport.sex=Sex +SelfReport.birthDate=Birth date +SelfReport.birthdateDD=Day of birth +SelfReport.birthdateMM=Month of birth +SelfReport.birthdateYYYY=Year of birth +SelfReport.nationalHealthId=National health ID +SelfReport.email=Email +SelfReport.phoneNumber=Phone number +SelfReport.address=Address +SelfReport.dateOfTest=Date of test +SelfReport.dateOfSymptoms=Date of symptoms +SelfReport.workplace=Workplace +SelfReport.dateWorkplace=Date workplace +SelfReport.isolationDate=Date of isolation +SelfReport.contactDate=Date of contact +SelfReport.comment=Comment +SelfReport.responsibleUser=Responsible user +SelfReport.investigationStatus=Investigation status +SelfReport.processingStatus=Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_de-DE.properties b/sormas-api/src/main/resources/captions_de-DE.properties index 2a45726efd6..78c243bfe6a 100644 --- a/sormas-api/src/main/resources/captions_de-DE.properties +++ b/sormas-api/src/main/resources/captions_de-DE.properties @@ -52,7 +52,7 @@ creationDate=Erstellungsdatum changeDate=Datum der letzten Änderung notAvailableShort=k. A inaccessibleValue=Vertraulich -includePartialBirthdates = Include partial birthdates +includePartialBirthdates=Include partial birthdates numberOfCharacters=Anzahl der Zeichen\: %d / %d remove=Entfernen notTestedYet=Noch nicht getestet @@ -189,15 +189,15 @@ actionDiscardAndContinue=Verwerfen und fortfahren actionNext=Weiter actionYesAll=Alle ja actionNoAll=Alle nein -actionOkAndGoToMerge = Okay, weiter zur Zusammenführungsübersicht -actionOkAndGoToContactDirectory = Okay, weiter zum Kontaktverzeichnis -actionOkAndGoToContactDetails = Okay, weiter zum Kontakt -actionOkAndGoToPersonDirectory = Okay, weiter zum Personenverzeichnis -actionExecuteAutomaticDeletion = Automatisches Löschen ausführen -actionDone = Erledigt -actionConfirmAction = Vorgang bestätigen -actionAefiSelectPrimarySuspectVaccination = Select Suspect Vaccination -actionAefiAssignNewReportingIdNumber = "Assign New AEFI ID" +actionOkAndGoToMerge=Okay, weiter zur Zusammenführungsübersicht +actionOkAndGoToContactDirectory=Okay, weiter zum Kontaktverzeichnis +actionOkAndGoToContactDetails=Okay, weiter zum Kontakt +actionOkAndGoToPersonDirectory=Okay, weiter zum Personenverzeichnis +actionExecuteAutomaticDeletion=Automatisches Löschen ausführen +actionDone=Erledigt +actionConfirmAction=Vorgang bestätigen +actionAefiSelectPrimarySuspectVaccination=Select Suspect Vaccination +actionAefiAssignNewReportingIdNumber="Assign New AEFI ID" activityAsCaseFlightNumber=Flugnummer ActivityAsCase=Betreuung/Unterbringung/Tätigkeit in Einrichtung ActivityAsCase.startDate=Start der Aktivität @@ -251,10 +251,10 @@ aggregateReportDiscardSelection=Auswahl verwerfen aggregateReportEditAggregateReport=Gesamtbericht bearbeiten aggregateReportEditReport=Bericht bearbeiten aggregateReportReportFound=Zusammenfassender Bericht gefunden -aggregateReportShowZeroRows = Zeige 0-Zeilen für Krankheit(en) -aggregateReportExpiredAgeGroups = Verfallen -aggregateReportNoAgeGroup = Keine Altersgruppe -aggregateReportShowOnlyDuplicateReports = Nur doppelte Berichte anzeigen +aggregateReportShowZeroRows=Zeige 0-Zeilen für Krankheit(en) +aggregateReportExpiredAgeGroups=Verfallen +aggregateReportNoAgeGroup=Keine Altersgruppe +aggregateReportShowOnlyDuplicateReports=Nur doppelte Berichte anzeigen aggregateReportNewAggregateReport=Neuer Gesamtbericht aggregateReportNewCasesShort=F aggregateReportThisWeek=Diese Woche @@ -278,7 +278,7 @@ days=Tage # Bulk actions bulkActions=Massenbearbeitung bulkEditAssignee=Zuweisung bearbeiten -bulkEmailSend = Send emails +bulkEmailSend=Send emails bulkCancelFollowUp=Nachverfolgung abbrechen bulkCaseClassification=Falldefinitionskategorie ändern bulkCaseOutcome=Verlauf der Erkrankung des Falls ändern @@ -437,6 +437,7 @@ CaseData.contactOfficer=Kontaktbeauftragte*r CaseData.dengueFeverType=Dengue-Fieber Art CaseData.diseaseVariant=Krankheitsvariante CaseData.diseaseDetails=Name der Krankheit +CaseData.disease=Krankheit CaseData.district=Landkreis/Kreisfreie Stadt CaseData.districtLevelDate=Empfangsdatum auf Landkreis-Ebene CaseData.doses=Wie viele Dosen @@ -1036,7 +1037,6 @@ aefiDashboardAefiInvestigationDiscarded=Investigation Discarded aefiDashboardAefiClassificationRelatedToVaccination=Related to vaccine or vaccination aefiDashboardAefiClassificationCoincidentalAdverseEvent=Coincidental adverse event aefiDashboardAefiClassificationUndetermined=Undetermined - captionDefault=Standard defaultRegion=Voreingestelltes Bundesland defaultDistrict=Voreingestellter Landkreis @@ -1154,22 +1154,20 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Generierte Dokumente auch de DocumentTemplate.documentUploadWarning=Dokumenten-Upload Warnung DocumentTemplate.fileTooBig=Die Dokumente wurden erfolgreich generiert, aber mindestens ein Dokument konnte nicht in seine Entität hochgeladen werden, da die Dateigröße die spezifizierte Dateigrößengrenze von %dMB übersteigt DocumentTemplate.notUploaded=Dokumente konnten nicht in die folgenden Entitäten hochgeladen werden\: - # Entity columns -EntityColumn.ENTITY = Entity -EntityColumn.FIELD_ID = Field ID -EntityColumn.FIELD = Field -EntityColumn.TYPE = Type -EntityColumn.DATA_PROTECTION = Data protection -EntityColumn.CAPTION = Caption -EntityColumn.DESCRIPTION = Description -EntityColumn.REQUIRED = Required -EntityColumn.NEW_DISEASE = New disease -EntityColumn.DISEASES = Diseases -EntityColumn.OUTBREAKS = Outbreaks -EntityColumn.IGNORED_COUNTRIES = Ignored countries -EntityColumn.EXCLUSIVE_COUNTRIES = Exclusive countries - +EntityColumn.ENTITY=Entity +EntityColumn.FIELD_ID=Field ID +EntityColumn.FIELD=Field +EntityColumn.TYPE=Type +EntityColumn.DATA_PROTECTION=Data protection +EntityColumn.CAPTION=Caption +EntityColumn.DESCRIPTION=Description +EntityColumn.REQUIRED=Required +EntityColumn.NEW_DISEASE=New disease +EntityColumn.DISEASES=Diseases +EntityColumn.OUTBREAKS=Outbreaks +EntityColumn.IGNORED_COUNTRIES=Ignored countries +EntityColumn.EXCLUSIVE_COUNTRIES=Exclusive countries # Environment Environment=Umgebung Environment.uuid=Umgebungs-ID @@ -1188,54 +1186,51 @@ Environment.otherInfrastructureDetails=andere Infrastrukturdetails Environment.waterUse=Wassernutzung Environment.otherWaterUse=Andere Wassernutzung Environment.location=Standort - environmentActiveEnvironments=Aktive Umgebungen -environmentArchivedEnvironments = Archivierte Umgebungen -environmentAllActiveAndArchivedEnvironments = Alle aktiven und archivierten Umgebungen -environmentDeletedEnvironments = gelöschte Umgebungen -environmentNewEnvironment= Neue Umgebungen +environmentArchivedEnvironments=Archivierte Umgebungen +environmentAllActiveAndArchivedEnvironments=Alle aktiven und archivierten Umgebungen +environmentDeletedEnvironments=gelöschte Umgebungen +environmentNewEnvironment=Neue Umgebungen environmentEnvironmentsList=Liste der Umgebungen - # EnvironmentSample -EnvironmentSample = Environment Sample -EnvironmentSample.uuid = Proben-ID -EnvironmentSample.environment = Umgebung -EnvironmentSample.sampleDateTime = Datum der Probenentnahme -EnvironmentSample.sampleMaterial = Probenmaterial -EnvironmentSample.otherSampleMaterial = anderes Probenmaterial -EnvironmentSample.sampleVolume = Volumen (in ml) -EnvironmentSample.fieldSampleId = Feld Proben-ID -EnvironmentSample.turbidity = Trübung (in NTU) -EnvironmentSample.phValue = pH Wert der Probe -EnvironmentSample.sampleTemperature = Temperature (in °C) -EnvironmentSample.chlorineResiduals = Gesamte Chlorreste (mg/L) -EnvironmentSample.laboratory = Labor -EnvironmentSample.laboratoryDetails = Labordetails -EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested -EnvironmentSample.reportingUser = Reporting user -EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested -EnvironmentSample.weatherConditions = Wetter zum Zeitpunkt der Probenahme -EnvironmentSample.heavyRain = Schwere Regen in den letzten 24 Stunden vor der Probe? -EnvironmentSample.dispatched = Sent/dispatched -EnvironmentSample.dispatchDate = Dispatchment date -EnvironmentSample.dispatchDetails = Dispatchment details -EnvironmentSample.received = Erhalten -EnvironmentSample.receivalDate = Empfangsdatum -EnvironmentSample.labSampleId = Lab sample ID -EnvironmentSample.specimenCondition = Probenzustand -EnvironmentSample.location = Location of sampling site -EnvironmentSample.generalComment = Allgemeiner Kommentar -EnvironmentSample.positivePathogenTests = Positive Erregertests -EnvironmentSample.latestPathogenTest = Neuester Erregertest -EnvironmentSample.numberOfTests = Anzahl der Tests - +EnvironmentSample=Environment Sample +EnvironmentSample.uuid=Proben-ID +EnvironmentSample.environment=Umgebung +EnvironmentSample.sampleDateTime=Datum der Probenentnahme +EnvironmentSample.sampleMaterial=Probenmaterial +EnvironmentSample.otherSampleMaterial=anderes Probenmaterial +EnvironmentSample.sampleVolume=Volumen (in ml) +EnvironmentSample.fieldSampleId=Feld Proben-ID +EnvironmentSample.turbidity=Trübung (in NTU) +EnvironmentSample.phValue=pH Wert der Probe +EnvironmentSample.sampleTemperature=Temperature (in °C) +EnvironmentSample.chlorineResiduals=Gesamte Chlorreste (mg/L) +EnvironmentSample.laboratory=Labor +EnvironmentSample.laboratoryDetails=Labordetails +EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested +EnvironmentSample.reportingUser=Reporting user +EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested +EnvironmentSample.weatherConditions=Wetter zum Zeitpunkt der Probenahme +EnvironmentSample.heavyRain=Schwere Regen in den letzten 24 Stunden vor der Probe? +EnvironmentSample.dispatched=Sent/dispatched +EnvironmentSample.dispatchDate=Dispatchment date +EnvironmentSample.dispatchDetails=Dispatchment details +EnvironmentSample.received=Erhalten +EnvironmentSample.receivalDate=Empfangsdatum +EnvironmentSample.labSampleId=Lab sample ID +EnvironmentSample.specimenCondition=Probenzustand +EnvironmentSample.location=Location of sampling site +EnvironmentSample.generalComment=Allgemeiner Kommentar +EnvironmentSample.positivePathogenTests=Positive Erregertests +EnvironmentSample.latestPathogenTest=Neuester Erregertest +EnvironmentSample.numberOfTests=Anzahl der Tests # Event eventActiveEvents=Aktive Ereignisse eventArchivedEvents=Abgeschlossene Ereignisse eventAllActiveAndArchivedEvents=Alle aktiven und archivierten Ereignisse eventActiveGroups=Aktive Gruppen eventArchivedGroups=Archivierte Gruppen -eventDeletedEvents = Gelöschte Ereignisse +eventDeletedEvents=Gelöschte Ereignisse eventAllGroups=Alle Gruppen eventEventActions=Ereignisaktionen eventEventParticipants=Ereignisteilnehmer @@ -1379,7 +1374,7 @@ eventParticipantAddPerson=Ereignisteilnehmer hinzufügen eventParticipantContactCountOnlyWithSourceCaseInEvent=Zählt nur Kontakte, deren Indexfall mit diesem Ereignis verbunden ist eventParticipantSelect=Ereignisteilnehmer auswählen eventParticipantCreateNew=Neuen Ereignisteilnehmer erstellen -eventParticipantDeletedEventParticipants = Gelöschte Ereignisteilnehmer +eventParticipantDeletedEventParticipants=Gelöschte Ereignisteilnehmer eventParticipantActiveEventParticipants=Aktive Ereignisteilnehmer eventParticipantActiveAndArchivedEventParticipants=Aktive und archivierte Veranstaltungsteilnehmer eventParticipantArchivedEventParticipants=Abgeschlossene Ereignisteilnehmer @@ -1392,7 +1387,7 @@ EventParticipant.caseUuid=Fall-ID EventParticipant.approximateAge=Alter EventParticipant.name=Name EventParticipant.sex=Geschlecht -EventParticipant.reportingUser = Reporting user +EventParticipant.reportingUser=Reporting user EventParticipant.responsibleRegion=Zuständiges Bundesland EventParticipant.responsibleDistrict=Zuständige/r Landkreis/Kreisfreie Stadt EventParticipant.personUuid=Personen-ID @@ -1429,9 +1424,9 @@ EventParticipantExport.personNationalHealthId=Krankenversicherungsnummer der Per EventParticipantExport.eventParticipantInvolvmentDescription=Beschreibung der Beteiligung EventParticipantExport.eventParticipantUuid=Ereignisteilnehmer ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink = Ereignisteilnehmer ID -EventParticipantSelection.eventUuidLink = Ereignis-ID -EventParticipantSelection.resultingCaseUuidLink = Resultierender Fall +EventParticipantSelection.eventParticipantUuidLink=Ereignisteilnehmer ID +EventParticipantSelection.eventUuidLink=Ereignis-ID +EventParticipantSelection.resultingCaseUuidLink=Resultierender Fall # Event Group EventGroup=Ereignisgruppe EventGroup.uuid=Gruppen-ID @@ -1651,7 +1646,6 @@ ExternalMessageCriteria.messageDateTo=... bis ExternalMessageCriteria.birthDateFrom=Geburtsdatum von... ExternalMessageCriteria.birthDateTo=... bis externalMessageValueNotSpecified=Value not specified in external message - #Physician report physiciansReportCaseImmunizations=Immunisierungen physiciansReportCaseAddVaccination=Impfung hinzufügen @@ -1662,7 +1656,7 @@ lineListingDiseaseOfSourceCase=Krankheit des Indexfalls lineListingInfrastructureData=Infrastrukturdaten der letzten Zeile übernehmen lineListingNewCasesList=Liste neuer Fälle lineListingNewContactsList=Liste neuer Kontakte -lineListingNewEventParticipantsList = List of new event participants +lineListingNewEventParticipantsList=List of new event participants lineListingSharedInformation=Weitergegebene Informationen lineListingEdit=Line Listing/Zeilenauflistung bearbeiten lineListingDisableAll=Alle Line Listing/Zeilenauflistungen deaktivieren @@ -1838,10 +1832,10 @@ personNoContactLinkedToPerson=Kein Kontakt mit Person verknüpft personLinkToEvents=Ereignisse für diese Person ansehen personLinkToCases=Fälle für diese Person ansehen personLinkToContacts=Kontakte für diese Person ansehen -personLinkToSamples = Proben für diese Person ansehen -caseLinkToSamples = See samples for this case -contactLinkToSamples = See samples for this contact -eventParticipantLinkToSamples = See samples for this event participant +personLinkToSamples=Proben für diese Person ansehen +caseLinkToSamples=See samples for this case +contactLinkToSamples=See samples for this contact +eventParticipantLinkToSamples=See samples for this event participant personsReplaceGeoCoordinates=Auch bestehende Koordinaten ersetzen. Warnung\: Dies könnte Koordinaten ersetzen, die absichtlich anders gesetzt wurden\! personsSetMissingGeoCoordinates=Fehlende Geo-Koordinaten generieren personsUpdated=Aktualisierte Personen @@ -2149,9 +2143,9 @@ SampleExport.caseReportDate=Fallmeldedatum SampleExport.caseResponsibleCommunity=Zuständige Gemeinde SampleExport.caseResponsibleDistrict=Zuständige/r Landkreis/Kreisfreie Stadt SampleExport.caseResponsibleRegion=Zuständiges Bundesland -SampleExport.eventParticipantCommunity = Community of event participant -SampleExport.eventParticipantDistrict = District of event participant -SampleExport.eventParticipantRegion = Region of event participant +SampleExport.eventParticipantCommunity=Community of event participant +SampleExport.eventParticipantDistrict=District of event participant +SampleExport.eventParticipantRegion=Region of event participant SampleExport.personSex=Geschlecht von Fall/Kontakt/Ereignisteilnehmer/in SampleExport.caseUuid=Fall UUID (Universally Unique Identifier) SampleExport.contactUuid=Kontakt-UUID @@ -2210,7 +2204,7 @@ SampleExport.wbcCount=Anzahl an weißen Blutkörperchen beim letzten zusätzlich # Immunization Immunization=Immunisierung Immunization.reportDate=Meldedatum -Immunization.reportingUser = Reporting user +Immunization.reportingUser=Reporting user Immunization.externalId=Externe ID Immunization.country=Immunisierungs-Land Immunization.deletionReason=Grund des Löschens @@ -2253,10 +2247,10 @@ Immunization.district=Landkreis/Kreisfreie Stadt Immunization.community=Gemeinde Immunization.changeDate=Datum der letzten Änderung Immunization.creationDate=Erstellungsdatum -immunizationActiveImmunizations = Aktive Immunisierungen -immunizationArchivedImmunizations = Archivierte Immunisierungen -immunizationAllActiveAndArchivedImmunizations = Alle aktiven und archivierten Immunisierungen -immunizationDeletedImmunizations = Gelöschte Immunisierungen +immunizationActiveImmunizations=Aktive Immunisierungen +immunizationArchivedImmunizations=Archivierte Immunisierungen +immunizationAllActiveAndArchivedImmunizations=Alle aktiven und archivierten Immunisierungen +immunizationDeletedImmunizations=Gelöschte Immunisierungen immunizationImmunizationsList=Immunisierungsliste linkImmunizationToCaseButton=Fall verknüpfen openLinkedCaseToImmunizationButton=Fall öffnen @@ -2321,10 +2315,10 @@ aefiVaccinationsDiluentInformation=Diluent Information aefiVaccinationsDiluentBatchLotNumber=Batch/Lot number aefiVaccinationsDiluentExpiryDate=Expiry date aefiVaccinationsDiluentTimeOfReconstitution=Reconstitution time -aefiActiveAdverseEvents = Active adverse events -aefiArchivedAdverseEvents = Archived adverse events -aefiAllActiveAndArchivedAdverseEvents = All active and archived adverse events -aefiDeletedAdverseEvents = Deleted adverse events +aefiActiveAdverseEvents=Active adverse events +aefiArchivedAdverseEvents=Archived adverse events +aefiAllActiveAndArchivedAdverseEvents=All active and archived adverse events +aefiDeletedAdverseEvents=Deleted adverse events # Adverse Events AdverseEvents.severeLocalReaction=Severe local reaction AdverseEvents.severeLocalReactionMoreThanThreeDays=>3 days @@ -2575,13 +2569,13 @@ aefiInvestigationMedicalCareDetailsInstruction=**Instructions ? Attach copies of aefiInvestigationReconstitutionProcedure=Reconstitution procedure aefiInvestigationOfThoseAffected=Of those effected, how many are aefiAefiInvestigationList=Adverse Event Investigations -aefiNewAefiInvestigation = New Investigation +aefiNewAefiInvestigation=New Investigation aefiAefiInvestigationDataView=Adverse Event Investigation aefiNewAefiInvestigationStageTitle=Investigation -aefiActiveInvestigations = Active AEFI investigations -aefiArchivedInvestigations = Archived AEFI investigations -aefiAllActiveAndArchivedInvestigations = All active and archived AEFI investigations -aefiDeletedInvestigations = Deleted AEFI investigations +aefiActiveInvestigations=Active AEFI investigations +aefiArchivedInvestigations=Archived AEFI investigations +aefiAllActiveAndArchivedInvestigations=All active and archived AEFI investigations +aefiDeletedInvestigations=Deleted AEFI investigations titleAefiInvestigationBasicDetails=Section A\: Basic details titleAefiInvestigationRelevantPatientInformation=Section B\: Relevant patient information prior to immunization titleAefiInvestigationFirstExaminationDetails=Section C\: Details of first examination** of serious AEFI case @@ -2854,7 +2848,7 @@ Task.contextReference=Verknüpfter Link Task.creatorComment=Kommentare zur Aufgabe Task.creatorUser=Erstellt von Task.dueDate=Fälligkeitsdatum -Task.environment = Zugeordnete Umgebung +Task.environment=Zugeordnete Umgebung Task.event=Zugehöriges Ereignis Task.observerUsers=Beobachtet von Task.perceivedStart=Erfasster Start @@ -2907,7 +2901,7 @@ travelEntriesNoTravelEntriesForPerson=Es gibt keine Einreisen für diese Person TravelEntry=Einreise TravelEntry.person=Einreiseperson TravelEntry.reportDate=Meldedatum -TravelEntry.reportingUser = Reporting user +TravelEntry.reportingUser=Reporting user TravelEntry.uuid=Einreise-ID TravelEntry.externalId=Externe ID TravelEntry.personFirstName=Vorname der Person @@ -3278,17 +3272,15 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=Liste der Benutzerrollen userRoleNotifications=Benachrichtigungen -userRoleNotificationTypeSms = SMS -userRoleNotificationTypeEmail = E-Mail +userRoleNotificationTypeSms=SMS +userRoleNotificationTypeEmail=E-Mail userrole.main=Benutzerrolle userrole.notifications=Benachrichtigungen userrole.applyUserRoleTemplate=Benutzerrollenvorlage anwenden - notificationType=Art der Benachrichtigung -notificationType.group = Gruppe -notificationType.caption = Bezeichnung -notificationType.description = Beschreibung - +notificationType.group=Gruppe +notificationType.caption=Bezeichnung +notificationType.description=Beschreibung SormasToSormasShareRequest.uuid=Anfrage ID SormasToSormasShareRequest.creationDate=Datum der Übergabe SormasToSormasShareRequest.dataType=Typ @@ -3323,10 +3315,10 @@ TaskExport.personAddressPostalCode=Postleitzahl der Personenadresse TaskExport.personPhone=Telefonnummer der Person TaskExport.personPhoneOwner=Telefonbesitzer des Telefons der Person TaskExport.personEmailAddress=E-Mail Adresse der Person -TaskExport.personOtherContactDetails = Kontaktdetails der Person -environmentSampleNotShipped = Nicht versendet -environmentSampleShipped = Versandt -environmentSampleReceived = Erhalten +TaskExport.personOtherContactDetails=Kontaktdetails der Person +environmentSampleNotShipped=Nicht versendet +environmentSampleShipped=Versandt +environmentSampleReceived=Erhalten environmentSampleActiveSamples=Aktive Umgebungs Proben environmentSampleArchivedSamples=Archivierte Umgebungs Proben environmentSampleAllActiveAndArchivedSamples=Alle aktiven und archivierten Umgebungs Proben @@ -3343,48 +3335,45 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents - # SpecialCaseAccess SpecialCaseAccess=Special case access -caze = Case -assignedTo = Assigned to -assignedBy = Assigned by -endDateTime = Access until -assignmentDate = Date assigned - +caze=Case +assignedTo=Assigned to +assignedBy=Assigned by +endDateTime=Access until +assignmentDate=Date assigned specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case - # SelfReport -SelfReport = Self report -SelfReport.type = Type -SelfReport.reportDate = Report date -SelfReport.caseReference = Case reference number -SelfReport.disease = Disease -SelfReport.diseaseDetails = Disease details -SelfReport.diseaseVariant = Disease variant -SelfReport.diseaseVariantDetails = Disease variant details -SelfReport.firstName = First name -SelfReport.lastName = Last name -SelfReport.sex = Sex -SelfReport.birthDate = Birth date -SelfReport.birthdateDD = Day of birth -SelfReport.birthdateMM = Month of birth -SelfReport.birthdateYYYY = Year of birth -SelfReport.nationalHealthId = National health ID -SelfReport.email = Email -SelfReport.phoneNumber = Phone number -SelfReport.address = Address -SelfReport.dateOfTest = Date of test -SelfReport.dateOfSymptoms = Date of symptoms -SelfReport.workplace = Workplace -SelfReport.dateWorkplace = Date workplace -SelfReport.isolationDate = Date of isolation -SelfReport.contactDate = Date of contact -SelfReport.comment = Comment -SelfReport.responsibleUser = Responsible user -SelfReport.investigationStatus = Investigation status -SelfReport.processingStatus = Processing status +SelfReport=Self report +SelfReport.type=Type +SelfReport.reportDate=Report date +SelfReport.caseReference=Case reference number +SelfReport.disease=Disease +SelfReport.diseaseDetails=Disease details +SelfReport.diseaseVariant=Disease variant +SelfReport.diseaseVariantDetails=Disease variant details +SelfReport.firstName=First name +SelfReport.lastName=Last name +SelfReport.sex=Sex +SelfReport.birthDate=Birth date +SelfReport.birthdateDD=Day of birth +SelfReport.birthdateMM=Month of birth +SelfReport.birthdateYYYY=Year of birth +SelfReport.nationalHealthId=National health ID +SelfReport.email=Email +SelfReport.phoneNumber=Phone number +SelfReport.address=Address +SelfReport.dateOfTest=Date of test +SelfReport.dateOfSymptoms=Date of symptoms +SelfReport.workplace=Workplace +SelfReport.dateWorkplace=Date workplace +SelfReport.isolationDate=Date of isolation +SelfReport.contactDate=Date of contact +SelfReport.comment=Comment +SelfReport.responsibleUser=Responsible user +SelfReport.investigationStatus=Investigation status +SelfReport.processingStatus=Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_en-AF.properties b/sormas-api/src/main/resources/captions_en-AF.properties index 9f9c7b22f16..218323983fb 100644 --- a/sormas-api/src/main/resources/captions_en-AF.properties +++ b/sormas-api/src/main/resources/captions_en-AF.properties @@ -52,7 +52,7 @@ creationDate=Creation date changeDate=Date of last change notAvailableShort=NA inaccessibleValue=Confidential -includePartialBirthdates = Include partial birthdates +includePartialBirthdates=Include partial birthdates numberOfCharacters=Number of characters\: %d / %d remove=Remove notTestedYet=Not tested yet @@ -189,15 +189,15 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge = Okay, and continue to merge overview -actionOkAndGoToContactDirectory = Okay, and continue to contact directory -actionOkAndGoToContactDetails = Okay, and continue to contact -actionOkAndGoToPersonDirectory = Okay, and continue to person directory -actionExecuteAutomaticDeletion = Execute automatic deletion -actionDone = Done -actionConfirmAction = Confirm action -actionAefiSelectPrimarySuspectVaccination = Select Suspect Vaccination -actionAefiAssignNewReportingIdNumber = "Assign New AEFI ID" +actionOkAndGoToMerge=Okay, and continue to merge overview +actionOkAndGoToContactDirectory=Okay, and continue to contact directory +actionOkAndGoToContactDetails=Okay, and continue to contact +actionOkAndGoToPersonDirectory=Okay, and continue to person directory +actionExecuteAutomaticDeletion=Execute automatic deletion +actionDone=Done +actionConfirmAction=Confirm action +actionAefiSelectPrimarySuspectVaccination=Select Suspect Vaccination +actionAefiAssignNewReportingIdNumber="Assign New AEFI ID" activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -251,10 +251,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows = Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups = Expired -aggregateReportNoAgeGroup = No age group -aggregateReportShowOnlyDuplicateReports = Display only duplicate reports +aggregateReportShowZeroRows=Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups=Expired +aggregateReportNoAgeGroup=No age group +aggregateReportShowOnlyDuplicateReports=Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -278,7 +278,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend = Send emails +bulkEmailSend=Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -437,6 +437,7 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name +CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1036,7 +1037,6 @@ aefiDashboardAefiInvestigationDiscarded=Investigation Discarded aefiDashboardAefiClassificationRelatedToVaccination=Related to vaccine or vaccination aefiDashboardAefiClassificationCoincidentalAdverseEvent=Coincidental adverse event aefiDashboardAefiClassificationUndetermined=Undetermined - captionDefault=Default defaultRegion=Default Province defaultDistrict=Default District @@ -1154,22 +1154,20 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: - # Entity columns -EntityColumn.ENTITY = Entity -EntityColumn.FIELD_ID = Field ID -EntityColumn.FIELD = Field -EntityColumn.TYPE = Type -EntityColumn.DATA_PROTECTION = Data protection -EntityColumn.CAPTION = Caption -EntityColumn.DESCRIPTION = Description -EntityColumn.REQUIRED = Required -EntityColumn.NEW_DISEASE = New disease -EntityColumn.DISEASES = Diseases -EntityColumn.OUTBREAKS = Outbreaks -EntityColumn.IGNORED_COUNTRIES = Ignored countries -EntityColumn.EXCLUSIVE_COUNTRIES = Exclusive countries - +EntityColumn.ENTITY=Entity +EntityColumn.FIELD_ID=Field ID +EntityColumn.FIELD=Field +EntityColumn.TYPE=Type +EntityColumn.DATA_PROTECTION=Data protection +EntityColumn.CAPTION=Caption +EntityColumn.DESCRIPTION=Description +EntityColumn.REQUIRED=Required +EntityColumn.NEW_DISEASE=New disease +EntityColumn.DISEASES=Diseases +EntityColumn.OUTBREAKS=Outbreaks +EntityColumn.IGNORED_COUNTRIES=Ignored countries +EntityColumn.EXCLUSIVE_COUNTRIES=Exclusive countries # Environment Environment=Environment Environment.uuid=Environment ID @@ -1188,54 +1186,51 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location - environmentActiveEnvironments=Active environments -environmentArchivedEnvironments = Archived environments -environmentAllActiveAndArchivedEnvironments = All active and archived environments -environmentDeletedEnvironments = Deleted environments -environmentNewEnvironment= New environment +environmentArchivedEnvironments=Archived environments +environmentAllActiveAndArchivedEnvironments=All active and archived environments +environmentDeletedEnvironments=Deleted environments +environmentNewEnvironment=New environment environmentEnvironmentsList=Environments list - # EnvironmentSample -EnvironmentSample = Environment Sample -EnvironmentSample.uuid = Sample ID -EnvironmentSample.environment = Environment -EnvironmentSample.sampleDateTime = Date of sampling -EnvironmentSample.sampleMaterial = Sample material -EnvironmentSample.otherSampleMaterial = Specify sample material -EnvironmentSample.sampleVolume = Volume (in mL) -EnvironmentSample.fieldSampleId = Field sample ID -EnvironmentSample.turbidity = Turbidity (in NTU) -EnvironmentSample.phValue = pH of sample -EnvironmentSample.sampleTemperature = Temperature (in °C) -EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) -EnvironmentSample.laboratory = Laboratory -EnvironmentSample.laboratoryDetails = Laboratory details -EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested -EnvironmentSample.reportingUser = Reporting user -EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested -EnvironmentSample.weatherConditions = Weather conditions at time of sampling -EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched = Sent/dispatched -EnvironmentSample.dispatchDate = Dispatchment date -EnvironmentSample.dispatchDetails = Dispatchment details -EnvironmentSample.received = Received -EnvironmentSample.receivalDate = Receival date -EnvironmentSample.labSampleId = Lab sample ID -EnvironmentSample.specimenCondition = Specimen condition -EnvironmentSample.location = Location of sampling site -EnvironmentSample.generalComment = General comment -EnvironmentSample.positivePathogenTests = Positive pathogen tests -EnvironmentSample.latestPathogenTest = Latest pathogen test -EnvironmentSample.numberOfTests = Number of tests - +EnvironmentSample=Environment Sample +EnvironmentSample.uuid=Sample ID +EnvironmentSample.environment=Environment +EnvironmentSample.sampleDateTime=Date of sampling +EnvironmentSample.sampleMaterial=Sample material +EnvironmentSample.otherSampleMaterial=Specify sample material +EnvironmentSample.sampleVolume=Volume (in mL) +EnvironmentSample.fieldSampleId=Field sample ID +EnvironmentSample.turbidity=Turbidity (in NTU) +EnvironmentSample.phValue=pH of sample +EnvironmentSample.sampleTemperature=Temperature (in °C) +EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) +EnvironmentSample.laboratory=Laboratory +EnvironmentSample.laboratoryDetails=Laboratory details +EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested +EnvironmentSample.reportingUser=Reporting user +EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested +EnvironmentSample.weatherConditions=Weather conditions at time of sampling +EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched=Sent/dispatched +EnvironmentSample.dispatchDate=Dispatchment date +EnvironmentSample.dispatchDetails=Dispatchment details +EnvironmentSample.received=Received +EnvironmentSample.receivalDate=Receival date +EnvironmentSample.labSampleId=Lab sample ID +EnvironmentSample.specimenCondition=Specimen condition +EnvironmentSample.location=Location of sampling site +EnvironmentSample.generalComment=General comment +EnvironmentSample.positivePathogenTests=Positive pathogen tests +EnvironmentSample.latestPathogenTest=Latest pathogen test +EnvironmentSample.numberOfTests=Number of tests # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents = Deleted events +eventDeletedEvents=Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1379,7 +1374,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants = Deleted event participants +eventParticipantDeletedEventParticipants=Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1392,7 +1387,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser = Reporting user +EventParticipant.reportingUser=Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1429,9 +1424,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink = Event participant ID -EventParticipantSelection.eventUuidLink = Event ID -EventParticipantSelection.resultingCaseUuidLink = Resulting case ID +EventParticipantSelection.eventParticipantUuidLink=Event participant ID +EventParticipantSelection.eventUuidLink=Event ID +EventParticipantSelection.resultingCaseUuidLink=Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1651,7 +1646,6 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message - #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1662,7 +1656,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList = List of new event participants +lineListingNewEventParticipantsList=List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1838,10 +1832,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples = See samples for this person -caseLinkToSamples = See samples for this case -contactLinkToSamples = See samples for this contact -eventParticipantLinkToSamples = See samples for this event participant +personLinkToSamples=See samples for this person +caseLinkToSamples=See samples for this case +contactLinkToSamples=See samples for this contact +eventParticipantLinkToSamples=See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2149,9 +2143,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity = Community of event participant -SampleExport.eventParticipantDistrict = District of event participant -SampleExport.eventParticipantRegion = Region of event participant +SampleExport.eventParticipantCommunity=Community of event participant +SampleExport.eventParticipantDistrict=District of event participant +SampleExport.eventParticipantRegion=Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2210,7 +2204,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser = Reporting user +Immunization.reportingUser=Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2253,10 +2247,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations = Active immunizations -immunizationArchivedImmunizations = Archived immunizations -immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations -immunizationDeletedImmunizations = Deleted immunizations +immunizationActiveImmunizations=Active immunizations +immunizationArchivedImmunizations=Archived immunizations +immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations +immunizationDeletedImmunizations=Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2321,10 +2315,10 @@ aefiVaccinationsDiluentInformation=Diluent Information aefiVaccinationsDiluentBatchLotNumber=Batch/Lot number aefiVaccinationsDiluentExpiryDate=Expiry date aefiVaccinationsDiluentTimeOfReconstitution=Reconstitution time -aefiActiveAdverseEvents = Active adverse events -aefiArchivedAdverseEvents = Archived adverse events -aefiAllActiveAndArchivedAdverseEvents = All active and archived adverse events -aefiDeletedAdverseEvents = Deleted adverse events +aefiActiveAdverseEvents=Active adverse events +aefiArchivedAdverseEvents=Archived adverse events +aefiAllActiveAndArchivedAdverseEvents=All active and archived adverse events +aefiDeletedAdverseEvents=Deleted adverse events # Adverse Events AdverseEvents.severeLocalReaction=Severe local reaction AdverseEvents.severeLocalReactionMoreThanThreeDays=>3 days @@ -2575,13 +2569,13 @@ aefiInvestigationMedicalCareDetailsInstruction=**Instructions ? Attach copies of aefiInvestigationReconstitutionProcedure=Reconstitution procedure aefiInvestigationOfThoseAffected=Of those effected, how many are aefiAefiInvestigationList=Adverse Event Investigations -aefiNewAefiInvestigation = New Investigation +aefiNewAefiInvestigation=New Investigation aefiAefiInvestigationDataView=Adverse Event Investigation aefiNewAefiInvestigationStageTitle=Investigation -aefiActiveInvestigations = Active AEFI investigations -aefiArchivedInvestigations = Archived AEFI investigations -aefiAllActiveAndArchivedInvestigations = All active and archived AEFI investigations -aefiDeletedInvestigations = Deleted AEFI investigations +aefiActiveInvestigations=Active AEFI investigations +aefiArchivedInvestigations=Archived AEFI investigations +aefiAllActiveAndArchivedInvestigations=All active and archived AEFI investigations +aefiDeletedInvestigations=Deleted AEFI investigations titleAefiInvestigationBasicDetails=Section A\: Basic details titleAefiInvestigationRelevantPatientInformation=Section B\: Relevant patient information prior to immunization titleAefiInvestigationFirstExaminationDetails=Section C\: Details of first examination** of serious AEFI case @@ -2854,7 +2848,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment = Associated environment +Task.environment=Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2907,7 +2901,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser = Reporting user +TravelEntry.reportingUser=Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -3278,17 +3272,15 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms = SMS -userRoleNotificationTypeEmail = EMAIL +userRoleNotificationTypeSms=SMS +userRoleNotificationTypeEmail=EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template - notificationType=Notification type -notificationType.group = Group -notificationType.caption = Caption -notificationType.description = Description - +notificationType.group=Group +notificationType.caption=Caption +notificationType.description=Description SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -3323,10 +3315,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails = Person contact details -environmentSampleNotShipped = Not shipped -environmentSampleShipped = Shipped -environmentSampleReceived = Received +TaskExport.personOtherContactDetails=Person contact details +environmentSampleNotShipped=Not shipped +environmentSampleShipped=Shipped +environmentSampleReceived=Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -3343,48 +3335,45 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents - # SpecialCaseAccess SpecialCaseAccess=Special case access -caze = Case -assignedTo = Assigned to -assignedBy = Assigned by -endDateTime = Access until -assignmentDate = Date assigned - +caze=Case +assignedTo=Assigned to +assignedBy=Assigned by +endDateTime=Access until +assignmentDate=Date assigned specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case - # SelfReport -SelfReport = Self report -SelfReport.type = Type -SelfReport.reportDate = Report date -SelfReport.caseReference = Case reference number -SelfReport.disease = Disease -SelfReport.diseaseDetails = Disease details -SelfReport.diseaseVariant = Disease variant -SelfReport.diseaseVariantDetails = Disease variant details -SelfReport.firstName = First name -SelfReport.lastName = Last name -SelfReport.sex = Sex -SelfReport.birthDate = Birth date -SelfReport.birthdateDD = Day of birth -SelfReport.birthdateMM = Month of birth -SelfReport.birthdateYYYY = Year of birth -SelfReport.nationalHealthId = National health ID -SelfReport.email = Email -SelfReport.phoneNumber = Phone number -SelfReport.address = Address -SelfReport.dateOfTest = Date of test -SelfReport.dateOfSymptoms = Date of symptoms -SelfReport.workplace = Workplace -SelfReport.dateWorkplace = Date workplace -SelfReport.isolationDate = Date of isolation -SelfReport.contactDate = Date of contact -SelfReport.comment = Comment -SelfReport.responsibleUser = Responsible user -SelfReport.investigationStatus = Investigation status -SelfReport.processingStatus = Processing status +SelfReport=Self report +SelfReport.type=Type +SelfReport.reportDate=Report date +SelfReport.caseReference=Case reference number +SelfReport.disease=Disease +SelfReport.diseaseDetails=Disease details +SelfReport.diseaseVariant=Disease variant +SelfReport.diseaseVariantDetails=Disease variant details +SelfReport.firstName=First name +SelfReport.lastName=Last name +SelfReport.sex=Sex +SelfReport.birthDate=Birth date +SelfReport.birthdateDD=Day of birth +SelfReport.birthdateMM=Month of birth +SelfReport.birthdateYYYY=Year of birth +SelfReport.nationalHealthId=National health ID +SelfReport.email=Email +SelfReport.phoneNumber=Phone number +SelfReport.address=Address +SelfReport.dateOfTest=Date of test +SelfReport.dateOfSymptoms=Date of symptoms +SelfReport.workplace=Workplace +SelfReport.dateWorkplace=Date workplace +SelfReport.isolationDate=Date of isolation +SelfReport.contactDate=Date of contact +SelfReport.comment=Comment +SelfReport.responsibleUser=Responsible user +SelfReport.investigationStatus=Investigation status +SelfReport.processingStatus=Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_en-GH.properties b/sormas-api/src/main/resources/captions_en-GH.properties index 8898160030b..39f7671cd7b 100644 --- a/sormas-api/src/main/resources/captions_en-GH.properties +++ b/sormas-api/src/main/resources/captions_en-GH.properties @@ -52,7 +52,7 @@ creationDate=Creation date changeDate=Date of last change notAvailableShort=NA inaccessibleValue=Confidential -includePartialBirthdates = Include partial birthdates +includePartialBirthdates=Include partial birthdates numberOfCharacters=Number of characters\: %d / %d remove=Remove notTestedYet=Not tested yet @@ -189,15 +189,15 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge = Okay, and continue to merge overview -actionOkAndGoToContactDirectory = Okay, and continue to contact directory -actionOkAndGoToContactDetails = Okay, and continue to contact -actionOkAndGoToPersonDirectory = Okay, and continue to person directory -actionExecuteAutomaticDeletion = Execute automatic deletion -actionDone = Done -actionConfirmAction = Confirm action -actionAefiSelectPrimarySuspectVaccination = Select Suspect Vaccination -actionAefiAssignNewReportingIdNumber = "Assign New AEFI ID" +actionOkAndGoToMerge=Okay, and continue to merge overview +actionOkAndGoToContactDirectory=Okay, and continue to contact directory +actionOkAndGoToContactDetails=Okay, and continue to contact +actionOkAndGoToPersonDirectory=Okay, and continue to person directory +actionExecuteAutomaticDeletion=Execute automatic deletion +actionDone=Done +actionConfirmAction=Confirm action +actionAefiSelectPrimarySuspectVaccination=Select Suspect Vaccination +actionAefiAssignNewReportingIdNumber="Assign New AEFI ID" activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -251,10 +251,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows = Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups = Expired -aggregateReportNoAgeGroup = No age group -aggregateReportShowOnlyDuplicateReports = Display only duplicate reports +aggregateReportShowZeroRows=Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups=Expired +aggregateReportNoAgeGroup=No age group +aggregateReportShowOnlyDuplicateReports=Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -278,7 +278,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend = Send emails +bulkEmailSend=Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -437,6 +437,7 @@ CaseData.contactOfficer=Contact district disease control officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name +CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1036,7 +1037,6 @@ aefiDashboardAefiInvestigationDiscarded=Investigation Discarded aefiDashboardAefiClassificationRelatedToVaccination=Related to vaccine or vaccination aefiDashboardAefiClassificationCoincidentalAdverseEvent=Coincidental adverse event aefiDashboardAefiClassificationUndetermined=Undetermined - captionDefault=Default defaultRegion=Default Region defaultDistrict=Default District @@ -1154,22 +1154,20 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: - # Entity columns -EntityColumn.ENTITY = Entity -EntityColumn.FIELD_ID = Field ID -EntityColumn.FIELD = Field -EntityColumn.TYPE = Type -EntityColumn.DATA_PROTECTION = Data protection -EntityColumn.CAPTION = Caption -EntityColumn.DESCRIPTION = Description -EntityColumn.REQUIRED = Required -EntityColumn.NEW_DISEASE = New disease -EntityColumn.DISEASES = Diseases -EntityColumn.OUTBREAKS = Outbreaks -EntityColumn.IGNORED_COUNTRIES = Ignored countries -EntityColumn.EXCLUSIVE_COUNTRIES = Exclusive countries - +EntityColumn.ENTITY=Entity +EntityColumn.FIELD_ID=Field ID +EntityColumn.FIELD=Field +EntityColumn.TYPE=Type +EntityColumn.DATA_PROTECTION=Data protection +EntityColumn.CAPTION=Caption +EntityColumn.DESCRIPTION=Description +EntityColumn.REQUIRED=Required +EntityColumn.NEW_DISEASE=New disease +EntityColumn.DISEASES=Diseases +EntityColumn.OUTBREAKS=Outbreaks +EntityColumn.IGNORED_COUNTRIES=Ignored countries +EntityColumn.EXCLUSIVE_COUNTRIES=Exclusive countries # Environment Environment=Environment Environment.uuid=Environment ID @@ -1188,54 +1186,51 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location - environmentActiveEnvironments=Active environments -environmentArchivedEnvironments = Archived environments -environmentAllActiveAndArchivedEnvironments = All active and archived environments -environmentDeletedEnvironments = Deleted environments -environmentNewEnvironment= New environment +environmentArchivedEnvironments=Archived environments +environmentAllActiveAndArchivedEnvironments=All active and archived environments +environmentDeletedEnvironments=Deleted environments +environmentNewEnvironment=New environment environmentEnvironmentsList=Environments list - # EnvironmentSample -EnvironmentSample = Environment Sample -EnvironmentSample.uuid = Sample ID -EnvironmentSample.environment = Environment -EnvironmentSample.sampleDateTime = Date of sampling -EnvironmentSample.sampleMaterial = Sample material -EnvironmentSample.otherSampleMaterial = Specify sample material -EnvironmentSample.sampleVolume = Volume (in mL) -EnvironmentSample.fieldSampleId = Field sample ID -EnvironmentSample.turbidity = Turbidity (in NTU) -EnvironmentSample.phValue = pH of sample -EnvironmentSample.sampleTemperature = Temperature (in °C) -EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) -EnvironmentSample.laboratory = Laboratory -EnvironmentSample.laboratoryDetails = Laboratory details -EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested -EnvironmentSample.reportingUser = Reporting user -EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested -EnvironmentSample.weatherConditions = Weather conditions at time of sampling -EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched = Sent/dispatched -EnvironmentSample.dispatchDate = Dispatchment date -EnvironmentSample.dispatchDetails = Dispatchment details -EnvironmentSample.received = Received -EnvironmentSample.receivalDate = Receival date -EnvironmentSample.labSampleId = Lab sample ID -EnvironmentSample.specimenCondition = Specimen condition -EnvironmentSample.location = Location of sampling site -EnvironmentSample.generalComment = General comment -EnvironmentSample.positivePathogenTests = Positive pathogen tests -EnvironmentSample.latestPathogenTest = Latest pathogen test -EnvironmentSample.numberOfTests = Number of tests - +EnvironmentSample=Environment Sample +EnvironmentSample.uuid=Sample ID +EnvironmentSample.environment=Environment +EnvironmentSample.sampleDateTime=Date of sampling +EnvironmentSample.sampleMaterial=Sample material +EnvironmentSample.otherSampleMaterial=Specify sample material +EnvironmentSample.sampleVolume=Volume (in mL) +EnvironmentSample.fieldSampleId=Field sample ID +EnvironmentSample.turbidity=Turbidity (in NTU) +EnvironmentSample.phValue=pH of sample +EnvironmentSample.sampleTemperature=Temperature (in °C) +EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) +EnvironmentSample.laboratory=Laboratory +EnvironmentSample.laboratoryDetails=Laboratory details +EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested +EnvironmentSample.reportingUser=Reporting user +EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested +EnvironmentSample.weatherConditions=Weather conditions at time of sampling +EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched=Sent/dispatched +EnvironmentSample.dispatchDate=Dispatchment date +EnvironmentSample.dispatchDetails=Dispatchment details +EnvironmentSample.received=Received +EnvironmentSample.receivalDate=Receival date +EnvironmentSample.labSampleId=Lab sample ID +EnvironmentSample.specimenCondition=Specimen condition +EnvironmentSample.location=Location of sampling site +EnvironmentSample.generalComment=General comment +EnvironmentSample.positivePathogenTests=Positive pathogen tests +EnvironmentSample.latestPathogenTest=Latest pathogen test +EnvironmentSample.numberOfTests=Number of tests # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents = Deleted events +eventDeletedEvents=Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1379,7 +1374,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants = Deleted event participants +eventParticipantDeletedEventParticipants=Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1392,7 +1387,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser = Reporting user +EventParticipant.reportingUser=Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1429,9 +1424,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink = Event participant ID -EventParticipantSelection.eventUuidLink = Event ID -EventParticipantSelection.resultingCaseUuidLink = Resulting case ID +EventParticipantSelection.eventParticipantUuidLink=Event participant ID +EventParticipantSelection.eventUuidLink=Event ID +EventParticipantSelection.resultingCaseUuidLink=Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1651,7 +1646,6 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message - #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1662,7 +1656,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList = List of new event participants +lineListingNewEventParticipantsList=List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1838,10 +1832,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples = See samples for this person -caseLinkToSamples = See samples for this case -contactLinkToSamples = See samples for this contact -eventParticipantLinkToSamples = See samples for this event participant +personLinkToSamples=See samples for this person +caseLinkToSamples=See samples for this case +contactLinkToSamples=See samples for this contact +eventParticipantLinkToSamples=See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2149,9 +2143,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity = Community of event participant -SampleExport.eventParticipantDistrict = District of event participant -SampleExport.eventParticipantRegion = Region of event participant +SampleExport.eventParticipantCommunity=Community of event participant +SampleExport.eventParticipantDistrict=District of event participant +SampleExport.eventParticipantRegion=Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2210,7 +2204,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser = Reporting user +Immunization.reportingUser=Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2253,10 +2247,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations = Active immunizations -immunizationArchivedImmunizations = Archived immunizations -immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations -immunizationDeletedImmunizations = Deleted immunizations +immunizationActiveImmunizations=Active immunizations +immunizationArchivedImmunizations=Archived immunizations +immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations +immunizationDeletedImmunizations=Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2321,10 +2315,10 @@ aefiVaccinationsDiluentInformation=Diluent Information aefiVaccinationsDiluentBatchLotNumber=Batch/Lot number aefiVaccinationsDiluentExpiryDate=Expiry date aefiVaccinationsDiluentTimeOfReconstitution=Reconstitution time -aefiActiveAdverseEvents = Active adverse events -aefiArchivedAdverseEvents = Archived adverse events -aefiAllActiveAndArchivedAdverseEvents = All active and archived adverse events -aefiDeletedAdverseEvents = Deleted adverse events +aefiActiveAdverseEvents=Active adverse events +aefiArchivedAdverseEvents=Archived adverse events +aefiAllActiveAndArchivedAdverseEvents=All active and archived adverse events +aefiDeletedAdverseEvents=Deleted adverse events # Adverse Events AdverseEvents.severeLocalReaction=Severe local reaction AdverseEvents.severeLocalReactionMoreThanThreeDays=>3 days @@ -2575,13 +2569,13 @@ aefiInvestigationMedicalCareDetailsInstruction=**Instructions ? Attach copies of aefiInvestigationReconstitutionProcedure=Reconstitution procedure aefiInvestigationOfThoseAffected=Of those effected, how many are aefiAefiInvestigationList=Adverse Event Investigations -aefiNewAefiInvestigation = New Investigation +aefiNewAefiInvestigation=New Investigation aefiAefiInvestigationDataView=Adverse Event Investigation aefiNewAefiInvestigationStageTitle=Investigation -aefiActiveInvestigations = Active AEFI investigations -aefiArchivedInvestigations = Archived AEFI investigations -aefiAllActiveAndArchivedInvestigations = All active and archived AEFI investigations -aefiDeletedInvestigations = Deleted AEFI investigations +aefiActiveInvestigations=Active AEFI investigations +aefiArchivedInvestigations=Archived AEFI investigations +aefiAllActiveAndArchivedInvestigations=All active and archived AEFI investigations +aefiDeletedInvestigations=Deleted AEFI investigations titleAefiInvestigationBasicDetails=Section A\: Basic details titleAefiInvestigationRelevantPatientInformation=Section B\: Relevant patient information prior to immunization titleAefiInvestigationFirstExaminationDetails=Section C\: Details of first examination** of serious AEFI case @@ -2854,7 +2848,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment = Associated environment +Task.environment=Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2907,7 +2901,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser = Reporting user +TravelEntry.reportingUser=Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -3278,17 +3272,15 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms = SMS -userRoleNotificationTypeEmail = EMAIL +userRoleNotificationTypeSms=SMS +userRoleNotificationTypeEmail=EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template - notificationType=Notification type -notificationType.group = Group -notificationType.caption = Caption -notificationType.description = Description - +notificationType.group=Group +notificationType.caption=Caption +notificationType.description=Description SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -3323,10 +3315,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails = Person contact details -environmentSampleNotShipped = Not shipped -environmentSampleShipped = Shipped -environmentSampleReceived = Received +TaskExport.personOtherContactDetails=Person contact details +environmentSampleNotShipped=Not shipped +environmentSampleShipped=Shipped +environmentSampleReceived=Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -3343,48 +3335,45 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents - # SpecialCaseAccess SpecialCaseAccess=Special case access -caze = Case -assignedTo = Assigned to -assignedBy = Assigned by -endDateTime = Access until -assignmentDate = Date assigned - +caze=Case +assignedTo=Assigned to +assignedBy=Assigned by +endDateTime=Access until +assignmentDate=Date assigned specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case - # SelfReport -SelfReport = Self report -SelfReport.type = Type -SelfReport.reportDate = Report date -SelfReport.caseReference = Case reference number -SelfReport.disease = Disease -SelfReport.diseaseDetails = Disease details -SelfReport.diseaseVariant = Disease variant -SelfReport.diseaseVariantDetails = Disease variant details -SelfReport.firstName = First name -SelfReport.lastName = Last name -SelfReport.sex = Sex -SelfReport.birthDate = Birth date -SelfReport.birthdateDD = Day of birth -SelfReport.birthdateMM = Month of birth -SelfReport.birthdateYYYY = Year of birth -SelfReport.nationalHealthId = National health ID -SelfReport.email = Email -SelfReport.phoneNumber = Phone number -SelfReport.address = Address -SelfReport.dateOfTest = Date of test -SelfReport.dateOfSymptoms = Date of symptoms -SelfReport.workplace = Workplace -SelfReport.dateWorkplace = Date workplace -SelfReport.isolationDate = Date of isolation -SelfReport.contactDate = Date of contact -SelfReport.comment = Comment -SelfReport.responsibleUser = Responsible user -SelfReport.investigationStatus = Investigation status -SelfReport.processingStatus = Processing status +SelfReport=Self report +SelfReport.type=Type +SelfReport.reportDate=Report date +SelfReport.caseReference=Case reference number +SelfReport.disease=Disease +SelfReport.diseaseDetails=Disease details +SelfReport.diseaseVariant=Disease variant +SelfReport.diseaseVariantDetails=Disease variant details +SelfReport.firstName=First name +SelfReport.lastName=Last name +SelfReport.sex=Sex +SelfReport.birthDate=Birth date +SelfReport.birthdateDD=Day of birth +SelfReport.birthdateMM=Month of birth +SelfReport.birthdateYYYY=Year of birth +SelfReport.nationalHealthId=National health ID +SelfReport.email=Email +SelfReport.phoneNumber=Phone number +SelfReport.address=Address +SelfReport.dateOfTest=Date of test +SelfReport.dateOfSymptoms=Date of symptoms +SelfReport.workplace=Workplace +SelfReport.dateWorkplace=Date workplace +SelfReport.isolationDate=Date of isolation +SelfReport.contactDate=Date of contact +SelfReport.comment=Comment +SelfReport.responsibleUser=Responsible user +SelfReport.investigationStatus=Investigation status +SelfReport.processingStatus=Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_en-GM.properties b/sormas-api/src/main/resources/captions_en-GM.properties index 8b11bb90c15..f27b56025c3 100644 --- a/sormas-api/src/main/resources/captions_en-GM.properties +++ b/sormas-api/src/main/resources/captions_en-GM.properties @@ -52,7 +52,7 @@ creationDate=Creation date changeDate=Date of last change notAvailableShort=NA inaccessibleValue=Confidential -includePartialBirthdates = Include partial birthdates +includePartialBirthdates=Include partial birthdates numberOfCharacters=Number of characters\: %d / %d remove=Remove notTestedYet=Not tested yet @@ -189,15 +189,15 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge = Okay, and continue to merge overview -actionOkAndGoToContactDirectory = Okay, and continue to contact directory -actionOkAndGoToContactDetails = Okay, and continue to contact -actionOkAndGoToPersonDirectory = Okay, and continue to person directory -actionExecuteAutomaticDeletion = Execute automatic deletion -actionDone = Done -actionConfirmAction = Confirm action -actionAefiSelectPrimarySuspectVaccination = Select Suspect Vaccination -actionAefiAssignNewReportingIdNumber = "Assign New AEFI ID" +actionOkAndGoToMerge=Okay, and continue to merge overview +actionOkAndGoToContactDirectory=Okay, and continue to contact directory +actionOkAndGoToContactDetails=Okay, and continue to contact +actionOkAndGoToPersonDirectory=Okay, and continue to person directory +actionExecuteAutomaticDeletion=Execute automatic deletion +actionDone=Done +actionConfirmAction=Confirm action +actionAefiSelectPrimarySuspectVaccination=Select Suspect Vaccination +actionAefiAssignNewReportingIdNumber="Assign New AEFI ID" activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -251,10 +251,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows = Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups = Expired -aggregateReportNoAgeGroup = No age group -aggregateReportShowOnlyDuplicateReports = Display only duplicate reports +aggregateReportShowZeroRows=Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups=Expired +aggregateReportNoAgeGroup=No age group +aggregateReportShowOnlyDuplicateReports=Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -278,7 +278,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend = Send emails +bulkEmailSend=Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -437,6 +437,7 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name +CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1036,7 +1037,6 @@ aefiDashboardAefiInvestigationDiscarded=Investigation Discarded aefiDashboardAefiClassificationRelatedToVaccination=Related to vaccine or vaccination aefiDashboardAefiClassificationCoincidentalAdverseEvent=Coincidental adverse event aefiDashboardAefiClassificationUndetermined=Undetermined - captionDefault=Default defaultRegion=Default Region defaultDistrict=Default District @@ -1154,22 +1154,20 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: - # Entity columns -EntityColumn.ENTITY = Entity -EntityColumn.FIELD_ID = Field ID -EntityColumn.FIELD = Field -EntityColumn.TYPE = Type -EntityColumn.DATA_PROTECTION = Data protection -EntityColumn.CAPTION = Caption -EntityColumn.DESCRIPTION = Description -EntityColumn.REQUIRED = Required -EntityColumn.NEW_DISEASE = New disease -EntityColumn.DISEASES = Diseases -EntityColumn.OUTBREAKS = Outbreaks -EntityColumn.IGNORED_COUNTRIES = Ignored countries -EntityColumn.EXCLUSIVE_COUNTRIES = Exclusive countries - +EntityColumn.ENTITY=Entity +EntityColumn.FIELD_ID=Field ID +EntityColumn.FIELD=Field +EntityColumn.TYPE=Type +EntityColumn.DATA_PROTECTION=Data protection +EntityColumn.CAPTION=Caption +EntityColumn.DESCRIPTION=Description +EntityColumn.REQUIRED=Required +EntityColumn.NEW_DISEASE=New disease +EntityColumn.DISEASES=Diseases +EntityColumn.OUTBREAKS=Outbreaks +EntityColumn.IGNORED_COUNTRIES=Ignored countries +EntityColumn.EXCLUSIVE_COUNTRIES=Exclusive countries # Environment Environment=Environment Environment.uuid=Environment ID @@ -1188,54 +1186,51 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location - environmentActiveEnvironments=Active environments -environmentArchivedEnvironments = Archived environments -environmentAllActiveAndArchivedEnvironments = All active and archived environments -environmentDeletedEnvironments = Deleted environments -environmentNewEnvironment= New environment +environmentArchivedEnvironments=Archived environments +environmentAllActiveAndArchivedEnvironments=All active and archived environments +environmentDeletedEnvironments=Deleted environments +environmentNewEnvironment=New environment environmentEnvironmentsList=Environments list - # EnvironmentSample -EnvironmentSample = Environment Sample -EnvironmentSample.uuid = Sample ID -EnvironmentSample.environment = Environment -EnvironmentSample.sampleDateTime = Date of sampling -EnvironmentSample.sampleMaterial = Sample material -EnvironmentSample.otherSampleMaterial = Specify sample material -EnvironmentSample.sampleVolume = Volume (in mL) -EnvironmentSample.fieldSampleId = Field sample ID -EnvironmentSample.turbidity = Turbidity (in NTU) -EnvironmentSample.phValue = pH of sample -EnvironmentSample.sampleTemperature = Temperature (in °C) -EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) -EnvironmentSample.laboratory = Laboratory -EnvironmentSample.laboratoryDetails = Laboratory details -EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested -EnvironmentSample.reportingUser = Reporting user -EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested -EnvironmentSample.weatherConditions = Weather conditions at time of sampling -EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched = Sent/dispatched -EnvironmentSample.dispatchDate = Dispatchment date -EnvironmentSample.dispatchDetails = Dispatchment details -EnvironmentSample.received = Received -EnvironmentSample.receivalDate = Receival date -EnvironmentSample.labSampleId = Lab sample ID -EnvironmentSample.specimenCondition = Specimen condition -EnvironmentSample.location = Location of sampling site -EnvironmentSample.generalComment = General comment -EnvironmentSample.positivePathogenTests = Positive pathogen tests -EnvironmentSample.latestPathogenTest = Latest pathogen test -EnvironmentSample.numberOfTests = Number of tests - +EnvironmentSample=Environment Sample +EnvironmentSample.uuid=Sample ID +EnvironmentSample.environment=Environment +EnvironmentSample.sampleDateTime=Date of sampling +EnvironmentSample.sampleMaterial=Sample material +EnvironmentSample.otherSampleMaterial=Specify sample material +EnvironmentSample.sampleVolume=Volume (in mL) +EnvironmentSample.fieldSampleId=Field sample ID +EnvironmentSample.turbidity=Turbidity (in NTU) +EnvironmentSample.phValue=pH of sample +EnvironmentSample.sampleTemperature=Temperature (in °C) +EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) +EnvironmentSample.laboratory=Laboratory +EnvironmentSample.laboratoryDetails=Laboratory details +EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested +EnvironmentSample.reportingUser=Reporting user +EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested +EnvironmentSample.weatherConditions=Weather conditions at time of sampling +EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched=Sent/dispatched +EnvironmentSample.dispatchDate=Dispatchment date +EnvironmentSample.dispatchDetails=Dispatchment details +EnvironmentSample.received=Received +EnvironmentSample.receivalDate=Receival date +EnvironmentSample.labSampleId=Lab sample ID +EnvironmentSample.specimenCondition=Specimen condition +EnvironmentSample.location=Location of sampling site +EnvironmentSample.generalComment=General comment +EnvironmentSample.positivePathogenTests=Positive pathogen tests +EnvironmentSample.latestPathogenTest=Latest pathogen test +EnvironmentSample.numberOfTests=Number of tests # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents = Deleted events +eventDeletedEvents=Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1379,7 +1374,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants = Deleted event participants +eventParticipantDeletedEventParticipants=Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1392,7 +1387,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser = Reporting user +EventParticipant.reportingUser=Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1429,9 +1424,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink = Event participant ID -EventParticipantSelection.eventUuidLink = Event ID -EventParticipantSelection.resultingCaseUuidLink = Resulting case ID +EventParticipantSelection.eventParticipantUuidLink=Event participant ID +EventParticipantSelection.eventUuidLink=Event ID +EventParticipantSelection.resultingCaseUuidLink=Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1651,7 +1646,6 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message - #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1662,7 +1656,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList = List of new event participants +lineListingNewEventParticipantsList=List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1838,10 +1832,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples = See samples for this person -caseLinkToSamples = See samples for this case -contactLinkToSamples = See samples for this contact -eventParticipantLinkToSamples = See samples for this event participant +personLinkToSamples=See samples for this person +caseLinkToSamples=See samples for this case +contactLinkToSamples=See samples for this contact +eventParticipantLinkToSamples=See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2149,9 +2143,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity = Community of event participant -SampleExport.eventParticipantDistrict = District of event participant -SampleExport.eventParticipantRegion = Region of event participant +SampleExport.eventParticipantCommunity=Community of event participant +SampleExport.eventParticipantDistrict=District of event participant +SampleExport.eventParticipantRegion=Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2210,7 +2204,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser = Reporting user +Immunization.reportingUser=Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2253,10 +2247,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations = Active immunizations -immunizationArchivedImmunizations = Archived immunizations -immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations -immunizationDeletedImmunizations = Deleted immunizations +immunizationActiveImmunizations=Active immunizations +immunizationArchivedImmunizations=Archived immunizations +immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations +immunizationDeletedImmunizations=Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2321,10 +2315,10 @@ aefiVaccinationsDiluentInformation=Diluent Information aefiVaccinationsDiluentBatchLotNumber=Batch/Lot number aefiVaccinationsDiluentExpiryDate=Expiry date aefiVaccinationsDiluentTimeOfReconstitution=Reconstitution time -aefiActiveAdverseEvents = Active adverse events -aefiArchivedAdverseEvents = Archived adverse events -aefiAllActiveAndArchivedAdverseEvents = All active and archived adverse events -aefiDeletedAdverseEvents = Deleted adverse events +aefiActiveAdverseEvents=Active adverse events +aefiArchivedAdverseEvents=Archived adverse events +aefiAllActiveAndArchivedAdverseEvents=All active and archived adverse events +aefiDeletedAdverseEvents=Deleted adverse events # Adverse Events AdverseEvents.severeLocalReaction=Severe local reaction AdverseEvents.severeLocalReactionMoreThanThreeDays=>3 days @@ -2575,13 +2569,13 @@ aefiInvestigationMedicalCareDetailsInstruction=**Instructions ? Attach copies of aefiInvestigationReconstitutionProcedure=Reconstitution procedure aefiInvestigationOfThoseAffected=Of those effected, how many are aefiAefiInvestigationList=Adverse Event Investigations -aefiNewAefiInvestigation = New Investigation +aefiNewAefiInvestigation=New Investigation aefiAefiInvestigationDataView=Adverse Event Investigation aefiNewAefiInvestigationStageTitle=Investigation -aefiActiveInvestigations = Active AEFI investigations -aefiArchivedInvestigations = Archived AEFI investigations -aefiAllActiveAndArchivedInvestigations = All active and archived AEFI investigations -aefiDeletedInvestigations = Deleted AEFI investigations +aefiActiveInvestigations=Active AEFI investigations +aefiArchivedInvestigations=Archived AEFI investigations +aefiAllActiveAndArchivedInvestigations=All active and archived AEFI investigations +aefiDeletedInvestigations=Deleted AEFI investigations titleAefiInvestigationBasicDetails=Section A\: Basic details titleAefiInvestigationRelevantPatientInformation=Section B\: Relevant patient information prior to immunization titleAefiInvestigationFirstExaminationDetails=Section C\: Details of first examination** of serious AEFI case @@ -2854,7 +2848,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment = Associated environment +Task.environment=Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2907,7 +2901,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser = Reporting user +TravelEntry.reportingUser=Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -3278,17 +3272,15 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms = SMS -userRoleNotificationTypeEmail = EMAIL +userRoleNotificationTypeSms=SMS +userRoleNotificationTypeEmail=EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template - notificationType=Notification type -notificationType.group = Group -notificationType.caption = Caption -notificationType.description = Description - +notificationType.group=Group +notificationType.caption=Caption +notificationType.description=Description SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -3323,10 +3315,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails = Person contact details -environmentSampleNotShipped = Not shipped -environmentSampleShipped = Shipped -environmentSampleReceived = Received +TaskExport.personOtherContactDetails=Person contact details +environmentSampleNotShipped=Not shipped +environmentSampleShipped=Shipped +environmentSampleReceived=Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -3343,48 +3335,45 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents - # SpecialCaseAccess SpecialCaseAccess=Special case access -caze = Case -assignedTo = Assigned to -assignedBy = Assigned by -endDateTime = Access until -assignmentDate = Date assigned - +caze=Case +assignedTo=Assigned to +assignedBy=Assigned by +endDateTime=Access until +assignmentDate=Date assigned specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case - # SelfReport -SelfReport = Self report -SelfReport.type = Type -SelfReport.reportDate = Report date -SelfReport.caseReference = Case reference number -SelfReport.disease = Disease -SelfReport.diseaseDetails = Disease details -SelfReport.diseaseVariant = Disease variant -SelfReport.diseaseVariantDetails = Disease variant details -SelfReport.firstName = First name -SelfReport.lastName = Last name -SelfReport.sex = Sex -SelfReport.birthDate = Birth date -SelfReport.birthdateDD = Day of birth -SelfReport.birthdateMM = Month of birth -SelfReport.birthdateYYYY = Year of birth -SelfReport.nationalHealthId = National health ID -SelfReport.email = Email -SelfReport.phoneNumber = Phone number -SelfReport.address = Address -SelfReport.dateOfTest = Date of test -SelfReport.dateOfSymptoms = Date of symptoms -SelfReport.workplace = Workplace -SelfReport.dateWorkplace = Date workplace -SelfReport.isolationDate = Date of isolation -SelfReport.contactDate = Date of contact -SelfReport.comment = Comment -SelfReport.responsibleUser = Responsible user -SelfReport.investigationStatus = Investigation status -SelfReport.processingStatus = Processing status +SelfReport=Self report +SelfReport.type=Type +SelfReport.reportDate=Report date +SelfReport.caseReference=Case reference number +SelfReport.disease=Disease +SelfReport.diseaseDetails=Disease details +SelfReport.diseaseVariant=Disease variant +SelfReport.diseaseVariantDetails=Disease variant details +SelfReport.firstName=First name +SelfReport.lastName=Last name +SelfReport.sex=Sex +SelfReport.birthDate=Birth date +SelfReport.birthdateDD=Day of birth +SelfReport.birthdateMM=Month of birth +SelfReport.birthdateYYYY=Year of birth +SelfReport.nationalHealthId=National health ID +SelfReport.email=Email +SelfReport.phoneNumber=Phone number +SelfReport.address=Address +SelfReport.dateOfTest=Date of test +SelfReport.dateOfSymptoms=Date of symptoms +SelfReport.workplace=Workplace +SelfReport.dateWorkplace=Date workplace +SelfReport.isolationDate=Date of isolation +SelfReport.contactDate=Date of contact +SelfReport.comment=Comment +SelfReport.responsibleUser=Responsible user +SelfReport.investigationStatus=Investigation status +SelfReport.processingStatus=Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_en-KE.properties b/sormas-api/src/main/resources/captions_en-KE.properties index ea936995d74..238d8e09844 100644 --- a/sormas-api/src/main/resources/captions_en-KE.properties +++ b/sormas-api/src/main/resources/captions_en-KE.properties @@ -52,7 +52,7 @@ creationDate=Creation date changeDate=Date of last change notAvailableShort=NA inaccessibleValue=Confidential -includePartialBirthdates = Include partial birthdates +includePartialBirthdates=Include partial birthdates numberOfCharacters=Number of characters\: %d / %d remove=Remove notTestedYet=Not tested yet @@ -189,15 +189,15 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge = Okay, and continue to merge overview -actionOkAndGoToContactDirectory = Okay, and continue to contact directory -actionOkAndGoToContactDetails = Okay, and continue to contact -actionOkAndGoToPersonDirectory = Okay, and continue to person directory -actionExecuteAutomaticDeletion = Execute automatic deletion -actionDone = Done -actionConfirmAction = Confirm action -actionAefiSelectPrimarySuspectVaccination = Select Suspect Vaccination -actionAefiAssignNewReportingIdNumber = "Assign New AEFI ID" +actionOkAndGoToMerge=Okay, and continue to merge overview +actionOkAndGoToContactDirectory=Okay, and continue to contact directory +actionOkAndGoToContactDetails=Okay, and continue to contact +actionOkAndGoToPersonDirectory=Okay, and continue to person directory +actionExecuteAutomaticDeletion=Execute automatic deletion +actionDone=Done +actionConfirmAction=Confirm action +actionAefiSelectPrimarySuspectVaccination=Select Suspect Vaccination +actionAefiAssignNewReportingIdNumber="Assign New AEFI ID" activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -251,10 +251,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows = Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups = Expired -aggregateReportNoAgeGroup = No age group -aggregateReportShowOnlyDuplicateReports = Display only duplicate reports +aggregateReportShowZeroRows=Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups=Expired +aggregateReportNoAgeGroup=No age group +aggregateReportShowOnlyDuplicateReports=Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -278,7 +278,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend = Send emails +bulkEmailSend=Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -437,6 +437,7 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name +CaseData.disease=Disease CaseData.district=Sub County CaseData.districtLevelDate=Date received at Sub county level CaseData.doses=How many doses @@ -1036,7 +1037,6 @@ aefiDashboardAefiInvestigationDiscarded=Investigation Discarded aefiDashboardAefiClassificationRelatedToVaccination=Related to vaccine or vaccination aefiDashboardAefiClassificationCoincidentalAdverseEvent=Coincidental adverse event aefiDashboardAefiClassificationUndetermined=Undetermined - captionDefault=Default defaultRegion=Default County defaultDistrict=Default Sub County @@ -1154,22 +1154,20 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: - # Entity columns -EntityColumn.ENTITY = Entity -EntityColumn.FIELD_ID = Field ID -EntityColumn.FIELD = Field -EntityColumn.TYPE = Type -EntityColumn.DATA_PROTECTION = Data protection -EntityColumn.CAPTION = Caption -EntityColumn.DESCRIPTION = Description -EntityColumn.REQUIRED = Required -EntityColumn.NEW_DISEASE = New disease -EntityColumn.DISEASES = Diseases -EntityColumn.OUTBREAKS = Outbreaks -EntityColumn.IGNORED_COUNTRIES = Ignored countries -EntityColumn.EXCLUSIVE_COUNTRIES = Exclusive countries - +EntityColumn.ENTITY=Entity +EntityColumn.FIELD_ID=Field ID +EntityColumn.FIELD=Field +EntityColumn.TYPE=Type +EntityColumn.DATA_PROTECTION=Data protection +EntityColumn.CAPTION=Caption +EntityColumn.DESCRIPTION=Description +EntityColumn.REQUIRED=Required +EntityColumn.NEW_DISEASE=New disease +EntityColumn.DISEASES=Diseases +EntityColumn.OUTBREAKS=Outbreaks +EntityColumn.IGNORED_COUNTRIES=Ignored countries +EntityColumn.EXCLUSIVE_COUNTRIES=Exclusive countries # Environment Environment=Environment Environment.uuid=Environment ID @@ -1188,54 +1186,51 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location - environmentActiveEnvironments=Active environments -environmentArchivedEnvironments = Archived environments -environmentAllActiveAndArchivedEnvironments = All active and archived environments -environmentDeletedEnvironments = Deleted environments -environmentNewEnvironment= New environment +environmentArchivedEnvironments=Archived environments +environmentAllActiveAndArchivedEnvironments=All active and archived environments +environmentDeletedEnvironments=Deleted environments +environmentNewEnvironment=New environment environmentEnvironmentsList=Environments list - # EnvironmentSample -EnvironmentSample = Environment Sample -EnvironmentSample.uuid = Sample ID -EnvironmentSample.environment = Environment -EnvironmentSample.sampleDateTime = Date of sampling -EnvironmentSample.sampleMaterial = Sample material -EnvironmentSample.otherSampleMaterial = Specify sample material -EnvironmentSample.sampleVolume = Volume (in mL) -EnvironmentSample.fieldSampleId = Field sample ID -EnvironmentSample.turbidity = Turbidity (in NTU) -EnvironmentSample.phValue = pH of sample -EnvironmentSample.sampleTemperature = Temperature (in °C) -EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) -EnvironmentSample.laboratory = Laboratory -EnvironmentSample.laboratoryDetails = Laboratory details -EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested -EnvironmentSample.reportingUser = Reporting user -EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested -EnvironmentSample.weatherConditions = Weather conditions at time of sampling -EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched = Sent/dispatched -EnvironmentSample.dispatchDate = Dispatchment date -EnvironmentSample.dispatchDetails = Dispatchment details -EnvironmentSample.received = Received -EnvironmentSample.receivalDate = Receival date -EnvironmentSample.labSampleId = Lab sample ID -EnvironmentSample.specimenCondition = Specimen condition -EnvironmentSample.location = Location of sampling site -EnvironmentSample.generalComment = General comment -EnvironmentSample.positivePathogenTests = Positive pathogen tests -EnvironmentSample.latestPathogenTest = Latest pathogen test -EnvironmentSample.numberOfTests = Number of tests - +EnvironmentSample=Environment Sample +EnvironmentSample.uuid=Sample ID +EnvironmentSample.environment=Environment +EnvironmentSample.sampleDateTime=Date of sampling +EnvironmentSample.sampleMaterial=Sample material +EnvironmentSample.otherSampleMaterial=Specify sample material +EnvironmentSample.sampleVolume=Volume (in mL) +EnvironmentSample.fieldSampleId=Field sample ID +EnvironmentSample.turbidity=Turbidity (in NTU) +EnvironmentSample.phValue=pH of sample +EnvironmentSample.sampleTemperature=Temperature (in °C) +EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) +EnvironmentSample.laboratory=Laboratory +EnvironmentSample.laboratoryDetails=Laboratory details +EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested +EnvironmentSample.reportingUser=Reporting user +EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested +EnvironmentSample.weatherConditions=Weather conditions at time of sampling +EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched=Sent/dispatched +EnvironmentSample.dispatchDate=Dispatchment date +EnvironmentSample.dispatchDetails=Dispatchment details +EnvironmentSample.received=Received +EnvironmentSample.receivalDate=Receival date +EnvironmentSample.labSampleId=Lab sample ID +EnvironmentSample.specimenCondition=Specimen condition +EnvironmentSample.location=Location of sampling site +EnvironmentSample.generalComment=General comment +EnvironmentSample.positivePathogenTests=Positive pathogen tests +EnvironmentSample.latestPathogenTest=Latest pathogen test +EnvironmentSample.numberOfTests=Number of tests # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents = Deleted events +eventDeletedEvents=Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1379,7 +1374,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants = Deleted event participants +eventParticipantDeletedEventParticipants=Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1392,7 +1387,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser = Reporting user +EventParticipant.reportingUser=Reporting user EventParticipant.responsibleRegion=Responsible County EventParticipant.responsibleDistrict=Responsible Sub County EventParticipant.personUuid=Person ID @@ -1429,9 +1424,9 @@ EventParticipantExport.personNationalHealthId=Person National Unique Patient Ide EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink = Event participant ID -EventParticipantSelection.eventUuidLink = Event ID -EventParticipantSelection.resultingCaseUuidLink = Resulting case ID +EventParticipantSelection.eventParticipantUuidLink=Event participant ID +EventParticipantSelection.eventUuidLink=Event ID +EventParticipantSelection.resultingCaseUuidLink=Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1651,7 +1646,6 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message - #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1662,7 +1656,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList = List of new event participants +lineListingNewEventParticipantsList=List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1838,10 +1832,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples = See samples for this person -caseLinkToSamples = See samples for this case -contactLinkToSamples = See samples for this contact -eventParticipantLinkToSamples = See samples for this event participant +personLinkToSamples=See samples for this person +caseLinkToSamples=See samples for this case +contactLinkToSamples=See samples for this contact +eventParticipantLinkToSamples=See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2149,9 +2143,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible ward SampleExport.caseResponsibleDistrict=Case responsible sub county SampleExport.caseResponsibleRegion=Case responsible county -SampleExport.eventParticipantCommunity = Ward of event participant -SampleExport.eventParticipantDistrict = Sub County of event participant -SampleExport.eventParticipantRegion = County of event participant +SampleExport.eventParticipantCommunity=Ward of event participant +SampleExport.eventParticipantDistrict=Sub County of event participant +SampleExport.eventParticipantRegion=County of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2210,7 +2204,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser = Reporting user +Immunization.reportingUser=Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2253,10 +2247,10 @@ Immunization.district=Sub County Immunization.community=Ward Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations = Active immunizations -immunizationArchivedImmunizations = Archived immunizations -immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations -immunizationDeletedImmunizations = Deleted immunizations +immunizationActiveImmunizations=Active immunizations +immunizationArchivedImmunizations=Archived immunizations +immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations +immunizationDeletedImmunizations=Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2321,10 +2315,10 @@ aefiVaccinationsDiluentInformation=Diluent Information aefiVaccinationsDiluentBatchLotNumber=Batch/Lot number aefiVaccinationsDiluentExpiryDate=Expiry date aefiVaccinationsDiluentTimeOfReconstitution=Reconstitution time -aefiActiveAdverseEvents = Active adverse events -aefiArchivedAdverseEvents = Archived adverse events -aefiAllActiveAndArchivedAdverseEvents = All active and archived adverse events -aefiDeletedAdverseEvents = Deleted adverse events +aefiActiveAdverseEvents=Active adverse events +aefiArchivedAdverseEvents=Archived adverse events +aefiAllActiveAndArchivedAdverseEvents=All active and archived adverse events +aefiDeletedAdverseEvents=Deleted adverse events # Adverse Events AdverseEvents.severeLocalReaction=Severe local reaction AdverseEvents.severeLocalReactionMoreThanThreeDays=>3 days @@ -2575,13 +2569,13 @@ aefiInvestigationMedicalCareDetailsInstruction=**Instructions ? Attach copies of aefiInvestigationReconstitutionProcedure=Reconstitution procedure aefiInvestigationOfThoseAffected=Of those effected, how many are aefiAefiInvestigationList=Adverse Event Investigations -aefiNewAefiInvestigation = New Investigation +aefiNewAefiInvestigation=New Investigation aefiAefiInvestigationDataView=Adverse Event Investigation aefiNewAefiInvestigationStageTitle=Investigation -aefiActiveInvestigations = Active AEFI investigations -aefiArchivedInvestigations = Archived AEFI investigations -aefiAllActiveAndArchivedInvestigations = All active and archived AEFI investigations -aefiDeletedInvestigations = Deleted AEFI investigations +aefiActiveInvestigations=Active AEFI investigations +aefiArchivedInvestigations=Archived AEFI investigations +aefiAllActiveAndArchivedInvestigations=All active and archived AEFI investigations +aefiDeletedInvestigations=Deleted AEFI investigations titleAefiInvestigationBasicDetails=Section A\: Basic details titleAefiInvestigationRelevantPatientInformation=Section B\: Relevant patient information prior to immunization titleAefiInvestigationFirstExaminationDetails=Section C\: Details of first examination** of serious AEFI case @@ -2854,7 +2848,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment = Associated environment +Task.environment=Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2907,7 +2901,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser = Reporting user +TravelEntry.reportingUser=Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -3278,17 +3272,15 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms = SMS -userRoleNotificationTypeEmail = EMAIL +userRoleNotificationTypeSms=SMS +userRoleNotificationTypeEmail=EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template - notificationType=Notification type -notificationType.group = Group -notificationType.caption = Caption -notificationType.description = Description - +notificationType.group=Group +notificationType.caption=Caption +notificationType.description=Description SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -3323,10 +3315,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails = Person contact details -environmentSampleNotShipped = Not shipped -environmentSampleShipped = Shipped -environmentSampleReceived = Received +TaskExport.personOtherContactDetails=Person contact details +environmentSampleNotShipped=Not shipped +environmentSampleShipped=Shipped +environmentSampleReceived=Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -3343,48 +3335,45 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents - # SpecialCaseAccess SpecialCaseAccess=Special case access -caze = Case -assignedTo = Assigned to -assignedBy = Assigned by -endDateTime = Access until -assignmentDate = Date assigned - +caze=Case +assignedTo=Assigned to +assignedBy=Assigned by +endDateTime=Access until +assignmentDate=Date assigned specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case - # SelfReport -SelfReport = Self report -SelfReport.type = Type -SelfReport.reportDate = Report date -SelfReport.caseReference = Case reference number -SelfReport.disease = Disease -SelfReport.diseaseDetails = Disease details -SelfReport.diseaseVariant = Disease variant -SelfReport.diseaseVariantDetails = Disease variant details -SelfReport.firstName = First name -SelfReport.lastName = Last name -SelfReport.sex = Sex -SelfReport.birthDate = Birth date -SelfReport.birthdateDD = Day of birth -SelfReport.birthdateMM = Month of birth -SelfReport.birthdateYYYY = Year of birth -SelfReport.nationalHealthId = National Unique Patient Identifier -SelfReport.email = Email -SelfReport.phoneNumber = Phone number -SelfReport.address = Address -SelfReport.dateOfTest = Date of test -SelfReport.dateOfSymptoms = Date of symptoms -SelfReport.workplace = Workplace -SelfReport.dateWorkplace = Date workplace -SelfReport.isolationDate = Date of isolation -SelfReport.contactDate = Date of contact -SelfReport.comment = Comment -SelfReport.responsibleUser = Responsible user -SelfReport.investigationStatus = Investigation status -SelfReport.processingStatus = Processing status +SelfReport=Self report +SelfReport.type=Type +SelfReport.reportDate=Report date +SelfReport.caseReference=Case reference number +SelfReport.disease=Disease +SelfReport.diseaseDetails=Disease details +SelfReport.diseaseVariant=Disease variant +SelfReport.diseaseVariantDetails=Disease variant details +SelfReport.firstName=First name +SelfReport.lastName=Last name +SelfReport.sex=Sex +SelfReport.birthDate=Birth date +SelfReport.birthdateDD=Day of birth +SelfReport.birthdateMM=Month of birth +SelfReport.birthdateYYYY=Year of birth +SelfReport.nationalHealthId=National Unique Patient Identifier +SelfReport.email=Email +SelfReport.phoneNumber=Phone number +SelfReport.address=Address +SelfReport.dateOfTest=Date of test +SelfReport.dateOfSymptoms=Date of symptoms +SelfReport.workplace=Workplace +SelfReport.dateWorkplace=Date workplace +SelfReport.isolationDate=Date of isolation +SelfReport.contactDate=Date of contact +SelfReport.comment=Comment +SelfReport.responsibleUser=Responsible user +SelfReport.investigationStatus=Investigation status +SelfReport.processingStatus=Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_en-LR.properties b/sormas-api/src/main/resources/captions_en-LR.properties index 8b11bb90c15..f27b56025c3 100644 --- a/sormas-api/src/main/resources/captions_en-LR.properties +++ b/sormas-api/src/main/resources/captions_en-LR.properties @@ -52,7 +52,7 @@ creationDate=Creation date changeDate=Date of last change notAvailableShort=NA inaccessibleValue=Confidential -includePartialBirthdates = Include partial birthdates +includePartialBirthdates=Include partial birthdates numberOfCharacters=Number of characters\: %d / %d remove=Remove notTestedYet=Not tested yet @@ -189,15 +189,15 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge = Okay, and continue to merge overview -actionOkAndGoToContactDirectory = Okay, and continue to contact directory -actionOkAndGoToContactDetails = Okay, and continue to contact -actionOkAndGoToPersonDirectory = Okay, and continue to person directory -actionExecuteAutomaticDeletion = Execute automatic deletion -actionDone = Done -actionConfirmAction = Confirm action -actionAefiSelectPrimarySuspectVaccination = Select Suspect Vaccination -actionAefiAssignNewReportingIdNumber = "Assign New AEFI ID" +actionOkAndGoToMerge=Okay, and continue to merge overview +actionOkAndGoToContactDirectory=Okay, and continue to contact directory +actionOkAndGoToContactDetails=Okay, and continue to contact +actionOkAndGoToPersonDirectory=Okay, and continue to person directory +actionExecuteAutomaticDeletion=Execute automatic deletion +actionDone=Done +actionConfirmAction=Confirm action +actionAefiSelectPrimarySuspectVaccination=Select Suspect Vaccination +actionAefiAssignNewReportingIdNumber="Assign New AEFI ID" activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -251,10 +251,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows = Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups = Expired -aggregateReportNoAgeGroup = No age group -aggregateReportShowOnlyDuplicateReports = Display only duplicate reports +aggregateReportShowZeroRows=Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups=Expired +aggregateReportNoAgeGroup=No age group +aggregateReportShowOnlyDuplicateReports=Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -278,7 +278,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend = Send emails +bulkEmailSend=Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -437,6 +437,7 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name +CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1036,7 +1037,6 @@ aefiDashboardAefiInvestigationDiscarded=Investigation Discarded aefiDashboardAefiClassificationRelatedToVaccination=Related to vaccine or vaccination aefiDashboardAefiClassificationCoincidentalAdverseEvent=Coincidental adverse event aefiDashboardAefiClassificationUndetermined=Undetermined - captionDefault=Default defaultRegion=Default Region defaultDistrict=Default District @@ -1154,22 +1154,20 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: - # Entity columns -EntityColumn.ENTITY = Entity -EntityColumn.FIELD_ID = Field ID -EntityColumn.FIELD = Field -EntityColumn.TYPE = Type -EntityColumn.DATA_PROTECTION = Data protection -EntityColumn.CAPTION = Caption -EntityColumn.DESCRIPTION = Description -EntityColumn.REQUIRED = Required -EntityColumn.NEW_DISEASE = New disease -EntityColumn.DISEASES = Diseases -EntityColumn.OUTBREAKS = Outbreaks -EntityColumn.IGNORED_COUNTRIES = Ignored countries -EntityColumn.EXCLUSIVE_COUNTRIES = Exclusive countries - +EntityColumn.ENTITY=Entity +EntityColumn.FIELD_ID=Field ID +EntityColumn.FIELD=Field +EntityColumn.TYPE=Type +EntityColumn.DATA_PROTECTION=Data protection +EntityColumn.CAPTION=Caption +EntityColumn.DESCRIPTION=Description +EntityColumn.REQUIRED=Required +EntityColumn.NEW_DISEASE=New disease +EntityColumn.DISEASES=Diseases +EntityColumn.OUTBREAKS=Outbreaks +EntityColumn.IGNORED_COUNTRIES=Ignored countries +EntityColumn.EXCLUSIVE_COUNTRIES=Exclusive countries # Environment Environment=Environment Environment.uuid=Environment ID @@ -1188,54 +1186,51 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location - environmentActiveEnvironments=Active environments -environmentArchivedEnvironments = Archived environments -environmentAllActiveAndArchivedEnvironments = All active and archived environments -environmentDeletedEnvironments = Deleted environments -environmentNewEnvironment= New environment +environmentArchivedEnvironments=Archived environments +environmentAllActiveAndArchivedEnvironments=All active and archived environments +environmentDeletedEnvironments=Deleted environments +environmentNewEnvironment=New environment environmentEnvironmentsList=Environments list - # EnvironmentSample -EnvironmentSample = Environment Sample -EnvironmentSample.uuid = Sample ID -EnvironmentSample.environment = Environment -EnvironmentSample.sampleDateTime = Date of sampling -EnvironmentSample.sampleMaterial = Sample material -EnvironmentSample.otherSampleMaterial = Specify sample material -EnvironmentSample.sampleVolume = Volume (in mL) -EnvironmentSample.fieldSampleId = Field sample ID -EnvironmentSample.turbidity = Turbidity (in NTU) -EnvironmentSample.phValue = pH of sample -EnvironmentSample.sampleTemperature = Temperature (in °C) -EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) -EnvironmentSample.laboratory = Laboratory -EnvironmentSample.laboratoryDetails = Laboratory details -EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested -EnvironmentSample.reportingUser = Reporting user -EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested -EnvironmentSample.weatherConditions = Weather conditions at time of sampling -EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched = Sent/dispatched -EnvironmentSample.dispatchDate = Dispatchment date -EnvironmentSample.dispatchDetails = Dispatchment details -EnvironmentSample.received = Received -EnvironmentSample.receivalDate = Receival date -EnvironmentSample.labSampleId = Lab sample ID -EnvironmentSample.specimenCondition = Specimen condition -EnvironmentSample.location = Location of sampling site -EnvironmentSample.generalComment = General comment -EnvironmentSample.positivePathogenTests = Positive pathogen tests -EnvironmentSample.latestPathogenTest = Latest pathogen test -EnvironmentSample.numberOfTests = Number of tests - +EnvironmentSample=Environment Sample +EnvironmentSample.uuid=Sample ID +EnvironmentSample.environment=Environment +EnvironmentSample.sampleDateTime=Date of sampling +EnvironmentSample.sampleMaterial=Sample material +EnvironmentSample.otherSampleMaterial=Specify sample material +EnvironmentSample.sampleVolume=Volume (in mL) +EnvironmentSample.fieldSampleId=Field sample ID +EnvironmentSample.turbidity=Turbidity (in NTU) +EnvironmentSample.phValue=pH of sample +EnvironmentSample.sampleTemperature=Temperature (in °C) +EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) +EnvironmentSample.laboratory=Laboratory +EnvironmentSample.laboratoryDetails=Laboratory details +EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested +EnvironmentSample.reportingUser=Reporting user +EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested +EnvironmentSample.weatherConditions=Weather conditions at time of sampling +EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched=Sent/dispatched +EnvironmentSample.dispatchDate=Dispatchment date +EnvironmentSample.dispatchDetails=Dispatchment details +EnvironmentSample.received=Received +EnvironmentSample.receivalDate=Receival date +EnvironmentSample.labSampleId=Lab sample ID +EnvironmentSample.specimenCondition=Specimen condition +EnvironmentSample.location=Location of sampling site +EnvironmentSample.generalComment=General comment +EnvironmentSample.positivePathogenTests=Positive pathogen tests +EnvironmentSample.latestPathogenTest=Latest pathogen test +EnvironmentSample.numberOfTests=Number of tests # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents = Deleted events +eventDeletedEvents=Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1379,7 +1374,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants = Deleted event participants +eventParticipantDeletedEventParticipants=Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1392,7 +1387,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser = Reporting user +EventParticipant.reportingUser=Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1429,9 +1424,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink = Event participant ID -EventParticipantSelection.eventUuidLink = Event ID -EventParticipantSelection.resultingCaseUuidLink = Resulting case ID +EventParticipantSelection.eventParticipantUuidLink=Event participant ID +EventParticipantSelection.eventUuidLink=Event ID +EventParticipantSelection.resultingCaseUuidLink=Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1651,7 +1646,6 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message - #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1662,7 +1656,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList = List of new event participants +lineListingNewEventParticipantsList=List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1838,10 +1832,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples = See samples for this person -caseLinkToSamples = See samples for this case -contactLinkToSamples = See samples for this contact -eventParticipantLinkToSamples = See samples for this event participant +personLinkToSamples=See samples for this person +caseLinkToSamples=See samples for this case +contactLinkToSamples=See samples for this contact +eventParticipantLinkToSamples=See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2149,9 +2143,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity = Community of event participant -SampleExport.eventParticipantDistrict = District of event participant -SampleExport.eventParticipantRegion = Region of event participant +SampleExport.eventParticipantCommunity=Community of event participant +SampleExport.eventParticipantDistrict=District of event participant +SampleExport.eventParticipantRegion=Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2210,7 +2204,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser = Reporting user +Immunization.reportingUser=Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2253,10 +2247,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations = Active immunizations -immunizationArchivedImmunizations = Archived immunizations -immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations -immunizationDeletedImmunizations = Deleted immunizations +immunizationActiveImmunizations=Active immunizations +immunizationArchivedImmunizations=Archived immunizations +immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations +immunizationDeletedImmunizations=Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2321,10 +2315,10 @@ aefiVaccinationsDiluentInformation=Diluent Information aefiVaccinationsDiluentBatchLotNumber=Batch/Lot number aefiVaccinationsDiluentExpiryDate=Expiry date aefiVaccinationsDiluentTimeOfReconstitution=Reconstitution time -aefiActiveAdverseEvents = Active adverse events -aefiArchivedAdverseEvents = Archived adverse events -aefiAllActiveAndArchivedAdverseEvents = All active and archived adverse events -aefiDeletedAdverseEvents = Deleted adverse events +aefiActiveAdverseEvents=Active adverse events +aefiArchivedAdverseEvents=Archived adverse events +aefiAllActiveAndArchivedAdverseEvents=All active and archived adverse events +aefiDeletedAdverseEvents=Deleted adverse events # Adverse Events AdverseEvents.severeLocalReaction=Severe local reaction AdverseEvents.severeLocalReactionMoreThanThreeDays=>3 days @@ -2575,13 +2569,13 @@ aefiInvestigationMedicalCareDetailsInstruction=**Instructions ? Attach copies of aefiInvestigationReconstitutionProcedure=Reconstitution procedure aefiInvestigationOfThoseAffected=Of those effected, how many are aefiAefiInvestigationList=Adverse Event Investigations -aefiNewAefiInvestigation = New Investigation +aefiNewAefiInvestigation=New Investigation aefiAefiInvestigationDataView=Adverse Event Investigation aefiNewAefiInvestigationStageTitle=Investigation -aefiActiveInvestigations = Active AEFI investigations -aefiArchivedInvestigations = Archived AEFI investigations -aefiAllActiveAndArchivedInvestigations = All active and archived AEFI investigations -aefiDeletedInvestigations = Deleted AEFI investigations +aefiActiveInvestigations=Active AEFI investigations +aefiArchivedInvestigations=Archived AEFI investigations +aefiAllActiveAndArchivedInvestigations=All active and archived AEFI investigations +aefiDeletedInvestigations=Deleted AEFI investigations titleAefiInvestigationBasicDetails=Section A\: Basic details titleAefiInvestigationRelevantPatientInformation=Section B\: Relevant patient information prior to immunization titleAefiInvestigationFirstExaminationDetails=Section C\: Details of first examination** of serious AEFI case @@ -2854,7 +2848,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment = Associated environment +Task.environment=Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2907,7 +2901,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser = Reporting user +TravelEntry.reportingUser=Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -3278,17 +3272,15 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms = SMS -userRoleNotificationTypeEmail = EMAIL +userRoleNotificationTypeSms=SMS +userRoleNotificationTypeEmail=EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template - notificationType=Notification type -notificationType.group = Group -notificationType.caption = Caption -notificationType.description = Description - +notificationType.group=Group +notificationType.caption=Caption +notificationType.description=Description SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -3323,10 +3315,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails = Person contact details -environmentSampleNotShipped = Not shipped -environmentSampleShipped = Shipped -environmentSampleReceived = Received +TaskExport.personOtherContactDetails=Person contact details +environmentSampleNotShipped=Not shipped +environmentSampleShipped=Shipped +environmentSampleReceived=Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -3343,48 +3335,45 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents - # SpecialCaseAccess SpecialCaseAccess=Special case access -caze = Case -assignedTo = Assigned to -assignedBy = Assigned by -endDateTime = Access until -assignmentDate = Date assigned - +caze=Case +assignedTo=Assigned to +assignedBy=Assigned by +endDateTime=Access until +assignmentDate=Date assigned specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case - # SelfReport -SelfReport = Self report -SelfReport.type = Type -SelfReport.reportDate = Report date -SelfReport.caseReference = Case reference number -SelfReport.disease = Disease -SelfReport.diseaseDetails = Disease details -SelfReport.diseaseVariant = Disease variant -SelfReport.diseaseVariantDetails = Disease variant details -SelfReport.firstName = First name -SelfReport.lastName = Last name -SelfReport.sex = Sex -SelfReport.birthDate = Birth date -SelfReport.birthdateDD = Day of birth -SelfReport.birthdateMM = Month of birth -SelfReport.birthdateYYYY = Year of birth -SelfReport.nationalHealthId = National health ID -SelfReport.email = Email -SelfReport.phoneNumber = Phone number -SelfReport.address = Address -SelfReport.dateOfTest = Date of test -SelfReport.dateOfSymptoms = Date of symptoms -SelfReport.workplace = Workplace -SelfReport.dateWorkplace = Date workplace -SelfReport.isolationDate = Date of isolation -SelfReport.contactDate = Date of contact -SelfReport.comment = Comment -SelfReport.responsibleUser = Responsible user -SelfReport.investigationStatus = Investigation status -SelfReport.processingStatus = Processing status +SelfReport=Self report +SelfReport.type=Type +SelfReport.reportDate=Report date +SelfReport.caseReference=Case reference number +SelfReport.disease=Disease +SelfReport.diseaseDetails=Disease details +SelfReport.diseaseVariant=Disease variant +SelfReport.diseaseVariantDetails=Disease variant details +SelfReport.firstName=First name +SelfReport.lastName=Last name +SelfReport.sex=Sex +SelfReport.birthDate=Birth date +SelfReport.birthdateDD=Day of birth +SelfReport.birthdateMM=Month of birth +SelfReport.birthdateYYYY=Year of birth +SelfReport.nationalHealthId=National health ID +SelfReport.email=Email +SelfReport.phoneNumber=Phone number +SelfReport.address=Address +SelfReport.dateOfTest=Date of test +SelfReport.dateOfSymptoms=Date of symptoms +SelfReport.workplace=Workplace +SelfReport.dateWorkplace=Date workplace +SelfReport.isolationDate=Date of isolation +SelfReport.contactDate=Date of contact +SelfReport.comment=Comment +SelfReport.responsibleUser=Responsible user +SelfReport.investigationStatus=Investigation status +SelfReport.processingStatus=Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_en-NG.properties b/sormas-api/src/main/resources/captions_en-NG.properties index bd66854678c..53744598df3 100644 --- a/sormas-api/src/main/resources/captions_en-NG.properties +++ b/sormas-api/src/main/resources/captions_en-NG.properties @@ -52,7 +52,7 @@ creationDate=Creation date changeDate=Date of last change notAvailableShort=NA inaccessibleValue=Confidential -includePartialBirthdates = Include partial birthdates +includePartialBirthdates=Include partial birthdates numberOfCharacters=Number of characters\: %d / %d remove=Remove notTestedYet=Not tested yet @@ -189,15 +189,15 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge = Okay, and continue to merge overview -actionOkAndGoToContactDirectory = Okay, and continue to contact directory -actionOkAndGoToContactDetails = Okay, and continue to contact -actionOkAndGoToPersonDirectory = Okay, and continue to person directory -actionExecuteAutomaticDeletion = Execute automatic deletion -actionDone = Done -actionConfirmAction = Confirm action -actionAefiSelectPrimarySuspectVaccination = Select Suspect Vaccination -actionAefiAssignNewReportingIdNumber = "Assign New AEFI ID" +actionOkAndGoToMerge=Okay, and continue to merge overview +actionOkAndGoToContactDirectory=Okay, and continue to contact directory +actionOkAndGoToContactDetails=Okay, and continue to contact +actionOkAndGoToPersonDirectory=Okay, and continue to person directory +actionExecuteAutomaticDeletion=Execute automatic deletion +actionDone=Done +actionConfirmAction=Confirm action +actionAefiSelectPrimarySuspectVaccination=Select Suspect Vaccination +actionAefiAssignNewReportingIdNumber="Assign New AEFI ID" activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -251,10 +251,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows = Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups = Expired -aggregateReportNoAgeGroup = No age group -aggregateReportShowOnlyDuplicateReports = Display only duplicate reports +aggregateReportShowZeroRows=Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups=Expired +aggregateReportNoAgeGroup=No age group +aggregateReportShowOnlyDuplicateReports=Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -278,7 +278,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend = Send emails +bulkEmailSend=Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -437,6 +437,7 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name +CaseData.disease=Disease CaseData.district=LGA CaseData.districtLevelDate=Date received at LGA level CaseData.doses=How many doses @@ -1036,7 +1037,6 @@ aefiDashboardAefiInvestigationDiscarded=Investigation Discarded aefiDashboardAefiClassificationRelatedToVaccination=Related to vaccine or vaccination aefiDashboardAefiClassificationCoincidentalAdverseEvent=Coincidental adverse event aefiDashboardAefiClassificationUndetermined=Undetermined - captionDefault=Default defaultRegion=Default State defaultDistrict=Default LGA @@ -1154,22 +1154,20 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: - # Entity columns -EntityColumn.ENTITY = Entity -EntityColumn.FIELD_ID = Field ID -EntityColumn.FIELD = Field -EntityColumn.TYPE = Type -EntityColumn.DATA_PROTECTION = Data protection -EntityColumn.CAPTION = Caption -EntityColumn.DESCRIPTION = Description -EntityColumn.REQUIRED = Required -EntityColumn.NEW_DISEASE = New disease -EntityColumn.DISEASES = Diseases -EntityColumn.OUTBREAKS = Outbreaks -EntityColumn.IGNORED_COUNTRIES = Ignored countries -EntityColumn.EXCLUSIVE_COUNTRIES = Exclusive countries - +EntityColumn.ENTITY=Entity +EntityColumn.FIELD_ID=Field ID +EntityColumn.FIELD=Field +EntityColumn.TYPE=Type +EntityColumn.DATA_PROTECTION=Data protection +EntityColumn.CAPTION=Caption +EntityColumn.DESCRIPTION=Description +EntityColumn.REQUIRED=Required +EntityColumn.NEW_DISEASE=New disease +EntityColumn.DISEASES=Diseases +EntityColumn.OUTBREAKS=Outbreaks +EntityColumn.IGNORED_COUNTRIES=Ignored countries +EntityColumn.EXCLUSIVE_COUNTRIES=Exclusive countries # Environment Environment=Environment Environment.uuid=Environment ID @@ -1188,54 +1186,51 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location - environmentActiveEnvironments=Active environments -environmentArchivedEnvironments = Archived environments -environmentAllActiveAndArchivedEnvironments = All active and archived environments -environmentDeletedEnvironments = Deleted environments -environmentNewEnvironment= New environment +environmentArchivedEnvironments=Archived environments +environmentAllActiveAndArchivedEnvironments=All active and archived environments +environmentDeletedEnvironments=Deleted environments +environmentNewEnvironment=New environment environmentEnvironmentsList=Environments list - # EnvironmentSample -EnvironmentSample = Environment Sample -EnvironmentSample.uuid = Sample ID -EnvironmentSample.environment = Environment -EnvironmentSample.sampleDateTime = Date of sampling -EnvironmentSample.sampleMaterial = Sample material -EnvironmentSample.otherSampleMaterial = Specify sample material -EnvironmentSample.sampleVolume = Volume (in mL) -EnvironmentSample.fieldSampleId = Field sample ID -EnvironmentSample.turbidity = Turbidity (in NTU) -EnvironmentSample.phValue = pH of sample -EnvironmentSample.sampleTemperature = Temperature (in °C) -EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) -EnvironmentSample.laboratory = Laboratory -EnvironmentSample.laboratoryDetails = Laboratory details -EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested -EnvironmentSample.reportingUser = Reporting user -EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested -EnvironmentSample.weatherConditions = Weather conditions at time of sampling -EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched = Sent/dispatched -EnvironmentSample.dispatchDate = Dispatchment date -EnvironmentSample.dispatchDetails = Dispatchment details -EnvironmentSample.received = Received -EnvironmentSample.receivalDate = Receival date -EnvironmentSample.labSampleId = Lab sample ID -EnvironmentSample.specimenCondition = Specimen condition -EnvironmentSample.location = Location of sampling site -EnvironmentSample.generalComment = General comment -EnvironmentSample.positivePathogenTests = Positive pathogen tests -EnvironmentSample.latestPathogenTest = Latest pathogen test -EnvironmentSample.numberOfTests = Number of tests - +EnvironmentSample=Environment Sample +EnvironmentSample.uuid=Sample ID +EnvironmentSample.environment=Environment +EnvironmentSample.sampleDateTime=Date of sampling +EnvironmentSample.sampleMaterial=Sample material +EnvironmentSample.otherSampleMaterial=Specify sample material +EnvironmentSample.sampleVolume=Volume (in mL) +EnvironmentSample.fieldSampleId=Field sample ID +EnvironmentSample.turbidity=Turbidity (in NTU) +EnvironmentSample.phValue=pH of sample +EnvironmentSample.sampleTemperature=Temperature (in °C) +EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) +EnvironmentSample.laboratory=Laboratory +EnvironmentSample.laboratoryDetails=Laboratory details +EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested +EnvironmentSample.reportingUser=Reporting user +EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested +EnvironmentSample.weatherConditions=Weather conditions at time of sampling +EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched=Sent/dispatched +EnvironmentSample.dispatchDate=Dispatchment date +EnvironmentSample.dispatchDetails=Dispatchment details +EnvironmentSample.received=Received +EnvironmentSample.receivalDate=Receival date +EnvironmentSample.labSampleId=Lab sample ID +EnvironmentSample.specimenCondition=Specimen condition +EnvironmentSample.location=Location of sampling site +EnvironmentSample.generalComment=General comment +EnvironmentSample.positivePathogenTests=Positive pathogen tests +EnvironmentSample.latestPathogenTest=Latest pathogen test +EnvironmentSample.numberOfTests=Number of tests # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents = Deleted events +eventDeletedEvents=Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1379,7 +1374,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants = Deleted event participants +eventParticipantDeletedEventParticipants=Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1392,7 +1387,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser = Reporting user +EventParticipant.reportingUser=Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1429,9 +1424,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink = Event participant ID -EventParticipantSelection.eventUuidLink = Event ID -EventParticipantSelection.resultingCaseUuidLink = Resulting case ID +EventParticipantSelection.eventParticipantUuidLink=Event participant ID +EventParticipantSelection.eventUuidLink=Event ID +EventParticipantSelection.resultingCaseUuidLink=Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1651,7 +1646,6 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message - #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1662,7 +1656,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList = List of new event participants +lineListingNewEventParticipantsList=List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1838,10 +1832,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples = See samples for this person -caseLinkToSamples = See samples for this case -contactLinkToSamples = See samples for this contact -eventParticipantLinkToSamples = See samples for this event participant +personLinkToSamples=See samples for this person +caseLinkToSamples=See samples for this case +contactLinkToSamples=See samples for this contact +eventParticipantLinkToSamples=See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2149,9 +2143,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity = Community of event participant -SampleExport.eventParticipantDistrict = District of event participant -SampleExport.eventParticipantRegion = Region of event participant +SampleExport.eventParticipantCommunity=Community of event participant +SampleExport.eventParticipantDistrict=District of event participant +SampleExport.eventParticipantRegion=Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2210,7 +2204,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser = Reporting user +Immunization.reportingUser=Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2253,10 +2247,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations = Active immunizations -immunizationArchivedImmunizations = Archived immunizations -immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations -immunizationDeletedImmunizations = Deleted immunizations +immunizationActiveImmunizations=Active immunizations +immunizationArchivedImmunizations=Archived immunizations +immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations +immunizationDeletedImmunizations=Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2321,10 +2315,10 @@ aefiVaccinationsDiluentInformation=Diluent Information aefiVaccinationsDiluentBatchLotNumber=Batch/Lot number aefiVaccinationsDiluentExpiryDate=Expiry date aefiVaccinationsDiluentTimeOfReconstitution=Reconstitution time -aefiActiveAdverseEvents = Active adverse events -aefiArchivedAdverseEvents = Archived adverse events -aefiAllActiveAndArchivedAdverseEvents = All active and archived adverse events -aefiDeletedAdverseEvents = Deleted adverse events +aefiActiveAdverseEvents=Active adverse events +aefiArchivedAdverseEvents=Archived adverse events +aefiAllActiveAndArchivedAdverseEvents=All active and archived adverse events +aefiDeletedAdverseEvents=Deleted adverse events # Adverse Events AdverseEvents.severeLocalReaction=Severe local reaction AdverseEvents.severeLocalReactionMoreThanThreeDays=>3 days @@ -2575,13 +2569,13 @@ aefiInvestigationMedicalCareDetailsInstruction=**Instructions ? Attach copies of aefiInvestigationReconstitutionProcedure=Reconstitution procedure aefiInvestigationOfThoseAffected=Of those effected, how many are aefiAefiInvestigationList=Adverse Event Investigations -aefiNewAefiInvestigation = New Investigation +aefiNewAefiInvestigation=New Investigation aefiAefiInvestigationDataView=Adverse Event Investigation aefiNewAefiInvestigationStageTitle=Investigation -aefiActiveInvestigations = Active AEFI investigations -aefiArchivedInvestigations = Archived AEFI investigations -aefiAllActiveAndArchivedInvestigations = All active and archived AEFI investigations -aefiDeletedInvestigations = Deleted AEFI investigations +aefiActiveInvestigations=Active AEFI investigations +aefiArchivedInvestigations=Archived AEFI investigations +aefiAllActiveAndArchivedInvestigations=All active and archived AEFI investigations +aefiDeletedInvestigations=Deleted AEFI investigations titleAefiInvestigationBasicDetails=Section A\: Basic details titleAefiInvestigationRelevantPatientInformation=Section B\: Relevant patient information prior to immunization titleAefiInvestigationFirstExaminationDetails=Section C\: Details of first examination** of serious AEFI case @@ -2854,7 +2848,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment = Associated environment +Task.environment=Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2907,7 +2901,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser = Reporting user +TravelEntry.reportingUser=Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -3278,17 +3272,15 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms = SMS -userRoleNotificationTypeEmail = EMAIL +userRoleNotificationTypeSms=SMS +userRoleNotificationTypeEmail=EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template - notificationType=Notification type -notificationType.group = Group -notificationType.caption = Caption -notificationType.description = Description - +notificationType.group=Group +notificationType.caption=Caption +notificationType.description=Description SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -3323,10 +3315,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails = Person contact details -environmentSampleNotShipped = Not shipped -environmentSampleShipped = Shipped -environmentSampleReceived = Received +TaskExport.personOtherContactDetails=Person contact details +environmentSampleNotShipped=Not shipped +environmentSampleShipped=Shipped +environmentSampleReceived=Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -3343,48 +3335,45 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents - # SpecialCaseAccess SpecialCaseAccess=Special case access -caze = Case -assignedTo = Assigned to -assignedBy = Assigned by -endDateTime = Access until -assignmentDate = Date assigned - +caze=Case +assignedTo=Assigned to +assignedBy=Assigned by +endDateTime=Access until +assignmentDate=Date assigned specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case - # SelfReport -SelfReport = Self report -SelfReport.type = Type -SelfReport.reportDate = Report date -SelfReport.caseReference = Case reference number -SelfReport.disease = Disease -SelfReport.diseaseDetails = Disease details -SelfReport.diseaseVariant = Disease variant -SelfReport.diseaseVariantDetails = Disease variant details -SelfReport.firstName = First name -SelfReport.lastName = Last name -SelfReport.sex = Sex -SelfReport.birthDate = Birth date -SelfReport.birthdateDD = Day of birth -SelfReport.birthdateMM = Month of birth -SelfReport.birthdateYYYY = Year of birth -SelfReport.nationalHealthId = National health ID -SelfReport.email = Email -SelfReport.phoneNumber = Phone number -SelfReport.address = Address -SelfReport.dateOfTest = Date of test -SelfReport.dateOfSymptoms = Date of symptoms -SelfReport.workplace = Workplace -SelfReport.dateWorkplace = Date workplace -SelfReport.isolationDate = Date of isolation -SelfReport.contactDate = Date of contact -SelfReport.comment = Comment -SelfReport.responsibleUser = Responsible user -SelfReport.investigationStatus = Investigation status -SelfReport.processingStatus = Processing status +SelfReport=Self report +SelfReport.type=Type +SelfReport.reportDate=Report date +SelfReport.caseReference=Case reference number +SelfReport.disease=Disease +SelfReport.diseaseDetails=Disease details +SelfReport.diseaseVariant=Disease variant +SelfReport.diseaseVariantDetails=Disease variant details +SelfReport.firstName=First name +SelfReport.lastName=Last name +SelfReport.sex=Sex +SelfReport.birthDate=Birth date +SelfReport.birthdateDD=Day of birth +SelfReport.birthdateMM=Month of birth +SelfReport.birthdateYYYY=Year of birth +SelfReport.nationalHealthId=National health ID +SelfReport.email=Email +SelfReport.phoneNumber=Phone number +SelfReport.address=Address +SelfReport.dateOfTest=Date of test +SelfReport.dateOfSymptoms=Date of symptoms +SelfReport.workplace=Workplace +SelfReport.dateWorkplace=Date workplace +SelfReport.isolationDate=Date of isolation +SelfReport.contactDate=Date of contact +SelfReport.comment=Comment +SelfReport.responsibleUser=Responsible user +SelfReport.investigationStatus=Investigation status +SelfReport.processingStatus=Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_es-ES.properties b/sormas-api/src/main/resources/captions_es-ES.properties index 15a8bc2d06c..48abd4b2a31 100644 --- a/sormas-api/src/main/resources/captions_es-ES.properties +++ b/sormas-api/src/main/resources/captions_es-ES.properties @@ -188,13 +188,13 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge = Okay, and continue to merge overview -actionOkAndGoToContactDirectory = Okay, and continue to contact directory -actionOkAndGoToContactDetails = Okay, and continue to contact -actionOkAndGoToPersonDirectory = Okay, and continue to person directory -actionExecuteAutomaticDeletion = Execute automatic deletion -actionDone = Done -actionConfirmAction = Confirm action +actionOkAndGoToMerge=Okay, and continue to merge overview +actionOkAndGoToContactDirectory=Okay, and continue to contact directory +actionOkAndGoToContactDetails=Okay, and continue to contact +actionOkAndGoToPersonDirectory=Okay, and continue to person directory +actionExecuteAutomaticDeletion=Execute automatic deletion +actionDone=Done +actionConfirmAction=Confirm action activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -248,10 +248,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows = Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups = Expired -aggregateReportNoAgeGroup = No age group -aggregateReportShowOnlyDuplicateReports = Display only duplicate reports +aggregateReportShowZeroRows=Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups=Expired +aggregateReportNoAgeGroup=No age group +aggregateReportShowOnlyDuplicateReports=Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -275,7 +275,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend = Send emails +bulkEmailSend=Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -434,6 +434,7 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name +CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1133,7 +1134,6 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: - # Environment Environment=Environment Environment.uuid=Environment ID @@ -1152,54 +1152,51 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location - environmentActiveEnvironments=Active environments -environmentArchivedEnvironments = Archived environments -environmentAllActiveAndArchivedEnvironments = All active and archived environments -environmentDeletedEnvironments = Deleted environments -environmentNewEnvironment= New environment +environmentArchivedEnvironments=Archived environments +environmentAllActiveAndArchivedEnvironments=All active and archived environments +environmentDeletedEnvironments=Deleted environments +environmentNewEnvironment=New environment environmentEnvironmentsList=Environments list - # EnvironmentSample -EnvironmentSample = Environment Sample -EnvironmentSample.uuid = Sample ID -EnvironmentSample.environment = Environment -EnvironmentSample.sampleDateTime = Date of sampling -EnvironmentSample.sampleMaterial = Sample material -EnvironmentSample.otherSampleMaterial = Specify sample material -EnvironmentSample.sampleVolume = Volume (in mL) -EnvironmentSample.fieldSampleId = Field sample ID -EnvironmentSample.turbidity = Turbidity (in NTU) -EnvironmentSample.phValue = pH of sample -EnvironmentSample.sampleTemperature = Temperature (in °C) -EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) -EnvironmentSample.laboratory = Laboratory -EnvironmentSample.laboratoryDetails = Laboratory details -EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested -EnvironmentSample.reportingUser = Reporting user -EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested -EnvironmentSample.weatherConditions = Weather conditions at time of sampling -EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched = Sent/dispatched -EnvironmentSample.dispatchDate = Dispatchment date -EnvironmentSample.dispatchDetails = Dispatchment details -EnvironmentSample.received = Received -EnvironmentSample.receivalDate = Receival date -EnvironmentSample.labSampleId = Lab sample ID -EnvironmentSample.specimenCondition = Specimen condition -EnvironmentSample.location = Location of sampling site -EnvironmentSample.generalComment = General comment -EnvironmentSample.positivePathogenTests = Positive pathogen tests -EnvironmentSample.latestPathogenTest = Latest pathogen test -EnvironmentSample.numberOfTests = Number of tests - +EnvironmentSample=Environment Sample +EnvironmentSample.uuid=Sample ID +EnvironmentSample.environment=Environment +EnvironmentSample.sampleDateTime=Date of sampling +EnvironmentSample.sampleMaterial=Sample material +EnvironmentSample.otherSampleMaterial=Specify sample material +EnvironmentSample.sampleVolume=Volume (in mL) +EnvironmentSample.fieldSampleId=Field sample ID +EnvironmentSample.turbidity=Turbidity (in NTU) +EnvironmentSample.phValue=pH of sample +EnvironmentSample.sampleTemperature=Temperature (in °C) +EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) +EnvironmentSample.laboratory=Laboratory +EnvironmentSample.laboratoryDetails=Laboratory details +EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested +EnvironmentSample.reportingUser=Reporting user +EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested +EnvironmentSample.weatherConditions=Weather conditions at time of sampling +EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched=Sent/dispatched +EnvironmentSample.dispatchDate=Dispatchment date +EnvironmentSample.dispatchDetails=Dispatchment details +EnvironmentSample.received=Received +EnvironmentSample.receivalDate=Receival date +EnvironmentSample.labSampleId=Lab sample ID +EnvironmentSample.specimenCondition=Specimen condition +EnvironmentSample.location=Location of sampling site +EnvironmentSample.generalComment=General comment +EnvironmentSample.positivePathogenTests=Positive pathogen tests +EnvironmentSample.latestPathogenTest=Latest pathogen test +EnvironmentSample.numberOfTests=Number of tests # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents = Deleted events +eventDeletedEvents=Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1343,7 +1340,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants = Deleted event participants +eventParticipantDeletedEventParticipants=Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1356,7 +1353,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser = Reporting user +EventParticipant.reportingUser=Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1393,9 +1390,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink = Event participant ID -EventParticipantSelection.eventUuidLink = Event ID -EventParticipantSelection.resultingCaseUuidLink = Resulting case ID +EventParticipantSelection.eventParticipantUuidLink=Event participant ID +EventParticipantSelection.eventUuidLink=Event ID +EventParticipantSelection.resultingCaseUuidLink=Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1615,7 +1612,6 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message - #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1626,7 +1622,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList = List of new event participants +lineListingNewEventParticipantsList=List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1800,10 +1796,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples = See samples for this person -caseLinkToSamples = See samples for this case -contactLinkToSamples = See samples for this contact -eventParticipantLinkToSamples = See samples for this event participant +personLinkToSamples=See samples for this person +caseLinkToSamples=See samples for this case +contactLinkToSamples=See samples for this contact +eventParticipantLinkToSamples=See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2111,9 +2107,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity = Community of event participant -SampleExport.eventParticipantDistrict = District of event participant -SampleExport.eventParticipantRegion = Region of event participant +SampleExport.eventParticipantCommunity=Community of event participant +SampleExport.eventParticipantDistrict=District of event participant +SampleExport.eventParticipantRegion=Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2172,7 +2168,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser = Reporting user +Immunization.reportingUser=Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2215,10 +2211,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations = Active immunizations -immunizationArchivedImmunizations = Archived immunizations -immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations -immunizationDeletedImmunizations = Deleted immunizations +immunizationActiveImmunizations=Active immunizations +immunizationArchivedImmunizations=Archived immunizations +immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations +immunizationDeletedImmunizations=Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2461,7 +2457,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment = Associated environment +Task.environment=Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2514,7 +2510,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser = Reporting user +TravelEntry.reportingUser=Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -2881,17 +2877,15 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms = SMS -userRoleNotificationTypeEmail = EMAIL +userRoleNotificationTypeSms=SMS +userRoleNotificationTypeEmail=EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template - notificationType=Notification type -notificationType.group = Group -notificationType.caption = Caption -notificationType.description = Description - +notificationType.group=Group +notificationType.caption=Caption +notificationType.description=Description SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -2926,10 +2920,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails = Person contact details -environmentSampleNotShipped = Not shipped -environmentSampleShipped = Shipped -environmentSampleReceived = Received +TaskExport.personOtherContactDetails=Person contact details +environmentSampleNotShipped=Not shipped +environmentSampleShipped=Shipped +environmentSampleReceived=Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -2946,37 +2940,34 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents - # SpecialCaseAccess SpecialCaseAccess=Special case access -caze = Case -assignedTo = Assigned to -assignedBy = Assigned by -endDateTime = Access until -assignmentDate = Date assigned - +caze=Case +assignedTo=Assigned to +assignedBy=Assigned by +endDateTime=Access until +assignmentDate=Date assigned specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case - # SelfReport -SelfReport.type = Type -SelfReport.reportDate = Report date -SelfReport.disease = Disease -SelfReport.diseaseVariant = Disease variant -SelfReport.firstName = First name -SelfReport.lastName = Last name -SelfReport.sex = Sex -SelfReport.birthdateDD = Day of birth -SelfReport.birthdateMM = Month of birth -SelfReport.birthdateYYYY = Year of birth -SelfReport.nationalHealthId = National health ID -SelfReport.email = Email -SelfReport.phoneNumber = Phone number -SelfReport.address = Address -SelfReport.comment = Comment -SelfReport.responsibleUser = Responsible user -SelfReport.investigationStatus = Investigation status -SelfReport.processingStatus = Processing status +SelfReport.type=Type +SelfReport.reportDate=Report date +SelfReport.disease=Disease +SelfReport.diseaseVariant=Disease variant +SelfReport.firstName=First name +SelfReport.lastName=Last name +SelfReport.sex=Sex +SelfReport.birthdateDD=Day of birth +SelfReport.birthdateMM=Month of birth +SelfReport.birthdateYYYY=Year of birth +SelfReport.nationalHealthId=National health ID +SelfReport.email=Email +SelfReport.phoneNumber=Phone number +SelfReport.address=Address +SelfReport.comment=Comment +SelfReport.responsibleUser=Responsible user +SelfReport.investigationStatus=Investigation status +SelfReport.processingStatus=Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_fa-AF.properties b/sormas-api/src/main/resources/captions_fa-AF.properties index 2243bd02ef6..96555bd99dc 100644 --- a/sormas-api/src/main/resources/captions_fa-AF.properties +++ b/sormas-api/src/main/resources/captions_fa-AF.properties @@ -52,7 +52,7 @@ creationDate=تاریخ ایجاد changeDate=Date of last change notAvailableShort=NA inaccessibleValue=Confidential -includePartialBirthdates = Include partial birthdates +includePartialBirthdates=Include partial birthdates numberOfCharacters=Number of characters\: %d / %d remove=برداشتن notTestedYet=Not tested yet @@ -189,15 +189,15 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge = Okay, and continue to merge overview -actionOkAndGoToContactDirectory = Okay, and continue to contact directory -actionOkAndGoToContactDetails = Okay, and continue to contact -actionOkAndGoToPersonDirectory = Okay, and continue to person directory -actionExecuteAutomaticDeletion = Execute automatic deletion -actionDone = Done -actionConfirmAction = Confirm action -actionAefiSelectPrimarySuspectVaccination = Select Suspect Vaccination -actionAefiAssignNewReportingIdNumber = "Assign New AEFI ID" +actionOkAndGoToMerge=Okay, and continue to merge overview +actionOkAndGoToContactDirectory=Okay, and continue to contact directory +actionOkAndGoToContactDetails=Okay, and continue to contact +actionOkAndGoToPersonDirectory=Okay, and continue to person directory +actionExecuteAutomaticDeletion=Execute automatic deletion +actionDone=Done +actionConfirmAction=Confirm action +actionAefiSelectPrimarySuspectVaccination=Select Suspect Vaccination +actionAefiAssignNewReportingIdNumber="Assign New AEFI ID" activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -251,10 +251,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows = Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups = Expired -aggregateReportNoAgeGroup = No age group -aggregateReportShowOnlyDuplicateReports = Display only duplicate reports +aggregateReportShowZeroRows=Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups=Expired +aggregateReportNoAgeGroup=No age group +aggregateReportShowOnlyDuplicateReports=Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -278,7 +278,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend = Send emails +bulkEmailSend=Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -437,6 +437,7 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name +CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1036,7 +1037,6 @@ aefiDashboardAefiInvestigationDiscarded=Investigation Discarded aefiDashboardAefiClassificationRelatedToVaccination=Related to vaccine or vaccination aefiDashboardAefiClassificationCoincidentalAdverseEvent=Coincidental adverse event aefiDashboardAefiClassificationUndetermined=Undetermined - captionDefault=Default defaultRegion=حوزه defaultDistrict=ولسوالی @@ -1154,22 +1154,20 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: - # Entity columns -EntityColumn.ENTITY = Entity -EntityColumn.FIELD_ID = Field ID -EntityColumn.FIELD = Field -EntityColumn.TYPE = Type -EntityColumn.DATA_PROTECTION = Data protection -EntityColumn.CAPTION = Caption -EntityColumn.DESCRIPTION = Description -EntityColumn.REQUIRED = Required -EntityColumn.NEW_DISEASE = New disease -EntityColumn.DISEASES = Diseases -EntityColumn.OUTBREAKS = Outbreaks -EntityColumn.IGNORED_COUNTRIES = Ignored countries -EntityColumn.EXCLUSIVE_COUNTRIES = Exclusive countries - +EntityColumn.ENTITY=Entity +EntityColumn.FIELD_ID=Field ID +EntityColumn.FIELD=Field +EntityColumn.TYPE=Type +EntityColumn.DATA_PROTECTION=Data protection +EntityColumn.CAPTION=Caption +EntityColumn.DESCRIPTION=Description +EntityColumn.REQUIRED=Required +EntityColumn.NEW_DISEASE=New disease +EntityColumn.DISEASES=Diseases +EntityColumn.OUTBREAKS=Outbreaks +EntityColumn.IGNORED_COUNTRIES=Ignored countries +EntityColumn.EXCLUSIVE_COUNTRIES=Exclusive countries # Environment Environment=Environment Environment.uuid=Environment ID @@ -1188,54 +1186,51 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location - environmentActiveEnvironments=Active environments -environmentArchivedEnvironments = Archived environments -environmentAllActiveAndArchivedEnvironments = All active and archived environments -environmentDeletedEnvironments = Deleted environments -environmentNewEnvironment= New environment +environmentArchivedEnvironments=Archived environments +environmentAllActiveAndArchivedEnvironments=All active and archived environments +environmentDeletedEnvironments=Deleted environments +environmentNewEnvironment=New environment environmentEnvironmentsList=Environments list - # EnvironmentSample -EnvironmentSample = Environment Sample -EnvironmentSample.uuid = Sample ID -EnvironmentSample.environment = Environment -EnvironmentSample.sampleDateTime = Date of sampling -EnvironmentSample.sampleMaterial = Sample material -EnvironmentSample.otherSampleMaterial = Specify sample material -EnvironmentSample.sampleVolume = Volume (in mL) -EnvironmentSample.fieldSampleId = Field sample ID -EnvironmentSample.turbidity = Turbidity (in NTU) -EnvironmentSample.phValue = pH of sample -EnvironmentSample.sampleTemperature = Temperature (in °C) -EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) -EnvironmentSample.laboratory = Laboratory -EnvironmentSample.laboratoryDetails = Laboratory details -EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested -EnvironmentSample.reportingUser = Reporting user -EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested -EnvironmentSample.weatherConditions = Weather conditions at time of sampling -EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched = Sent/dispatched -EnvironmentSample.dispatchDate = Dispatchment date -EnvironmentSample.dispatchDetails = Dispatchment details -EnvironmentSample.received = Received -EnvironmentSample.receivalDate = Receival date -EnvironmentSample.labSampleId = Lab sample ID -EnvironmentSample.specimenCondition = Specimen condition -EnvironmentSample.location = Location of sampling site -EnvironmentSample.generalComment = General comment -EnvironmentSample.positivePathogenTests = Positive pathogen tests -EnvironmentSample.latestPathogenTest = Latest pathogen test -EnvironmentSample.numberOfTests = Number of tests - +EnvironmentSample=Environment Sample +EnvironmentSample.uuid=Sample ID +EnvironmentSample.environment=Environment +EnvironmentSample.sampleDateTime=Date of sampling +EnvironmentSample.sampleMaterial=Sample material +EnvironmentSample.otherSampleMaterial=Specify sample material +EnvironmentSample.sampleVolume=Volume (in mL) +EnvironmentSample.fieldSampleId=Field sample ID +EnvironmentSample.turbidity=Turbidity (in NTU) +EnvironmentSample.phValue=pH of sample +EnvironmentSample.sampleTemperature=Temperature (in °C) +EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) +EnvironmentSample.laboratory=Laboratory +EnvironmentSample.laboratoryDetails=Laboratory details +EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested +EnvironmentSample.reportingUser=Reporting user +EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested +EnvironmentSample.weatherConditions=Weather conditions at time of sampling +EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched=Sent/dispatched +EnvironmentSample.dispatchDate=Dispatchment date +EnvironmentSample.dispatchDetails=Dispatchment details +EnvironmentSample.received=Received +EnvironmentSample.receivalDate=Receival date +EnvironmentSample.labSampleId=Lab sample ID +EnvironmentSample.specimenCondition=Specimen condition +EnvironmentSample.location=Location of sampling site +EnvironmentSample.generalComment=General comment +EnvironmentSample.positivePathogenTests=Positive pathogen tests +EnvironmentSample.latestPathogenTest=Latest pathogen test +EnvironmentSample.numberOfTests=Number of tests # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents = Deleted events +eventDeletedEvents=Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1379,7 +1374,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants = Deleted event participants +eventParticipantDeletedEventParticipants=Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1392,7 +1387,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser = Reporting user +EventParticipant.reportingUser=Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1429,9 +1424,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink = Event participant ID -EventParticipantSelection.eventUuidLink = Event ID -EventParticipantSelection.resultingCaseUuidLink = Resulting case ID +EventParticipantSelection.eventParticipantUuidLink=Event participant ID +EventParticipantSelection.eventUuidLink=Event ID +EventParticipantSelection.resultingCaseUuidLink=Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1651,7 +1646,6 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message - #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1662,7 +1656,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList = List of new event participants +lineListingNewEventParticipantsList=List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1838,10 +1832,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples = See samples for this person -caseLinkToSamples = See samples for this case -contactLinkToSamples = See samples for this contact -eventParticipantLinkToSamples = See samples for this event participant +personLinkToSamples=See samples for this person +caseLinkToSamples=See samples for this case +contactLinkToSamples=See samples for this contact +eventParticipantLinkToSamples=See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2149,9 +2143,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity = Community of event participant -SampleExport.eventParticipantDistrict = District of event participant -SampleExport.eventParticipantRegion = Region of event participant +SampleExport.eventParticipantCommunity=Community of event participant +SampleExport.eventParticipantDistrict=District of event participant +SampleExport.eventParticipantRegion=Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2210,7 +2204,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser = Reporting user +Immunization.reportingUser=Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2253,10 +2247,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations = Active immunizations -immunizationArchivedImmunizations = Archived immunizations -immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations -immunizationDeletedImmunizations = Deleted immunizations +immunizationActiveImmunizations=Active immunizations +immunizationArchivedImmunizations=Archived immunizations +immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations +immunizationDeletedImmunizations=Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2321,10 +2315,10 @@ aefiVaccinationsDiluentInformation=Diluent Information aefiVaccinationsDiluentBatchLotNumber=Batch/Lot number aefiVaccinationsDiluentExpiryDate=Expiry date aefiVaccinationsDiluentTimeOfReconstitution=Reconstitution time -aefiActiveAdverseEvents = Active adverse events -aefiArchivedAdverseEvents = Archived adverse events -aefiAllActiveAndArchivedAdverseEvents = All active and archived adverse events -aefiDeletedAdverseEvents = Deleted adverse events +aefiActiveAdverseEvents=Active adverse events +aefiArchivedAdverseEvents=Archived adverse events +aefiAllActiveAndArchivedAdverseEvents=All active and archived adverse events +aefiDeletedAdverseEvents=Deleted adverse events # Adverse Events AdverseEvents.severeLocalReaction=Severe local reaction AdverseEvents.severeLocalReactionMoreThanThreeDays=>3 days @@ -2575,13 +2569,13 @@ aefiInvestigationMedicalCareDetailsInstruction=**Instructions ? Attach copies of aefiInvestigationReconstitutionProcedure=Reconstitution procedure aefiInvestigationOfThoseAffected=Of those effected, how many are aefiAefiInvestigationList=Adverse Event Investigations -aefiNewAefiInvestigation = New Investigation +aefiNewAefiInvestigation=New Investigation aefiAefiInvestigationDataView=Adverse Event Investigation aefiNewAefiInvestigationStageTitle=Investigation -aefiActiveInvestigations = Active AEFI investigations -aefiArchivedInvestigations = Archived AEFI investigations -aefiAllActiveAndArchivedInvestigations = All active and archived AEFI investigations -aefiDeletedInvestigations = Deleted AEFI investigations +aefiActiveInvestigations=Active AEFI investigations +aefiArchivedInvestigations=Archived AEFI investigations +aefiAllActiveAndArchivedInvestigations=All active and archived AEFI investigations +aefiDeletedInvestigations=Deleted AEFI investigations titleAefiInvestigationBasicDetails=Section A\: Basic details titleAefiInvestigationRelevantPatientInformation=Section B\: Relevant patient information prior to immunization titleAefiInvestigationFirstExaminationDetails=Section C\: Details of first examination** of serious AEFI case @@ -2854,7 +2848,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment = Associated environment +Task.environment=Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2907,7 +2901,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser = Reporting user +TravelEntry.reportingUser=Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -3278,17 +3272,15 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms = SMS -userRoleNotificationTypeEmail = EMAIL +userRoleNotificationTypeSms=SMS +userRoleNotificationTypeEmail=EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template - notificationType=Notification type -notificationType.group = Group -notificationType.caption = Caption -notificationType.description = Description - +notificationType.group=Group +notificationType.caption=Caption +notificationType.description=Description SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -3323,10 +3315,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails = Person contact details -environmentSampleNotShipped = Not shipped -environmentSampleShipped = Shipped -environmentSampleReceived = Received +TaskExport.personOtherContactDetails=Person contact details +environmentSampleNotShipped=Not shipped +environmentSampleShipped=Shipped +environmentSampleReceived=Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -3343,48 +3335,45 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents - # SpecialCaseAccess SpecialCaseAccess=Special case access -caze = Case -assignedTo = Assigned to -assignedBy = Assigned by -endDateTime = Access until -assignmentDate = Date assigned - +caze=Case +assignedTo=Assigned to +assignedBy=Assigned by +endDateTime=Access until +assignmentDate=Date assigned specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case - # SelfReport -SelfReport = Self report -SelfReport.type = Type -SelfReport.reportDate = Report date -SelfReport.caseReference = Case reference number -SelfReport.disease = Disease -SelfReport.diseaseDetails = Disease details -SelfReport.diseaseVariant = Disease variant -SelfReport.diseaseVariantDetails = Disease variant details -SelfReport.firstName = First name -SelfReport.lastName = Last name -SelfReport.sex = Sex -SelfReport.birthDate = Birth date -SelfReport.birthdateDD = Day of birth -SelfReport.birthdateMM = Month of birth -SelfReport.birthdateYYYY = Year of birth -SelfReport.nationalHealthId = National health ID -SelfReport.email = Email -SelfReport.phoneNumber = Phone number -SelfReport.address = Address -SelfReport.dateOfTest = Date of test -SelfReport.dateOfSymptoms = Date of symptoms -SelfReport.workplace = Workplace -SelfReport.dateWorkplace = Date workplace -SelfReport.isolationDate = Date of isolation -SelfReport.contactDate = Date of contact -SelfReport.comment = Comment -SelfReport.responsibleUser = Responsible user -SelfReport.investigationStatus = Investigation status -SelfReport.processingStatus = Processing status +SelfReport=Self report +SelfReport.type=Type +SelfReport.reportDate=Report date +SelfReport.caseReference=Case reference number +SelfReport.disease=Disease +SelfReport.diseaseDetails=Disease details +SelfReport.diseaseVariant=Disease variant +SelfReport.diseaseVariantDetails=Disease variant details +SelfReport.firstName=First name +SelfReport.lastName=Last name +SelfReport.sex=Sex +SelfReport.birthDate=Birth date +SelfReport.birthdateDD=Day of birth +SelfReport.birthdateMM=Month of birth +SelfReport.birthdateYYYY=Year of birth +SelfReport.nationalHealthId=National health ID +SelfReport.email=Email +SelfReport.phoneNumber=Phone number +SelfReport.address=Address +SelfReport.dateOfTest=Date of test +SelfReport.dateOfSymptoms=Date of symptoms +SelfReport.workplace=Workplace +SelfReport.dateWorkplace=Date workplace +SelfReport.isolationDate=Date of isolation +SelfReport.contactDate=Date of contact +SelfReport.comment=Comment +SelfReport.responsibleUser=Responsible user +SelfReport.investigationStatus=Investigation status +SelfReport.processingStatus=Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_fil-PH.properties b/sormas-api/src/main/resources/captions_fil-PH.properties index 7ca0f1f4687..1e611b51ccf 100644 --- a/sormas-api/src/main/resources/captions_fil-PH.properties +++ b/sormas-api/src/main/resources/captions_fil-PH.properties @@ -188,13 +188,13 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge = Okay, and continue to merge overview -actionOkAndGoToContactDirectory = Okay, and continue to contact directory -actionOkAndGoToContactDetails = Okay, and continue to contact -actionOkAndGoToPersonDirectory = Okay, and continue to person directory -actionExecuteAutomaticDeletion = Execute automatic deletion -actionDone = Done -actionConfirmAction = Confirm action +actionOkAndGoToMerge=Okay, and continue to merge overview +actionOkAndGoToContactDirectory=Okay, and continue to contact directory +actionOkAndGoToContactDetails=Okay, and continue to contact +actionOkAndGoToPersonDirectory=Okay, and continue to person directory +actionExecuteAutomaticDeletion=Execute automatic deletion +actionDone=Done +actionConfirmAction=Confirm action activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -248,10 +248,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows = Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups = Expired -aggregateReportNoAgeGroup = No age group -aggregateReportShowOnlyDuplicateReports = Display only duplicate reports +aggregateReportShowZeroRows=Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups=Expired +aggregateReportNoAgeGroup=No age group +aggregateReportShowOnlyDuplicateReports=Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -275,7 +275,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend = Send emails +bulkEmailSend=Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -434,6 +434,7 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name +CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1133,7 +1134,6 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: - # Environment Environment=Environment Environment.uuid=Environment ID @@ -1152,54 +1152,51 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location - environmentActiveEnvironments=Active environments -environmentArchivedEnvironments = Archived environments -environmentAllActiveAndArchivedEnvironments = All active and archived environments -environmentDeletedEnvironments = Deleted environments -environmentNewEnvironment= New environment +environmentArchivedEnvironments=Archived environments +environmentAllActiveAndArchivedEnvironments=All active and archived environments +environmentDeletedEnvironments=Deleted environments +environmentNewEnvironment=New environment environmentEnvironmentsList=Environments list - # EnvironmentSample -EnvironmentSample = Environment Sample -EnvironmentSample.uuid = Sample ID -EnvironmentSample.environment = Environment -EnvironmentSample.sampleDateTime = Date of sampling -EnvironmentSample.sampleMaterial = Sample material -EnvironmentSample.otherSampleMaterial = Specify sample material -EnvironmentSample.sampleVolume = Volume (in mL) -EnvironmentSample.fieldSampleId = Field sample ID -EnvironmentSample.turbidity = Turbidity (in NTU) -EnvironmentSample.phValue = pH of sample -EnvironmentSample.sampleTemperature = Temperature (in °C) -EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) -EnvironmentSample.laboratory = Laboratory -EnvironmentSample.laboratoryDetails = Laboratory details -EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested -EnvironmentSample.reportingUser = Reporting user -EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested -EnvironmentSample.weatherConditions = Weather conditions at time of sampling -EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched = Sent/dispatched -EnvironmentSample.dispatchDate = Dispatchment date -EnvironmentSample.dispatchDetails = Dispatchment details -EnvironmentSample.received = Received -EnvironmentSample.receivalDate = Receival date -EnvironmentSample.labSampleId = Lab sample ID -EnvironmentSample.specimenCondition = Specimen condition -EnvironmentSample.location = Location of sampling site -EnvironmentSample.generalComment = General comment -EnvironmentSample.positivePathogenTests = Positive pathogen tests -EnvironmentSample.latestPathogenTest = Latest pathogen test -EnvironmentSample.numberOfTests = Number of tests - +EnvironmentSample=Environment Sample +EnvironmentSample.uuid=Sample ID +EnvironmentSample.environment=Environment +EnvironmentSample.sampleDateTime=Date of sampling +EnvironmentSample.sampleMaterial=Sample material +EnvironmentSample.otherSampleMaterial=Specify sample material +EnvironmentSample.sampleVolume=Volume (in mL) +EnvironmentSample.fieldSampleId=Field sample ID +EnvironmentSample.turbidity=Turbidity (in NTU) +EnvironmentSample.phValue=pH of sample +EnvironmentSample.sampleTemperature=Temperature (in °C) +EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) +EnvironmentSample.laboratory=Laboratory +EnvironmentSample.laboratoryDetails=Laboratory details +EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested +EnvironmentSample.reportingUser=Reporting user +EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested +EnvironmentSample.weatherConditions=Weather conditions at time of sampling +EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched=Sent/dispatched +EnvironmentSample.dispatchDate=Dispatchment date +EnvironmentSample.dispatchDetails=Dispatchment details +EnvironmentSample.received=Received +EnvironmentSample.receivalDate=Receival date +EnvironmentSample.labSampleId=Lab sample ID +EnvironmentSample.specimenCondition=Specimen condition +EnvironmentSample.location=Location of sampling site +EnvironmentSample.generalComment=General comment +EnvironmentSample.positivePathogenTests=Positive pathogen tests +EnvironmentSample.latestPathogenTest=Latest pathogen test +EnvironmentSample.numberOfTests=Number of tests # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents = Deleted events +eventDeletedEvents=Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1343,7 +1340,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants = Deleted event participants +eventParticipantDeletedEventParticipants=Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1356,7 +1353,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser = Reporting user +EventParticipant.reportingUser=Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1393,9 +1390,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink = Event participant ID -EventParticipantSelection.eventUuidLink = Event ID -EventParticipantSelection.resultingCaseUuidLink = Resulting case ID +EventParticipantSelection.eventParticipantUuidLink=Event participant ID +EventParticipantSelection.eventUuidLink=Event ID +EventParticipantSelection.resultingCaseUuidLink=Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1615,7 +1612,6 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message - #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1626,7 +1622,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList = List of new event participants +lineListingNewEventParticipantsList=List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1800,10 +1796,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples = See samples for this person -caseLinkToSamples = See samples for this case -contactLinkToSamples = See samples for this contact -eventParticipantLinkToSamples = See samples for this event participant +personLinkToSamples=See samples for this person +caseLinkToSamples=See samples for this case +contactLinkToSamples=See samples for this contact +eventParticipantLinkToSamples=See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2111,9 +2107,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity = Community of event participant -SampleExport.eventParticipantDistrict = District of event participant -SampleExport.eventParticipantRegion = Region of event participant +SampleExport.eventParticipantCommunity=Community of event participant +SampleExport.eventParticipantDistrict=District of event participant +SampleExport.eventParticipantRegion=Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2172,7 +2168,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser = Reporting user +Immunization.reportingUser=Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2215,10 +2211,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations = Active immunizations -immunizationArchivedImmunizations = Archived immunizations -immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations -immunizationDeletedImmunizations = Deleted immunizations +immunizationActiveImmunizations=Active immunizations +immunizationArchivedImmunizations=Archived immunizations +immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations +immunizationDeletedImmunizations=Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2461,7 +2457,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment = Associated environment +Task.environment=Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2514,7 +2510,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser = Reporting user +TravelEntry.reportingUser=Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -2881,17 +2877,15 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms = SMS -userRoleNotificationTypeEmail = EMAIL +userRoleNotificationTypeSms=SMS +userRoleNotificationTypeEmail=EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template - notificationType=Notification type -notificationType.group = Group -notificationType.caption = Caption -notificationType.description = Description - +notificationType.group=Group +notificationType.caption=Caption +notificationType.description=Description SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -2926,10 +2920,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails = Person contact details -environmentSampleNotShipped = Not shipped -environmentSampleShipped = Shipped -environmentSampleReceived = Received +TaskExport.personOtherContactDetails=Person contact details +environmentSampleNotShipped=Not shipped +environmentSampleShipped=Shipped +environmentSampleReceived=Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -2946,37 +2940,34 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents - # SpecialCaseAccess SpecialCaseAccess=Special case access -caze = Case -assignedTo = Assigned to -assignedBy = Assigned by -endDateTime = Access until -assignmentDate = Date assigned - +caze=Case +assignedTo=Assigned to +assignedBy=Assigned by +endDateTime=Access until +assignmentDate=Date assigned specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case - # SelfReport -SelfReport.type = Type -SelfReport.reportDate = Report date -SelfReport.disease = Disease -SelfReport.diseaseVariant = Disease variant -SelfReport.firstName = First name -SelfReport.lastName = Last name -SelfReport.sex = Sex -SelfReport.birthdateDD = Day of birth -SelfReport.birthdateMM = Month of birth -SelfReport.birthdateYYYY = Year of birth -SelfReport.nationalHealthId = National health ID -SelfReport.email = Email -SelfReport.phoneNumber = Phone number -SelfReport.address = Address -SelfReport.comment = Comment -SelfReport.responsibleUser = Responsible user -SelfReport.investigationStatus = Investigation status -SelfReport.processingStatus = Processing status +SelfReport.type=Type +SelfReport.reportDate=Report date +SelfReport.disease=Disease +SelfReport.diseaseVariant=Disease variant +SelfReport.firstName=First name +SelfReport.lastName=Last name +SelfReport.sex=Sex +SelfReport.birthdateDD=Day of birth +SelfReport.birthdateMM=Month of birth +SelfReport.birthdateYYYY=Year of birth +SelfReport.nationalHealthId=National health ID +SelfReport.email=Email +SelfReport.phoneNumber=Phone number +SelfReport.address=Address +SelfReport.comment=Comment +SelfReport.responsibleUser=Responsible user +SelfReport.investigationStatus=Investigation status +SelfReport.processingStatus=Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_fj-FJ.properties b/sormas-api/src/main/resources/captions_fj-FJ.properties index 7ca0f1f4687..1e611b51ccf 100644 --- a/sormas-api/src/main/resources/captions_fj-FJ.properties +++ b/sormas-api/src/main/resources/captions_fj-FJ.properties @@ -188,13 +188,13 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge = Okay, and continue to merge overview -actionOkAndGoToContactDirectory = Okay, and continue to contact directory -actionOkAndGoToContactDetails = Okay, and continue to contact -actionOkAndGoToPersonDirectory = Okay, and continue to person directory -actionExecuteAutomaticDeletion = Execute automatic deletion -actionDone = Done -actionConfirmAction = Confirm action +actionOkAndGoToMerge=Okay, and continue to merge overview +actionOkAndGoToContactDirectory=Okay, and continue to contact directory +actionOkAndGoToContactDetails=Okay, and continue to contact +actionOkAndGoToPersonDirectory=Okay, and continue to person directory +actionExecuteAutomaticDeletion=Execute automatic deletion +actionDone=Done +actionConfirmAction=Confirm action activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -248,10 +248,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows = Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups = Expired -aggregateReportNoAgeGroup = No age group -aggregateReportShowOnlyDuplicateReports = Display only duplicate reports +aggregateReportShowZeroRows=Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups=Expired +aggregateReportNoAgeGroup=No age group +aggregateReportShowOnlyDuplicateReports=Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -275,7 +275,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend = Send emails +bulkEmailSend=Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -434,6 +434,7 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name +CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1133,7 +1134,6 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: - # Environment Environment=Environment Environment.uuid=Environment ID @@ -1152,54 +1152,51 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location - environmentActiveEnvironments=Active environments -environmentArchivedEnvironments = Archived environments -environmentAllActiveAndArchivedEnvironments = All active and archived environments -environmentDeletedEnvironments = Deleted environments -environmentNewEnvironment= New environment +environmentArchivedEnvironments=Archived environments +environmentAllActiveAndArchivedEnvironments=All active and archived environments +environmentDeletedEnvironments=Deleted environments +environmentNewEnvironment=New environment environmentEnvironmentsList=Environments list - # EnvironmentSample -EnvironmentSample = Environment Sample -EnvironmentSample.uuid = Sample ID -EnvironmentSample.environment = Environment -EnvironmentSample.sampleDateTime = Date of sampling -EnvironmentSample.sampleMaterial = Sample material -EnvironmentSample.otherSampleMaterial = Specify sample material -EnvironmentSample.sampleVolume = Volume (in mL) -EnvironmentSample.fieldSampleId = Field sample ID -EnvironmentSample.turbidity = Turbidity (in NTU) -EnvironmentSample.phValue = pH of sample -EnvironmentSample.sampleTemperature = Temperature (in °C) -EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) -EnvironmentSample.laboratory = Laboratory -EnvironmentSample.laboratoryDetails = Laboratory details -EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested -EnvironmentSample.reportingUser = Reporting user -EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested -EnvironmentSample.weatherConditions = Weather conditions at time of sampling -EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched = Sent/dispatched -EnvironmentSample.dispatchDate = Dispatchment date -EnvironmentSample.dispatchDetails = Dispatchment details -EnvironmentSample.received = Received -EnvironmentSample.receivalDate = Receival date -EnvironmentSample.labSampleId = Lab sample ID -EnvironmentSample.specimenCondition = Specimen condition -EnvironmentSample.location = Location of sampling site -EnvironmentSample.generalComment = General comment -EnvironmentSample.positivePathogenTests = Positive pathogen tests -EnvironmentSample.latestPathogenTest = Latest pathogen test -EnvironmentSample.numberOfTests = Number of tests - +EnvironmentSample=Environment Sample +EnvironmentSample.uuid=Sample ID +EnvironmentSample.environment=Environment +EnvironmentSample.sampleDateTime=Date of sampling +EnvironmentSample.sampleMaterial=Sample material +EnvironmentSample.otherSampleMaterial=Specify sample material +EnvironmentSample.sampleVolume=Volume (in mL) +EnvironmentSample.fieldSampleId=Field sample ID +EnvironmentSample.turbidity=Turbidity (in NTU) +EnvironmentSample.phValue=pH of sample +EnvironmentSample.sampleTemperature=Temperature (in °C) +EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) +EnvironmentSample.laboratory=Laboratory +EnvironmentSample.laboratoryDetails=Laboratory details +EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested +EnvironmentSample.reportingUser=Reporting user +EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested +EnvironmentSample.weatherConditions=Weather conditions at time of sampling +EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched=Sent/dispatched +EnvironmentSample.dispatchDate=Dispatchment date +EnvironmentSample.dispatchDetails=Dispatchment details +EnvironmentSample.received=Received +EnvironmentSample.receivalDate=Receival date +EnvironmentSample.labSampleId=Lab sample ID +EnvironmentSample.specimenCondition=Specimen condition +EnvironmentSample.location=Location of sampling site +EnvironmentSample.generalComment=General comment +EnvironmentSample.positivePathogenTests=Positive pathogen tests +EnvironmentSample.latestPathogenTest=Latest pathogen test +EnvironmentSample.numberOfTests=Number of tests # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents = Deleted events +eventDeletedEvents=Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1343,7 +1340,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants = Deleted event participants +eventParticipantDeletedEventParticipants=Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1356,7 +1353,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser = Reporting user +EventParticipant.reportingUser=Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1393,9 +1390,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink = Event participant ID -EventParticipantSelection.eventUuidLink = Event ID -EventParticipantSelection.resultingCaseUuidLink = Resulting case ID +EventParticipantSelection.eventParticipantUuidLink=Event participant ID +EventParticipantSelection.eventUuidLink=Event ID +EventParticipantSelection.resultingCaseUuidLink=Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1615,7 +1612,6 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message - #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1626,7 +1622,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList = List of new event participants +lineListingNewEventParticipantsList=List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1800,10 +1796,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples = See samples for this person -caseLinkToSamples = See samples for this case -contactLinkToSamples = See samples for this contact -eventParticipantLinkToSamples = See samples for this event participant +personLinkToSamples=See samples for this person +caseLinkToSamples=See samples for this case +contactLinkToSamples=See samples for this contact +eventParticipantLinkToSamples=See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2111,9 +2107,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity = Community of event participant -SampleExport.eventParticipantDistrict = District of event participant -SampleExport.eventParticipantRegion = Region of event participant +SampleExport.eventParticipantCommunity=Community of event participant +SampleExport.eventParticipantDistrict=District of event participant +SampleExport.eventParticipantRegion=Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2172,7 +2168,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser = Reporting user +Immunization.reportingUser=Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2215,10 +2211,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations = Active immunizations -immunizationArchivedImmunizations = Archived immunizations -immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations -immunizationDeletedImmunizations = Deleted immunizations +immunizationActiveImmunizations=Active immunizations +immunizationArchivedImmunizations=Archived immunizations +immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations +immunizationDeletedImmunizations=Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2461,7 +2457,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment = Associated environment +Task.environment=Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2514,7 +2510,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser = Reporting user +TravelEntry.reportingUser=Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -2881,17 +2877,15 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms = SMS -userRoleNotificationTypeEmail = EMAIL +userRoleNotificationTypeSms=SMS +userRoleNotificationTypeEmail=EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template - notificationType=Notification type -notificationType.group = Group -notificationType.caption = Caption -notificationType.description = Description - +notificationType.group=Group +notificationType.caption=Caption +notificationType.description=Description SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -2926,10 +2920,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails = Person contact details -environmentSampleNotShipped = Not shipped -environmentSampleShipped = Shipped -environmentSampleReceived = Received +TaskExport.personOtherContactDetails=Person contact details +environmentSampleNotShipped=Not shipped +environmentSampleShipped=Shipped +environmentSampleReceived=Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -2946,37 +2940,34 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents - # SpecialCaseAccess SpecialCaseAccess=Special case access -caze = Case -assignedTo = Assigned to -assignedBy = Assigned by -endDateTime = Access until -assignmentDate = Date assigned - +caze=Case +assignedTo=Assigned to +assignedBy=Assigned by +endDateTime=Access until +assignmentDate=Date assigned specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case - # SelfReport -SelfReport.type = Type -SelfReport.reportDate = Report date -SelfReport.disease = Disease -SelfReport.diseaseVariant = Disease variant -SelfReport.firstName = First name -SelfReport.lastName = Last name -SelfReport.sex = Sex -SelfReport.birthdateDD = Day of birth -SelfReport.birthdateMM = Month of birth -SelfReport.birthdateYYYY = Year of birth -SelfReport.nationalHealthId = National health ID -SelfReport.email = Email -SelfReport.phoneNumber = Phone number -SelfReport.address = Address -SelfReport.comment = Comment -SelfReport.responsibleUser = Responsible user -SelfReport.investigationStatus = Investigation status -SelfReport.processingStatus = Processing status +SelfReport.type=Type +SelfReport.reportDate=Report date +SelfReport.disease=Disease +SelfReport.diseaseVariant=Disease variant +SelfReport.firstName=First name +SelfReport.lastName=Last name +SelfReport.sex=Sex +SelfReport.birthdateDD=Day of birth +SelfReport.birthdateMM=Month of birth +SelfReport.birthdateYYYY=Year of birth +SelfReport.nationalHealthId=National health ID +SelfReport.email=Email +SelfReport.phoneNumber=Phone number +SelfReport.address=Address +SelfReport.comment=Comment +SelfReport.responsibleUser=Responsible user +SelfReport.investigationStatus=Investigation status +SelfReport.processingStatus=Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_fr-CD.properties b/sormas-api/src/main/resources/captions_fr-CD.properties index e0ad26ef407..b89fbc27426 100644 --- a/sormas-api/src/main/resources/captions_fr-CD.properties +++ b/sormas-api/src/main/resources/captions_fr-CD.properties @@ -188,13 +188,13 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge = Okay, and continue to merge overview -actionOkAndGoToContactDirectory = Okay, and continue to contact directory -actionOkAndGoToContactDetails = Okay, and continue to contact -actionOkAndGoToPersonDirectory = Okay, and continue to person directory -actionExecuteAutomaticDeletion = Execute automatic deletion -actionDone = Done -actionConfirmAction = Confirm action +actionOkAndGoToMerge=Okay, and continue to merge overview +actionOkAndGoToContactDirectory=Okay, and continue to contact directory +actionOkAndGoToContactDetails=Okay, and continue to contact +actionOkAndGoToPersonDirectory=Okay, and continue to person directory +actionExecuteAutomaticDeletion=Execute automatic deletion +actionDone=Done +actionConfirmAction=Confirm action activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -248,10 +248,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows = Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups = Expired -aggregateReportNoAgeGroup = No age group -aggregateReportShowOnlyDuplicateReports = Display only duplicate reports +aggregateReportShowZeroRows=Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups=Expired +aggregateReportNoAgeGroup=No age group +aggregateReportShowOnlyDuplicateReports=Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -275,7 +275,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend = Send emails +bulkEmailSend=Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -434,6 +434,7 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name +CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1133,7 +1134,6 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: - # Environment Environment=Environment Environment.uuid=Environment ID @@ -1152,54 +1152,51 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location - environmentActiveEnvironments=Active environments -environmentArchivedEnvironments = Archived environments -environmentAllActiveAndArchivedEnvironments = All active and archived environments -environmentDeletedEnvironments = Deleted environments -environmentNewEnvironment= New environment +environmentArchivedEnvironments=Archived environments +environmentAllActiveAndArchivedEnvironments=All active and archived environments +environmentDeletedEnvironments=Deleted environments +environmentNewEnvironment=New environment environmentEnvironmentsList=Environments list - # EnvironmentSample -EnvironmentSample = Environment Sample -EnvironmentSample.uuid = Sample ID -EnvironmentSample.environment = Environment -EnvironmentSample.sampleDateTime = Date of sampling -EnvironmentSample.sampleMaterial = Sample material -EnvironmentSample.otherSampleMaterial = Specify sample material -EnvironmentSample.sampleVolume = Volume (in mL) -EnvironmentSample.fieldSampleId = Field sample ID -EnvironmentSample.turbidity = Turbidity (in NTU) -EnvironmentSample.phValue = pH of sample -EnvironmentSample.sampleTemperature = Temperature (in °C) -EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) -EnvironmentSample.laboratory = Laboratory -EnvironmentSample.laboratoryDetails = Laboratory details -EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested -EnvironmentSample.reportingUser = Reporting user -EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested -EnvironmentSample.weatherConditions = Weather conditions at time of sampling -EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched = Sent/dispatched -EnvironmentSample.dispatchDate = Dispatchment date -EnvironmentSample.dispatchDetails = Dispatchment details -EnvironmentSample.received = Received -EnvironmentSample.receivalDate = Receival date -EnvironmentSample.labSampleId = Lab sample ID -EnvironmentSample.specimenCondition = Specimen condition -EnvironmentSample.location = Location of sampling site -EnvironmentSample.generalComment = General comment -EnvironmentSample.positivePathogenTests = Positive pathogen tests -EnvironmentSample.latestPathogenTest = Latest pathogen test -EnvironmentSample.numberOfTests = Number of tests - +EnvironmentSample=Environment Sample +EnvironmentSample.uuid=Sample ID +EnvironmentSample.environment=Environment +EnvironmentSample.sampleDateTime=Date of sampling +EnvironmentSample.sampleMaterial=Sample material +EnvironmentSample.otherSampleMaterial=Specify sample material +EnvironmentSample.sampleVolume=Volume (in mL) +EnvironmentSample.fieldSampleId=Field sample ID +EnvironmentSample.turbidity=Turbidity (in NTU) +EnvironmentSample.phValue=pH of sample +EnvironmentSample.sampleTemperature=Temperature (in °C) +EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) +EnvironmentSample.laboratory=Laboratory +EnvironmentSample.laboratoryDetails=Laboratory details +EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested +EnvironmentSample.reportingUser=Reporting user +EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested +EnvironmentSample.weatherConditions=Weather conditions at time of sampling +EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched=Sent/dispatched +EnvironmentSample.dispatchDate=Dispatchment date +EnvironmentSample.dispatchDetails=Dispatchment details +EnvironmentSample.received=Received +EnvironmentSample.receivalDate=Receival date +EnvironmentSample.labSampleId=Lab sample ID +EnvironmentSample.specimenCondition=Specimen condition +EnvironmentSample.location=Location of sampling site +EnvironmentSample.generalComment=General comment +EnvironmentSample.positivePathogenTests=Positive pathogen tests +EnvironmentSample.latestPathogenTest=Latest pathogen test +EnvironmentSample.numberOfTests=Number of tests # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents = Deleted events +eventDeletedEvents=Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1343,7 +1340,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants = Deleted event participants +eventParticipantDeletedEventParticipants=Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1356,7 +1353,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser = Reporting user +EventParticipant.reportingUser=Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1393,9 +1390,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink = Event participant ID -EventParticipantSelection.eventUuidLink = Event ID -EventParticipantSelection.resultingCaseUuidLink = Resulting case ID +EventParticipantSelection.eventParticipantUuidLink=Event participant ID +EventParticipantSelection.eventUuidLink=Event ID +EventParticipantSelection.resultingCaseUuidLink=Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1615,7 +1612,6 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message - #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1626,7 +1622,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList = List of new event participants +lineListingNewEventParticipantsList=List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1800,10 +1796,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples = See samples for this person -caseLinkToSamples = See samples for this case -contactLinkToSamples = See samples for this contact -eventParticipantLinkToSamples = See samples for this event participant +personLinkToSamples=See samples for this person +caseLinkToSamples=See samples for this case +contactLinkToSamples=See samples for this contact +eventParticipantLinkToSamples=See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2111,9 +2107,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity = Community of event participant -SampleExport.eventParticipantDistrict = District of event participant -SampleExport.eventParticipantRegion = Region of event participant +SampleExport.eventParticipantCommunity=Community of event participant +SampleExport.eventParticipantDistrict=District of event participant +SampleExport.eventParticipantRegion=Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2172,7 +2168,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser = Reporting user +Immunization.reportingUser=Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2215,10 +2211,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations = Active immunizations -immunizationArchivedImmunizations = Archived immunizations -immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations -immunizationDeletedImmunizations = Deleted immunizations +immunizationActiveImmunizations=Active immunizations +immunizationArchivedImmunizations=Archived immunizations +immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations +immunizationDeletedImmunizations=Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2461,7 +2457,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment = Associated environment +Task.environment=Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2514,7 +2510,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser = Reporting user +TravelEntry.reportingUser=Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -2881,17 +2877,15 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms = SMS -userRoleNotificationTypeEmail = EMAIL +userRoleNotificationTypeSms=SMS +userRoleNotificationTypeEmail=EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template - notificationType=Notification type -notificationType.group = Group -notificationType.caption = Caption -notificationType.description = Description - +notificationType.group=Group +notificationType.caption=Caption +notificationType.description=Description SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -2926,10 +2920,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails = Person contact details -environmentSampleNotShipped = Not shipped -environmentSampleShipped = Shipped -environmentSampleReceived = Received +TaskExport.personOtherContactDetails=Person contact details +environmentSampleNotShipped=Not shipped +environmentSampleShipped=Shipped +environmentSampleReceived=Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -2946,37 +2940,34 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents - # SpecialCaseAccess SpecialCaseAccess=Special case access -caze = Case -assignedTo = Assigned to -assignedBy = Assigned by -endDateTime = Access until -assignmentDate = Date assigned - +caze=Case +assignedTo=Assigned to +assignedBy=Assigned by +endDateTime=Access until +assignmentDate=Date assigned specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case - # SelfReport -SelfReport.type = Type -SelfReport.reportDate = Report date -SelfReport.disease = Disease -SelfReport.diseaseVariant = Disease variant -SelfReport.firstName = First name -SelfReport.lastName = Last name -SelfReport.sex = Sex -SelfReport.birthdateDD = Day of birth -SelfReport.birthdateMM = Month of birth -SelfReport.birthdateYYYY = Year of birth -SelfReport.nationalHealthId = National health ID -SelfReport.email = Email -SelfReport.phoneNumber = Phone number -SelfReport.address = Address -SelfReport.comment = Comment -SelfReport.responsibleUser = Responsible user -SelfReport.investigationStatus = Investigation status -SelfReport.processingStatus = Processing status +SelfReport.type=Type +SelfReport.reportDate=Report date +SelfReport.disease=Disease +SelfReport.diseaseVariant=Disease variant +SelfReport.firstName=First name +SelfReport.lastName=Last name +SelfReport.sex=Sex +SelfReport.birthdateDD=Day of birth +SelfReport.birthdateMM=Month of birth +SelfReport.birthdateYYYY=Year of birth +SelfReport.nationalHealthId=National health ID +SelfReport.email=Email +SelfReport.phoneNumber=Phone number +SelfReport.address=Address +SelfReport.comment=Comment +SelfReport.responsibleUser=Responsible user +SelfReport.investigationStatus=Investigation status +SelfReport.processingStatus=Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_haw-US.properties b/sormas-api/src/main/resources/captions_haw-US.properties index 111a929df1f..d52e7461ff0 100644 --- a/sormas-api/src/main/resources/captions_haw-US.properties +++ b/sormas-api/src/main/resources/captions_haw-US.properties @@ -14,7 +14,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . ############################################################################### - # General Captions all=All city=City @@ -56,7 +55,6 @@ facility=Facility pointOfEntry=Point of entry remove=Remove reportingUser=Reporting user - # About about=About aboutDocuments=Documents @@ -68,14 +66,12 @@ aboutDataDictionary=Data Dictionary (XLSX) aboutSormasWebsite=Official SORMAS Website aboutTechnicalManual=Technical Manual (PDF) aboutWhatsNew=What's New? - # Action actionNewAction=New action actionNoActions=There are no actions for this %s actionCreatingLabel=Created at %s by %s actionLastModifiedByLabel=Updated at %s by %s actionStatusChangeDate=updated at %s - Action=Action Action.title=Title Action.description=Description @@ -88,13 +84,12 @@ Action.actionContext=Action context Action.actionStatus=Action status Action.lastModifiedBy=Last modified by Action.actionMeasure=Measure - # Actions actionApplyDateFilter=Apply date filter actionArchive=Archive actionAssignNewEpidNumber=Assign new epid number actionBack=Back -actionSend = Send +actionSend=Send actionCancel=Cancel actionClear=Clear actionClearAll=Clear all @@ -133,10 +128,8 @@ actionBackToNationOverview=Back to Nation Overview actionSettings=User Settings actionNewForm=New Form actionOverwrite=Overwrite - # AdditionalTest additionalTestNewTest=New test result - AdditionalTest=Additional test AdditionalTest.altSgpt=ALT/SGPT (U/L) AdditionalTest.arterialVenousBloodGas=Arterial/venous blood gas @@ -160,7 +153,6 @@ AdditionalTest.testDateTime=Date and time of result AdditionalTest.totalBilirubin=Total bilirubin (umol/L) AdditionalTest.urea=Urea (mmol/L) AdditionalTest.wbcCount=WBC count (x10^9/L) - aggregateReportDeathsShort=D aggregateReportLabConfirmationsShort=L aggregateReportLastWeek=Last Week @@ -177,13 +169,11 @@ AggregateReport.labConfirmations=Lab confirmations AggregateReport.deaths=Deaths AggregateReport.healthFacility=Facility AggregateReport.pointOfEntry=Point of Entry - -areaActiveAreas = Active areas -areaArchivedAreas = Archived areas -areaAllAreas = All areas -Area.archived = Archived -Area.externalId = External ID - +areaActiveAreas=Active areas +areaArchivedAreas=Archived areas +areaAllAreas=All areas +Area.archived=Archived +Area.externalId=External ID # Bulk actions bulkActions=Bulk Actions bulkCancelFollowUp=Cancel follow-up @@ -201,7 +191,6 @@ bulkFacility=Change facility bulkInvestigationStatus=Change investigation status bulkLostToFollowUp=Set to lost to follow-up bulkSurveillanceOfficer=Change surveillance officer - # Campaign campaignActiveCampaigns=Active campaigns campaignAllCampaigns=All campaigns @@ -221,7 +210,6 @@ campaignDashboardChartHeight=Height in % campaignDashboardOrder=Order campaignSearch=Search Campaign campaignDiagramGroupBy=Group by - Campaign=Campaign Campaign.name=Name Campaign.description=Description @@ -234,13 +222,11 @@ Campaign.area=Area Campaign.region=Region Campaign.district=District Campaign.community=Community - -CampaignFormData.campaign = Campaign -CampaignFormData.campaignFormMeta = Form -CampaignFormData.formDate = Form date -CampaignFormData.area = Area +CampaignFormData.campaign=Campaign +CampaignFormData.campaignFormMeta=Form +CampaignFormData.formDate=Form date +CampaignFormData.area=Area CampaignFormData.edit=Edit - # CaseData caseCasesList=Cases list caseInfrastructureDataChanged=Infrastructure data has changed @@ -290,9 +276,8 @@ convertEventParticipantToCase=Create case from event participant with positive t convertContactToCase=Create case from contact with positive test result? caseSearchSpecificCase=Search specific case caseSearchCase=Search case -caseSelect= Select case +caseSelect=Select case caseCreateNew=Create new case - CaseData=Case CaseData.additionalDetails=General comment CaseData.caseClassification=Case classification @@ -315,6 +300,7 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name +CaseData.disease=Disease CaseData.district=Responsible district CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -435,7 +421,6 @@ CaseData.notACaseReasonPhysicianInformation=Information provided by physician CaseData.notACaseReasonDifferentPathogen=Verification of different pathogen CaseData.notACaseReasonOther=Other CaseData.notACaseReasonDetails=Reason details - # CaseExport CaseExport.address=Address CaseExport.addressRegion=Address Region @@ -481,7 +466,6 @@ CaseExport.lastCooperativeVisitSymptomatic=Symptomatic at last cooperative visit CaseExport.lastCooperativeVisitSymptoms=Symptoms at last cooperative visit CaseExport.traveled=Traveled outside of district CaseExport.burialAttended=Visited a burial - # CaseHospitalization CaseHospitalization=Hospitalization CaseHospitalization.admissionDate=Date of visit or admission @@ -496,12 +480,9 @@ CaseHospitalization.previousHospitalizations=Previous hospitalizations CaseHospitalization.intensiveCareUnit=Stay in the intensive care unit CaseHospitalization.intensiveCareUnitStart=Start of the stay CaseHospitalization.intensiveCareUnitEnd=End of the stay - - # CaseImport caseImportErrorDescription=Error description caseImportMergeCase=Override existing case with changes from the imported case? - # CasePreviousHospitalization CasePreviousHospitalization=Previous hospitalization CasePreviousHospitalization.admissionAndDischargeDate=Date of admission & discharge @@ -513,10 +494,8 @@ CasePreviousHospitalization.healthFacility=Hospital CasePreviousHospitalization.healthFacilityDetails=Hospital name & description CasePreviousHospitalization.isolated=Isolation CasePreviousHospitalization.prevHospPeriod=Period of hospitalization - # ClinicalVisit clinicalVisitNewClinicalVisit=New clinical assessment - ClinicalVisit=Clinical assessment ClinicalVisit.bloodPressure=Blood pressure ClinicalVisit.heartRate=Heart rate @@ -524,28 +503,22 @@ ClinicalVisit.temperature=Temperature ClinicalVisit.visitDateTime=Date and time of visit ClinicalVisit.visitingPerson=Attending clinician ClinicalVisit.visitRemarks=Clinician remarks - ClinicalVisitExport.caseUuid=Case ID ClinicalVisitExport.caseName=Case name - columnAdditionalTests=Additional tests columnDiseaseShort=Disease columnNumberOfPendingTasks=Pending tasks - # Community Community.archived=Archived Community.externalID=External ID - communityActiveCommunities=Active communities communityArchivedCommunities=Archived communities communityAllCommunities=All communities - # Configuration Configuration.Facilities=Facilities Configuration.Outbreaks=Outbreaks Configuration.PointsOfEntry=Points of Entry Configuration.LineListing=Line Listing - # Contact contactCancelFollowUp=Cancel follow-up contactCaseContacts=Case contacts @@ -582,10 +555,9 @@ contactOnlyWithSharedEventWithSourceCase=Only contacts with source case linked t contactOnlyWithSourceCaseInGivenEvent=Only contacts whose source case is linked to this event contactFollowUpDay=Day contactQuarantineNotOrdered=No quarantine ordered -contactCreatePIAAccount = PIA -contactPersonPhoneNumber = Contact Person's Phone Number -contactSourceCase = Source case - +contactCreatePIAAccount=PIA +contactPersonPhoneNumber=Contact Person's Phone Number +contactSourceCase=Source case Contact=Contact Contact.additionalDetails=General comment Contact.caseClassification=Classification of the source case @@ -602,10 +574,10 @@ Contact.community=Responsible community Contact.contactClassification=Contact classification Contact.contactOfficer=Responsible contact officer Contact.contactOfficerUuid=Responsible contact officer -Contact.contactIdentificationSource = Contact identification source -Contact.contactIdentificationSourceDetails = Contact identification source details -Contact.tracingApp = Tracing app -Contact.tracingAppDetails = Tracing app details, e.g. name +Contact.contactIdentificationSource=Contact identification source +Contact.contactIdentificationSourceDetails=Contact identification source details +Contact.tracingApp=Tracing app +Contact.tracingAppDetails=Tracing app details, e.g. name Contact.contactProximity=Type of contact - if multiple pick the closest contact proximity Contact.contactStatus=Contact status Contact.description=Description of how contact took place @@ -676,7 +648,6 @@ Contact.prohibitionToWork=Prohibition to work Contact.prohibitionToWorkFrom=Prohibition to work from Contact.prohibitionToWorkUntil=Prohibition to work until Contact.reportingDistrict=Reporting district - # ContactExport ContactExport.address=Address ContactExport.addressDistrict=Address District @@ -695,7 +666,6 @@ ContactExport.sourceCaseUuid=Source case ID ContactExport.traveled=Traveled outside of district ContactExport.travelHistory=Travel history ContactExport.quarantineInformation=Quarantine information - # Dashboard dashboardAlive=Alive dashboardApplyCustomFilter=Apply custom filter @@ -819,14 +789,12 @@ dashboardAggregatedNumber=Count dashboardProportion=Proportion (%) dashboardViewAsColumnChart=View as Column Chart dashboardViewAsBarChart=View as Bar Chart - defaultRegion=Default Region defaultDistrict=Default District defaultCommunity=Default Community defaultFacility=Default Facility defaultLaboratory=Default Laboratory defaultPointOfEntry=Default Point Of Entry - devModeCaseCount=Number of generated cases devModeCaseDisease=Disease of the cases devModeCaseDistrict=District of the cases @@ -857,7 +825,6 @@ devModeEventStartDate=Earliest event start date devModeGenerateCases=Generate Cases devModeGenerateContacts=Generate Contacts devModeGenerateEvents=Generate Events - DiseaseBurden.caseCount=New cases DiseaseBurden.caseDeathCount=Fatalities DiseaseBurden.casesDifference=Dynamic @@ -865,20 +832,16 @@ DiseaseBurden.caseFatalityRate=CFR DiseaseBurden.eventCount=Number of events DiseaseBurden.outbreakDistrictCount=Outbreak districts DiseaseBurden.previousCaseCount=Previous cases - # District districtActiveDistricts=Active districts districtArchivedDistricts=Archived districts districtAllDistricts=All districts - District.archived=Archived District.epidCode=Epid code District.growthRate=Growth rate District.population=Population District.externalID=External ID - epiDataNoSourceContacts=No source contacts have been created for this case - EpiData=Epidemiological data EpiData.areaInfectedAnimals=Residing, working or travelling to an area where infected animals have been confirmed EpiData.exposureDetailsKnown=Exposure details known @@ -886,11 +849,9 @@ EpiData.exposures=Exposures EpiData.highTransmissionRiskArea=Residing or working in an area with high risk of transmission of the disease, e.g. closed residential and camp-like settings EpiData.largeOutbreaksArea=Residing or travelling to countries/territories/areas experiencing larger outbreaks of local transmission EpiData.contactWithSourceCaseKnown=Contacts with source case known - # Documents documentUploadDocument=New document documentNoDocuments=There are no documents for this %s - # DocumentTemplate DocumentTemplate=Document Template DocumentTemplate.buttonUploadTemplate=Upload Template @@ -907,7 +868,6 @@ DocumentTemplate.exampleTemplateCases=Example Template Cases DocumentTemplate.exampleTemplateContacts=Example Template Contacts DocumentTemplate.exampleTemplateEventHandout=Example Template Event Handout DocumentTemplate.exampleTemplateEventParticipants=Example Template Event Participants - # Event eventActiveEvents=Active events eventArchivedEvents=Archived events @@ -935,7 +895,6 @@ eventUnlinkEvent=Unlink event eventOpenSuperordinateEvent=Open event eventEditEvent=Edit event eventLinkToEventsWithinTheSameFacility=See events within the same facility - Event=Event Event.caseCount=Cases Event.contactCount=Contacts @@ -992,7 +951,6 @@ Event.typeOfPlaceText=Specify other event place Event.uuid=Event ID Event.transregionalOutbreak=Transregional outbreak Event.diseaseTransmissionMode=Primary mode of transmission - # Event action EventAction.eventUuid=Event id EventAction.eventTitle=Event title @@ -1009,18 +967,14 @@ EventAction.actionChangeDate=Action change date EventAction.actionStatus=Action status EventAction.actionPriority=Action priority EventAction.actionLastModifiedBy=Action last modified by - # Event action export EventActionExport.eventDate=Date of event - #Event export - # EventParticipant eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant - EventParticipant=Event participant EventParticipant.contactCount=Contact count EventParticipant.event=Event @@ -1034,7 +988,6 @@ EventParticipant.person=Person EventParticipant.uuid=Event participant ID EventParticipant.region=Responsible region EventParticipant.district=Responsible district - #EventParticipant export EventParticipantExport.eventParticipantU=Event disease EventParticipantExport.eventDisease=Event disease @@ -1059,7 +1012,6 @@ EventParticipantExport.sampleInformation=Sample information EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID - # Expo export=Export exportBasic=Basic Export @@ -1074,16 +1026,13 @@ exportCaseManagement=Case Management Export exportCaseCustom=Custom Case Export exportNewExportConfiguration=New Export Configuration exportEditExportConfiguration=Edit Export Configuration - ExportConfiguration.NAME=Configuration name ExportConfiguration.myExports=My exports ExportConfiguration.sharedExports=Shared exports ExportConfiguration.sharedToPublic=Shared to public - exposureFlightNumber=Flight number exposureTimePeriod=Time period exposureSourceCaseName=Name of source case - Exposure.startDate=Start of exposure Exposure.endDate=End of exposure Exposure.exposureType=Type of activity @@ -1134,16 +1083,13 @@ Exposure.prophylaxisDate=Date of prophylaxis Exposure.riskArea=Risk area as defined by public health institution Exposure.exposureDate=Exposure date Exposure.exposureRole=Role - # Facility facilityActiveFacilities=Active facilities facilityArchivedFacilities=Archived facilities facilityAllFacilities=All facilities - Facility.CONFIGURED_FACILITY=Configured facility Facility.NO_FACILITY=Home or other place Facility.OTHER_FACILITY=Other facility - Facility.archived=Archived Facility.city=City Facility.community=Community @@ -1156,22 +1102,18 @@ Facility.publicOwnership=Public ownership Facility.region=Region Facility.type=Facility type Facility.typeGroup=Facility category - FeatureConfiguration.districtName=District FeatureConfiguration.enabled=Line listing enabled? FeatureConfiguration.endDate=End date - # Formats formatNumberOfVisitsFormat=%d (%d missed) formatNumberOfVisitsLongFormat=%d visits (%d missed) formatSimpleNumberFormat=%d - # FollowUp FollowUp.uuid=Follow-up ID FollowUp.person=Follow-up person FollowUp.reportDate=Date of report FollowUp.followUpUntil=Follow-up until - # HealthConditions HealthConditions=Health conditions HealthConditions.tuberculosis=Tuberculosis @@ -1197,7 +1139,6 @@ HealthConditions.formerSmoker=Former smoker\t\t HealthConditions.asthma=Asthma HealthConditions.sickleCellDisease=Sickle cell disease\t HealthConditions.immunodeficiencyIncludingHiv=Immunodeficiency including HIV - # Import importDetailed=Detailed Import importDownloadCaseImportTemplate=Download Case Import Template @@ -1214,7 +1155,6 @@ importLineListing=Line Listing Import importProcessed=%d/%d Processed importSkips=%d Skipped importCancelImport=Cancel import - #Lab Message LabMessage=Lab Message LabMessage.labMessageDetails=Lab message details @@ -1236,12 +1176,10 @@ LabMessage.sampleMaterial=Type of sample LabMessage.sampleReceivedDate=Sample received LabMessage.specimenCondition=Specimen condition LabMessage.testedDisease=Tested disease - -labMessageFetch= Fetch lab messages +labMessageFetch=Fetch lab messages labMessageProcess=Process labMessageProcessed=Processed labMessageUnprocessed=Unprocessed - #Line listing lineListingAddLine=Add line lineListingInfrastructureData=Take over infrastructure data from last line @@ -1254,7 +1192,6 @@ lineListingEnableAll=Enable all lineListingDisableAllShort=Disable all lineListingEndDate=End date lineListingSetEndDateForAll=Set end date for all - # Location Location=Location Location.additionalInformation=Additional information @@ -1272,31 +1209,27 @@ Location.latLonAccuracy=GPS accuracy in m Location.longitude=GPS longitude Location.postalCode=Postal code Location.street=Street - # Login Login.doLogIn=Log in Login.login=Login Login.password=password Login.username=username - #LoginSidebar LoginSidebar.diseaseDetection=Disease Detection LoginSidebar.diseasePrevention=Disease Prevention LoginSidebar.outbreakResponse=Outbreak Response LoginSidebar.poweredBy=Powered By - # Messaging messagesSendSMS=Send SMS messagesSentBy=Sent by messagesNoSmsSentForCase=No SMS sent to case person messagesNoPhoneNumberForCasePerson=Case person has no phone number -messagesSms = SMS -messagesEmail = Email -messagesSendingSms = Send new SMS -messagesNumberOfMissingPhoneNumbers = Number of selected cases without phone number\: %s -messagesCharacters = Characters\: %d / 160 -messagesNumberOfMessages = Nr. of messages\: %d - +messagesSms=SMS +messagesEmail=Email +messagesSendingSms=Send new SMS +messagesNumberOfMissingPhoneNumbers=Number of selected cases without phone number\: %s +messagesCharacters=Characters\: %d / 160 +messagesNumberOfMessages=Nr. of messages\: %d # Main Menu mainMenuAbout=About mainMenuCampaigns=Campaigns @@ -1312,7 +1245,6 @@ mainMenuStatistics=Statistics mainMenuTasks=Tasks mainMenuUsers=Users mainMenuAggregateReports=mSERS - MaternalHistory.childrenNumber=Total number of children MaternalHistory.ageAtBirth=Mother's age at birth of infant patient MaternalHistory.conjunctivitis=Conjunctivitis @@ -1339,19 +1271,16 @@ MaternalHistory.otherComplications=Other complications MaternalHistory.otherComplicationsOnset=Date of onset MaternalHistory.otherComplicationsMonth=Month of pregnancy MaternalHistory.otherComplicationsDetails=Complication details - # Outbreak outbreakAffectedDistricts=Affected districts outbreakNoOutbreak=No outbreak outbreakNormal=Normal outbreakOutbreak=Outbreak - # PathogenTest pathogenTestCreateNew=Create new pathogen test pathogenTestNewResult=New result pathogenTestNewTest=New test result pathogenTestSelect=Select pathogen test - PathogenTest=Pathogen test PathogenTests=Pathogen tests PathogenTest.fourFoldIncreaseAntibodyTiter=4 fold increase of antibody titer @@ -1368,7 +1297,6 @@ PathogenTest.testedDiseaseDetails=Tested disease name PathogenTest.typingId=Typing ID PathogenTest.serotype=Serotype PathogenTest.cqValue=CQ/CT Value - # Person personPersonsList=Person list personCreateNew=Create a new person @@ -1381,7 +1309,6 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person - Person=Person Person.address=Home address Person.addresses=Addresses @@ -1453,11 +1380,9 @@ Person.otherSalutation=Other salutation Person.birthName=Birth name Person.birthCountry=Country of birth Person.citizenship=Citizenship - pointOfEntryActivePointsOfEntry=Active points of entry pointOfEntryArchivedPointsOfEntry=Archived points of entry pointOfEntryAllPointsOfEntry=All points of entry - PointOfEntry.OTHER_AIRPORT=Other airport PointOfEntry.OTHER_SEAPORT=Other seaport PointOfEntry.OTHER_GROUND_CROSSING=Other ground crossing @@ -1467,10 +1392,8 @@ PointOfEntry.active=Active? PointOfEntry.latitude=Latitude PointOfEntry.longitude=Longitude PointOfEntry.externalID=External ID - populationDataMaleTotal=Male total populationDataFemaleTotal=Female total - PortHealthInfo=Port health information PortHealthInfo.airlineName=Airline name PortHealthInfo.flightNumber=Flight number @@ -1494,10 +1417,8 @@ PortHealthInfo.conveyanceTypeDetails=Specify the conveyance type PortHealthInfo.departureLocation=Start location of travel PortHealthInfo.finalDestination=Final destination PortHealthInfo.details=Point of entry details - # Prescription prescriptionNewPrescription=New prescription - Prescription.additionalNotes=Additional notes Prescription.dose=Dose Prescription.drugIntakeDetails=Drug name @@ -1513,33 +1434,27 @@ Prescription.prescriptionType=Prescription type Prescription.route=Route Prescription.routeDetails=Route specification Prescription.typeOfDrug=Type of drug - PrescriptionExport.caseUuid=Case ID PrescriptionExport.caseName=Case name - # Country countryActiveCountries=Active countries countryArchivedCountries=Archived countries countryAllCountries=All countries - Country.archived=Archived Country.externalId=External ID Country.defaultName=Default name Country.displayName=Name Country.isoCode=ISO code Country.unoCode=UNO code - # Region regionActiveRegions=Active regions regionArchivedRegions=Archived regions regionAllRegions=All regions - Region.archived=Archived Region.epidCode=Epid code Region.growthRate=Growth rate Region.population=Population Region.externalID=External ID - # Sample sampleCreateNew=Create new sample sampleIncludeTestOnCreation=Create test result for this sample now @@ -1566,7 +1481,6 @@ sampleActiveSamples=Active samples sampleArchivedSamples=Archived samples sampleAllSamples=All samples sampleAssociationType=Sample type - Sample=Sample Sample.additionalTestingRequested=Request additional tests to be performed? Sample.additionalTestingStatus=Additional testing status @@ -1616,23 +1530,22 @@ Sample.testType=Type of test Sample.typeOfTest=Type of test Sample.uuid=Sample ID Sample.samplePurpose=Purpose of the Sample - SampleExport.additionalTestingRequested=Have additional tests been requested? SampleExport.personAddressCaption=Address of case/contact/event participant person SampleExport.personAge=Age of case/contact/event participant person SampleExport.caseDistrict=District of case SampleExport.caseCommunity=Community of case SampleExport.caseFacility=Facility of case -SampleExport.contactRegion = Region of contact -SampleExport.contactDistrict = District of contact -SampleExport.contactCommunity = Community of contact +SampleExport.contactRegion=Region of contact +SampleExport.contactDistrict=District of contact +SampleExport.contactCommunity=Community of contact SampleExport.caseOutcome=Outcome of case SampleExport.caseRegion=Region of case SampleExport.caseReportDate=Case report date SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID -SampleExport.contactUuid = Contact UUID -SampleExport.contactReportDate = Contact report date +SampleExport.contactUuid=Contact UUID +SampleExport.contactReportDate=Contact report date SampleExport.id=Sample SN SampleExport.sampleReportDate=Sample report date SampleExport.noTestPossibleReason=No test possible reason @@ -1684,7 +1597,6 @@ SampleExport.testDateTime=Date and time of latest additional test SampleExport.totalBilirubin=Total bilirubin of latest additional test SampleExport.urea=Urea of latest additional test SampleExport.wbcCount=WBC count of latest additional test - # Statistics statisticsAddFilter=Add filter statisticsAttribute=Attribute @@ -1707,13 +1619,11 @@ statisticsStatistics=Statistics statisticsVisualizationType=Type statisticsIncidenceDivisor=Incidence divisor statisticsDataDisplayed=Data displayed - # Symptoms symptomsLesionsLocations=Localization of the lesions symptomsMaxTemperature=Maximum body temperature in ° C symptomsSetClearedToNo=Set cleared to No symptomsSetClearedToUnknown=Set cleared to Unknown - Symptoms=Symptoms Symptoms.abdominalPain=Abdominal pain Symptoms.alteredConsciousness=Altered level of consciousness @@ -1901,7 +1811,6 @@ Symptoms.palpitations=Palpitations Symptoms.dizzinessStandingUp=Dizziness (when standing up from a sitting or lying position) Symptoms.highOrLowBloodPressure=Blood pressure too high or too low (measured) Symptoms.urinaryRetention=Urinary retention - # Task taskMyTasks=My tasks taskNewTask=New task @@ -1910,7 +1819,6 @@ taskOfficerTasks=Officer tasks taskActiveTasks=Active tasks taskArchivedTasks=Archived tasks taskAllTasks=All tasks - Task=Task Task.assigneeReply=Comments on execution Task.assigneeUser=Assigned to @@ -1928,9 +1836,7 @@ Task.suggestedStart=Suggested start Task.taskContext=Task context Task.taskStatus=Task status Task.taskType=Task type - # TestReport - TestReport.testDateTime=Date and time of result TestReport.testLabCity=Lab city TestReport.testLabExternalId=Lab external ID @@ -1938,12 +1844,10 @@ TestReport.testLabName=Lab name TestReport.testLabPostalCode=Lab postal code TestReport.testResult=Test result TestReport.testType=Type of test - # Treatment treatmentCreateTreatment=Create treatment treatmentNewTreatment=New treatment treatmentOpenPrescription=Open prescription - Treatment.additionalNotes=Additional notes Treatment.dose=Dose Treatment.drugIntakeDetails=Drug name @@ -1957,10 +1861,8 @@ Treatment.treatmentDetails=Treatment details Treatment.treatmentType=Treatment type Treatment.typeOfDrug=Type of drug Treatment.treatmentRoute=Treatment route - TreatmentExport.caseUuid=Case ID TreatmentExport.caseName=Case name - # User userNewUser=New user userResetPassword=Create new password @@ -1970,7 +1872,6 @@ syncUsers=Sync Users syncErrors=%d Error(s) syncSuccessful=%d Synced syncProcessed=%d/%d Processed - User=User User.active=Active? User.associatedOfficer=Associated officer @@ -1985,20 +1886,16 @@ User.userName=User name User.userRoles=User roles User.address=Address User.uuid=UUID - # Views View.actions=Action Directory - View.aggregatereports=Aggregate Reporting (mSERS) View.aggregatereports.sub= - View.campaign.campaigns=Campaign Directory View.campaign.campaigns.short=Campaigns View.campaign.campaigndata=Campaign Data View.campaign.campaigndata.short=Campaign Data View.campaign.campaigndata.dataform=Campaign Data Form View.campaign.campaigndata.dataform.short=Data Form - View.cases=Case Directory View.cases.merge=Merge Duplicate Cases View.cases.archive=Case Archive @@ -2014,10 +1911,8 @@ View.cases.clinicalcourse=Clinical Course View.cases.maternalhistory=Maternal History View.cases.porthealthinfo=Port Health Information View.cases.visits=Case Visits - View.persons=Person Directory View.persons.data=Person Information - View.configuration.communities=Communities Configuration View.configuration.communities.short=Communities View.configuration.districts=Districts Configuration @@ -2048,7 +1943,6 @@ View.configuration.populationdata=Population Data View.configuration.populationdata.short=Population View.configuration.linelisting=Line Listing Configuration View.configuration.linelisting.short=Line Listing - View.contacts=Contact Directory View.contacts.archive=Contact Archive View.contacts.epidata=Contact Epidemiological Data @@ -2056,11 +1950,9 @@ View.contacts.data=Contact Information View.contacts.person=Contact Person View.contacts.sub= View.contacts.visits=Contact Visits - View.dashboard.contacts=Contacts Dashboard View.dashboard.surveillance=Surveillance Dashboard View.dashboard.campaigns=Campaigns Dashboard - View.events=Event Directory View.events.archive=Event Archive View.events.data=Event Information @@ -2068,30 +1960,22 @@ View.events.eventactions=Event Actions View.events.eventparticipants=Event Participants View.events.sub= View.events.eventparticipants.data=Event Participant Information - View.samples.labMessages=Lab Message Directory - View.reports=Weekly Reports View.reports.sub= - View.samples=Sample Directory View.samples.archive=Sample Archive View.samples.data=Sample Information View.samples.sub= - View.statistics=Statistics View.statistics.database-export=Database export - View.tasks=Task Management View.tasks.archive=Task Archive View.tasks.sub= - View.users=User Management View.users.sub= - # Visit visitNewVisit=New visit - Visit=Visit Visit.person=Visited person Visit.symptoms=Symptoms @@ -2103,24 +1987,19 @@ Visit.visitUser=Visiting officer Visit.disease=Disease Visit.reportLat=Report latitude Visit.reportLon=Report longitude - # WeeklyReport weeklyReportNoReport=Missing report weeklyReportOfficerInformants=Informants weeklyReportsInDistrict=Weekly Reports in %s weeklyReportRegionOfficers=Officers weeklyReportRegionInformants=Informants - WeeklyReport.epiWeek=Epi Week WeeklyReport.year=Year - # WeeklyReportEntry WeeklyReportEntry.numberOfCases=Cases reported - # WeeklyReportInformantSummary WeeklyReportInformantSummary.informantReportDate=Informant report submission WeeklyReportInformantSummary.totalCaseCount=Cases reported by informant - # WeeklyReportOfficerSummary WeeklyReportOfficerSummary.informants=Number of informants WeeklyReportOfficerSummary.informantReports=Number of informant reports @@ -2129,7 +2008,6 @@ WeeklyReportOfficerSummary.informantZeroReports=Number of informant zero reports WeeklyReportOfficerSummary.officer=Officer WeeklyReportOfficerSummary.officerReportDate=Officer report submission WeeklyReportOfficerSummary.totalCaseCount=Cases reported by officer - # WeeklyReportRegionSummary WeeklyReportRegionSummary.informants=Number of informants WeeklyReportRegionSummary.informantReports=Number of informant reports @@ -2139,7 +2017,6 @@ WeeklyReportRegionSummary.officers=Number of officers WeeklyReportRegionSummary.officerReports=Number of officers reports WeeklyReportRegionSummary.officerReportPercentage=Percentage WeeklyReportRegionSummary.officerZeroReports=Number of officer zero reports - # SORMAS to SORMAS SormasToSormasOptions.organization=Orgainzation SormasToSormasOptions.withAssociatedContacts=Share associated contacts @@ -2160,23 +2037,17 @@ sormasToSormasSharedWith=Shared with sormasToSormasSharedBy=By sormasToSormasSharedDate=On sormasToSormasSentFrom=Sent from - BAGExport=BAG Export - # Survnet Gateway SurvnetGateway.title=SurvNet SurvnetGateway.send=send to own SurvNet instance SurvnetGateway.unableToSend=Unable to send SurvnetGateway.confirmSend=Confirm sending SurvnetGateway.sendShort=Send to SurvNet - patientDiaryRegistrationError=Could not register person in the patient diary. patientDiaryPersonNotExportable=Cannot export the person to the patient diary. The person needs a valid birthdate and either a valid phone number or email address. - showPlacesOnMap=Show - changeUserEmail=Change user email - VaccinationInfo.vaccination=Vaccination status for this disease VaccinationInfo.firstVaccinationDate=Date of first vaccination VaccinationInfo.lastVaccinationDate=Date of last vaccination diff --git a/sormas-api/src/main/resources/captions_hi-IN.properties b/sormas-api/src/main/resources/captions_hi-IN.properties index d3542225c7c..09d72562fce 100644 --- a/sormas-api/src/main/resources/captions_hi-IN.properties +++ b/sormas-api/src/main/resources/captions_hi-IN.properties @@ -188,13 +188,13 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge = Okay, and continue to merge overview -actionOkAndGoToContactDirectory = Okay, and continue to contact directory -actionOkAndGoToContactDetails = Okay, and continue to contact -actionOkAndGoToPersonDirectory = Okay, and continue to person directory -actionExecuteAutomaticDeletion = Execute automatic deletion -actionDone = Done -actionConfirmAction = Confirm action +actionOkAndGoToMerge=Okay, and continue to merge overview +actionOkAndGoToContactDirectory=Okay, and continue to contact directory +actionOkAndGoToContactDetails=Okay, and continue to contact +actionOkAndGoToPersonDirectory=Okay, and continue to person directory +actionExecuteAutomaticDeletion=Execute automatic deletion +actionDone=Done +actionConfirmAction=Confirm action activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -248,10 +248,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows = Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups = Expired -aggregateReportNoAgeGroup = No age group -aggregateReportShowOnlyDuplicateReports = Display only duplicate reports +aggregateReportShowZeroRows=Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups=Expired +aggregateReportNoAgeGroup=No age group +aggregateReportShowOnlyDuplicateReports=Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -275,7 +275,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend = Send emails +bulkEmailSend=Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -434,6 +434,7 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name +CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1133,7 +1134,6 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: - # Environment Environment=Environment Environment.uuid=Environment ID @@ -1152,54 +1152,51 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location - environmentActiveEnvironments=Active environments -environmentArchivedEnvironments = Archived environments -environmentAllActiveAndArchivedEnvironments = All active and archived environments -environmentDeletedEnvironments = Deleted environments -environmentNewEnvironment= New environment +environmentArchivedEnvironments=Archived environments +environmentAllActiveAndArchivedEnvironments=All active and archived environments +environmentDeletedEnvironments=Deleted environments +environmentNewEnvironment=New environment environmentEnvironmentsList=Environments list - # EnvironmentSample -EnvironmentSample = Environment Sample -EnvironmentSample.uuid = Sample ID -EnvironmentSample.environment = Environment -EnvironmentSample.sampleDateTime = Date of sampling -EnvironmentSample.sampleMaterial = Sample material -EnvironmentSample.otherSampleMaterial = Specify sample material -EnvironmentSample.sampleVolume = Volume (in mL) -EnvironmentSample.fieldSampleId = Field sample ID -EnvironmentSample.turbidity = Turbidity (in NTU) -EnvironmentSample.phValue = pH of sample -EnvironmentSample.sampleTemperature = Temperature (in °C) -EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) -EnvironmentSample.laboratory = Laboratory -EnvironmentSample.laboratoryDetails = Laboratory details -EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested -EnvironmentSample.reportingUser = Reporting user -EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested -EnvironmentSample.weatherConditions = Weather conditions at time of sampling -EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched = Sent/dispatched -EnvironmentSample.dispatchDate = Dispatchment date -EnvironmentSample.dispatchDetails = Dispatchment details -EnvironmentSample.received = Received -EnvironmentSample.receivalDate = Receival date -EnvironmentSample.labSampleId = Lab sample ID -EnvironmentSample.specimenCondition = Specimen condition -EnvironmentSample.location = Location of sampling site -EnvironmentSample.generalComment = General comment -EnvironmentSample.positivePathogenTests = Positive pathogen tests -EnvironmentSample.latestPathogenTest = Latest pathogen test -EnvironmentSample.numberOfTests = Number of tests - +EnvironmentSample=Environment Sample +EnvironmentSample.uuid=Sample ID +EnvironmentSample.environment=Environment +EnvironmentSample.sampleDateTime=Date of sampling +EnvironmentSample.sampleMaterial=Sample material +EnvironmentSample.otherSampleMaterial=Specify sample material +EnvironmentSample.sampleVolume=Volume (in mL) +EnvironmentSample.fieldSampleId=Field sample ID +EnvironmentSample.turbidity=Turbidity (in NTU) +EnvironmentSample.phValue=pH of sample +EnvironmentSample.sampleTemperature=Temperature (in °C) +EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) +EnvironmentSample.laboratory=Laboratory +EnvironmentSample.laboratoryDetails=Laboratory details +EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested +EnvironmentSample.reportingUser=Reporting user +EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested +EnvironmentSample.weatherConditions=Weather conditions at time of sampling +EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched=Sent/dispatched +EnvironmentSample.dispatchDate=Dispatchment date +EnvironmentSample.dispatchDetails=Dispatchment details +EnvironmentSample.received=Received +EnvironmentSample.receivalDate=Receival date +EnvironmentSample.labSampleId=Lab sample ID +EnvironmentSample.specimenCondition=Specimen condition +EnvironmentSample.location=Location of sampling site +EnvironmentSample.generalComment=General comment +EnvironmentSample.positivePathogenTests=Positive pathogen tests +EnvironmentSample.latestPathogenTest=Latest pathogen test +EnvironmentSample.numberOfTests=Number of tests # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents = Deleted events +eventDeletedEvents=Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1343,7 +1340,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants = Deleted event participants +eventParticipantDeletedEventParticipants=Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1356,7 +1353,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser = Reporting user +EventParticipant.reportingUser=Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1393,9 +1390,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink = Event participant ID -EventParticipantSelection.eventUuidLink = Event ID -EventParticipantSelection.resultingCaseUuidLink = Resulting case ID +EventParticipantSelection.eventParticipantUuidLink=Event participant ID +EventParticipantSelection.eventUuidLink=Event ID +EventParticipantSelection.resultingCaseUuidLink=Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1615,7 +1612,6 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message - #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1626,7 +1622,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList = List of new event participants +lineListingNewEventParticipantsList=List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1800,10 +1796,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples = See samples for this person -caseLinkToSamples = See samples for this case -contactLinkToSamples = See samples for this contact -eventParticipantLinkToSamples = See samples for this event participant +personLinkToSamples=See samples for this person +caseLinkToSamples=See samples for this case +contactLinkToSamples=See samples for this contact +eventParticipantLinkToSamples=See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2111,9 +2107,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity = Community of event participant -SampleExport.eventParticipantDistrict = District of event participant -SampleExport.eventParticipantRegion = Region of event participant +SampleExport.eventParticipantCommunity=Community of event participant +SampleExport.eventParticipantDistrict=District of event participant +SampleExport.eventParticipantRegion=Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2172,7 +2168,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser = Reporting user +Immunization.reportingUser=Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2215,10 +2211,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations = Active immunizations -immunizationArchivedImmunizations = Archived immunizations -immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations -immunizationDeletedImmunizations = Deleted immunizations +immunizationActiveImmunizations=Active immunizations +immunizationArchivedImmunizations=Archived immunizations +immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations +immunizationDeletedImmunizations=Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2461,7 +2457,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment = Associated environment +Task.environment=Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2514,7 +2510,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser = Reporting user +TravelEntry.reportingUser=Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -2881,17 +2877,15 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms = SMS -userRoleNotificationTypeEmail = EMAIL +userRoleNotificationTypeSms=SMS +userRoleNotificationTypeEmail=EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template - notificationType=Notification type -notificationType.group = Group -notificationType.caption = Caption -notificationType.description = Description - +notificationType.group=Group +notificationType.caption=Caption +notificationType.description=Description SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -2926,10 +2920,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails = Person contact details -environmentSampleNotShipped = Not shipped -environmentSampleShipped = Shipped -environmentSampleReceived = Received +TaskExport.personOtherContactDetails=Person contact details +environmentSampleNotShipped=Not shipped +environmentSampleShipped=Shipped +environmentSampleReceived=Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -2946,37 +2940,34 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents - # SpecialCaseAccess SpecialCaseAccess=Special case access -caze = Case -assignedTo = Assigned to -assignedBy = Assigned by -endDateTime = Access until -assignmentDate = Date assigned - +caze=Case +assignedTo=Assigned to +assignedBy=Assigned by +endDateTime=Access until +assignmentDate=Date assigned specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case - # SelfReport -SelfReport.type = Type -SelfReport.reportDate = Report date -SelfReport.disease = Disease -SelfReport.diseaseVariant = Disease variant -SelfReport.firstName = First name -SelfReport.lastName = Last name -SelfReport.sex = Sex -SelfReport.birthdateDD = Day of birth -SelfReport.birthdateMM = Month of birth -SelfReport.birthdateYYYY = Year of birth -SelfReport.nationalHealthId = National health ID -SelfReport.email = Email -SelfReport.phoneNumber = Phone number -SelfReport.address = Address -SelfReport.comment = Comment -SelfReport.responsibleUser = Responsible user -SelfReport.investigationStatus = Investigation status -SelfReport.processingStatus = Processing status +SelfReport.type=Type +SelfReport.reportDate=Report date +SelfReport.disease=Disease +SelfReport.diseaseVariant=Disease variant +SelfReport.firstName=First name +SelfReport.lastName=Last name +SelfReport.sex=Sex +SelfReport.birthdateDD=Day of birth +SelfReport.birthdateMM=Month of birth +SelfReport.birthdateYYYY=Year of birth +SelfReport.nationalHealthId=National health ID +SelfReport.email=Email +SelfReport.phoneNumber=Phone number +SelfReport.address=Address +SelfReport.comment=Comment +SelfReport.responsibleUser=Responsible user +SelfReport.investigationStatus=Investigation status +SelfReport.processingStatus=Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_hr-HR.properties b/sormas-api/src/main/resources/captions_hr-HR.properties index 7ca0f1f4687..1e611b51ccf 100644 --- a/sormas-api/src/main/resources/captions_hr-HR.properties +++ b/sormas-api/src/main/resources/captions_hr-HR.properties @@ -188,13 +188,13 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge = Okay, and continue to merge overview -actionOkAndGoToContactDirectory = Okay, and continue to contact directory -actionOkAndGoToContactDetails = Okay, and continue to contact -actionOkAndGoToPersonDirectory = Okay, and continue to person directory -actionExecuteAutomaticDeletion = Execute automatic deletion -actionDone = Done -actionConfirmAction = Confirm action +actionOkAndGoToMerge=Okay, and continue to merge overview +actionOkAndGoToContactDirectory=Okay, and continue to contact directory +actionOkAndGoToContactDetails=Okay, and continue to contact +actionOkAndGoToPersonDirectory=Okay, and continue to person directory +actionExecuteAutomaticDeletion=Execute automatic deletion +actionDone=Done +actionConfirmAction=Confirm action activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -248,10 +248,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows = Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups = Expired -aggregateReportNoAgeGroup = No age group -aggregateReportShowOnlyDuplicateReports = Display only duplicate reports +aggregateReportShowZeroRows=Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups=Expired +aggregateReportNoAgeGroup=No age group +aggregateReportShowOnlyDuplicateReports=Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -275,7 +275,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend = Send emails +bulkEmailSend=Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -434,6 +434,7 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name +CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1133,7 +1134,6 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: - # Environment Environment=Environment Environment.uuid=Environment ID @@ -1152,54 +1152,51 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location - environmentActiveEnvironments=Active environments -environmentArchivedEnvironments = Archived environments -environmentAllActiveAndArchivedEnvironments = All active and archived environments -environmentDeletedEnvironments = Deleted environments -environmentNewEnvironment= New environment +environmentArchivedEnvironments=Archived environments +environmentAllActiveAndArchivedEnvironments=All active and archived environments +environmentDeletedEnvironments=Deleted environments +environmentNewEnvironment=New environment environmentEnvironmentsList=Environments list - # EnvironmentSample -EnvironmentSample = Environment Sample -EnvironmentSample.uuid = Sample ID -EnvironmentSample.environment = Environment -EnvironmentSample.sampleDateTime = Date of sampling -EnvironmentSample.sampleMaterial = Sample material -EnvironmentSample.otherSampleMaterial = Specify sample material -EnvironmentSample.sampleVolume = Volume (in mL) -EnvironmentSample.fieldSampleId = Field sample ID -EnvironmentSample.turbidity = Turbidity (in NTU) -EnvironmentSample.phValue = pH of sample -EnvironmentSample.sampleTemperature = Temperature (in °C) -EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) -EnvironmentSample.laboratory = Laboratory -EnvironmentSample.laboratoryDetails = Laboratory details -EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested -EnvironmentSample.reportingUser = Reporting user -EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested -EnvironmentSample.weatherConditions = Weather conditions at time of sampling -EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched = Sent/dispatched -EnvironmentSample.dispatchDate = Dispatchment date -EnvironmentSample.dispatchDetails = Dispatchment details -EnvironmentSample.received = Received -EnvironmentSample.receivalDate = Receival date -EnvironmentSample.labSampleId = Lab sample ID -EnvironmentSample.specimenCondition = Specimen condition -EnvironmentSample.location = Location of sampling site -EnvironmentSample.generalComment = General comment -EnvironmentSample.positivePathogenTests = Positive pathogen tests -EnvironmentSample.latestPathogenTest = Latest pathogen test -EnvironmentSample.numberOfTests = Number of tests - +EnvironmentSample=Environment Sample +EnvironmentSample.uuid=Sample ID +EnvironmentSample.environment=Environment +EnvironmentSample.sampleDateTime=Date of sampling +EnvironmentSample.sampleMaterial=Sample material +EnvironmentSample.otherSampleMaterial=Specify sample material +EnvironmentSample.sampleVolume=Volume (in mL) +EnvironmentSample.fieldSampleId=Field sample ID +EnvironmentSample.turbidity=Turbidity (in NTU) +EnvironmentSample.phValue=pH of sample +EnvironmentSample.sampleTemperature=Temperature (in °C) +EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) +EnvironmentSample.laboratory=Laboratory +EnvironmentSample.laboratoryDetails=Laboratory details +EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested +EnvironmentSample.reportingUser=Reporting user +EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested +EnvironmentSample.weatherConditions=Weather conditions at time of sampling +EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched=Sent/dispatched +EnvironmentSample.dispatchDate=Dispatchment date +EnvironmentSample.dispatchDetails=Dispatchment details +EnvironmentSample.received=Received +EnvironmentSample.receivalDate=Receival date +EnvironmentSample.labSampleId=Lab sample ID +EnvironmentSample.specimenCondition=Specimen condition +EnvironmentSample.location=Location of sampling site +EnvironmentSample.generalComment=General comment +EnvironmentSample.positivePathogenTests=Positive pathogen tests +EnvironmentSample.latestPathogenTest=Latest pathogen test +EnvironmentSample.numberOfTests=Number of tests # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents = Deleted events +eventDeletedEvents=Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1343,7 +1340,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants = Deleted event participants +eventParticipantDeletedEventParticipants=Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1356,7 +1353,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser = Reporting user +EventParticipant.reportingUser=Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1393,9 +1390,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink = Event participant ID -EventParticipantSelection.eventUuidLink = Event ID -EventParticipantSelection.resultingCaseUuidLink = Resulting case ID +EventParticipantSelection.eventParticipantUuidLink=Event participant ID +EventParticipantSelection.eventUuidLink=Event ID +EventParticipantSelection.resultingCaseUuidLink=Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1615,7 +1612,6 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message - #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1626,7 +1622,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList = List of new event participants +lineListingNewEventParticipantsList=List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1800,10 +1796,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples = See samples for this person -caseLinkToSamples = See samples for this case -contactLinkToSamples = See samples for this contact -eventParticipantLinkToSamples = See samples for this event participant +personLinkToSamples=See samples for this person +caseLinkToSamples=See samples for this case +contactLinkToSamples=See samples for this contact +eventParticipantLinkToSamples=See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2111,9 +2107,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity = Community of event participant -SampleExport.eventParticipantDistrict = District of event participant -SampleExport.eventParticipantRegion = Region of event participant +SampleExport.eventParticipantCommunity=Community of event participant +SampleExport.eventParticipantDistrict=District of event participant +SampleExport.eventParticipantRegion=Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2172,7 +2168,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser = Reporting user +Immunization.reportingUser=Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2215,10 +2211,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations = Active immunizations -immunizationArchivedImmunizations = Archived immunizations -immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations -immunizationDeletedImmunizations = Deleted immunizations +immunizationActiveImmunizations=Active immunizations +immunizationArchivedImmunizations=Archived immunizations +immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations +immunizationDeletedImmunizations=Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2461,7 +2457,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment = Associated environment +Task.environment=Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2514,7 +2510,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser = Reporting user +TravelEntry.reportingUser=Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -2881,17 +2877,15 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms = SMS -userRoleNotificationTypeEmail = EMAIL +userRoleNotificationTypeSms=SMS +userRoleNotificationTypeEmail=EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template - notificationType=Notification type -notificationType.group = Group -notificationType.caption = Caption -notificationType.description = Description - +notificationType.group=Group +notificationType.caption=Caption +notificationType.description=Description SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -2926,10 +2920,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails = Person contact details -environmentSampleNotShipped = Not shipped -environmentSampleShipped = Shipped -environmentSampleReceived = Received +TaskExport.personOtherContactDetails=Person contact details +environmentSampleNotShipped=Not shipped +environmentSampleShipped=Shipped +environmentSampleReceived=Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -2946,37 +2940,34 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents - # SpecialCaseAccess SpecialCaseAccess=Special case access -caze = Case -assignedTo = Assigned to -assignedBy = Assigned by -endDateTime = Access until -assignmentDate = Date assigned - +caze=Case +assignedTo=Assigned to +assignedBy=Assigned by +endDateTime=Access until +assignmentDate=Date assigned specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case - # SelfReport -SelfReport.type = Type -SelfReport.reportDate = Report date -SelfReport.disease = Disease -SelfReport.diseaseVariant = Disease variant -SelfReport.firstName = First name -SelfReport.lastName = Last name -SelfReport.sex = Sex -SelfReport.birthdateDD = Day of birth -SelfReport.birthdateMM = Month of birth -SelfReport.birthdateYYYY = Year of birth -SelfReport.nationalHealthId = National health ID -SelfReport.email = Email -SelfReport.phoneNumber = Phone number -SelfReport.address = Address -SelfReport.comment = Comment -SelfReport.responsibleUser = Responsible user -SelfReport.investigationStatus = Investigation status -SelfReport.processingStatus = Processing status +SelfReport.type=Type +SelfReport.reportDate=Report date +SelfReport.disease=Disease +SelfReport.diseaseVariant=Disease variant +SelfReport.firstName=First name +SelfReport.lastName=Last name +SelfReport.sex=Sex +SelfReport.birthdateDD=Day of birth +SelfReport.birthdateMM=Month of birth +SelfReport.birthdateYYYY=Year of birth +SelfReport.nationalHealthId=National health ID +SelfReport.email=Email +SelfReport.phoneNumber=Phone number +SelfReport.address=Address +SelfReport.comment=Comment +SelfReport.responsibleUser=Responsible user +SelfReport.investigationStatus=Investigation status +SelfReport.processingStatus=Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_ja-JP.properties b/sormas-api/src/main/resources/captions_ja-JP.properties index 7ca0f1f4687..1e611b51ccf 100644 --- a/sormas-api/src/main/resources/captions_ja-JP.properties +++ b/sormas-api/src/main/resources/captions_ja-JP.properties @@ -188,13 +188,13 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge = Okay, and continue to merge overview -actionOkAndGoToContactDirectory = Okay, and continue to contact directory -actionOkAndGoToContactDetails = Okay, and continue to contact -actionOkAndGoToPersonDirectory = Okay, and continue to person directory -actionExecuteAutomaticDeletion = Execute automatic deletion -actionDone = Done -actionConfirmAction = Confirm action +actionOkAndGoToMerge=Okay, and continue to merge overview +actionOkAndGoToContactDirectory=Okay, and continue to contact directory +actionOkAndGoToContactDetails=Okay, and continue to contact +actionOkAndGoToPersonDirectory=Okay, and continue to person directory +actionExecuteAutomaticDeletion=Execute automatic deletion +actionDone=Done +actionConfirmAction=Confirm action activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -248,10 +248,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows = Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups = Expired -aggregateReportNoAgeGroup = No age group -aggregateReportShowOnlyDuplicateReports = Display only duplicate reports +aggregateReportShowZeroRows=Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups=Expired +aggregateReportNoAgeGroup=No age group +aggregateReportShowOnlyDuplicateReports=Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -275,7 +275,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend = Send emails +bulkEmailSend=Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -434,6 +434,7 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name +CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1133,7 +1134,6 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: - # Environment Environment=Environment Environment.uuid=Environment ID @@ -1152,54 +1152,51 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location - environmentActiveEnvironments=Active environments -environmentArchivedEnvironments = Archived environments -environmentAllActiveAndArchivedEnvironments = All active and archived environments -environmentDeletedEnvironments = Deleted environments -environmentNewEnvironment= New environment +environmentArchivedEnvironments=Archived environments +environmentAllActiveAndArchivedEnvironments=All active and archived environments +environmentDeletedEnvironments=Deleted environments +environmentNewEnvironment=New environment environmentEnvironmentsList=Environments list - # EnvironmentSample -EnvironmentSample = Environment Sample -EnvironmentSample.uuid = Sample ID -EnvironmentSample.environment = Environment -EnvironmentSample.sampleDateTime = Date of sampling -EnvironmentSample.sampleMaterial = Sample material -EnvironmentSample.otherSampleMaterial = Specify sample material -EnvironmentSample.sampleVolume = Volume (in mL) -EnvironmentSample.fieldSampleId = Field sample ID -EnvironmentSample.turbidity = Turbidity (in NTU) -EnvironmentSample.phValue = pH of sample -EnvironmentSample.sampleTemperature = Temperature (in °C) -EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) -EnvironmentSample.laboratory = Laboratory -EnvironmentSample.laboratoryDetails = Laboratory details -EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested -EnvironmentSample.reportingUser = Reporting user -EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested -EnvironmentSample.weatherConditions = Weather conditions at time of sampling -EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched = Sent/dispatched -EnvironmentSample.dispatchDate = Dispatchment date -EnvironmentSample.dispatchDetails = Dispatchment details -EnvironmentSample.received = Received -EnvironmentSample.receivalDate = Receival date -EnvironmentSample.labSampleId = Lab sample ID -EnvironmentSample.specimenCondition = Specimen condition -EnvironmentSample.location = Location of sampling site -EnvironmentSample.generalComment = General comment -EnvironmentSample.positivePathogenTests = Positive pathogen tests -EnvironmentSample.latestPathogenTest = Latest pathogen test -EnvironmentSample.numberOfTests = Number of tests - +EnvironmentSample=Environment Sample +EnvironmentSample.uuid=Sample ID +EnvironmentSample.environment=Environment +EnvironmentSample.sampleDateTime=Date of sampling +EnvironmentSample.sampleMaterial=Sample material +EnvironmentSample.otherSampleMaterial=Specify sample material +EnvironmentSample.sampleVolume=Volume (in mL) +EnvironmentSample.fieldSampleId=Field sample ID +EnvironmentSample.turbidity=Turbidity (in NTU) +EnvironmentSample.phValue=pH of sample +EnvironmentSample.sampleTemperature=Temperature (in °C) +EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) +EnvironmentSample.laboratory=Laboratory +EnvironmentSample.laboratoryDetails=Laboratory details +EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested +EnvironmentSample.reportingUser=Reporting user +EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested +EnvironmentSample.weatherConditions=Weather conditions at time of sampling +EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched=Sent/dispatched +EnvironmentSample.dispatchDate=Dispatchment date +EnvironmentSample.dispatchDetails=Dispatchment details +EnvironmentSample.received=Received +EnvironmentSample.receivalDate=Receival date +EnvironmentSample.labSampleId=Lab sample ID +EnvironmentSample.specimenCondition=Specimen condition +EnvironmentSample.location=Location of sampling site +EnvironmentSample.generalComment=General comment +EnvironmentSample.positivePathogenTests=Positive pathogen tests +EnvironmentSample.latestPathogenTest=Latest pathogen test +EnvironmentSample.numberOfTests=Number of tests # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents = Deleted events +eventDeletedEvents=Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1343,7 +1340,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants = Deleted event participants +eventParticipantDeletedEventParticipants=Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1356,7 +1353,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser = Reporting user +EventParticipant.reportingUser=Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1393,9 +1390,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink = Event participant ID -EventParticipantSelection.eventUuidLink = Event ID -EventParticipantSelection.resultingCaseUuidLink = Resulting case ID +EventParticipantSelection.eventParticipantUuidLink=Event participant ID +EventParticipantSelection.eventUuidLink=Event ID +EventParticipantSelection.resultingCaseUuidLink=Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1615,7 +1612,6 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message - #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1626,7 +1622,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList = List of new event participants +lineListingNewEventParticipantsList=List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1800,10 +1796,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples = See samples for this person -caseLinkToSamples = See samples for this case -contactLinkToSamples = See samples for this contact -eventParticipantLinkToSamples = See samples for this event participant +personLinkToSamples=See samples for this person +caseLinkToSamples=See samples for this case +contactLinkToSamples=See samples for this contact +eventParticipantLinkToSamples=See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2111,9 +2107,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity = Community of event participant -SampleExport.eventParticipantDistrict = District of event participant -SampleExport.eventParticipantRegion = Region of event participant +SampleExport.eventParticipantCommunity=Community of event participant +SampleExport.eventParticipantDistrict=District of event participant +SampleExport.eventParticipantRegion=Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2172,7 +2168,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser = Reporting user +Immunization.reportingUser=Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2215,10 +2211,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations = Active immunizations -immunizationArchivedImmunizations = Archived immunizations -immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations -immunizationDeletedImmunizations = Deleted immunizations +immunizationActiveImmunizations=Active immunizations +immunizationArchivedImmunizations=Archived immunizations +immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations +immunizationDeletedImmunizations=Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2461,7 +2457,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment = Associated environment +Task.environment=Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2514,7 +2510,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser = Reporting user +TravelEntry.reportingUser=Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -2881,17 +2877,15 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms = SMS -userRoleNotificationTypeEmail = EMAIL +userRoleNotificationTypeSms=SMS +userRoleNotificationTypeEmail=EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template - notificationType=Notification type -notificationType.group = Group -notificationType.caption = Caption -notificationType.description = Description - +notificationType.group=Group +notificationType.caption=Caption +notificationType.description=Description SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -2926,10 +2920,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails = Person contact details -environmentSampleNotShipped = Not shipped -environmentSampleShipped = Shipped -environmentSampleReceived = Received +TaskExport.personOtherContactDetails=Person contact details +environmentSampleNotShipped=Not shipped +environmentSampleShipped=Shipped +environmentSampleReceived=Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -2946,37 +2940,34 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents - # SpecialCaseAccess SpecialCaseAccess=Special case access -caze = Case -assignedTo = Assigned to -assignedBy = Assigned by -endDateTime = Access until -assignmentDate = Date assigned - +caze=Case +assignedTo=Assigned to +assignedBy=Assigned by +endDateTime=Access until +assignmentDate=Date assigned specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case - # SelfReport -SelfReport.type = Type -SelfReport.reportDate = Report date -SelfReport.disease = Disease -SelfReport.diseaseVariant = Disease variant -SelfReport.firstName = First name -SelfReport.lastName = Last name -SelfReport.sex = Sex -SelfReport.birthdateDD = Day of birth -SelfReport.birthdateMM = Month of birth -SelfReport.birthdateYYYY = Year of birth -SelfReport.nationalHealthId = National health ID -SelfReport.email = Email -SelfReport.phoneNumber = Phone number -SelfReport.address = Address -SelfReport.comment = Comment -SelfReport.responsibleUser = Responsible user -SelfReport.investigationStatus = Investigation status -SelfReport.processingStatus = Processing status +SelfReport.type=Type +SelfReport.reportDate=Report date +SelfReport.disease=Disease +SelfReport.diseaseVariant=Disease variant +SelfReport.firstName=First name +SelfReport.lastName=Last name +SelfReport.sex=Sex +SelfReport.birthdateDD=Day of birth +SelfReport.birthdateMM=Month of birth +SelfReport.birthdateYYYY=Year of birth +SelfReport.nationalHealthId=National health ID +SelfReport.email=Email +SelfReport.phoneNumber=Phone number +SelfReport.address=Address +SelfReport.comment=Comment +SelfReport.responsibleUser=Responsible user +SelfReport.investigationStatus=Investigation status +SelfReport.processingStatus=Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_ks-PK.properties b/sormas-api/src/main/resources/captions_ks-PK.properties index 111a929df1f..d52e7461ff0 100644 --- a/sormas-api/src/main/resources/captions_ks-PK.properties +++ b/sormas-api/src/main/resources/captions_ks-PK.properties @@ -14,7 +14,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . ############################################################################### - # General Captions all=All city=City @@ -56,7 +55,6 @@ facility=Facility pointOfEntry=Point of entry remove=Remove reportingUser=Reporting user - # About about=About aboutDocuments=Documents @@ -68,14 +66,12 @@ aboutDataDictionary=Data Dictionary (XLSX) aboutSormasWebsite=Official SORMAS Website aboutTechnicalManual=Technical Manual (PDF) aboutWhatsNew=What's New? - # Action actionNewAction=New action actionNoActions=There are no actions for this %s actionCreatingLabel=Created at %s by %s actionLastModifiedByLabel=Updated at %s by %s actionStatusChangeDate=updated at %s - Action=Action Action.title=Title Action.description=Description @@ -88,13 +84,12 @@ Action.actionContext=Action context Action.actionStatus=Action status Action.lastModifiedBy=Last modified by Action.actionMeasure=Measure - # Actions actionApplyDateFilter=Apply date filter actionArchive=Archive actionAssignNewEpidNumber=Assign new epid number actionBack=Back -actionSend = Send +actionSend=Send actionCancel=Cancel actionClear=Clear actionClearAll=Clear all @@ -133,10 +128,8 @@ actionBackToNationOverview=Back to Nation Overview actionSettings=User Settings actionNewForm=New Form actionOverwrite=Overwrite - # AdditionalTest additionalTestNewTest=New test result - AdditionalTest=Additional test AdditionalTest.altSgpt=ALT/SGPT (U/L) AdditionalTest.arterialVenousBloodGas=Arterial/venous blood gas @@ -160,7 +153,6 @@ AdditionalTest.testDateTime=Date and time of result AdditionalTest.totalBilirubin=Total bilirubin (umol/L) AdditionalTest.urea=Urea (mmol/L) AdditionalTest.wbcCount=WBC count (x10^9/L) - aggregateReportDeathsShort=D aggregateReportLabConfirmationsShort=L aggregateReportLastWeek=Last Week @@ -177,13 +169,11 @@ AggregateReport.labConfirmations=Lab confirmations AggregateReport.deaths=Deaths AggregateReport.healthFacility=Facility AggregateReport.pointOfEntry=Point of Entry - -areaActiveAreas = Active areas -areaArchivedAreas = Archived areas -areaAllAreas = All areas -Area.archived = Archived -Area.externalId = External ID - +areaActiveAreas=Active areas +areaArchivedAreas=Archived areas +areaAllAreas=All areas +Area.archived=Archived +Area.externalId=External ID # Bulk actions bulkActions=Bulk Actions bulkCancelFollowUp=Cancel follow-up @@ -201,7 +191,6 @@ bulkFacility=Change facility bulkInvestigationStatus=Change investigation status bulkLostToFollowUp=Set to lost to follow-up bulkSurveillanceOfficer=Change surveillance officer - # Campaign campaignActiveCampaigns=Active campaigns campaignAllCampaigns=All campaigns @@ -221,7 +210,6 @@ campaignDashboardChartHeight=Height in % campaignDashboardOrder=Order campaignSearch=Search Campaign campaignDiagramGroupBy=Group by - Campaign=Campaign Campaign.name=Name Campaign.description=Description @@ -234,13 +222,11 @@ Campaign.area=Area Campaign.region=Region Campaign.district=District Campaign.community=Community - -CampaignFormData.campaign = Campaign -CampaignFormData.campaignFormMeta = Form -CampaignFormData.formDate = Form date -CampaignFormData.area = Area +CampaignFormData.campaign=Campaign +CampaignFormData.campaignFormMeta=Form +CampaignFormData.formDate=Form date +CampaignFormData.area=Area CampaignFormData.edit=Edit - # CaseData caseCasesList=Cases list caseInfrastructureDataChanged=Infrastructure data has changed @@ -290,9 +276,8 @@ convertEventParticipantToCase=Create case from event participant with positive t convertContactToCase=Create case from contact with positive test result? caseSearchSpecificCase=Search specific case caseSearchCase=Search case -caseSelect= Select case +caseSelect=Select case caseCreateNew=Create new case - CaseData=Case CaseData.additionalDetails=General comment CaseData.caseClassification=Case classification @@ -315,6 +300,7 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name +CaseData.disease=Disease CaseData.district=Responsible district CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -435,7 +421,6 @@ CaseData.notACaseReasonPhysicianInformation=Information provided by physician CaseData.notACaseReasonDifferentPathogen=Verification of different pathogen CaseData.notACaseReasonOther=Other CaseData.notACaseReasonDetails=Reason details - # CaseExport CaseExport.address=Address CaseExport.addressRegion=Address Region @@ -481,7 +466,6 @@ CaseExport.lastCooperativeVisitSymptomatic=Symptomatic at last cooperative visit CaseExport.lastCooperativeVisitSymptoms=Symptoms at last cooperative visit CaseExport.traveled=Traveled outside of district CaseExport.burialAttended=Visited a burial - # CaseHospitalization CaseHospitalization=Hospitalization CaseHospitalization.admissionDate=Date of visit or admission @@ -496,12 +480,9 @@ CaseHospitalization.previousHospitalizations=Previous hospitalizations CaseHospitalization.intensiveCareUnit=Stay in the intensive care unit CaseHospitalization.intensiveCareUnitStart=Start of the stay CaseHospitalization.intensiveCareUnitEnd=End of the stay - - # CaseImport caseImportErrorDescription=Error description caseImportMergeCase=Override existing case with changes from the imported case? - # CasePreviousHospitalization CasePreviousHospitalization=Previous hospitalization CasePreviousHospitalization.admissionAndDischargeDate=Date of admission & discharge @@ -513,10 +494,8 @@ CasePreviousHospitalization.healthFacility=Hospital CasePreviousHospitalization.healthFacilityDetails=Hospital name & description CasePreviousHospitalization.isolated=Isolation CasePreviousHospitalization.prevHospPeriod=Period of hospitalization - # ClinicalVisit clinicalVisitNewClinicalVisit=New clinical assessment - ClinicalVisit=Clinical assessment ClinicalVisit.bloodPressure=Blood pressure ClinicalVisit.heartRate=Heart rate @@ -524,28 +503,22 @@ ClinicalVisit.temperature=Temperature ClinicalVisit.visitDateTime=Date and time of visit ClinicalVisit.visitingPerson=Attending clinician ClinicalVisit.visitRemarks=Clinician remarks - ClinicalVisitExport.caseUuid=Case ID ClinicalVisitExport.caseName=Case name - columnAdditionalTests=Additional tests columnDiseaseShort=Disease columnNumberOfPendingTasks=Pending tasks - # Community Community.archived=Archived Community.externalID=External ID - communityActiveCommunities=Active communities communityArchivedCommunities=Archived communities communityAllCommunities=All communities - # Configuration Configuration.Facilities=Facilities Configuration.Outbreaks=Outbreaks Configuration.PointsOfEntry=Points of Entry Configuration.LineListing=Line Listing - # Contact contactCancelFollowUp=Cancel follow-up contactCaseContacts=Case contacts @@ -582,10 +555,9 @@ contactOnlyWithSharedEventWithSourceCase=Only contacts with source case linked t contactOnlyWithSourceCaseInGivenEvent=Only contacts whose source case is linked to this event contactFollowUpDay=Day contactQuarantineNotOrdered=No quarantine ordered -contactCreatePIAAccount = PIA -contactPersonPhoneNumber = Contact Person's Phone Number -contactSourceCase = Source case - +contactCreatePIAAccount=PIA +contactPersonPhoneNumber=Contact Person's Phone Number +contactSourceCase=Source case Contact=Contact Contact.additionalDetails=General comment Contact.caseClassification=Classification of the source case @@ -602,10 +574,10 @@ Contact.community=Responsible community Contact.contactClassification=Contact classification Contact.contactOfficer=Responsible contact officer Contact.contactOfficerUuid=Responsible contact officer -Contact.contactIdentificationSource = Contact identification source -Contact.contactIdentificationSourceDetails = Contact identification source details -Contact.tracingApp = Tracing app -Contact.tracingAppDetails = Tracing app details, e.g. name +Contact.contactIdentificationSource=Contact identification source +Contact.contactIdentificationSourceDetails=Contact identification source details +Contact.tracingApp=Tracing app +Contact.tracingAppDetails=Tracing app details, e.g. name Contact.contactProximity=Type of contact - if multiple pick the closest contact proximity Contact.contactStatus=Contact status Contact.description=Description of how contact took place @@ -676,7 +648,6 @@ Contact.prohibitionToWork=Prohibition to work Contact.prohibitionToWorkFrom=Prohibition to work from Contact.prohibitionToWorkUntil=Prohibition to work until Contact.reportingDistrict=Reporting district - # ContactExport ContactExport.address=Address ContactExport.addressDistrict=Address District @@ -695,7 +666,6 @@ ContactExport.sourceCaseUuid=Source case ID ContactExport.traveled=Traveled outside of district ContactExport.travelHistory=Travel history ContactExport.quarantineInformation=Quarantine information - # Dashboard dashboardAlive=Alive dashboardApplyCustomFilter=Apply custom filter @@ -819,14 +789,12 @@ dashboardAggregatedNumber=Count dashboardProportion=Proportion (%) dashboardViewAsColumnChart=View as Column Chart dashboardViewAsBarChart=View as Bar Chart - defaultRegion=Default Region defaultDistrict=Default District defaultCommunity=Default Community defaultFacility=Default Facility defaultLaboratory=Default Laboratory defaultPointOfEntry=Default Point Of Entry - devModeCaseCount=Number of generated cases devModeCaseDisease=Disease of the cases devModeCaseDistrict=District of the cases @@ -857,7 +825,6 @@ devModeEventStartDate=Earliest event start date devModeGenerateCases=Generate Cases devModeGenerateContacts=Generate Contacts devModeGenerateEvents=Generate Events - DiseaseBurden.caseCount=New cases DiseaseBurden.caseDeathCount=Fatalities DiseaseBurden.casesDifference=Dynamic @@ -865,20 +832,16 @@ DiseaseBurden.caseFatalityRate=CFR DiseaseBurden.eventCount=Number of events DiseaseBurden.outbreakDistrictCount=Outbreak districts DiseaseBurden.previousCaseCount=Previous cases - # District districtActiveDistricts=Active districts districtArchivedDistricts=Archived districts districtAllDistricts=All districts - District.archived=Archived District.epidCode=Epid code District.growthRate=Growth rate District.population=Population District.externalID=External ID - epiDataNoSourceContacts=No source contacts have been created for this case - EpiData=Epidemiological data EpiData.areaInfectedAnimals=Residing, working or travelling to an area where infected animals have been confirmed EpiData.exposureDetailsKnown=Exposure details known @@ -886,11 +849,9 @@ EpiData.exposures=Exposures EpiData.highTransmissionRiskArea=Residing or working in an area with high risk of transmission of the disease, e.g. closed residential and camp-like settings EpiData.largeOutbreaksArea=Residing or travelling to countries/territories/areas experiencing larger outbreaks of local transmission EpiData.contactWithSourceCaseKnown=Contacts with source case known - # Documents documentUploadDocument=New document documentNoDocuments=There are no documents for this %s - # DocumentTemplate DocumentTemplate=Document Template DocumentTemplate.buttonUploadTemplate=Upload Template @@ -907,7 +868,6 @@ DocumentTemplate.exampleTemplateCases=Example Template Cases DocumentTemplate.exampleTemplateContacts=Example Template Contacts DocumentTemplate.exampleTemplateEventHandout=Example Template Event Handout DocumentTemplate.exampleTemplateEventParticipants=Example Template Event Participants - # Event eventActiveEvents=Active events eventArchivedEvents=Archived events @@ -935,7 +895,6 @@ eventUnlinkEvent=Unlink event eventOpenSuperordinateEvent=Open event eventEditEvent=Edit event eventLinkToEventsWithinTheSameFacility=See events within the same facility - Event=Event Event.caseCount=Cases Event.contactCount=Contacts @@ -992,7 +951,6 @@ Event.typeOfPlaceText=Specify other event place Event.uuid=Event ID Event.transregionalOutbreak=Transregional outbreak Event.diseaseTransmissionMode=Primary mode of transmission - # Event action EventAction.eventUuid=Event id EventAction.eventTitle=Event title @@ -1009,18 +967,14 @@ EventAction.actionChangeDate=Action change date EventAction.actionStatus=Action status EventAction.actionPriority=Action priority EventAction.actionLastModifiedBy=Action last modified by - # Event action export EventActionExport.eventDate=Date of event - #Event export - # EventParticipant eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant - EventParticipant=Event participant EventParticipant.contactCount=Contact count EventParticipant.event=Event @@ -1034,7 +988,6 @@ EventParticipant.person=Person EventParticipant.uuid=Event participant ID EventParticipant.region=Responsible region EventParticipant.district=Responsible district - #EventParticipant export EventParticipantExport.eventParticipantU=Event disease EventParticipantExport.eventDisease=Event disease @@ -1059,7 +1012,6 @@ EventParticipantExport.sampleInformation=Sample information EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID - # Expo export=Export exportBasic=Basic Export @@ -1074,16 +1026,13 @@ exportCaseManagement=Case Management Export exportCaseCustom=Custom Case Export exportNewExportConfiguration=New Export Configuration exportEditExportConfiguration=Edit Export Configuration - ExportConfiguration.NAME=Configuration name ExportConfiguration.myExports=My exports ExportConfiguration.sharedExports=Shared exports ExportConfiguration.sharedToPublic=Shared to public - exposureFlightNumber=Flight number exposureTimePeriod=Time period exposureSourceCaseName=Name of source case - Exposure.startDate=Start of exposure Exposure.endDate=End of exposure Exposure.exposureType=Type of activity @@ -1134,16 +1083,13 @@ Exposure.prophylaxisDate=Date of prophylaxis Exposure.riskArea=Risk area as defined by public health institution Exposure.exposureDate=Exposure date Exposure.exposureRole=Role - # Facility facilityActiveFacilities=Active facilities facilityArchivedFacilities=Archived facilities facilityAllFacilities=All facilities - Facility.CONFIGURED_FACILITY=Configured facility Facility.NO_FACILITY=Home or other place Facility.OTHER_FACILITY=Other facility - Facility.archived=Archived Facility.city=City Facility.community=Community @@ -1156,22 +1102,18 @@ Facility.publicOwnership=Public ownership Facility.region=Region Facility.type=Facility type Facility.typeGroup=Facility category - FeatureConfiguration.districtName=District FeatureConfiguration.enabled=Line listing enabled? FeatureConfiguration.endDate=End date - # Formats formatNumberOfVisitsFormat=%d (%d missed) formatNumberOfVisitsLongFormat=%d visits (%d missed) formatSimpleNumberFormat=%d - # FollowUp FollowUp.uuid=Follow-up ID FollowUp.person=Follow-up person FollowUp.reportDate=Date of report FollowUp.followUpUntil=Follow-up until - # HealthConditions HealthConditions=Health conditions HealthConditions.tuberculosis=Tuberculosis @@ -1197,7 +1139,6 @@ HealthConditions.formerSmoker=Former smoker\t\t HealthConditions.asthma=Asthma HealthConditions.sickleCellDisease=Sickle cell disease\t HealthConditions.immunodeficiencyIncludingHiv=Immunodeficiency including HIV - # Import importDetailed=Detailed Import importDownloadCaseImportTemplate=Download Case Import Template @@ -1214,7 +1155,6 @@ importLineListing=Line Listing Import importProcessed=%d/%d Processed importSkips=%d Skipped importCancelImport=Cancel import - #Lab Message LabMessage=Lab Message LabMessage.labMessageDetails=Lab message details @@ -1236,12 +1176,10 @@ LabMessage.sampleMaterial=Type of sample LabMessage.sampleReceivedDate=Sample received LabMessage.specimenCondition=Specimen condition LabMessage.testedDisease=Tested disease - -labMessageFetch= Fetch lab messages +labMessageFetch=Fetch lab messages labMessageProcess=Process labMessageProcessed=Processed labMessageUnprocessed=Unprocessed - #Line listing lineListingAddLine=Add line lineListingInfrastructureData=Take over infrastructure data from last line @@ -1254,7 +1192,6 @@ lineListingEnableAll=Enable all lineListingDisableAllShort=Disable all lineListingEndDate=End date lineListingSetEndDateForAll=Set end date for all - # Location Location=Location Location.additionalInformation=Additional information @@ -1272,31 +1209,27 @@ Location.latLonAccuracy=GPS accuracy in m Location.longitude=GPS longitude Location.postalCode=Postal code Location.street=Street - # Login Login.doLogIn=Log in Login.login=Login Login.password=password Login.username=username - #LoginSidebar LoginSidebar.diseaseDetection=Disease Detection LoginSidebar.diseasePrevention=Disease Prevention LoginSidebar.outbreakResponse=Outbreak Response LoginSidebar.poweredBy=Powered By - # Messaging messagesSendSMS=Send SMS messagesSentBy=Sent by messagesNoSmsSentForCase=No SMS sent to case person messagesNoPhoneNumberForCasePerson=Case person has no phone number -messagesSms = SMS -messagesEmail = Email -messagesSendingSms = Send new SMS -messagesNumberOfMissingPhoneNumbers = Number of selected cases without phone number\: %s -messagesCharacters = Characters\: %d / 160 -messagesNumberOfMessages = Nr. of messages\: %d - +messagesSms=SMS +messagesEmail=Email +messagesSendingSms=Send new SMS +messagesNumberOfMissingPhoneNumbers=Number of selected cases without phone number\: %s +messagesCharacters=Characters\: %d / 160 +messagesNumberOfMessages=Nr. of messages\: %d # Main Menu mainMenuAbout=About mainMenuCampaigns=Campaigns @@ -1312,7 +1245,6 @@ mainMenuStatistics=Statistics mainMenuTasks=Tasks mainMenuUsers=Users mainMenuAggregateReports=mSERS - MaternalHistory.childrenNumber=Total number of children MaternalHistory.ageAtBirth=Mother's age at birth of infant patient MaternalHistory.conjunctivitis=Conjunctivitis @@ -1339,19 +1271,16 @@ MaternalHistory.otherComplications=Other complications MaternalHistory.otherComplicationsOnset=Date of onset MaternalHistory.otherComplicationsMonth=Month of pregnancy MaternalHistory.otherComplicationsDetails=Complication details - # Outbreak outbreakAffectedDistricts=Affected districts outbreakNoOutbreak=No outbreak outbreakNormal=Normal outbreakOutbreak=Outbreak - # PathogenTest pathogenTestCreateNew=Create new pathogen test pathogenTestNewResult=New result pathogenTestNewTest=New test result pathogenTestSelect=Select pathogen test - PathogenTest=Pathogen test PathogenTests=Pathogen tests PathogenTest.fourFoldIncreaseAntibodyTiter=4 fold increase of antibody titer @@ -1368,7 +1297,6 @@ PathogenTest.testedDiseaseDetails=Tested disease name PathogenTest.typingId=Typing ID PathogenTest.serotype=Serotype PathogenTest.cqValue=CQ/CT Value - # Person personPersonsList=Person list personCreateNew=Create a new person @@ -1381,7 +1309,6 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person - Person=Person Person.address=Home address Person.addresses=Addresses @@ -1453,11 +1380,9 @@ Person.otherSalutation=Other salutation Person.birthName=Birth name Person.birthCountry=Country of birth Person.citizenship=Citizenship - pointOfEntryActivePointsOfEntry=Active points of entry pointOfEntryArchivedPointsOfEntry=Archived points of entry pointOfEntryAllPointsOfEntry=All points of entry - PointOfEntry.OTHER_AIRPORT=Other airport PointOfEntry.OTHER_SEAPORT=Other seaport PointOfEntry.OTHER_GROUND_CROSSING=Other ground crossing @@ -1467,10 +1392,8 @@ PointOfEntry.active=Active? PointOfEntry.latitude=Latitude PointOfEntry.longitude=Longitude PointOfEntry.externalID=External ID - populationDataMaleTotal=Male total populationDataFemaleTotal=Female total - PortHealthInfo=Port health information PortHealthInfo.airlineName=Airline name PortHealthInfo.flightNumber=Flight number @@ -1494,10 +1417,8 @@ PortHealthInfo.conveyanceTypeDetails=Specify the conveyance type PortHealthInfo.departureLocation=Start location of travel PortHealthInfo.finalDestination=Final destination PortHealthInfo.details=Point of entry details - # Prescription prescriptionNewPrescription=New prescription - Prescription.additionalNotes=Additional notes Prescription.dose=Dose Prescription.drugIntakeDetails=Drug name @@ -1513,33 +1434,27 @@ Prescription.prescriptionType=Prescription type Prescription.route=Route Prescription.routeDetails=Route specification Prescription.typeOfDrug=Type of drug - PrescriptionExport.caseUuid=Case ID PrescriptionExport.caseName=Case name - # Country countryActiveCountries=Active countries countryArchivedCountries=Archived countries countryAllCountries=All countries - Country.archived=Archived Country.externalId=External ID Country.defaultName=Default name Country.displayName=Name Country.isoCode=ISO code Country.unoCode=UNO code - # Region regionActiveRegions=Active regions regionArchivedRegions=Archived regions regionAllRegions=All regions - Region.archived=Archived Region.epidCode=Epid code Region.growthRate=Growth rate Region.population=Population Region.externalID=External ID - # Sample sampleCreateNew=Create new sample sampleIncludeTestOnCreation=Create test result for this sample now @@ -1566,7 +1481,6 @@ sampleActiveSamples=Active samples sampleArchivedSamples=Archived samples sampleAllSamples=All samples sampleAssociationType=Sample type - Sample=Sample Sample.additionalTestingRequested=Request additional tests to be performed? Sample.additionalTestingStatus=Additional testing status @@ -1616,23 +1530,22 @@ Sample.testType=Type of test Sample.typeOfTest=Type of test Sample.uuid=Sample ID Sample.samplePurpose=Purpose of the Sample - SampleExport.additionalTestingRequested=Have additional tests been requested? SampleExport.personAddressCaption=Address of case/contact/event participant person SampleExport.personAge=Age of case/contact/event participant person SampleExport.caseDistrict=District of case SampleExport.caseCommunity=Community of case SampleExport.caseFacility=Facility of case -SampleExport.contactRegion = Region of contact -SampleExport.contactDistrict = District of contact -SampleExport.contactCommunity = Community of contact +SampleExport.contactRegion=Region of contact +SampleExport.contactDistrict=District of contact +SampleExport.contactCommunity=Community of contact SampleExport.caseOutcome=Outcome of case SampleExport.caseRegion=Region of case SampleExport.caseReportDate=Case report date SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID -SampleExport.contactUuid = Contact UUID -SampleExport.contactReportDate = Contact report date +SampleExport.contactUuid=Contact UUID +SampleExport.contactReportDate=Contact report date SampleExport.id=Sample SN SampleExport.sampleReportDate=Sample report date SampleExport.noTestPossibleReason=No test possible reason @@ -1684,7 +1597,6 @@ SampleExport.testDateTime=Date and time of latest additional test SampleExport.totalBilirubin=Total bilirubin of latest additional test SampleExport.urea=Urea of latest additional test SampleExport.wbcCount=WBC count of latest additional test - # Statistics statisticsAddFilter=Add filter statisticsAttribute=Attribute @@ -1707,13 +1619,11 @@ statisticsStatistics=Statistics statisticsVisualizationType=Type statisticsIncidenceDivisor=Incidence divisor statisticsDataDisplayed=Data displayed - # Symptoms symptomsLesionsLocations=Localization of the lesions symptomsMaxTemperature=Maximum body temperature in ° C symptomsSetClearedToNo=Set cleared to No symptomsSetClearedToUnknown=Set cleared to Unknown - Symptoms=Symptoms Symptoms.abdominalPain=Abdominal pain Symptoms.alteredConsciousness=Altered level of consciousness @@ -1901,7 +1811,6 @@ Symptoms.palpitations=Palpitations Symptoms.dizzinessStandingUp=Dizziness (when standing up from a sitting or lying position) Symptoms.highOrLowBloodPressure=Blood pressure too high or too low (measured) Symptoms.urinaryRetention=Urinary retention - # Task taskMyTasks=My tasks taskNewTask=New task @@ -1910,7 +1819,6 @@ taskOfficerTasks=Officer tasks taskActiveTasks=Active tasks taskArchivedTasks=Archived tasks taskAllTasks=All tasks - Task=Task Task.assigneeReply=Comments on execution Task.assigneeUser=Assigned to @@ -1928,9 +1836,7 @@ Task.suggestedStart=Suggested start Task.taskContext=Task context Task.taskStatus=Task status Task.taskType=Task type - # TestReport - TestReport.testDateTime=Date and time of result TestReport.testLabCity=Lab city TestReport.testLabExternalId=Lab external ID @@ -1938,12 +1844,10 @@ TestReport.testLabName=Lab name TestReport.testLabPostalCode=Lab postal code TestReport.testResult=Test result TestReport.testType=Type of test - # Treatment treatmentCreateTreatment=Create treatment treatmentNewTreatment=New treatment treatmentOpenPrescription=Open prescription - Treatment.additionalNotes=Additional notes Treatment.dose=Dose Treatment.drugIntakeDetails=Drug name @@ -1957,10 +1861,8 @@ Treatment.treatmentDetails=Treatment details Treatment.treatmentType=Treatment type Treatment.typeOfDrug=Type of drug Treatment.treatmentRoute=Treatment route - TreatmentExport.caseUuid=Case ID TreatmentExport.caseName=Case name - # User userNewUser=New user userResetPassword=Create new password @@ -1970,7 +1872,6 @@ syncUsers=Sync Users syncErrors=%d Error(s) syncSuccessful=%d Synced syncProcessed=%d/%d Processed - User=User User.active=Active? User.associatedOfficer=Associated officer @@ -1985,20 +1886,16 @@ User.userName=User name User.userRoles=User roles User.address=Address User.uuid=UUID - # Views View.actions=Action Directory - View.aggregatereports=Aggregate Reporting (mSERS) View.aggregatereports.sub= - View.campaign.campaigns=Campaign Directory View.campaign.campaigns.short=Campaigns View.campaign.campaigndata=Campaign Data View.campaign.campaigndata.short=Campaign Data View.campaign.campaigndata.dataform=Campaign Data Form View.campaign.campaigndata.dataform.short=Data Form - View.cases=Case Directory View.cases.merge=Merge Duplicate Cases View.cases.archive=Case Archive @@ -2014,10 +1911,8 @@ View.cases.clinicalcourse=Clinical Course View.cases.maternalhistory=Maternal History View.cases.porthealthinfo=Port Health Information View.cases.visits=Case Visits - View.persons=Person Directory View.persons.data=Person Information - View.configuration.communities=Communities Configuration View.configuration.communities.short=Communities View.configuration.districts=Districts Configuration @@ -2048,7 +1943,6 @@ View.configuration.populationdata=Population Data View.configuration.populationdata.short=Population View.configuration.linelisting=Line Listing Configuration View.configuration.linelisting.short=Line Listing - View.contacts=Contact Directory View.contacts.archive=Contact Archive View.contacts.epidata=Contact Epidemiological Data @@ -2056,11 +1950,9 @@ View.contacts.data=Contact Information View.contacts.person=Contact Person View.contacts.sub= View.contacts.visits=Contact Visits - View.dashboard.contacts=Contacts Dashboard View.dashboard.surveillance=Surveillance Dashboard View.dashboard.campaigns=Campaigns Dashboard - View.events=Event Directory View.events.archive=Event Archive View.events.data=Event Information @@ -2068,30 +1960,22 @@ View.events.eventactions=Event Actions View.events.eventparticipants=Event Participants View.events.sub= View.events.eventparticipants.data=Event Participant Information - View.samples.labMessages=Lab Message Directory - View.reports=Weekly Reports View.reports.sub= - View.samples=Sample Directory View.samples.archive=Sample Archive View.samples.data=Sample Information View.samples.sub= - View.statistics=Statistics View.statistics.database-export=Database export - View.tasks=Task Management View.tasks.archive=Task Archive View.tasks.sub= - View.users=User Management View.users.sub= - # Visit visitNewVisit=New visit - Visit=Visit Visit.person=Visited person Visit.symptoms=Symptoms @@ -2103,24 +1987,19 @@ Visit.visitUser=Visiting officer Visit.disease=Disease Visit.reportLat=Report latitude Visit.reportLon=Report longitude - # WeeklyReport weeklyReportNoReport=Missing report weeklyReportOfficerInformants=Informants weeklyReportsInDistrict=Weekly Reports in %s weeklyReportRegionOfficers=Officers weeklyReportRegionInformants=Informants - WeeklyReport.epiWeek=Epi Week WeeklyReport.year=Year - # WeeklyReportEntry WeeklyReportEntry.numberOfCases=Cases reported - # WeeklyReportInformantSummary WeeklyReportInformantSummary.informantReportDate=Informant report submission WeeklyReportInformantSummary.totalCaseCount=Cases reported by informant - # WeeklyReportOfficerSummary WeeklyReportOfficerSummary.informants=Number of informants WeeklyReportOfficerSummary.informantReports=Number of informant reports @@ -2129,7 +2008,6 @@ WeeklyReportOfficerSummary.informantZeroReports=Number of informant zero reports WeeklyReportOfficerSummary.officer=Officer WeeklyReportOfficerSummary.officerReportDate=Officer report submission WeeklyReportOfficerSummary.totalCaseCount=Cases reported by officer - # WeeklyReportRegionSummary WeeklyReportRegionSummary.informants=Number of informants WeeklyReportRegionSummary.informantReports=Number of informant reports @@ -2139,7 +2017,6 @@ WeeklyReportRegionSummary.officers=Number of officers WeeklyReportRegionSummary.officerReports=Number of officers reports WeeklyReportRegionSummary.officerReportPercentage=Percentage WeeklyReportRegionSummary.officerZeroReports=Number of officer zero reports - # SORMAS to SORMAS SormasToSormasOptions.organization=Orgainzation SormasToSormasOptions.withAssociatedContacts=Share associated contacts @@ -2160,23 +2037,17 @@ sormasToSormasSharedWith=Shared with sormasToSormasSharedBy=By sormasToSormasSharedDate=On sormasToSormasSentFrom=Sent from - BAGExport=BAG Export - # Survnet Gateway SurvnetGateway.title=SurvNet SurvnetGateway.send=send to own SurvNet instance SurvnetGateway.unableToSend=Unable to send SurvnetGateway.confirmSend=Confirm sending SurvnetGateway.sendShort=Send to SurvNet - patientDiaryRegistrationError=Could not register person in the patient diary. patientDiaryPersonNotExportable=Cannot export the person to the patient diary. The person needs a valid birthdate and either a valid phone number or email address. - showPlacesOnMap=Show - changeUserEmail=Change user email - VaccinationInfo.vaccination=Vaccination status for this disease VaccinationInfo.firstVaccinationDate=Date of first vaccination VaccinationInfo.lastVaccinationDate=Date of last vaccination diff --git a/sormas-api/src/main/resources/captions_ku-TR.properties b/sormas-api/src/main/resources/captions_ku-TR.properties index af730baa12a..8f7bd72f939 100644 --- a/sormas-api/src/main/resources/captions_ku-TR.properties +++ b/sormas-api/src/main/resources/captions_ku-TR.properties @@ -14,7 +14,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . ############################################################################### - # General Captions all=All area=Area @@ -61,7 +60,6 @@ pointOfEntry=Point of entry remove=Remove reportingUser=Reporting user notTestedYet=Not tested yet - # About about=About aboutDocuments=Documents @@ -73,14 +71,12 @@ aboutDataDictionary=Data Dictionary (XLSX) aboutSormasWebsite=Official SORMAS Website aboutTechnicalManual=Technical Manual (PDF) aboutWhatsNew=What's New? - # Action actionNewAction=New action actionNoActions=There are no actions for this %s actionCreatingLabel=Created at %s by %s actionLastModifiedByLabel=Updated at %s by %s actionStatusChangeDate=updated at %s - Action=Action Action.title=Title Action.description=Description @@ -93,13 +89,12 @@ Action.actionContext=Action context Action.actionStatus=Action status Action.lastModifiedBy=Last modified by Action.actionMeasure=Measure - # Actions actionApplyDateFilter=Apply date filter actionArchive=Archive actionAssignNewEpidNumber=Assign new epid number actionBack=Back -actionSend = Send +actionSend=Send actionCancel=Cancel actionClear=Clear actionClearAll=Clear all @@ -146,9 +141,7 @@ actionRemindMeLater=Remind me later actionGroupEvent=Group actionUnclearLabMessage=Mark as unclear actionManualForwardLabMessage=Mark as forwarded - activityAsCaseFlightNumber=Flight number - ActivityAsCase.startDate=Start of activity ActivityAsCase.endDate=End of activity ActivityAsCase.activityAsCaseDate=Activity date @@ -168,10 +161,8 @@ ActivityAsCase.gatheringDetails=Type of gathering details ActivityAsCase.habitationType=Type of habitation ActivityAsCase.habitationDetails=Type of habitation details ActivityAsCase.role=Role - # AdditionalTest additionalTestNewTest=New test result - AdditionalTest=Additional test AdditionalTest.altSgpt=ALT/SGPT (U/L) AdditionalTest.arterialVenousBloodGas=Arterial/venous blood gas @@ -195,7 +186,6 @@ AdditionalTest.testDateTime=Date and time of result AdditionalTest.totalBilirubin=Total bilirubin (umol/L) AdditionalTest.urea=Urea (mmol/L) AdditionalTest.wbcCount=WBC count (x10^9/L) - aggregateReportDeathsShort=D aggregateReportLabConfirmationsShort=L aggregateReportLastWeek=Last Week @@ -212,13 +202,11 @@ AggregateReport.labConfirmations=Lab confirmations AggregateReport.deaths=Deaths AggregateReport.healthFacility=Facility AggregateReport.pointOfEntry=Point of Entry - -areaActiveAreas = Active areas -areaArchivedAreas = Archived areas -areaAllAreas = All areas -Area.archived = Archived -Area.externalId = External ID - +areaActiveAreas=Active areas +areaArchivedAreas=Archived areas +areaAllAreas=All areas +Area.archived=Archived +Area.externalId=External ID # Bulk actions bulkActions=Bulk Actions bulkCancelFollowUp=Cancel follow-up @@ -236,7 +224,6 @@ bulkFacility=Change facility bulkInvestigationStatus=Change investigation status bulkLostToFollowUp=Set to lost to follow-up bulkSurveillanceOfficer=Change surveillance officer - # Campaign campaignActiveCampaigns=Active campaigns campaignAllCampaigns=All campaigns @@ -256,7 +243,6 @@ campaignDashboardChartHeight=Height in % campaignDashboardOrder=Order campaignSearch=Search Campaign campaignDiagramGroupBy=Group by - Campaign=Campaign Campaign.name=Name Campaign.description=Description @@ -270,13 +256,11 @@ Campaign.region=Region Campaign.district=District Campaign.community=Community Campaign.grouping=Grouping - -CampaignFormData.campaign = Campaign -CampaignFormData.campaignFormMeta = Form -CampaignFormData.formDate = Form date -CampaignFormData.area = Area +CampaignFormData.campaign=Campaign +CampaignFormData.campaignFormMeta=Form +CampaignFormData.formDate=Form date +CampaignFormData.area=Area CampaignFormData.edit=Edit - # CaseData caseCasesList=Cases list caseInfrastructureDataChanged=Infrastructure data has changed @@ -301,7 +285,6 @@ caseFilterCasesWithReinfection=Only cases with reinfection caseFilterOnlyCasesNotSharedWithExternalSurvTool=Only cases not yet shared with reporting tool caseFilterOnlyCasesSharedWithExternalSurvToo=Only cases already shared with reporting tool caseFilterOnlyCasesChangedSinceLastSharedWithExternalSurvTool=Only cases changed since last shared with reporting tool - caseFacilityDetailsShort=Facility name caseLineListing=Line listing caseNewCase=New case @@ -331,9 +314,8 @@ convertEventParticipantToCase=Create case from event participant with positive t convertContactToCase=Create case from contact with positive test result? caseSearchSpecificCase=Search specific case caseSearchCase=Search case -caseSelect= Select case +caseSelect=Select case caseCreateNew=Create new case - CaseData=Case CaseData.additionalDetails=General comment CaseData.caseClassification=Case classification @@ -358,6 +340,7 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name +CaseData.disease=Disease CaseData.district=Responsible district CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -481,7 +464,6 @@ CaseData.expectedFollowUpUntil=Expected follow-up until CaseData.surveillanceToolLastShareDate=Last shared with reporting tool CaseData.surveillanceToolShareCount=Reporting tool share count CaseData.surveillanceToolStatus=Reporting tool status - # CaseExport CaseExport.address=Address CaseExport.addressRegion=Address Region @@ -527,7 +509,6 @@ CaseExport.lastCooperativeVisitSymptomatic=Symptomatic at last cooperative visit CaseExport.lastCooperativeVisitSymptoms=Symptoms at last cooperative visit CaseExport.traveled=Traveled outside of district CaseExport.burialAttended=Visited a burial - # CaseHospitalization CaseHospitalization=Hospitalization CaseHospitalization.admissionDate=Date of visit or admission @@ -544,12 +525,9 @@ CaseHospitalization.intensiveCareUnitStart=Start of the stay CaseHospitalization.intensiveCareUnitEnd=End of the stay CaseHospitalization.hospitalizationReason=Reason for hospitalization CaseHospitalization.otherHospitalizationReason=Specify reason - - # CaseImport caseImportErrorDescription=Error description caseImportMergeCase=Override existing case with changes from the imported case? - # CasePreviousHospitalization CasePreviousHospitalization=Previous hospitalization CasePreviousHospitalization.admissionAndDischargeDate=Date of admission & discharge @@ -566,10 +544,8 @@ CasePreviousHospitalization.otherHospitalizationReason=Specify reason CasePreviousHospitalization.intensiveCareUnit=Stay in the intensive care unit CasePreviousHospitalization.intensiveCareUnitStart=Start of the stay CasePreviousHospitalization.intensiveCareUnitEnd=End of the stay - # ClinicalVisit clinicalVisitNewClinicalVisit=New clinical assessment - ClinicalVisit=Clinical assessment ClinicalVisit.bloodPressure=Blood pressure ClinicalVisit.heartRate=Heart rate @@ -577,28 +553,22 @@ ClinicalVisit.temperature=Temperature ClinicalVisit.visitDateTime=Date and time of visit ClinicalVisit.visitingPerson=Attending clinician ClinicalVisit.visitRemarks=Clinician remarks - ClinicalVisitExport.caseUuid=Case ID ClinicalVisitExport.caseName=Case name - columnAdditionalTests=Additional tests columnDiseaseShort=Disease columnNumberOfPendingTasks=Pending tasks - # Community Community.archived=Archived Community.externalID=External ID - communityActiveCommunities=Active communities communityArchivedCommunities=Archived communities communityAllCommunities=All communities - # Configuration Configuration.Facilities=Facilities Configuration.Outbreaks=Outbreaks Configuration.PointsOfEntry=Points of Entry Configuration.LineListing=Line Listing - # Contact contactCancelFollowUp=Cancel follow-up contactCaseContacts=Case contacts @@ -635,9 +605,8 @@ contactOnlyWithSharedEventWithSourceCase=Only contacts with source case linked t contactOnlyWithSourceCaseInGivenEvent=Only contacts whose source case is linked to this event contactFollowUpDay=Day contactQuarantineNotOrdered=No quarantine ordered -contactPersonPhoneNumber = Contact Person's Phone Number -contactSourceCase = Source case - +contactPersonPhoneNumber=Contact Person's Phone Number +contactSourceCase=Source case Contact=Contact Contact.additionalDetails=General comment Contact.caseClassification=Classification of the source case @@ -653,10 +622,10 @@ Contact.community=Responsible community Contact.contactClassification=Contact classification Contact.contactOfficer=Responsible contact officer Contact.contactOfficerUuid=Responsible contact officer -Contact.contactIdentificationSource = Contact identification source -Contact.contactIdentificationSourceDetails = Contact identification source details -Contact.tracingApp = Tracing app -Contact.tracingAppDetails = Tracing app details, e.g. name +Contact.contactIdentificationSource=Contact identification source +Contact.contactIdentificationSourceDetails=Contact identification source details +Contact.tracingApp=Tracing app +Contact.tracingAppDetails=Tracing app details, e.g. name Contact.contactProximity=Type of contact - if multiple pick the closest contact proximity Contact.contactStatus=Contact status Contact.description=Description of how contact took place @@ -730,7 +699,6 @@ Contact.reportingDistrict=Reporting district Contact.followUpStatusChangeDate=Date of follow-up status change Contact.followUpStatusChangeUser=Responsible user Contact.expectedFollowUpUntil=Expected follow-up until - # ContactExport ContactExport.address=Address ContactExport.addressDistrict=Address District @@ -749,7 +717,6 @@ ContactExport.sourceCaseUuid=Source case ID ContactExport.traveled=Traveled outside of district ContactExport.travelHistory=Travel history ContactExport.quarantineInformation=Quarantine information - # Dashboard dashboardAlive=Alive dashboardApplyCustomFilter=Apply custom filter @@ -873,14 +840,12 @@ dashboardAggregatedNumber=Count dashboardProportion=Proportion (%) dashboardViewAsColumnChart=View as Column Chart dashboardViewAsBarChart=View as Bar Chart - defaultRegion=Default Region defaultDistrict=Default District defaultCommunity=Default Community defaultFacility=Default Facility defaultLaboratory=Default Laboratory defaultPointOfEntry=Default Point Of Entry - devModeCaseCount=Number of generated cases devModeCaseDisease=Disease of the cases devModeCaseDistrict=District of the cases @@ -930,7 +895,6 @@ devModeGeneratorSeed=Generator Seed devModeLoadDefaultConfig=Load default config devModeLoadPerformanceTestConfig=Load performance testing config devModeUseSeed=Use Seed - DiseaseBurden.caseCount=New cases DiseaseBurden.caseDeathCount=Fatalities DiseaseBurden.casesDifference=Dynamic @@ -938,35 +902,29 @@ DiseaseBurden.caseFatalityRate=CFR DiseaseBurden.eventCount=Number of events DiseaseBurden.outbreakDistrictCount=Outbreak districts DiseaseBurden.previousCaseCount=Previous cases - # District districtActiveDistricts=Active districts districtArchivedDistricts=Archived districts districtAllDistricts=All districts - District.archived=Archived District.epidCode=Epid code District.growthRate=Growth rate District.population=Population District.externalID=External ID - epiDataNoSourceContacts=No source contacts have been created for this case - EpiData=Epidemiological data EpiData.areaInfectedAnimals=Residing, working or travelling to an area where infected animals have been confirmed EpiData.exposureDetailsKnown=Exposure details known EpiData.exposures=Exposures -EpiData.activityAsCaseDetailsKnown = Activity details known -EpiData.activitiesAsCase = Activities as case +EpiData.activityAsCaseDetailsKnown=Activity details known +EpiData.activitiesAsCase=Activities as case EpiData.highTransmissionRiskArea=Residing or working in an area with high risk of transmission of the disease, e.g. closed residential and camp-like settings EpiData.largeOutbreaksArea=Residing or travelling to countries/territories/areas experiencing larger outbreaks of local transmission EpiData.contactWithSourceCaseKnown=Contacts with source case known - # Documents documentUploadDocument=New document documentNoDocuments=There are no documents for this %s bulkActionCreatDocuments=Create quarantine order documents - # DocumentTemplate DocumentTemplate=Document Template DocumentTemplate.buttonUploadTemplate=Upload Template @@ -983,7 +941,6 @@ DocumentTemplate.exampleTemplateCases=Example Template Cases DocumentTemplate.exampleTemplateContacts=Example Template Contacts DocumentTemplate.exampleTemplateEventHandout=Example Template Event Handout DocumentTemplate.exampleTemplateEventParticipants=Example Template Event Participants - # Event eventActiveEvents=Active events eventArchivedEvents=Archived events @@ -1025,7 +982,6 @@ eventLinkToEventsWithinTheSameFacility=See events within the same facility eventNoDisease=No disease eventGroups=Event groups eventGroupsMultiple=This event is related to %s event groups - Event=Event Event.caseCount=Cases Event.contactCount=Contacts @@ -1091,7 +1047,6 @@ Event.internalId=Internal ID Event.eventGroups=Groups Event.latestEventGroup=Latest Event Group Event.eventGroupCount=Event Group Count - # Event action EventAction.eventUuid=Event id EventAction.eventTitle=Event title @@ -1108,18 +1063,14 @@ EventAction.actionChangeDate=Action change date EventAction.actionStatus=Action status EventAction.actionPriority=Action priority EventAction.actionLastModifiedBy=Action last modified by - # Event action export EventActionExport.eventDate=Date of event - #Event export - # EventParticipant eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant - EventParticipant=Event participant EventParticipant.contactCount=Contact count EventParticipant.event=Event @@ -1133,7 +1084,6 @@ EventParticipant.person=Person EventParticipant.uuid=Event participant ID EventParticipant.region=Responsible region EventParticipant.district=Responsible district - #EventParticipant export EventParticipantExport.eventParticipantU=Event disease EventParticipantExport.eventDisease=Event disease @@ -1158,13 +1108,11 @@ EventParticipantExport.sampleInformation=Sample information EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID - # Event Group EventGroup=Event group EventGroup.uuid=Group id EventGroup.name=Group name EventGroup.eventCount=Event count - # Expo export=Export exportBasic=Basic Export @@ -1179,17 +1127,14 @@ exportCaseManagement=Case Management Export exportCaseCustom=Custom Case Export exportNewExportConfiguration=New Export Configuration exportEditExportConfiguration=Edit Export Configuration - ExportConfiguration.NAME=Configuration name ExportConfiguration.myExports=My exports ExportConfiguration.sharedExports=Shared exports ExportConfiguration.sharedToPublic=Shared to public - exposureFlightNumber=Flight number exposureTimePeriod=Time period exposureSourceCaseName=Name of source case - -Exposure.probableInfectionEnvironment= Probable infection environment +Exposure.probableInfectionEnvironment=Probable infection environment Exposure.startDate=Start of exposure Exposure.endDate=End of exposure Exposure.exposureType=Type of activity @@ -1241,16 +1186,13 @@ Exposure.riskArea=Risk area as defined by public health institution Exposure.exposureDate=Exposure date Exposure.exposureRole=Role Exposure.largeAttendanceNumber=More than 300 attendees - # Facility facilityActiveFacilities=Active facilities facilityArchivedFacilities=Archived facilities facilityAllFacilities=All facilities - Facility.CONFIGURED_FACILITY=Configured facility Facility.NO_FACILITY=Home or other place Facility.OTHER_FACILITY=Other facility - Facility.additionalInformation=Additional information Facility.archived=Archived Facility.areaType=Area type (urban/rural) @@ -1268,26 +1210,22 @@ Facility.publicOwnership=Public ownership Facility.region=Region Facility.type=Facility type Facility.typeGroup=Facility category -Facility.contactPersonFirstName = Contact person first name -Facility.contactPersonLastName = Contact person last name -Facility.contactPersonPhone = Contact person phone number -Facility.contactPersonEmail = Contact person email address - +Facility.contactPersonFirstName=Contact person first name +Facility.contactPersonLastName=Contact person last name +Facility.contactPersonPhone=Contact person phone number +Facility.contactPersonEmail=Contact person email address FeatureConfiguration.districtName=District FeatureConfiguration.enabled=Line listing enabled? FeatureConfiguration.endDate=End date - # Formats formatNumberOfVisitsFormat=%d (%d missed) formatNumberOfVisitsLongFormat=%d visits (%d missed) formatSimpleNumberFormat=%d - # FollowUp FollowUp.uuid=Follow-up ID FollowUp.person=Follow-up person FollowUp.reportDate=Date of report FollowUp.followUpUntil=Follow-up until - # HealthConditions HealthConditions=Health conditions HealthConditions.tuberculosis=Tuberculosis @@ -1313,7 +1251,6 @@ HealthConditions.formerSmoker=Former smoker\t\t HealthConditions.asthma=Asthma HealthConditions.sickleCellDisease=Sickle cell disease\t HealthConditions.immunodeficiencyIncludingHiv=Immunodeficiency including HIV - # Import importDetailed=Detailed Import importDownloadCaseImportTemplate=Download Case Import Template @@ -1331,7 +1268,6 @@ importProcessed=%d/%d Processed importSkips=%d Skipped importCancelImport=Cancel import infrastructureImportAllowOverwrite=Overwrite existing entries with imported data - #Lab Message LabMessage=Lab Message LabMessage.labMessageDetails=Lab message details @@ -1356,11 +1292,9 @@ LabMessage.testedDisease=Tested disease labMessage.deleteNewlyCreatedCase=Delete new case you just created labMessage.deleteNewlyCreatedContact=Delete new contact you just created labMessage.deleteNewlyCreatedEventParticipant=Delete new event participant you just created - -labMessageFetch= Fetch lab messages +labMessageFetch=Fetch lab messages labMessageProcess=Process labMessageNoNewMessages=No new messages available - #Line listing lineListingAddLine=Add line lineListingInfrastructureData=Take over infrastructure data from last line @@ -1373,7 +1307,6 @@ lineListingEnableAll=Enable all lineListingDisableAllShort=Disable all lineListingEndDate=End date lineListingSetEndDateForAll=Set end date for all - # Location Location=Location Location.additionalInformation=Additional information @@ -1391,35 +1324,31 @@ Location.latLonAccuracy=GPS accuracy in m Location.longitude=GPS longitude Location.postalCode=Postal code Location.street=Street -Location.contactPersonFirstName = Contact person first name -Location.contactPersonLastName = Contact person last name -Location.contactPersonPhone = Contact person phone number -Location.contactPersonEmail = Contact person email address - +Location.contactPersonFirstName=Contact person first name +Location.contactPersonLastName=Contact person last name +Location.contactPersonPhone=Contact person phone number +Location.contactPersonEmail=Contact person email address # Login Login.doLogIn=Log in Login.login=Login Login.password=password Login.username=username - #LoginSidebar LoginSidebar.diseaseDetection=Disease Detection LoginSidebar.diseasePrevention=Disease Prevention LoginSidebar.outbreakResponse=Outbreak Response LoginSidebar.poweredBy=Powered By - # Messaging messagesSendSMS=Send SMS messagesSentBy=Sent by messagesNoSmsSentForCase=No SMS sent to case person messagesNoPhoneNumberForCasePerson=Case person has no phone number -messagesSms = SMS -messagesEmail = Email -messagesSendingSms = Send new SMS -messagesNumberOfMissingPhoneNumbers = Number of selected cases without phone number\: %s -messagesCharacters = Characters\: %d / 160 -messagesNumberOfMessages = Nr. of messages\: %d - +messagesSms=SMS +messagesEmail=Email +messagesSendingSms=Send new SMS +messagesNumberOfMissingPhoneNumbers=Number of selected cases without phone number\: %s +messagesCharacters=Characters\: %d / 160 +messagesNumberOfMessages=Nr. of messages\: %d # Main Menu mainMenuAbout=About mainMenuCampaigns=Campaigns @@ -1435,7 +1364,6 @@ mainMenuStatistics=Statistics mainMenuTasks=Tasks mainMenuUsers=Users mainMenuAggregateReports=mSERS - MaternalHistory.childrenNumber=Total number of children MaternalHistory.ageAtBirth=Mother's age at birth of infant patient MaternalHistory.conjunctivitis=Conjunctivitis @@ -1462,19 +1390,16 @@ MaternalHistory.otherComplications=Other complications MaternalHistory.otherComplicationsOnset=Date of onset MaternalHistory.otherComplicationsMonth=Month of pregnancy MaternalHistory.otherComplicationsDetails=Complication details - # Outbreak outbreakAffectedDistricts=Affected districts outbreakNoOutbreak=No outbreak outbreakNormal=Normal outbreakOutbreak=Outbreak - # PathogenTest pathogenTestCreateNew=Create new pathogen test pathogenTestNewResult=New result pathogenTestNewTest=New test result pathogenTestSelect=Select pathogen test - PathogenTest=Pathogen test PathogenTests=Pathogen tests PathogenTest.fourFoldIncreaseAntibodyTiter=4 fold increase of antibody titer @@ -1493,7 +1418,6 @@ PathogenTest.serotype=Serotype PathogenTest.cqValue=CQ/CT Value PathogenTest.reportDate=Report date PathogenTest.viaLims=Via LIMS - # Person personPersonsList=Person list personCreateNew=Create a new person @@ -1509,7 +1433,6 @@ personLinkToContacts=See contacts for this person personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated - Person=Person Person.address=Home address Person.addresses=Addresses @@ -1582,27 +1505,23 @@ Person.otherSalutation=Other salutation Person.birthName=Birth name Person.birthCountry=Country of birth Person.citizenship=Citizenship - -personContactDetailOwner = Owner -personContactDetailOwnerName = Owner name -personContactDetailThisPerson = This person -personContactDetailThirdParty = Collect contact details of another person or facility - -PersonContactDetail.person = Person -PersonContactDetail.primaryContact = Primary contact details -PersonContactDetail.personContactDetailType = Type of contact details -PersonContactDetail.phoneNumberType = Phone number type -PersonContactDetail.details = Details -PersonContactDetail.contactInformation = Contact information -PersonContactDetail.additionalInformation = Additional information -PersonContactDetail.thirdParty = Third party -PersonContactDetail.thirdPartyRole = Third party role -PersonContactDetail.thirdPartyName = Third party name - +personContactDetailOwner=Owner +personContactDetailOwnerName=Owner name +personContactDetailThisPerson=This person +personContactDetailThirdParty=Collect contact details of another person or facility +PersonContactDetail.person=Person +PersonContactDetail.primaryContact=Primary contact details +PersonContactDetail.personContactDetailType=Type of contact details +PersonContactDetail.phoneNumberType=Phone number type +PersonContactDetail.details=Details +PersonContactDetail.contactInformation=Contact information +PersonContactDetail.additionalInformation=Additional information +PersonContactDetail.thirdParty=Third party +PersonContactDetail.thirdPartyRole=Third party role +PersonContactDetail.thirdPartyName=Third party name pointOfEntryActivePointsOfEntry=Active points of entry pointOfEntryArchivedPointsOfEntry=Archived points of entry pointOfEntryAllPointsOfEntry=All points of entry - PointOfEntry.OTHER_AIRPORT=Other airport PointOfEntry.OTHER_SEAPORT=Other seaport PointOfEntry.OTHER_GROUND_CROSSING=Other ground crossing @@ -1612,10 +1531,8 @@ PointOfEntry.active=Active? PointOfEntry.latitude=Latitude PointOfEntry.longitude=Longitude PointOfEntry.externalID=External ID - populationDataMaleTotal=Male total populationDataFemaleTotal=Female total - PortHealthInfo=Port health information PortHealthInfo.airlineName=Airline name PortHealthInfo.flightNumber=Flight number @@ -1639,10 +1556,8 @@ PortHealthInfo.conveyanceTypeDetails=Specify the conveyance type PortHealthInfo.departureLocation=Start location of travel PortHealthInfo.finalDestination=Final destination PortHealthInfo.details=Point of entry details - # Prescription prescriptionNewPrescription=New prescription - Prescription.additionalNotes=Additional notes Prescription.dose=Dose Prescription.drugIntakeDetails=Drug name @@ -1658,36 +1573,29 @@ Prescription.prescriptionType=Prescription type Prescription.route=Route Prescription.routeDetails=Route specification Prescription.typeOfDrug=Type of drug - PrescriptionExport.caseUuid=Case ID PrescriptionExport.caseName=Case name - # Continent continentActiveContinents=Active continents continentArchivedContinents=Archived continents continentAllContinents=All continents - Continent.archived=Archived Continent.externalId=External ID Continent.defaultName=Default name Continent.displayName=Name - # Subcontinent subcontinentActiveSubcontinents=Active subcontinents subcontinentArchivedSubcontinents=Archived subcontinents subcontinentAllSubcontinents=All subcontinents - Subcontinent.archived=Archived Subcontinent.externalId=External ID Subcontinent.defaultName=Default name Subcontinent.displayName=Name Subcontinent.continent=Continent name - # Country countryActiveCountries=Active countries countryArchivedCountries=Archived countries countryAllCountries=All countries - Country.archived=Archived Country.externalId=External ID Country.defaultName=Default name @@ -1695,19 +1603,16 @@ Country.displayName=Name Country.isoCode=ISO code Country.unoCode=UNO code Country.subcontinent=Subcontinent - # Region regionActiveRegions=Active regions regionArchivedRegions=Archived regions regionAllRegions=All regions - Region.archived=Archived Region.epidCode=Epid code Region.growthRate=Growth rate Region.population=Population Region.externalID=External ID Region.country=Country - # Sample sampleCreateNew=Create new sample sampleIncludeTestOnCreation=Create test result for this sample now @@ -1734,7 +1639,6 @@ sampleActiveSamples=Active samples sampleArchivedSamples=Archived samples sampleAllSamples=All samples sampleAssociationType=Sample type - Sample=Sample Sample.additionalTestingRequested=Request additional tests to be performed? Sample.additionalTestingStatus=Additional testing status @@ -1786,23 +1690,22 @@ Sample.uuid=Sample ID Sample.samplePurpose=Purpose of the Sample Sample.samplingReason=Reason for sampling/testing Sample.samplingReasonDetails=Sampling reason details - SampleExport.additionalTestingRequested=Have additional tests been requested? SampleExport.personAddressCaption=Address of case/contact/event participant person SampleExport.personAge=Age of case/contact/event participant person SampleExport.caseDistrict=District of case SampleExport.caseCommunity=Community of case SampleExport.caseFacility=Facility of case -SampleExport.contactRegion = Region of contact -SampleExport.contactDistrict = District of contact -SampleExport.contactCommunity = Community of contact +SampleExport.contactRegion=Region of contact +SampleExport.contactDistrict=District of contact +SampleExport.contactCommunity=Community of contact SampleExport.caseOutcome=Outcome of case SampleExport.caseRegion=Region of case SampleExport.caseReportDate=Case report date SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID -SampleExport.contactUuid = Contact UUID -SampleExport.contactReportDate = Contact report date +SampleExport.contactUuid=Contact UUID +SampleExport.contactReportDate=Contact report date SampleExport.id=Sample SN SampleExport.sampleReportDate=Sample report date SampleExport.noTestPossibleReason=No test possible reason @@ -1854,7 +1757,6 @@ SampleExport.testDateTime=Date and time of latest additional test SampleExport.totalBilirubin=Total bilirubin of latest additional test SampleExport.urea=Urea of latest additional test SampleExport.wbcCount=WBC count of latest additional test - # Statistics statisticsAddFilter=Add filter statisticsAttribute=Attribute @@ -1877,13 +1779,11 @@ statisticsStatistics=Statistics statisticsVisualizationType=Type statisticsIncidenceDivisor=Incidence divisor statisticsDataDisplayed=Data displayed - # Symptoms symptomsLesionsLocations=Localization of the lesions symptomsMaxTemperature=Maximum body temperature in ° C symptomsSetClearedToNo=Set cleared to No symptomsSetClearedToUnknown=Set cleared to Unknown - Symptoms=Symptoms Symptoms.abdominalPain=Abdominal pain Symptoms.alteredConsciousness=Altered level of consciousness @@ -2071,7 +1971,6 @@ Symptoms.palpitations=Palpitations Symptoms.dizzinessStandingUp=Dizziness (when standing up from a sitting or lying position) Symptoms.highOrLowBloodPressure=Blood pressure too high or too low (measured) Symptoms.urinaryRetention=Urinary retention - # Task taskMyTasks=My tasks taskNewTask=New task @@ -2080,7 +1979,6 @@ taskOfficerTasks=Officer tasks taskActiveTasks=Active tasks taskArchivedTasks=Archived tasks taskAllTasks=All tasks - Task=Task Task.assigneeReply=Comments on execution Task.assigneeUser=Assigned to @@ -2098,9 +1996,7 @@ Task.suggestedStart=Suggested start Task.taskContext=Task context Task.taskStatus=Task status Task.taskType=Task type - # TestReport - TestReport.testDateTime=Date and time of result TestReport.testLabCity=Lab city TestReport.testLabExternalId=Lab external ID @@ -2108,12 +2004,10 @@ TestReport.testLabName=Lab name TestReport.testLabPostalCode=Lab postal code TestReport.testResult=Test result TestReport.testType=Type of test - # Treatment treatmentCreateTreatment=Create treatment treatmentNewTreatment=New treatment treatmentOpenPrescription=Open prescription - Treatment.additionalNotes=Additional notes Treatment.dose=Dose Treatment.drugIntakeDetails=Drug name @@ -2127,10 +2021,8 @@ Treatment.treatmentDetails=Treatment details Treatment.treatmentType=Treatment type Treatment.typeOfDrug=Type of drug Treatment.treatmentRoute=Treatment route - TreatmentExport.caseUuid=Case ID TreatmentExport.caseName=Case name - # User userNewUser=New user userResetPassword=Create new password @@ -2140,7 +2032,6 @@ syncUsers=Sync Users syncErrors=%d Error(s) syncSuccessful=%d Synced syncProcessed=%d/%d Processed - User=User User.active=Active? User.associatedOfficer=Associated officer @@ -2155,14 +2046,11 @@ User.userName=User name User.userRoles=User roles User.address=Address User.uuid=UUID - # Views View.actions=Action Directory View.groups=Group Directory - View.aggregatereports=Aggregate Reporting (mSERS) View.aggregatereports.sub= - View.campaign.campaigns=Campaign Directory View.campaign.campaigns.short=Campaigns View.campaign.campaigndata=Campaign Data @@ -2171,7 +2059,6 @@ View.campaign.campaigndata.dataform=Campaign Data Form View.campaign.campaigndata.dataform.short=Data Form View.campaign.campaignstatistics=Campaign statistics View.campaign.campaignstatistics.short=Campaign statistics - View.cases=Case Directory View.cases.merge=Merge Duplicate Cases View.cases.archive=Case Archive @@ -2187,10 +2074,8 @@ View.cases.clinicalcourse=Clinical Course View.cases.maternalhistory=Maternal History View.cases.porthealthinfo=Port Health Information View.cases.visits=Case Visits - View.persons=Person Directory View.persons.data=Person Information - View.configuration.communities=Communities Configuration View.configuration.communities.short=Communities View.configuration.districts=Districts Configuration @@ -2225,7 +2110,6 @@ View.configuration.populationdata=Population Data View.configuration.populationdata.short=Population View.configuration.linelisting=Line Listing Configuration View.configuration.linelisting.short=Line Listing - View.contacts=Contact Directory View.contacts.archive=Contact Archive View.contacts.epidata=Contact Epidemiological Data @@ -2233,11 +2117,9 @@ View.contacts.data=Contact Information View.contacts.person=Contact Person View.contacts.sub= View.contacts.visits=Contact Visits - View.dashboard.contacts=Contacts Dashboard View.dashboard.surveillance=Surveillance Dashboard View.dashboard.campaigns=Campaigns Dashboard - View.events=Event Directory View.events.archive=Event Archive View.events.data=Event Information @@ -2245,30 +2127,22 @@ View.events.eventactions=Event Actions View.events.eventparticipants=Event Participants View.events.sub= View.events.eventparticipants.data=Event Participant Information - View.samples.labMessages=Lab Message Directory - View.reports=Weekly Reports View.reports.sub= - View.samples=Sample Directory View.samples.archive=Sample Archive View.samples.data=Sample Information View.samples.sub= - View.statistics=Statistics View.statistics.database-export=Database export - View.tasks=Task Management View.tasks.archive=Task Archive View.tasks.sub= - View.users=User Management View.users.sub= - # Visit visitNewVisit=New visit - Visit=Visit Visit.person=Visited person Visit.symptoms=Symptoms @@ -2280,24 +2154,19 @@ Visit.visitUser=Visiting officer Visit.disease=Disease Visit.reportLat=Report latitude Visit.reportLon=Report longitude - # WeeklyReport weeklyReportNoReport=Missing report weeklyReportOfficerInformants=Informants weeklyReportsInDistrict=Weekly Reports in %s weeklyReportRegionOfficers=Officers weeklyReportRegionInformants=Informants - WeeklyReport.epiWeek=Epi Week WeeklyReport.year=Year - # WeeklyReportEntry WeeklyReportEntry.numberOfCases=Cases reported - # WeeklyReportInformantSummary WeeklyReportInformantSummary.informantReportDate=Informant report submission WeeklyReportInformantSummary.totalCaseCount=Cases reported by informant - # WeeklyReportOfficerSummary WeeklyReportOfficerSummary.informants=Number of informants WeeklyReportOfficerSummary.informantReports=Number of informant reports @@ -2306,7 +2175,6 @@ WeeklyReportOfficerSummary.informantZeroReports=Number of informant zero reports WeeklyReportOfficerSummary.officer=Officer WeeklyReportOfficerSummary.officerReportDate=Officer report submission WeeklyReportOfficerSummary.totalCaseCount=Cases reported by officer - # WeeklyReportRegionSummary WeeklyReportRegionSummary.informants=Number of informants WeeklyReportRegionSummary.informantReports=Number of informant reports @@ -2316,7 +2184,6 @@ WeeklyReportRegionSummary.officers=Number of officers WeeklyReportRegionSummary.officerReports=Number of officers reports WeeklyReportRegionSummary.officerReportPercentage=Percentage WeeklyReportRegionSummary.officerZeroReports=Number of officer zero reports - # SORMAS to SORMAS SormasToSormasOptions.organization=Orgainzation SormasToSormasOptions.withAssociatedContacts=Share associated contacts @@ -2342,9 +2209,7 @@ sormasToSormasSharedBy=By sormasToSormasSharedDate=On sormasToSormasSentFrom=Sent from sormasToSormasSendLabMessage=Send to another organization - BAGExport=BAG Export - # Survnet Gateway ExternalSurveillanceToolGateway.title=Reporting Tool ExternalSurveillanceToolGateway.send=Send to reporting tool @@ -2352,15 +2217,11 @@ ExternalSurveillanceToolGateway.unableToSend=Unable to send ExternalSurveillanceToolGateway.confirmSend=Confirm sending ExternalSurveillanceToolGateway.notTransferred=Not yet sent to reporting tool ExternalSurveillanceToolGateway.confirmDelete=Confirm delete - patientDiaryRegistrationError=Could not register person in the patient diary. patientDiaryCancelError=Could not cancel external journal follow-up patientDiaryPersonNotExportable=Cannot export the person to the patient diary. The person needs a valid birthdate and either a valid phone number or email address. - showPlacesOnMap=Show - changeUserEmail=Change user email - VaccinationInfo.vaccination=Vaccination status for this disease VaccinationInfo.firstVaccinationDate=Date of first vaccination VaccinationInfo.lastVaccinationDate=Date of last vaccination @@ -2374,7 +2235,6 @@ VaccinationInfo.vaccineInn=INN VaccinationInfo.vaccineBatchNumber=Batch number VaccinationInfo.vaccineUniiCode=UNII code VaccinationInfo.vaccineAtcCode=ATC code - SurveillanceReport=Report SurveillanceReport.reportingType=Type of reporting SurveillanceReport.creatingUser=Creating user @@ -2388,7 +2248,6 @@ SurveillanceReport.facilityDetails=Facility details SurveillanceReport.notificationDetails=Details surveillanceReportNewReport=New report surveillanceReportNoReportsForCase=There are no reports for this case - cancelExternalFollowUpButton=Cancel external follow-up createSymptomJournalAccountButton=Create PIA Account registerInPatientDiaryButton=Register in CLIMEDO eDiary @@ -2397,7 +2256,6 @@ patientDiaryOptionsButton=CLIMEDO eDiary openInSymptomJournalButton=Open in PIA openInPatientDiaryButton=Open in CLIMEDO cancelExternalFollowUpPopupTitle=Cancel External Follow-Up - # User role/right exportUserRoles=Export user roles userRights=User Rights diff --git a/sormas-api/src/main/resources/captions_la-LA.properties b/sormas-api/src/main/resources/captions_la-LA.properties index 111a929df1f..d52e7461ff0 100644 --- a/sormas-api/src/main/resources/captions_la-LA.properties +++ b/sormas-api/src/main/resources/captions_la-LA.properties @@ -14,7 +14,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . ############################################################################### - # General Captions all=All city=City @@ -56,7 +55,6 @@ facility=Facility pointOfEntry=Point of entry remove=Remove reportingUser=Reporting user - # About about=About aboutDocuments=Documents @@ -68,14 +66,12 @@ aboutDataDictionary=Data Dictionary (XLSX) aboutSormasWebsite=Official SORMAS Website aboutTechnicalManual=Technical Manual (PDF) aboutWhatsNew=What's New? - # Action actionNewAction=New action actionNoActions=There are no actions for this %s actionCreatingLabel=Created at %s by %s actionLastModifiedByLabel=Updated at %s by %s actionStatusChangeDate=updated at %s - Action=Action Action.title=Title Action.description=Description @@ -88,13 +84,12 @@ Action.actionContext=Action context Action.actionStatus=Action status Action.lastModifiedBy=Last modified by Action.actionMeasure=Measure - # Actions actionApplyDateFilter=Apply date filter actionArchive=Archive actionAssignNewEpidNumber=Assign new epid number actionBack=Back -actionSend = Send +actionSend=Send actionCancel=Cancel actionClear=Clear actionClearAll=Clear all @@ -133,10 +128,8 @@ actionBackToNationOverview=Back to Nation Overview actionSettings=User Settings actionNewForm=New Form actionOverwrite=Overwrite - # AdditionalTest additionalTestNewTest=New test result - AdditionalTest=Additional test AdditionalTest.altSgpt=ALT/SGPT (U/L) AdditionalTest.arterialVenousBloodGas=Arterial/venous blood gas @@ -160,7 +153,6 @@ AdditionalTest.testDateTime=Date and time of result AdditionalTest.totalBilirubin=Total bilirubin (umol/L) AdditionalTest.urea=Urea (mmol/L) AdditionalTest.wbcCount=WBC count (x10^9/L) - aggregateReportDeathsShort=D aggregateReportLabConfirmationsShort=L aggregateReportLastWeek=Last Week @@ -177,13 +169,11 @@ AggregateReport.labConfirmations=Lab confirmations AggregateReport.deaths=Deaths AggregateReport.healthFacility=Facility AggregateReport.pointOfEntry=Point of Entry - -areaActiveAreas = Active areas -areaArchivedAreas = Archived areas -areaAllAreas = All areas -Area.archived = Archived -Area.externalId = External ID - +areaActiveAreas=Active areas +areaArchivedAreas=Archived areas +areaAllAreas=All areas +Area.archived=Archived +Area.externalId=External ID # Bulk actions bulkActions=Bulk Actions bulkCancelFollowUp=Cancel follow-up @@ -201,7 +191,6 @@ bulkFacility=Change facility bulkInvestigationStatus=Change investigation status bulkLostToFollowUp=Set to lost to follow-up bulkSurveillanceOfficer=Change surveillance officer - # Campaign campaignActiveCampaigns=Active campaigns campaignAllCampaigns=All campaigns @@ -221,7 +210,6 @@ campaignDashboardChartHeight=Height in % campaignDashboardOrder=Order campaignSearch=Search Campaign campaignDiagramGroupBy=Group by - Campaign=Campaign Campaign.name=Name Campaign.description=Description @@ -234,13 +222,11 @@ Campaign.area=Area Campaign.region=Region Campaign.district=District Campaign.community=Community - -CampaignFormData.campaign = Campaign -CampaignFormData.campaignFormMeta = Form -CampaignFormData.formDate = Form date -CampaignFormData.area = Area +CampaignFormData.campaign=Campaign +CampaignFormData.campaignFormMeta=Form +CampaignFormData.formDate=Form date +CampaignFormData.area=Area CampaignFormData.edit=Edit - # CaseData caseCasesList=Cases list caseInfrastructureDataChanged=Infrastructure data has changed @@ -290,9 +276,8 @@ convertEventParticipantToCase=Create case from event participant with positive t convertContactToCase=Create case from contact with positive test result? caseSearchSpecificCase=Search specific case caseSearchCase=Search case -caseSelect= Select case +caseSelect=Select case caseCreateNew=Create new case - CaseData=Case CaseData.additionalDetails=General comment CaseData.caseClassification=Case classification @@ -315,6 +300,7 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name +CaseData.disease=Disease CaseData.district=Responsible district CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -435,7 +421,6 @@ CaseData.notACaseReasonPhysicianInformation=Information provided by physician CaseData.notACaseReasonDifferentPathogen=Verification of different pathogen CaseData.notACaseReasonOther=Other CaseData.notACaseReasonDetails=Reason details - # CaseExport CaseExport.address=Address CaseExport.addressRegion=Address Region @@ -481,7 +466,6 @@ CaseExport.lastCooperativeVisitSymptomatic=Symptomatic at last cooperative visit CaseExport.lastCooperativeVisitSymptoms=Symptoms at last cooperative visit CaseExport.traveled=Traveled outside of district CaseExport.burialAttended=Visited a burial - # CaseHospitalization CaseHospitalization=Hospitalization CaseHospitalization.admissionDate=Date of visit or admission @@ -496,12 +480,9 @@ CaseHospitalization.previousHospitalizations=Previous hospitalizations CaseHospitalization.intensiveCareUnit=Stay in the intensive care unit CaseHospitalization.intensiveCareUnitStart=Start of the stay CaseHospitalization.intensiveCareUnitEnd=End of the stay - - # CaseImport caseImportErrorDescription=Error description caseImportMergeCase=Override existing case with changes from the imported case? - # CasePreviousHospitalization CasePreviousHospitalization=Previous hospitalization CasePreviousHospitalization.admissionAndDischargeDate=Date of admission & discharge @@ -513,10 +494,8 @@ CasePreviousHospitalization.healthFacility=Hospital CasePreviousHospitalization.healthFacilityDetails=Hospital name & description CasePreviousHospitalization.isolated=Isolation CasePreviousHospitalization.prevHospPeriod=Period of hospitalization - # ClinicalVisit clinicalVisitNewClinicalVisit=New clinical assessment - ClinicalVisit=Clinical assessment ClinicalVisit.bloodPressure=Blood pressure ClinicalVisit.heartRate=Heart rate @@ -524,28 +503,22 @@ ClinicalVisit.temperature=Temperature ClinicalVisit.visitDateTime=Date and time of visit ClinicalVisit.visitingPerson=Attending clinician ClinicalVisit.visitRemarks=Clinician remarks - ClinicalVisitExport.caseUuid=Case ID ClinicalVisitExport.caseName=Case name - columnAdditionalTests=Additional tests columnDiseaseShort=Disease columnNumberOfPendingTasks=Pending tasks - # Community Community.archived=Archived Community.externalID=External ID - communityActiveCommunities=Active communities communityArchivedCommunities=Archived communities communityAllCommunities=All communities - # Configuration Configuration.Facilities=Facilities Configuration.Outbreaks=Outbreaks Configuration.PointsOfEntry=Points of Entry Configuration.LineListing=Line Listing - # Contact contactCancelFollowUp=Cancel follow-up contactCaseContacts=Case contacts @@ -582,10 +555,9 @@ contactOnlyWithSharedEventWithSourceCase=Only contacts with source case linked t contactOnlyWithSourceCaseInGivenEvent=Only contacts whose source case is linked to this event contactFollowUpDay=Day contactQuarantineNotOrdered=No quarantine ordered -contactCreatePIAAccount = PIA -contactPersonPhoneNumber = Contact Person's Phone Number -contactSourceCase = Source case - +contactCreatePIAAccount=PIA +contactPersonPhoneNumber=Contact Person's Phone Number +contactSourceCase=Source case Contact=Contact Contact.additionalDetails=General comment Contact.caseClassification=Classification of the source case @@ -602,10 +574,10 @@ Contact.community=Responsible community Contact.contactClassification=Contact classification Contact.contactOfficer=Responsible contact officer Contact.contactOfficerUuid=Responsible contact officer -Contact.contactIdentificationSource = Contact identification source -Contact.contactIdentificationSourceDetails = Contact identification source details -Contact.tracingApp = Tracing app -Contact.tracingAppDetails = Tracing app details, e.g. name +Contact.contactIdentificationSource=Contact identification source +Contact.contactIdentificationSourceDetails=Contact identification source details +Contact.tracingApp=Tracing app +Contact.tracingAppDetails=Tracing app details, e.g. name Contact.contactProximity=Type of contact - if multiple pick the closest contact proximity Contact.contactStatus=Contact status Contact.description=Description of how contact took place @@ -676,7 +648,6 @@ Contact.prohibitionToWork=Prohibition to work Contact.prohibitionToWorkFrom=Prohibition to work from Contact.prohibitionToWorkUntil=Prohibition to work until Contact.reportingDistrict=Reporting district - # ContactExport ContactExport.address=Address ContactExport.addressDistrict=Address District @@ -695,7 +666,6 @@ ContactExport.sourceCaseUuid=Source case ID ContactExport.traveled=Traveled outside of district ContactExport.travelHistory=Travel history ContactExport.quarantineInformation=Quarantine information - # Dashboard dashboardAlive=Alive dashboardApplyCustomFilter=Apply custom filter @@ -819,14 +789,12 @@ dashboardAggregatedNumber=Count dashboardProportion=Proportion (%) dashboardViewAsColumnChart=View as Column Chart dashboardViewAsBarChart=View as Bar Chart - defaultRegion=Default Region defaultDistrict=Default District defaultCommunity=Default Community defaultFacility=Default Facility defaultLaboratory=Default Laboratory defaultPointOfEntry=Default Point Of Entry - devModeCaseCount=Number of generated cases devModeCaseDisease=Disease of the cases devModeCaseDistrict=District of the cases @@ -857,7 +825,6 @@ devModeEventStartDate=Earliest event start date devModeGenerateCases=Generate Cases devModeGenerateContacts=Generate Contacts devModeGenerateEvents=Generate Events - DiseaseBurden.caseCount=New cases DiseaseBurden.caseDeathCount=Fatalities DiseaseBurden.casesDifference=Dynamic @@ -865,20 +832,16 @@ DiseaseBurden.caseFatalityRate=CFR DiseaseBurden.eventCount=Number of events DiseaseBurden.outbreakDistrictCount=Outbreak districts DiseaseBurden.previousCaseCount=Previous cases - # District districtActiveDistricts=Active districts districtArchivedDistricts=Archived districts districtAllDistricts=All districts - District.archived=Archived District.epidCode=Epid code District.growthRate=Growth rate District.population=Population District.externalID=External ID - epiDataNoSourceContacts=No source contacts have been created for this case - EpiData=Epidemiological data EpiData.areaInfectedAnimals=Residing, working or travelling to an area where infected animals have been confirmed EpiData.exposureDetailsKnown=Exposure details known @@ -886,11 +849,9 @@ EpiData.exposures=Exposures EpiData.highTransmissionRiskArea=Residing or working in an area with high risk of transmission of the disease, e.g. closed residential and camp-like settings EpiData.largeOutbreaksArea=Residing or travelling to countries/territories/areas experiencing larger outbreaks of local transmission EpiData.contactWithSourceCaseKnown=Contacts with source case known - # Documents documentUploadDocument=New document documentNoDocuments=There are no documents for this %s - # DocumentTemplate DocumentTemplate=Document Template DocumentTemplate.buttonUploadTemplate=Upload Template @@ -907,7 +868,6 @@ DocumentTemplate.exampleTemplateCases=Example Template Cases DocumentTemplate.exampleTemplateContacts=Example Template Contacts DocumentTemplate.exampleTemplateEventHandout=Example Template Event Handout DocumentTemplate.exampleTemplateEventParticipants=Example Template Event Participants - # Event eventActiveEvents=Active events eventArchivedEvents=Archived events @@ -935,7 +895,6 @@ eventUnlinkEvent=Unlink event eventOpenSuperordinateEvent=Open event eventEditEvent=Edit event eventLinkToEventsWithinTheSameFacility=See events within the same facility - Event=Event Event.caseCount=Cases Event.contactCount=Contacts @@ -992,7 +951,6 @@ Event.typeOfPlaceText=Specify other event place Event.uuid=Event ID Event.transregionalOutbreak=Transregional outbreak Event.diseaseTransmissionMode=Primary mode of transmission - # Event action EventAction.eventUuid=Event id EventAction.eventTitle=Event title @@ -1009,18 +967,14 @@ EventAction.actionChangeDate=Action change date EventAction.actionStatus=Action status EventAction.actionPriority=Action priority EventAction.actionLastModifiedBy=Action last modified by - # Event action export EventActionExport.eventDate=Date of event - #Event export - # EventParticipant eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant - EventParticipant=Event participant EventParticipant.contactCount=Contact count EventParticipant.event=Event @@ -1034,7 +988,6 @@ EventParticipant.person=Person EventParticipant.uuid=Event participant ID EventParticipant.region=Responsible region EventParticipant.district=Responsible district - #EventParticipant export EventParticipantExport.eventParticipantU=Event disease EventParticipantExport.eventDisease=Event disease @@ -1059,7 +1012,6 @@ EventParticipantExport.sampleInformation=Sample information EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID - # Expo export=Export exportBasic=Basic Export @@ -1074,16 +1026,13 @@ exportCaseManagement=Case Management Export exportCaseCustom=Custom Case Export exportNewExportConfiguration=New Export Configuration exportEditExportConfiguration=Edit Export Configuration - ExportConfiguration.NAME=Configuration name ExportConfiguration.myExports=My exports ExportConfiguration.sharedExports=Shared exports ExportConfiguration.sharedToPublic=Shared to public - exposureFlightNumber=Flight number exposureTimePeriod=Time period exposureSourceCaseName=Name of source case - Exposure.startDate=Start of exposure Exposure.endDate=End of exposure Exposure.exposureType=Type of activity @@ -1134,16 +1083,13 @@ Exposure.prophylaxisDate=Date of prophylaxis Exposure.riskArea=Risk area as defined by public health institution Exposure.exposureDate=Exposure date Exposure.exposureRole=Role - # Facility facilityActiveFacilities=Active facilities facilityArchivedFacilities=Archived facilities facilityAllFacilities=All facilities - Facility.CONFIGURED_FACILITY=Configured facility Facility.NO_FACILITY=Home or other place Facility.OTHER_FACILITY=Other facility - Facility.archived=Archived Facility.city=City Facility.community=Community @@ -1156,22 +1102,18 @@ Facility.publicOwnership=Public ownership Facility.region=Region Facility.type=Facility type Facility.typeGroup=Facility category - FeatureConfiguration.districtName=District FeatureConfiguration.enabled=Line listing enabled? FeatureConfiguration.endDate=End date - # Formats formatNumberOfVisitsFormat=%d (%d missed) formatNumberOfVisitsLongFormat=%d visits (%d missed) formatSimpleNumberFormat=%d - # FollowUp FollowUp.uuid=Follow-up ID FollowUp.person=Follow-up person FollowUp.reportDate=Date of report FollowUp.followUpUntil=Follow-up until - # HealthConditions HealthConditions=Health conditions HealthConditions.tuberculosis=Tuberculosis @@ -1197,7 +1139,6 @@ HealthConditions.formerSmoker=Former smoker\t\t HealthConditions.asthma=Asthma HealthConditions.sickleCellDisease=Sickle cell disease\t HealthConditions.immunodeficiencyIncludingHiv=Immunodeficiency including HIV - # Import importDetailed=Detailed Import importDownloadCaseImportTemplate=Download Case Import Template @@ -1214,7 +1155,6 @@ importLineListing=Line Listing Import importProcessed=%d/%d Processed importSkips=%d Skipped importCancelImport=Cancel import - #Lab Message LabMessage=Lab Message LabMessage.labMessageDetails=Lab message details @@ -1236,12 +1176,10 @@ LabMessage.sampleMaterial=Type of sample LabMessage.sampleReceivedDate=Sample received LabMessage.specimenCondition=Specimen condition LabMessage.testedDisease=Tested disease - -labMessageFetch= Fetch lab messages +labMessageFetch=Fetch lab messages labMessageProcess=Process labMessageProcessed=Processed labMessageUnprocessed=Unprocessed - #Line listing lineListingAddLine=Add line lineListingInfrastructureData=Take over infrastructure data from last line @@ -1254,7 +1192,6 @@ lineListingEnableAll=Enable all lineListingDisableAllShort=Disable all lineListingEndDate=End date lineListingSetEndDateForAll=Set end date for all - # Location Location=Location Location.additionalInformation=Additional information @@ -1272,31 +1209,27 @@ Location.latLonAccuracy=GPS accuracy in m Location.longitude=GPS longitude Location.postalCode=Postal code Location.street=Street - # Login Login.doLogIn=Log in Login.login=Login Login.password=password Login.username=username - #LoginSidebar LoginSidebar.diseaseDetection=Disease Detection LoginSidebar.diseasePrevention=Disease Prevention LoginSidebar.outbreakResponse=Outbreak Response LoginSidebar.poweredBy=Powered By - # Messaging messagesSendSMS=Send SMS messagesSentBy=Sent by messagesNoSmsSentForCase=No SMS sent to case person messagesNoPhoneNumberForCasePerson=Case person has no phone number -messagesSms = SMS -messagesEmail = Email -messagesSendingSms = Send new SMS -messagesNumberOfMissingPhoneNumbers = Number of selected cases without phone number\: %s -messagesCharacters = Characters\: %d / 160 -messagesNumberOfMessages = Nr. of messages\: %d - +messagesSms=SMS +messagesEmail=Email +messagesSendingSms=Send new SMS +messagesNumberOfMissingPhoneNumbers=Number of selected cases without phone number\: %s +messagesCharacters=Characters\: %d / 160 +messagesNumberOfMessages=Nr. of messages\: %d # Main Menu mainMenuAbout=About mainMenuCampaigns=Campaigns @@ -1312,7 +1245,6 @@ mainMenuStatistics=Statistics mainMenuTasks=Tasks mainMenuUsers=Users mainMenuAggregateReports=mSERS - MaternalHistory.childrenNumber=Total number of children MaternalHistory.ageAtBirth=Mother's age at birth of infant patient MaternalHistory.conjunctivitis=Conjunctivitis @@ -1339,19 +1271,16 @@ MaternalHistory.otherComplications=Other complications MaternalHistory.otherComplicationsOnset=Date of onset MaternalHistory.otherComplicationsMonth=Month of pregnancy MaternalHistory.otherComplicationsDetails=Complication details - # Outbreak outbreakAffectedDistricts=Affected districts outbreakNoOutbreak=No outbreak outbreakNormal=Normal outbreakOutbreak=Outbreak - # PathogenTest pathogenTestCreateNew=Create new pathogen test pathogenTestNewResult=New result pathogenTestNewTest=New test result pathogenTestSelect=Select pathogen test - PathogenTest=Pathogen test PathogenTests=Pathogen tests PathogenTest.fourFoldIncreaseAntibodyTiter=4 fold increase of antibody titer @@ -1368,7 +1297,6 @@ PathogenTest.testedDiseaseDetails=Tested disease name PathogenTest.typingId=Typing ID PathogenTest.serotype=Serotype PathogenTest.cqValue=CQ/CT Value - # Person personPersonsList=Person list personCreateNew=Create a new person @@ -1381,7 +1309,6 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person - Person=Person Person.address=Home address Person.addresses=Addresses @@ -1453,11 +1380,9 @@ Person.otherSalutation=Other salutation Person.birthName=Birth name Person.birthCountry=Country of birth Person.citizenship=Citizenship - pointOfEntryActivePointsOfEntry=Active points of entry pointOfEntryArchivedPointsOfEntry=Archived points of entry pointOfEntryAllPointsOfEntry=All points of entry - PointOfEntry.OTHER_AIRPORT=Other airport PointOfEntry.OTHER_SEAPORT=Other seaport PointOfEntry.OTHER_GROUND_CROSSING=Other ground crossing @@ -1467,10 +1392,8 @@ PointOfEntry.active=Active? PointOfEntry.latitude=Latitude PointOfEntry.longitude=Longitude PointOfEntry.externalID=External ID - populationDataMaleTotal=Male total populationDataFemaleTotal=Female total - PortHealthInfo=Port health information PortHealthInfo.airlineName=Airline name PortHealthInfo.flightNumber=Flight number @@ -1494,10 +1417,8 @@ PortHealthInfo.conveyanceTypeDetails=Specify the conveyance type PortHealthInfo.departureLocation=Start location of travel PortHealthInfo.finalDestination=Final destination PortHealthInfo.details=Point of entry details - # Prescription prescriptionNewPrescription=New prescription - Prescription.additionalNotes=Additional notes Prescription.dose=Dose Prescription.drugIntakeDetails=Drug name @@ -1513,33 +1434,27 @@ Prescription.prescriptionType=Prescription type Prescription.route=Route Prescription.routeDetails=Route specification Prescription.typeOfDrug=Type of drug - PrescriptionExport.caseUuid=Case ID PrescriptionExport.caseName=Case name - # Country countryActiveCountries=Active countries countryArchivedCountries=Archived countries countryAllCountries=All countries - Country.archived=Archived Country.externalId=External ID Country.defaultName=Default name Country.displayName=Name Country.isoCode=ISO code Country.unoCode=UNO code - # Region regionActiveRegions=Active regions regionArchivedRegions=Archived regions regionAllRegions=All regions - Region.archived=Archived Region.epidCode=Epid code Region.growthRate=Growth rate Region.population=Population Region.externalID=External ID - # Sample sampleCreateNew=Create new sample sampleIncludeTestOnCreation=Create test result for this sample now @@ -1566,7 +1481,6 @@ sampleActiveSamples=Active samples sampleArchivedSamples=Archived samples sampleAllSamples=All samples sampleAssociationType=Sample type - Sample=Sample Sample.additionalTestingRequested=Request additional tests to be performed? Sample.additionalTestingStatus=Additional testing status @@ -1616,23 +1530,22 @@ Sample.testType=Type of test Sample.typeOfTest=Type of test Sample.uuid=Sample ID Sample.samplePurpose=Purpose of the Sample - SampleExport.additionalTestingRequested=Have additional tests been requested? SampleExport.personAddressCaption=Address of case/contact/event participant person SampleExport.personAge=Age of case/contact/event participant person SampleExport.caseDistrict=District of case SampleExport.caseCommunity=Community of case SampleExport.caseFacility=Facility of case -SampleExport.contactRegion = Region of contact -SampleExport.contactDistrict = District of contact -SampleExport.contactCommunity = Community of contact +SampleExport.contactRegion=Region of contact +SampleExport.contactDistrict=District of contact +SampleExport.contactCommunity=Community of contact SampleExport.caseOutcome=Outcome of case SampleExport.caseRegion=Region of case SampleExport.caseReportDate=Case report date SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID -SampleExport.contactUuid = Contact UUID -SampleExport.contactReportDate = Contact report date +SampleExport.contactUuid=Contact UUID +SampleExport.contactReportDate=Contact report date SampleExport.id=Sample SN SampleExport.sampleReportDate=Sample report date SampleExport.noTestPossibleReason=No test possible reason @@ -1684,7 +1597,6 @@ SampleExport.testDateTime=Date and time of latest additional test SampleExport.totalBilirubin=Total bilirubin of latest additional test SampleExport.urea=Urea of latest additional test SampleExport.wbcCount=WBC count of latest additional test - # Statistics statisticsAddFilter=Add filter statisticsAttribute=Attribute @@ -1707,13 +1619,11 @@ statisticsStatistics=Statistics statisticsVisualizationType=Type statisticsIncidenceDivisor=Incidence divisor statisticsDataDisplayed=Data displayed - # Symptoms symptomsLesionsLocations=Localization of the lesions symptomsMaxTemperature=Maximum body temperature in ° C symptomsSetClearedToNo=Set cleared to No symptomsSetClearedToUnknown=Set cleared to Unknown - Symptoms=Symptoms Symptoms.abdominalPain=Abdominal pain Symptoms.alteredConsciousness=Altered level of consciousness @@ -1901,7 +1811,6 @@ Symptoms.palpitations=Palpitations Symptoms.dizzinessStandingUp=Dizziness (when standing up from a sitting or lying position) Symptoms.highOrLowBloodPressure=Blood pressure too high or too low (measured) Symptoms.urinaryRetention=Urinary retention - # Task taskMyTasks=My tasks taskNewTask=New task @@ -1910,7 +1819,6 @@ taskOfficerTasks=Officer tasks taskActiveTasks=Active tasks taskArchivedTasks=Archived tasks taskAllTasks=All tasks - Task=Task Task.assigneeReply=Comments on execution Task.assigneeUser=Assigned to @@ -1928,9 +1836,7 @@ Task.suggestedStart=Suggested start Task.taskContext=Task context Task.taskStatus=Task status Task.taskType=Task type - # TestReport - TestReport.testDateTime=Date and time of result TestReport.testLabCity=Lab city TestReport.testLabExternalId=Lab external ID @@ -1938,12 +1844,10 @@ TestReport.testLabName=Lab name TestReport.testLabPostalCode=Lab postal code TestReport.testResult=Test result TestReport.testType=Type of test - # Treatment treatmentCreateTreatment=Create treatment treatmentNewTreatment=New treatment treatmentOpenPrescription=Open prescription - Treatment.additionalNotes=Additional notes Treatment.dose=Dose Treatment.drugIntakeDetails=Drug name @@ -1957,10 +1861,8 @@ Treatment.treatmentDetails=Treatment details Treatment.treatmentType=Treatment type Treatment.typeOfDrug=Type of drug Treatment.treatmentRoute=Treatment route - TreatmentExport.caseUuid=Case ID TreatmentExport.caseName=Case name - # User userNewUser=New user userResetPassword=Create new password @@ -1970,7 +1872,6 @@ syncUsers=Sync Users syncErrors=%d Error(s) syncSuccessful=%d Synced syncProcessed=%d/%d Processed - User=User User.active=Active? User.associatedOfficer=Associated officer @@ -1985,20 +1886,16 @@ User.userName=User name User.userRoles=User roles User.address=Address User.uuid=UUID - # Views View.actions=Action Directory - View.aggregatereports=Aggregate Reporting (mSERS) View.aggregatereports.sub= - View.campaign.campaigns=Campaign Directory View.campaign.campaigns.short=Campaigns View.campaign.campaigndata=Campaign Data View.campaign.campaigndata.short=Campaign Data View.campaign.campaigndata.dataform=Campaign Data Form View.campaign.campaigndata.dataform.short=Data Form - View.cases=Case Directory View.cases.merge=Merge Duplicate Cases View.cases.archive=Case Archive @@ -2014,10 +1911,8 @@ View.cases.clinicalcourse=Clinical Course View.cases.maternalhistory=Maternal History View.cases.porthealthinfo=Port Health Information View.cases.visits=Case Visits - View.persons=Person Directory View.persons.data=Person Information - View.configuration.communities=Communities Configuration View.configuration.communities.short=Communities View.configuration.districts=Districts Configuration @@ -2048,7 +1943,6 @@ View.configuration.populationdata=Population Data View.configuration.populationdata.short=Population View.configuration.linelisting=Line Listing Configuration View.configuration.linelisting.short=Line Listing - View.contacts=Contact Directory View.contacts.archive=Contact Archive View.contacts.epidata=Contact Epidemiological Data @@ -2056,11 +1950,9 @@ View.contacts.data=Contact Information View.contacts.person=Contact Person View.contacts.sub= View.contacts.visits=Contact Visits - View.dashboard.contacts=Contacts Dashboard View.dashboard.surveillance=Surveillance Dashboard View.dashboard.campaigns=Campaigns Dashboard - View.events=Event Directory View.events.archive=Event Archive View.events.data=Event Information @@ -2068,30 +1960,22 @@ View.events.eventactions=Event Actions View.events.eventparticipants=Event Participants View.events.sub= View.events.eventparticipants.data=Event Participant Information - View.samples.labMessages=Lab Message Directory - View.reports=Weekly Reports View.reports.sub= - View.samples=Sample Directory View.samples.archive=Sample Archive View.samples.data=Sample Information View.samples.sub= - View.statistics=Statistics View.statistics.database-export=Database export - View.tasks=Task Management View.tasks.archive=Task Archive View.tasks.sub= - View.users=User Management View.users.sub= - # Visit visitNewVisit=New visit - Visit=Visit Visit.person=Visited person Visit.symptoms=Symptoms @@ -2103,24 +1987,19 @@ Visit.visitUser=Visiting officer Visit.disease=Disease Visit.reportLat=Report latitude Visit.reportLon=Report longitude - # WeeklyReport weeklyReportNoReport=Missing report weeklyReportOfficerInformants=Informants weeklyReportsInDistrict=Weekly Reports in %s weeklyReportRegionOfficers=Officers weeklyReportRegionInformants=Informants - WeeklyReport.epiWeek=Epi Week WeeklyReport.year=Year - # WeeklyReportEntry WeeklyReportEntry.numberOfCases=Cases reported - # WeeklyReportInformantSummary WeeklyReportInformantSummary.informantReportDate=Informant report submission WeeklyReportInformantSummary.totalCaseCount=Cases reported by informant - # WeeklyReportOfficerSummary WeeklyReportOfficerSummary.informants=Number of informants WeeklyReportOfficerSummary.informantReports=Number of informant reports @@ -2129,7 +2008,6 @@ WeeklyReportOfficerSummary.informantZeroReports=Number of informant zero reports WeeklyReportOfficerSummary.officer=Officer WeeklyReportOfficerSummary.officerReportDate=Officer report submission WeeklyReportOfficerSummary.totalCaseCount=Cases reported by officer - # WeeklyReportRegionSummary WeeklyReportRegionSummary.informants=Number of informants WeeklyReportRegionSummary.informantReports=Number of informant reports @@ -2139,7 +2017,6 @@ WeeklyReportRegionSummary.officers=Number of officers WeeklyReportRegionSummary.officerReports=Number of officers reports WeeklyReportRegionSummary.officerReportPercentage=Percentage WeeklyReportRegionSummary.officerZeroReports=Number of officer zero reports - # SORMAS to SORMAS SormasToSormasOptions.organization=Orgainzation SormasToSormasOptions.withAssociatedContacts=Share associated contacts @@ -2160,23 +2037,17 @@ sormasToSormasSharedWith=Shared with sormasToSormasSharedBy=By sormasToSormasSharedDate=On sormasToSormasSentFrom=Sent from - BAGExport=BAG Export - # Survnet Gateway SurvnetGateway.title=SurvNet SurvnetGateway.send=send to own SurvNet instance SurvnetGateway.unableToSend=Unable to send SurvnetGateway.confirmSend=Confirm sending SurvnetGateway.sendShort=Send to SurvNet - patientDiaryRegistrationError=Could not register person in the patient diary. patientDiaryPersonNotExportable=Cannot export the person to the patient diary. The person needs a valid birthdate and either a valid phone number or email address. - showPlacesOnMap=Show - changeUserEmail=Change user email - VaccinationInfo.vaccination=Vaccination status for this disease VaccinationInfo.firstVaccinationDate=Date of first vaccination VaccinationInfo.lastVaccinationDate=Date of last vaccination diff --git a/sormas-api/src/main/resources/captions_lv-LV.properties b/sormas-api/src/main/resources/captions_lv-LV.properties index 46dd9b76fc1..df716e5b8a3 100644 --- a/sormas-api/src/main/resources/captions_lv-LV.properties +++ b/sormas-api/src/main/resources/captions_lv-LV.properties @@ -188,13 +188,13 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge = Okay, and continue to merge overview -actionOkAndGoToContactDirectory = Okay, and continue to contact directory -actionOkAndGoToContactDetails = Okay, and continue to contact -actionOkAndGoToPersonDirectory = Okay, and continue to person directory -actionExecuteAutomaticDeletion = Execute automatic deletion -actionDone = Done -actionConfirmAction = Confirm action +actionOkAndGoToMerge=Okay, and continue to merge overview +actionOkAndGoToContactDirectory=Okay, and continue to contact directory +actionOkAndGoToContactDetails=Okay, and continue to contact +actionOkAndGoToPersonDirectory=Okay, and continue to person directory +actionExecuteAutomaticDeletion=Execute automatic deletion +actionDone=Done +actionConfirmAction=Confirm action activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -248,10 +248,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows = Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups = Expired -aggregateReportNoAgeGroup = No age group -aggregateReportShowOnlyDuplicateReports = Display only duplicate reports +aggregateReportShowZeroRows=Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups=Expired +aggregateReportNoAgeGroup=No age group +aggregateReportShowOnlyDuplicateReports=Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -275,7 +275,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend = Send emails +bulkEmailSend=Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -434,6 +434,7 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name +CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1133,7 +1134,6 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: - # Environment Environment=Environment Environment.uuid=Environment ID @@ -1152,54 +1152,51 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location - environmentActiveEnvironments=Active environments -environmentArchivedEnvironments = Archived environments -environmentAllActiveAndArchivedEnvironments = All active and archived environments -environmentDeletedEnvironments = Deleted environments -environmentNewEnvironment= New environment +environmentArchivedEnvironments=Archived environments +environmentAllActiveAndArchivedEnvironments=All active and archived environments +environmentDeletedEnvironments=Deleted environments +environmentNewEnvironment=New environment environmentEnvironmentsList=Environments list - # EnvironmentSample -EnvironmentSample = Environment Sample -EnvironmentSample.uuid = Sample ID -EnvironmentSample.environment = Environment -EnvironmentSample.sampleDateTime = Date of sampling -EnvironmentSample.sampleMaterial = Sample material -EnvironmentSample.otherSampleMaterial = Specify sample material -EnvironmentSample.sampleVolume = Volume (in mL) -EnvironmentSample.fieldSampleId = Field sample ID -EnvironmentSample.turbidity = Turbidity (in NTU) -EnvironmentSample.phValue = pH of sample -EnvironmentSample.sampleTemperature = Temperature (in °C) -EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) -EnvironmentSample.laboratory = Laboratory -EnvironmentSample.laboratoryDetails = Laboratory details -EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested -EnvironmentSample.reportingUser = Reporting user -EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested -EnvironmentSample.weatherConditions = Weather conditions at time of sampling -EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched = Sent/dispatched -EnvironmentSample.dispatchDate = Dispatchment date -EnvironmentSample.dispatchDetails = Dispatchment details -EnvironmentSample.received = Received -EnvironmentSample.receivalDate = Receival date -EnvironmentSample.labSampleId = Lab sample ID -EnvironmentSample.specimenCondition = Specimen condition -EnvironmentSample.location = Location of sampling site -EnvironmentSample.generalComment = General comment -EnvironmentSample.positivePathogenTests = Positive pathogen tests -EnvironmentSample.latestPathogenTest = Latest pathogen test -EnvironmentSample.numberOfTests = Number of tests - +EnvironmentSample=Environment Sample +EnvironmentSample.uuid=Sample ID +EnvironmentSample.environment=Environment +EnvironmentSample.sampleDateTime=Date of sampling +EnvironmentSample.sampleMaterial=Sample material +EnvironmentSample.otherSampleMaterial=Specify sample material +EnvironmentSample.sampleVolume=Volume (in mL) +EnvironmentSample.fieldSampleId=Field sample ID +EnvironmentSample.turbidity=Turbidity (in NTU) +EnvironmentSample.phValue=pH of sample +EnvironmentSample.sampleTemperature=Temperature (in °C) +EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) +EnvironmentSample.laboratory=Laboratory +EnvironmentSample.laboratoryDetails=Laboratory details +EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested +EnvironmentSample.reportingUser=Reporting user +EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested +EnvironmentSample.weatherConditions=Weather conditions at time of sampling +EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched=Sent/dispatched +EnvironmentSample.dispatchDate=Dispatchment date +EnvironmentSample.dispatchDetails=Dispatchment details +EnvironmentSample.received=Received +EnvironmentSample.receivalDate=Receival date +EnvironmentSample.labSampleId=Lab sample ID +EnvironmentSample.specimenCondition=Specimen condition +EnvironmentSample.location=Location of sampling site +EnvironmentSample.generalComment=General comment +EnvironmentSample.positivePathogenTests=Positive pathogen tests +EnvironmentSample.latestPathogenTest=Latest pathogen test +EnvironmentSample.numberOfTests=Number of tests # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents = Deleted events +eventDeletedEvents=Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1343,7 +1340,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants = Deleted event participants +eventParticipantDeletedEventParticipants=Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1356,7 +1353,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser = Reporting user +EventParticipant.reportingUser=Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1393,9 +1390,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink = Event participant ID -EventParticipantSelection.eventUuidLink = Event ID -EventParticipantSelection.resultingCaseUuidLink = Resulting case ID +EventParticipantSelection.eventParticipantUuidLink=Event participant ID +EventParticipantSelection.eventUuidLink=Event ID +EventParticipantSelection.resultingCaseUuidLink=Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1615,7 +1612,6 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message - #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1626,7 +1622,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList = List of new event participants +lineListingNewEventParticipantsList=List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1800,10 +1796,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples = See samples for this person -caseLinkToSamples = See samples for this case -contactLinkToSamples = See samples for this contact -eventParticipantLinkToSamples = See samples for this event participant +personLinkToSamples=See samples for this person +caseLinkToSamples=See samples for this case +contactLinkToSamples=See samples for this contact +eventParticipantLinkToSamples=See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2111,9 +2107,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity = Community of event participant -SampleExport.eventParticipantDistrict = District of event participant -SampleExport.eventParticipantRegion = Region of event participant +SampleExport.eventParticipantCommunity=Community of event participant +SampleExport.eventParticipantDistrict=District of event participant +SampleExport.eventParticipantRegion=Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2172,7 +2168,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser = Reporting user +Immunization.reportingUser=Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2215,10 +2211,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations = Active immunizations -immunizationArchivedImmunizations = Archived immunizations -immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations -immunizationDeletedImmunizations = Deleted immunizations +immunizationActiveImmunizations=Active immunizations +immunizationArchivedImmunizations=Archived immunizations +immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations +immunizationDeletedImmunizations=Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2461,7 +2457,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment = Associated environment +Task.environment=Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2514,7 +2510,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser = Reporting user +TravelEntry.reportingUser=Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -2881,17 +2877,15 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms = SMS -userRoleNotificationTypeEmail = EMAIL +userRoleNotificationTypeSms=SMS +userRoleNotificationTypeEmail=EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template - notificationType=Notification type -notificationType.group = Group -notificationType.caption = Caption -notificationType.description = Description - +notificationType.group=Group +notificationType.caption=Caption +notificationType.description=Description SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -2926,10 +2920,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails = Person contact details -environmentSampleNotShipped = Not shipped -environmentSampleShipped = Shipped -environmentSampleReceived = Received +TaskExport.personOtherContactDetails=Person contact details +environmentSampleNotShipped=Not shipped +environmentSampleShipped=Shipped +environmentSampleReceived=Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -2946,37 +2940,34 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents - # SpecialCaseAccess SpecialCaseAccess=Special case access -caze = Case -assignedTo = Assigned to -assignedBy = Assigned by -endDateTime = Access until -assignmentDate = Date assigned - +caze=Case +assignedTo=Assigned to +assignedBy=Assigned by +endDateTime=Access until +assignmentDate=Date assigned specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case - # SelfReport -SelfReport.type = Type -SelfReport.reportDate = Report date -SelfReport.disease = Disease -SelfReport.diseaseVariant = Disease variant -SelfReport.firstName = First name -SelfReport.lastName = Last name -SelfReport.sex = Sex -SelfReport.birthdateDD = Day of birth -SelfReport.birthdateMM = Month of birth -SelfReport.birthdateYYYY = Year of birth -SelfReport.nationalHealthId = National health ID -SelfReport.email = Email -SelfReport.phoneNumber = Phone number -SelfReport.address = Address -SelfReport.comment = Comment -SelfReport.responsibleUser = Responsible user -SelfReport.investigationStatus = Investigation status -SelfReport.processingStatus = Processing status +SelfReport.type=Type +SelfReport.reportDate=Report date +SelfReport.disease=Disease +SelfReport.diseaseVariant=Disease variant +SelfReport.firstName=First name +SelfReport.lastName=Last name +SelfReport.sex=Sex +SelfReport.birthdateDD=Day of birth +SelfReport.birthdateMM=Month of birth +SelfReport.birthdateYYYY=Year of birth +SelfReport.nationalHealthId=National health ID +SelfReport.email=Email +SelfReport.phoneNumber=Phone number +SelfReport.address=Address +SelfReport.comment=Comment +SelfReport.responsibleUser=Responsible user +SelfReport.investigationStatus=Investigation status +SelfReport.processingStatus=Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_mt-MT.properties b/sormas-api/src/main/resources/captions_mt-MT.properties index 111a929df1f..d52e7461ff0 100644 --- a/sormas-api/src/main/resources/captions_mt-MT.properties +++ b/sormas-api/src/main/resources/captions_mt-MT.properties @@ -14,7 +14,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . ############################################################################### - # General Captions all=All city=City @@ -56,7 +55,6 @@ facility=Facility pointOfEntry=Point of entry remove=Remove reportingUser=Reporting user - # About about=About aboutDocuments=Documents @@ -68,14 +66,12 @@ aboutDataDictionary=Data Dictionary (XLSX) aboutSormasWebsite=Official SORMAS Website aboutTechnicalManual=Technical Manual (PDF) aboutWhatsNew=What's New? - # Action actionNewAction=New action actionNoActions=There are no actions for this %s actionCreatingLabel=Created at %s by %s actionLastModifiedByLabel=Updated at %s by %s actionStatusChangeDate=updated at %s - Action=Action Action.title=Title Action.description=Description @@ -88,13 +84,12 @@ Action.actionContext=Action context Action.actionStatus=Action status Action.lastModifiedBy=Last modified by Action.actionMeasure=Measure - # Actions actionApplyDateFilter=Apply date filter actionArchive=Archive actionAssignNewEpidNumber=Assign new epid number actionBack=Back -actionSend = Send +actionSend=Send actionCancel=Cancel actionClear=Clear actionClearAll=Clear all @@ -133,10 +128,8 @@ actionBackToNationOverview=Back to Nation Overview actionSettings=User Settings actionNewForm=New Form actionOverwrite=Overwrite - # AdditionalTest additionalTestNewTest=New test result - AdditionalTest=Additional test AdditionalTest.altSgpt=ALT/SGPT (U/L) AdditionalTest.arterialVenousBloodGas=Arterial/venous blood gas @@ -160,7 +153,6 @@ AdditionalTest.testDateTime=Date and time of result AdditionalTest.totalBilirubin=Total bilirubin (umol/L) AdditionalTest.urea=Urea (mmol/L) AdditionalTest.wbcCount=WBC count (x10^9/L) - aggregateReportDeathsShort=D aggregateReportLabConfirmationsShort=L aggregateReportLastWeek=Last Week @@ -177,13 +169,11 @@ AggregateReport.labConfirmations=Lab confirmations AggregateReport.deaths=Deaths AggregateReport.healthFacility=Facility AggregateReport.pointOfEntry=Point of Entry - -areaActiveAreas = Active areas -areaArchivedAreas = Archived areas -areaAllAreas = All areas -Area.archived = Archived -Area.externalId = External ID - +areaActiveAreas=Active areas +areaArchivedAreas=Archived areas +areaAllAreas=All areas +Area.archived=Archived +Area.externalId=External ID # Bulk actions bulkActions=Bulk Actions bulkCancelFollowUp=Cancel follow-up @@ -201,7 +191,6 @@ bulkFacility=Change facility bulkInvestigationStatus=Change investigation status bulkLostToFollowUp=Set to lost to follow-up bulkSurveillanceOfficer=Change surveillance officer - # Campaign campaignActiveCampaigns=Active campaigns campaignAllCampaigns=All campaigns @@ -221,7 +210,6 @@ campaignDashboardChartHeight=Height in % campaignDashboardOrder=Order campaignSearch=Search Campaign campaignDiagramGroupBy=Group by - Campaign=Campaign Campaign.name=Name Campaign.description=Description @@ -234,13 +222,11 @@ Campaign.area=Area Campaign.region=Region Campaign.district=District Campaign.community=Community - -CampaignFormData.campaign = Campaign -CampaignFormData.campaignFormMeta = Form -CampaignFormData.formDate = Form date -CampaignFormData.area = Area +CampaignFormData.campaign=Campaign +CampaignFormData.campaignFormMeta=Form +CampaignFormData.formDate=Form date +CampaignFormData.area=Area CampaignFormData.edit=Edit - # CaseData caseCasesList=Cases list caseInfrastructureDataChanged=Infrastructure data has changed @@ -290,9 +276,8 @@ convertEventParticipantToCase=Create case from event participant with positive t convertContactToCase=Create case from contact with positive test result? caseSearchSpecificCase=Search specific case caseSearchCase=Search case -caseSelect= Select case +caseSelect=Select case caseCreateNew=Create new case - CaseData=Case CaseData.additionalDetails=General comment CaseData.caseClassification=Case classification @@ -315,6 +300,7 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name +CaseData.disease=Disease CaseData.district=Responsible district CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -435,7 +421,6 @@ CaseData.notACaseReasonPhysicianInformation=Information provided by physician CaseData.notACaseReasonDifferentPathogen=Verification of different pathogen CaseData.notACaseReasonOther=Other CaseData.notACaseReasonDetails=Reason details - # CaseExport CaseExport.address=Address CaseExport.addressRegion=Address Region @@ -481,7 +466,6 @@ CaseExport.lastCooperativeVisitSymptomatic=Symptomatic at last cooperative visit CaseExport.lastCooperativeVisitSymptoms=Symptoms at last cooperative visit CaseExport.traveled=Traveled outside of district CaseExport.burialAttended=Visited a burial - # CaseHospitalization CaseHospitalization=Hospitalization CaseHospitalization.admissionDate=Date of visit or admission @@ -496,12 +480,9 @@ CaseHospitalization.previousHospitalizations=Previous hospitalizations CaseHospitalization.intensiveCareUnit=Stay in the intensive care unit CaseHospitalization.intensiveCareUnitStart=Start of the stay CaseHospitalization.intensiveCareUnitEnd=End of the stay - - # CaseImport caseImportErrorDescription=Error description caseImportMergeCase=Override existing case with changes from the imported case? - # CasePreviousHospitalization CasePreviousHospitalization=Previous hospitalization CasePreviousHospitalization.admissionAndDischargeDate=Date of admission & discharge @@ -513,10 +494,8 @@ CasePreviousHospitalization.healthFacility=Hospital CasePreviousHospitalization.healthFacilityDetails=Hospital name & description CasePreviousHospitalization.isolated=Isolation CasePreviousHospitalization.prevHospPeriod=Period of hospitalization - # ClinicalVisit clinicalVisitNewClinicalVisit=New clinical assessment - ClinicalVisit=Clinical assessment ClinicalVisit.bloodPressure=Blood pressure ClinicalVisit.heartRate=Heart rate @@ -524,28 +503,22 @@ ClinicalVisit.temperature=Temperature ClinicalVisit.visitDateTime=Date and time of visit ClinicalVisit.visitingPerson=Attending clinician ClinicalVisit.visitRemarks=Clinician remarks - ClinicalVisitExport.caseUuid=Case ID ClinicalVisitExport.caseName=Case name - columnAdditionalTests=Additional tests columnDiseaseShort=Disease columnNumberOfPendingTasks=Pending tasks - # Community Community.archived=Archived Community.externalID=External ID - communityActiveCommunities=Active communities communityArchivedCommunities=Archived communities communityAllCommunities=All communities - # Configuration Configuration.Facilities=Facilities Configuration.Outbreaks=Outbreaks Configuration.PointsOfEntry=Points of Entry Configuration.LineListing=Line Listing - # Contact contactCancelFollowUp=Cancel follow-up contactCaseContacts=Case contacts @@ -582,10 +555,9 @@ contactOnlyWithSharedEventWithSourceCase=Only contacts with source case linked t contactOnlyWithSourceCaseInGivenEvent=Only contacts whose source case is linked to this event contactFollowUpDay=Day contactQuarantineNotOrdered=No quarantine ordered -contactCreatePIAAccount = PIA -contactPersonPhoneNumber = Contact Person's Phone Number -contactSourceCase = Source case - +contactCreatePIAAccount=PIA +contactPersonPhoneNumber=Contact Person's Phone Number +contactSourceCase=Source case Contact=Contact Contact.additionalDetails=General comment Contact.caseClassification=Classification of the source case @@ -602,10 +574,10 @@ Contact.community=Responsible community Contact.contactClassification=Contact classification Contact.contactOfficer=Responsible contact officer Contact.contactOfficerUuid=Responsible contact officer -Contact.contactIdentificationSource = Contact identification source -Contact.contactIdentificationSourceDetails = Contact identification source details -Contact.tracingApp = Tracing app -Contact.tracingAppDetails = Tracing app details, e.g. name +Contact.contactIdentificationSource=Contact identification source +Contact.contactIdentificationSourceDetails=Contact identification source details +Contact.tracingApp=Tracing app +Contact.tracingAppDetails=Tracing app details, e.g. name Contact.contactProximity=Type of contact - if multiple pick the closest contact proximity Contact.contactStatus=Contact status Contact.description=Description of how contact took place @@ -676,7 +648,6 @@ Contact.prohibitionToWork=Prohibition to work Contact.prohibitionToWorkFrom=Prohibition to work from Contact.prohibitionToWorkUntil=Prohibition to work until Contact.reportingDistrict=Reporting district - # ContactExport ContactExport.address=Address ContactExport.addressDistrict=Address District @@ -695,7 +666,6 @@ ContactExport.sourceCaseUuid=Source case ID ContactExport.traveled=Traveled outside of district ContactExport.travelHistory=Travel history ContactExport.quarantineInformation=Quarantine information - # Dashboard dashboardAlive=Alive dashboardApplyCustomFilter=Apply custom filter @@ -819,14 +789,12 @@ dashboardAggregatedNumber=Count dashboardProportion=Proportion (%) dashboardViewAsColumnChart=View as Column Chart dashboardViewAsBarChart=View as Bar Chart - defaultRegion=Default Region defaultDistrict=Default District defaultCommunity=Default Community defaultFacility=Default Facility defaultLaboratory=Default Laboratory defaultPointOfEntry=Default Point Of Entry - devModeCaseCount=Number of generated cases devModeCaseDisease=Disease of the cases devModeCaseDistrict=District of the cases @@ -857,7 +825,6 @@ devModeEventStartDate=Earliest event start date devModeGenerateCases=Generate Cases devModeGenerateContacts=Generate Contacts devModeGenerateEvents=Generate Events - DiseaseBurden.caseCount=New cases DiseaseBurden.caseDeathCount=Fatalities DiseaseBurden.casesDifference=Dynamic @@ -865,20 +832,16 @@ DiseaseBurden.caseFatalityRate=CFR DiseaseBurden.eventCount=Number of events DiseaseBurden.outbreakDistrictCount=Outbreak districts DiseaseBurden.previousCaseCount=Previous cases - # District districtActiveDistricts=Active districts districtArchivedDistricts=Archived districts districtAllDistricts=All districts - District.archived=Archived District.epidCode=Epid code District.growthRate=Growth rate District.population=Population District.externalID=External ID - epiDataNoSourceContacts=No source contacts have been created for this case - EpiData=Epidemiological data EpiData.areaInfectedAnimals=Residing, working or travelling to an area where infected animals have been confirmed EpiData.exposureDetailsKnown=Exposure details known @@ -886,11 +849,9 @@ EpiData.exposures=Exposures EpiData.highTransmissionRiskArea=Residing or working in an area with high risk of transmission of the disease, e.g. closed residential and camp-like settings EpiData.largeOutbreaksArea=Residing or travelling to countries/territories/areas experiencing larger outbreaks of local transmission EpiData.contactWithSourceCaseKnown=Contacts with source case known - # Documents documentUploadDocument=New document documentNoDocuments=There are no documents for this %s - # DocumentTemplate DocumentTemplate=Document Template DocumentTemplate.buttonUploadTemplate=Upload Template @@ -907,7 +868,6 @@ DocumentTemplate.exampleTemplateCases=Example Template Cases DocumentTemplate.exampleTemplateContacts=Example Template Contacts DocumentTemplate.exampleTemplateEventHandout=Example Template Event Handout DocumentTemplate.exampleTemplateEventParticipants=Example Template Event Participants - # Event eventActiveEvents=Active events eventArchivedEvents=Archived events @@ -935,7 +895,6 @@ eventUnlinkEvent=Unlink event eventOpenSuperordinateEvent=Open event eventEditEvent=Edit event eventLinkToEventsWithinTheSameFacility=See events within the same facility - Event=Event Event.caseCount=Cases Event.contactCount=Contacts @@ -992,7 +951,6 @@ Event.typeOfPlaceText=Specify other event place Event.uuid=Event ID Event.transregionalOutbreak=Transregional outbreak Event.diseaseTransmissionMode=Primary mode of transmission - # Event action EventAction.eventUuid=Event id EventAction.eventTitle=Event title @@ -1009,18 +967,14 @@ EventAction.actionChangeDate=Action change date EventAction.actionStatus=Action status EventAction.actionPriority=Action priority EventAction.actionLastModifiedBy=Action last modified by - # Event action export EventActionExport.eventDate=Date of event - #Event export - # EventParticipant eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant - EventParticipant=Event participant EventParticipant.contactCount=Contact count EventParticipant.event=Event @@ -1034,7 +988,6 @@ EventParticipant.person=Person EventParticipant.uuid=Event participant ID EventParticipant.region=Responsible region EventParticipant.district=Responsible district - #EventParticipant export EventParticipantExport.eventParticipantU=Event disease EventParticipantExport.eventDisease=Event disease @@ -1059,7 +1012,6 @@ EventParticipantExport.sampleInformation=Sample information EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID - # Expo export=Export exportBasic=Basic Export @@ -1074,16 +1026,13 @@ exportCaseManagement=Case Management Export exportCaseCustom=Custom Case Export exportNewExportConfiguration=New Export Configuration exportEditExportConfiguration=Edit Export Configuration - ExportConfiguration.NAME=Configuration name ExportConfiguration.myExports=My exports ExportConfiguration.sharedExports=Shared exports ExportConfiguration.sharedToPublic=Shared to public - exposureFlightNumber=Flight number exposureTimePeriod=Time period exposureSourceCaseName=Name of source case - Exposure.startDate=Start of exposure Exposure.endDate=End of exposure Exposure.exposureType=Type of activity @@ -1134,16 +1083,13 @@ Exposure.prophylaxisDate=Date of prophylaxis Exposure.riskArea=Risk area as defined by public health institution Exposure.exposureDate=Exposure date Exposure.exposureRole=Role - # Facility facilityActiveFacilities=Active facilities facilityArchivedFacilities=Archived facilities facilityAllFacilities=All facilities - Facility.CONFIGURED_FACILITY=Configured facility Facility.NO_FACILITY=Home or other place Facility.OTHER_FACILITY=Other facility - Facility.archived=Archived Facility.city=City Facility.community=Community @@ -1156,22 +1102,18 @@ Facility.publicOwnership=Public ownership Facility.region=Region Facility.type=Facility type Facility.typeGroup=Facility category - FeatureConfiguration.districtName=District FeatureConfiguration.enabled=Line listing enabled? FeatureConfiguration.endDate=End date - # Formats formatNumberOfVisitsFormat=%d (%d missed) formatNumberOfVisitsLongFormat=%d visits (%d missed) formatSimpleNumberFormat=%d - # FollowUp FollowUp.uuid=Follow-up ID FollowUp.person=Follow-up person FollowUp.reportDate=Date of report FollowUp.followUpUntil=Follow-up until - # HealthConditions HealthConditions=Health conditions HealthConditions.tuberculosis=Tuberculosis @@ -1197,7 +1139,6 @@ HealthConditions.formerSmoker=Former smoker\t\t HealthConditions.asthma=Asthma HealthConditions.sickleCellDisease=Sickle cell disease\t HealthConditions.immunodeficiencyIncludingHiv=Immunodeficiency including HIV - # Import importDetailed=Detailed Import importDownloadCaseImportTemplate=Download Case Import Template @@ -1214,7 +1155,6 @@ importLineListing=Line Listing Import importProcessed=%d/%d Processed importSkips=%d Skipped importCancelImport=Cancel import - #Lab Message LabMessage=Lab Message LabMessage.labMessageDetails=Lab message details @@ -1236,12 +1176,10 @@ LabMessage.sampleMaterial=Type of sample LabMessage.sampleReceivedDate=Sample received LabMessage.specimenCondition=Specimen condition LabMessage.testedDisease=Tested disease - -labMessageFetch= Fetch lab messages +labMessageFetch=Fetch lab messages labMessageProcess=Process labMessageProcessed=Processed labMessageUnprocessed=Unprocessed - #Line listing lineListingAddLine=Add line lineListingInfrastructureData=Take over infrastructure data from last line @@ -1254,7 +1192,6 @@ lineListingEnableAll=Enable all lineListingDisableAllShort=Disable all lineListingEndDate=End date lineListingSetEndDateForAll=Set end date for all - # Location Location=Location Location.additionalInformation=Additional information @@ -1272,31 +1209,27 @@ Location.latLonAccuracy=GPS accuracy in m Location.longitude=GPS longitude Location.postalCode=Postal code Location.street=Street - # Login Login.doLogIn=Log in Login.login=Login Login.password=password Login.username=username - #LoginSidebar LoginSidebar.diseaseDetection=Disease Detection LoginSidebar.diseasePrevention=Disease Prevention LoginSidebar.outbreakResponse=Outbreak Response LoginSidebar.poweredBy=Powered By - # Messaging messagesSendSMS=Send SMS messagesSentBy=Sent by messagesNoSmsSentForCase=No SMS sent to case person messagesNoPhoneNumberForCasePerson=Case person has no phone number -messagesSms = SMS -messagesEmail = Email -messagesSendingSms = Send new SMS -messagesNumberOfMissingPhoneNumbers = Number of selected cases without phone number\: %s -messagesCharacters = Characters\: %d / 160 -messagesNumberOfMessages = Nr. of messages\: %d - +messagesSms=SMS +messagesEmail=Email +messagesSendingSms=Send new SMS +messagesNumberOfMissingPhoneNumbers=Number of selected cases without phone number\: %s +messagesCharacters=Characters\: %d / 160 +messagesNumberOfMessages=Nr. of messages\: %d # Main Menu mainMenuAbout=About mainMenuCampaigns=Campaigns @@ -1312,7 +1245,6 @@ mainMenuStatistics=Statistics mainMenuTasks=Tasks mainMenuUsers=Users mainMenuAggregateReports=mSERS - MaternalHistory.childrenNumber=Total number of children MaternalHistory.ageAtBirth=Mother's age at birth of infant patient MaternalHistory.conjunctivitis=Conjunctivitis @@ -1339,19 +1271,16 @@ MaternalHistory.otherComplications=Other complications MaternalHistory.otherComplicationsOnset=Date of onset MaternalHistory.otherComplicationsMonth=Month of pregnancy MaternalHistory.otherComplicationsDetails=Complication details - # Outbreak outbreakAffectedDistricts=Affected districts outbreakNoOutbreak=No outbreak outbreakNormal=Normal outbreakOutbreak=Outbreak - # PathogenTest pathogenTestCreateNew=Create new pathogen test pathogenTestNewResult=New result pathogenTestNewTest=New test result pathogenTestSelect=Select pathogen test - PathogenTest=Pathogen test PathogenTests=Pathogen tests PathogenTest.fourFoldIncreaseAntibodyTiter=4 fold increase of antibody titer @@ -1368,7 +1297,6 @@ PathogenTest.testedDiseaseDetails=Tested disease name PathogenTest.typingId=Typing ID PathogenTest.serotype=Serotype PathogenTest.cqValue=CQ/CT Value - # Person personPersonsList=Person list personCreateNew=Create a new person @@ -1381,7 +1309,6 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person - Person=Person Person.address=Home address Person.addresses=Addresses @@ -1453,11 +1380,9 @@ Person.otherSalutation=Other salutation Person.birthName=Birth name Person.birthCountry=Country of birth Person.citizenship=Citizenship - pointOfEntryActivePointsOfEntry=Active points of entry pointOfEntryArchivedPointsOfEntry=Archived points of entry pointOfEntryAllPointsOfEntry=All points of entry - PointOfEntry.OTHER_AIRPORT=Other airport PointOfEntry.OTHER_SEAPORT=Other seaport PointOfEntry.OTHER_GROUND_CROSSING=Other ground crossing @@ -1467,10 +1392,8 @@ PointOfEntry.active=Active? PointOfEntry.latitude=Latitude PointOfEntry.longitude=Longitude PointOfEntry.externalID=External ID - populationDataMaleTotal=Male total populationDataFemaleTotal=Female total - PortHealthInfo=Port health information PortHealthInfo.airlineName=Airline name PortHealthInfo.flightNumber=Flight number @@ -1494,10 +1417,8 @@ PortHealthInfo.conveyanceTypeDetails=Specify the conveyance type PortHealthInfo.departureLocation=Start location of travel PortHealthInfo.finalDestination=Final destination PortHealthInfo.details=Point of entry details - # Prescription prescriptionNewPrescription=New prescription - Prescription.additionalNotes=Additional notes Prescription.dose=Dose Prescription.drugIntakeDetails=Drug name @@ -1513,33 +1434,27 @@ Prescription.prescriptionType=Prescription type Prescription.route=Route Prescription.routeDetails=Route specification Prescription.typeOfDrug=Type of drug - PrescriptionExport.caseUuid=Case ID PrescriptionExport.caseName=Case name - # Country countryActiveCountries=Active countries countryArchivedCountries=Archived countries countryAllCountries=All countries - Country.archived=Archived Country.externalId=External ID Country.defaultName=Default name Country.displayName=Name Country.isoCode=ISO code Country.unoCode=UNO code - # Region regionActiveRegions=Active regions regionArchivedRegions=Archived regions regionAllRegions=All regions - Region.archived=Archived Region.epidCode=Epid code Region.growthRate=Growth rate Region.population=Population Region.externalID=External ID - # Sample sampleCreateNew=Create new sample sampleIncludeTestOnCreation=Create test result for this sample now @@ -1566,7 +1481,6 @@ sampleActiveSamples=Active samples sampleArchivedSamples=Archived samples sampleAllSamples=All samples sampleAssociationType=Sample type - Sample=Sample Sample.additionalTestingRequested=Request additional tests to be performed? Sample.additionalTestingStatus=Additional testing status @@ -1616,23 +1530,22 @@ Sample.testType=Type of test Sample.typeOfTest=Type of test Sample.uuid=Sample ID Sample.samplePurpose=Purpose of the Sample - SampleExport.additionalTestingRequested=Have additional tests been requested? SampleExport.personAddressCaption=Address of case/contact/event participant person SampleExport.personAge=Age of case/contact/event participant person SampleExport.caseDistrict=District of case SampleExport.caseCommunity=Community of case SampleExport.caseFacility=Facility of case -SampleExport.contactRegion = Region of contact -SampleExport.contactDistrict = District of contact -SampleExport.contactCommunity = Community of contact +SampleExport.contactRegion=Region of contact +SampleExport.contactDistrict=District of contact +SampleExport.contactCommunity=Community of contact SampleExport.caseOutcome=Outcome of case SampleExport.caseRegion=Region of case SampleExport.caseReportDate=Case report date SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID -SampleExport.contactUuid = Contact UUID -SampleExport.contactReportDate = Contact report date +SampleExport.contactUuid=Contact UUID +SampleExport.contactReportDate=Contact report date SampleExport.id=Sample SN SampleExport.sampleReportDate=Sample report date SampleExport.noTestPossibleReason=No test possible reason @@ -1684,7 +1597,6 @@ SampleExport.testDateTime=Date and time of latest additional test SampleExport.totalBilirubin=Total bilirubin of latest additional test SampleExport.urea=Urea of latest additional test SampleExport.wbcCount=WBC count of latest additional test - # Statistics statisticsAddFilter=Add filter statisticsAttribute=Attribute @@ -1707,13 +1619,11 @@ statisticsStatistics=Statistics statisticsVisualizationType=Type statisticsIncidenceDivisor=Incidence divisor statisticsDataDisplayed=Data displayed - # Symptoms symptomsLesionsLocations=Localization of the lesions symptomsMaxTemperature=Maximum body temperature in ° C symptomsSetClearedToNo=Set cleared to No symptomsSetClearedToUnknown=Set cleared to Unknown - Symptoms=Symptoms Symptoms.abdominalPain=Abdominal pain Symptoms.alteredConsciousness=Altered level of consciousness @@ -1901,7 +1811,6 @@ Symptoms.palpitations=Palpitations Symptoms.dizzinessStandingUp=Dizziness (when standing up from a sitting or lying position) Symptoms.highOrLowBloodPressure=Blood pressure too high or too low (measured) Symptoms.urinaryRetention=Urinary retention - # Task taskMyTasks=My tasks taskNewTask=New task @@ -1910,7 +1819,6 @@ taskOfficerTasks=Officer tasks taskActiveTasks=Active tasks taskArchivedTasks=Archived tasks taskAllTasks=All tasks - Task=Task Task.assigneeReply=Comments on execution Task.assigneeUser=Assigned to @@ -1928,9 +1836,7 @@ Task.suggestedStart=Suggested start Task.taskContext=Task context Task.taskStatus=Task status Task.taskType=Task type - # TestReport - TestReport.testDateTime=Date and time of result TestReport.testLabCity=Lab city TestReport.testLabExternalId=Lab external ID @@ -1938,12 +1844,10 @@ TestReport.testLabName=Lab name TestReport.testLabPostalCode=Lab postal code TestReport.testResult=Test result TestReport.testType=Type of test - # Treatment treatmentCreateTreatment=Create treatment treatmentNewTreatment=New treatment treatmentOpenPrescription=Open prescription - Treatment.additionalNotes=Additional notes Treatment.dose=Dose Treatment.drugIntakeDetails=Drug name @@ -1957,10 +1861,8 @@ Treatment.treatmentDetails=Treatment details Treatment.treatmentType=Treatment type Treatment.typeOfDrug=Type of drug Treatment.treatmentRoute=Treatment route - TreatmentExport.caseUuid=Case ID TreatmentExport.caseName=Case name - # User userNewUser=New user userResetPassword=Create new password @@ -1970,7 +1872,6 @@ syncUsers=Sync Users syncErrors=%d Error(s) syncSuccessful=%d Synced syncProcessed=%d/%d Processed - User=User User.active=Active? User.associatedOfficer=Associated officer @@ -1985,20 +1886,16 @@ User.userName=User name User.userRoles=User roles User.address=Address User.uuid=UUID - # Views View.actions=Action Directory - View.aggregatereports=Aggregate Reporting (mSERS) View.aggregatereports.sub= - View.campaign.campaigns=Campaign Directory View.campaign.campaigns.short=Campaigns View.campaign.campaigndata=Campaign Data View.campaign.campaigndata.short=Campaign Data View.campaign.campaigndata.dataform=Campaign Data Form View.campaign.campaigndata.dataform.short=Data Form - View.cases=Case Directory View.cases.merge=Merge Duplicate Cases View.cases.archive=Case Archive @@ -2014,10 +1911,8 @@ View.cases.clinicalcourse=Clinical Course View.cases.maternalhistory=Maternal History View.cases.porthealthinfo=Port Health Information View.cases.visits=Case Visits - View.persons=Person Directory View.persons.data=Person Information - View.configuration.communities=Communities Configuration View.configuration.communities.short=Communities View.configuration.districts=Districts Configuration @@ -2048,7 +1943,6 @@ View.configuration.populationdata=Population Data View.configuration.populationdata.short=Population View.configuration.linelisting=Line Listing Configuration View.configuration.linelisting.short=Line Listing - View.contacts=Contact Directory View.contacts.archive=Contact Archive View.contacts.epidata=Contact Epidemiological Data @@ -2056,11 +1950,9 @@ View.contacts.data=Contact Information View.contacts.person=Contact Person View.contacts.sub= View.contacts.visits=Contact Visits - View.dashboard.contacts=Contacts Dashboard View.dashboard.surveillance=Surveillance Dashboard View.dashboard.campaigns=Campaigns Dashboard - View.events=Event Directory View.events.archive=Event Archive View.events.data=Event Information @@ -2068,30 +1960,22 @@ View.events.eventactions=Event Actions View.events.eventparticipants=Event Participants View.events.sub= View.events.eventparticipants.data=Event Participant Information - View.samples.labMessages=Lab Message Directory - View.reports=Weekly Reports View.reports.sub= - View.samples=Sample Directory View.samples.archive=Sample Archive View.samples.data=Sample Information View.samples.sub= - View.statistics=Statistics View.statistics.database-export=Database export - View.tasks=Task Management View.tasks.archive=Task Archive View.tasks.sub= - View.users=User Management View.users.sub= - # Visit visitNewVisit=New visit - Visit=Visit Visit.person=Visited person Visit.symptoms=Symptoms @@ -2103,24 +1987,19 @@ Visit.visitUser=Visiting officer Visit.disease=Disease Visit.reportLat=Report latitude Visit.reportLon=Report longitude - # WeeklyReport weeklyReportNoReport=Missing report weeklyReportOfficerInformants=Informants weeklyReportsInDistrict=Weekly Reports in %s weeklyReportRegionOfficers=Officers weeklyReportRegionInformants=Informants - WeeklyReport.epiWeek=Epi Week WeeklyReport.year=Year - # WeeklyReportEntry WeeklyReportEntry.numberOfCases=Cases reported - # WeeklyReportInformantSummary WeeklyReportInformantSummary.informantReportDate=Informant report submission WeeklyReportInformantSummary.totalCaseCount=Cases reported by informant - # WeeklyReportOfficerSummary WeeklyReportOfficerSummary.informants=Number of informants WeeklyReportOfficerSummary.informantReports=Number of informant reports @@ -2129,7 +2008,6 @@ WeeklyReportOfficerSummary.informantZeroReports=Number of informant zero reports WeeklyReportOfficerSummary.officer=Officer WeeklyReportOfficerSummary.officerReportDate=Officer report submission WeeklyReportOfficerSummary.totalCaseCount=Cases reported by officer - # WeeklyReportRegionSummary WeeklyReportRegionSummary.informants=Number of informants WeeklyReportRegionSummary.informantReports=Number of informant reports @@ -2139,7 +2017,6 @@ WeeklyReportRegionSummary.officers=Number of officers WeeklyReportRegionSummary.officerReports=Number of officers reports WeeklyReportRegionSummary.officerReportPercentage=Percentage WeeklyReportRegionSummary.officerZeroReports=Number of officer zero reports - # SORMAS to SORMAS SormasToSormasOptions.organization=Orgainzation SormasToSormasOptions.withAssociatedContacts=Share associated contacts @@ -2160,23 +2037,17 @@ sormasToSormasSharedWith=Shared with sormasToSormasSharedBy=By sormasToSormasSharedDate=On sormasToSormasSentFrom=Sent from - BAGExport=BAG Export - # Survnet Gateway SurvnetGateway.title=SurvNet SurvnetGateway.send=send to own SurvNet instance SurvnetGateway.unableToSend=Unable to send SurvnetGateway.confirmSend=Confirm sending SurvnetGateway.sendShort=Send to SurvNet - patientDiaryRegistrationError=Could not register person in the patient diary. patientDiaryPersonNotExportable=Cannot export the person to the patient diary. The person needs a valid birthdate and either a valid phone number or email address. - showPlacesOnMap=Show - changeUserEmail=Change user email - VaccinationInfo.vaccination=Vaccination status for this disease VaccinationInfo.firstVaccinationDate=Date of first vaccination VaccinationInfo.lastVaccinationDate=Date of last vaccination diff --git a/sormas-api/src/main/resources/captions_ne-NP.properties b/sormas-api/src/main/resources/captions_ne-NP.properties index 42f5c2bc105..932cab54c47 100644 --- a/sormas-api/src/main/resources/captions_ne-NP.properties +++ b/sormas-api/src/main/resources/captions_ne-NP.properties @@ -188,13 +188,13 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge = Okay, and continue to merge overview -actionOkAndGoToContactDirectory = Okay, and continue to contact directory -actionOkAndGoToContactDetails = Okay, and continue to contact -actionOkAndGoToPersonDirectory = Okay, and continue to person directory -actionExecuteAutomaticDeletion = Execute automatic deletion -actionDone = Done -actionConfirmAction = Confirm action +actionOkAndGoToMerge=Okay, and continue to merge overview +actionOkAndGoToContactDirectory=Okay, and continue to contact directory +actionOkAndGoToContactDetails=Okay, and continue to contact +actionOkAndGoToPersonDirectory=Okay, and continue to person directory +actionExecuteAutomaticDeletion=Execute automatic deletion +actionDone=Done +actionConfirmAction=Confirm action activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -248,10 +248,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows = Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups = Expired -aggregateReportNoAgeGroup = No age group -aggregateReportShowOnlyDuplicateReports = Display only duplicate reports +aggregateReportShowZeroRows=Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups=Expired +aggregateReportNoAgeGroup=No age group +aggregateReportShowOnlyDuplicateReports=Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -275,7 +275,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend = Send emails +bulkEmailSend=Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -434,6 +434,7 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name +CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1133,7 +1134,6 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: - # Environment Environment=Environment Environment.uuid=Environment ID @@ -1152,54 +1152,51 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location - environmentActiveEnvironments=Active environments -environmentArchivedEnvironments = Archived environments -environmentAllActiveAndArchivedEnvironments = All active and archived environments -environmentDeletedEnvironments = Deleted environments -environmentNewEnvironment= New environment +environmentArchivedEnvironments=Archived environments +environmentAllActiveAndArchivedEnvironments=All active and archived environments +environmentDeletedEnvironments=Deleted environments +environmentNewEnvironment=New environment environmentEnvironmentsList=Environments list - # EnvironmentSample -EnvironmentSample = Environment Sample -EnvironmentSample.uuid = Sample ID -EnvironmentSample.environment = Environment -EnvironmentSample.sampleDateTime = Date of sampling -EnvironmentSample.sampleMaterial = Sample material -EnvironmentSample.otherSampleMaterial = Specify sample material -EnvironmentSample.sampleVolume = Volume (in mL) -EnvironmentSample.fieldSampleId = Field sample ID -EnvironmentSample.turbidity = Turbidity (in NTU) -EnvironmentSample.phValue = pH of sample -EnvironmentSample.sampleTemperature = Temperature (in °C) -EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) -EnvironmentSample.laboratory = Laboratory -EnvironmentSample.laboratoryDetails = Laboratory details -EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested -EnvironmentSample.reportingUser = Reporting user -EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested -EnvironmentSample.weatherConditions = Weather conditions at time of sampling -EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched = Sent/dispatched -EnvironmentSample.dispatchDate = Dispatchment date -EnvironmentSample.dispatchDetails = Dispatchment details -EnvironmentSample.received = Received -EnvironmentSample.receivalDate = Receival date -EnvironmentSample.labSampleId = Lab sample ID -EnvironmentSample.specimenCondition = Specimen condition -EnvironmentSample.location = Location of sampling site -EnvironmentSample.generalComment = General comment -EnvironmentSample.positivePathogenTests = Positive pathogen tests -EnvironmentSample.latestPathogenTest = Latest pathogen test -EnvironmentSample.numberOfTests = Number of tests - +EnvironmentSample=Environment Sample +EnvironmentSample.uuid=Sample ID +EnvironmentSample.environment=Environment +EnvironmentSample.sampleDateTime=Date of sampling +EnvironmentSample.sampleMaterial=Sample material +EnvironmentSample.otherSampleMaterial=Specify sample material +EnvironmentSample.sampleVolume=Volume (in mL) +EnvironmentSample.fieldSampleId=Field sample ID +EnvironmentSample.turbidity=Turbidity (in NTU) +EnvironmentSample.phValue=pH of sample +EnvironmentSample.sampleTemperature=Temperature (in °C) +EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) +EnvironmentSample.laboratory=Laboratory +EnvironmentSample.laboratoryDetails=Laboratory details +EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested +EnvironmentSample.reportingUser=Reporting user +EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested +EnvironmentSample.weatherConditions=Weather conditions at time of sampling +EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched=Sent/dispatched +EnvironmentSample.dispatchDate=Dispatchment date +EnvironmentSample.dispatchDetails=Dispatchment details +EnvironmentSample.received=Received +EnvironmentSample.receivalDate=Receival date +EnvironmentSample.labSampleId=Lab sample ID +EnvironmentSample.specimenCondition=Specimen condition +EnvironmentSample.location=Location of sampling site +EnvironmentSample.generalComment=General comment +EnvironmentSample.positivePathogenTests=Positive pathogen tests +EnvironmentSample.latestPathogenTest=Latest pathogen test +EnvironmentSample.numberOfTests=Number of tests # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents = Deleted events +eventDeletedEvents=Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1343,7 +1340,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants = Deleted event participants +eventParticipantDeletedEventParticipants=Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1356,7 +1353,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser = Reporting user +EventParticipant.reportingUser=Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1393,9 +1390,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink = Event participant ID -EventParticipantSelection.eventUuidLink = Event ID -EventParticipantSelection.resultingCaseUuidLink = Resulting case ID +EventParticipantSelection.eventParticipantUuidLink=Event participant ID +EventParticipantSelection.eventUuidLink=Event ID +EventParticipantSelection.resultingCaseUuidLink=Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1615,7 +1612,6 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message - #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1626,7 +1622,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList = List of new event participants +lineListingNewEventParticipantsList=List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1800,10 +1796,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples = See samples for this person -caseLinkToSamples = See samples for this case -contactLinkToSamples = See samples for this contact -eventParticipantLinkToSamples = See samples for this event participant +personLinkToSamples=See samples for this person +caseLinkToSamples=See samples for this case +contactLinkToSamples=See samples for this contact +eventParticipantLinkToSamples=See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2111,9 +2107,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity = Community of event participant -SampleExport.eventParticipantDistrict = District of event participant -SampleExport.eventParticipantRegion = Region of event participant +SampleExport.eventParticipantCommunity=Community of event participant +SampleExport.eventParticipantDistrict=District of event participant +SampleExport.eventParticipantRegion=Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2172,7 +2168,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser = Reporting user +Immunization.reportingUser=Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2215,10 +2211,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations = Active immunizations -immunizationArchivedImmunizations = Archived immunizations -immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations -immunizationDeletedImmunizations = Deleted immunizations +immunizationActiveImmunizations=Active immunizations +immunizationArchivedImmunizations=Archived immunizations +immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations +immunizationDeletedImmunizations=Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2461,7 +2457,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment = Associated environment +Task.environment=Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2514,7 +2510,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser = Reporting user +TravelEntry.reportingUser=Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -2881,17 +2877,15 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms = SMS -userRoleNotificationTypeEmail = EMAIL +userRoleNotificationTypeSms=SMS +userRoleNotificationTypeEmail=EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template - notificationType=Notification type -notificationType.group = Group -notificationType.caption = Caption -notificationType.description = Description - +notificationType.group=Group +notificationType.caption=Caption +notificationType.description=Description SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -2926,10 +2920,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails = Person contact details -environmentSampleNotShipped = Not shipped -environmentSampleShipped = Shipped -environmentSampleReceived = Received +TaskExport.personOtherContactDetails=Person contact details +environmentSampleNotShipped=Not shipped +environmentSampleShipped=Shipped +environmentSampleReceived=Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -2946,37 +2940,34 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents - # SpecialCaseAccess SpecialCaseAccess=Special case access -caze = Case -assignedTo = Assigned to -assignedBy = Assigned by -endDateTime = Access until -assignmentDate = Date assigned - +caze=Case +assignedTo=Assigned to +assignedBy=Assigned by +endDateTime=Access until +assignmentDate=Date assigned specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case - # SelfReport -SelfReport.type = Type -SelfReport.reportDate = Report date -SelfReport.disease = Disease -SelfReport.diseaseVariant = Disease variant -SelfReport.firstName = First name -SelfReport.lastName = Last name -SelfReport.sex = Sex -SelfReport.birthdateDD = Day of birth -SelfReport.birthdateMM = Month of birth -SelfReport.birthdateYYYY = Year of birth -SelfReport.nationalHealthId = National health ID -SelfReport.email = Email -SelfReport.phoneNumber = Phone number -SelfReport.address = Address -SelfReport.comment = Comment -SelfReport.responsibleUser = Responsible user -SelfReport.investigationStatus = Investigation status -SelfReport.processingStatus = Processing status +SelfReport.type=Type +SelfReport.reportDate=Report date +SelfReport.disease=Disease +SelfReport.diseaseVariant=Disease variant +SelfReport.firstName=First name +SelfReport.lastName=Last name +SelfReport.sex=Sex +SelfReport.birthdateDD=Day of birth +SelfReport.birthdateMM=Month of birth +SelfReport.birthdateYYYY=Year of birth +SelfReport.nationalHealthId=National health ID +SelfReport.email=Email +SelfReport.phoneNumber=Phone number +SelfReport.address=Address +SelfReport.comment=Comment +SelfReport.responsibleUser=Responsible user +SelfReport.investigationStatus=Investigation status +SelfReport.processingStatus=Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_nl-NL.properties b/sormas-api/src/main/resources/captions_nl-NL.properties index af2b546cf31..2c3589116cb 100644 --- a/sormas-api/src/main/resources/captions_nl-NL.properties +++ b/sormas-api/src/main/resources/captions_nl-NL.properties @@ -188,13 +188,13 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge = Okay, and continue to merge overview -actionOkAndGoToContactDirectory = Okay, and continue to contact directory -actionOkAndGoToContactDetails = Okay, and continue to contact -actionOkAndGoToPersonDirectory = Okay, and continue to person directory -actionExecuteAutomaticDeletion = Execute automatic deletion -actionDone = Done -actionConfirmAction = Confirm action +actionOkAndGoToMerge=Okay, and continue to merge overview +actionOkAndGoToContactDirectory=Okay, and continue to contact directory +actionOkAndGoToContactDetails=Okay, and continue to contact +actionOkAndGoToPersonDirectory=Okay, and continue to person directory +actionExecuteAutomaticDeletion=Execute automatic deletion +actionDone=Done +actionConfirmAction=Confirm action activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -248,10 +248,10 @@ aggregateReportDiscardSelection=Selectie verwijderen aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows = Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups = Expired -aggregateReportNoAgeGroup = No age group -aggregateReportShowOnlyDuplicateReports = Display only duplicate reports +aggregateReportShowZeroRows=Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups=Expired +aggregateReportNoAgeGroup=No age group +aggregateReportShowOnlyDuplicateReports=Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=Deze week @@ -275,7 +275,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend = Send emails +bulkEmailSend=Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -434,6 +434,7 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name +CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1133,7 +1134,6 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: - # Environment Environment=Environment Environment.uuid=Environment ID @@ -1152,54 +1152,51 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location - environmentActiveEnvironments=Active environments -environmentArchivedEnvironments = Archived environments -environmentAllActiveAndArchivedEnvironments = All active and archived environments -environmentDeletedEnvironments = Deleted environments -environmentNewEnvironment= New environment +environmentArchivedEnvironments=Archived environments +environmentAllActiveAndArchivedEnvironments=All active and archived environments +environmentDeletedEnvironments=Deleted environments +environmentNewEnvironment=New environment environmentEnvironmentsList=Environments list - # EnvironmentSample -EnvironmentSample = Environment Sample -EnvironmentSample.uuid = Sample ID -EnvironmentSample.environment = Environment -EnvironmentSample.sampleDateTime = Date of sampling -EnvironmentSample.sampleMaterial = Sample material -EnvironmentSample.otherSampleMaterial = Specify sample material -EnvironmentSample.sampleVolume = Volume (in mL) -EnvironmentSample.fieldSampleId = Field sample ID -EnvironmentSample.turbidity = Turbidity (in NTU) -EnvironmentSample.phValue = pH of sample -EnvironmentSample.sampleTemperature = Temperature (in °C) -EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) -EnvironmentSample.laboratory = Laboratory -EnvironmentSample.laboratoryDetails = Laboratory details -EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested -EnvironmentSample.reportingUser = Reporting user -EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested -EnvironmentSample.weatherConditions = Weather conditions at time of sampling -EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched = Sent/dispatched -EnvironmentSample.dispatchDate = Dispatchment date -EnvironmentSample.dispatchDetails = Dispatchment details -EnvironmentSample.received = Received -EnvironmentSample.receivalDate = Receival date -EnvironmentSample.labSampleId = Lab sample ID -EnvironmentSample.specimenCondition = Specimen condition -EnvironmentSample.location = Location of sampling site -EnvironmentSample.generalComment = General comment -EnvironmentSample.positivePathogenTests = Positive pathogen tests -EnvironmentSample.latestPathogenTest = Latest pathogen test -EnvironmentSample.numberOfTests = Number of tests - +EnvironmentSample=Environment Sample +EnvironmentSample.uuid=Sample ID +EnvironmentSample.environment=Environment +EnvironmentSample.sampleDateTime=Date of sampling +EnvironmentSample.sampleMaterial=Sample material +EnvironmentSample.otherSampleMaterial=Specify sample material +EnvironmentSample.sampleVolume=Volume (in mL) +EnvironmentSample.fieldSampleId=Field sample ID +EnvironmentSample.turbidity=Turbidity (in NTU) +EnvironmentSample.phValue=pH of sample +EnvironmentSample.sampleTemperature=Temperature (in °C) +EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) +EnvironmentSample.laboratory=Laboratory +EnvironmentSample.laboratoryDetails=Laboratory details +EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested +EnvironmentSample.reportingUser=Reporting user +EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested +EnvironmentSample.weatherConditions=Weather conditions at time of sampling +EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched=Sent/dispatched +EnvironmentSample.dispatchDate=Dispatchment date +EnvironmentSample.dispatchDetails=Dispatchment details +EnvironmentSample.received=Received +EnvironmentSample.receivalDate=Receival date +EnvironmentSample.labSampleId=Lab sample ID +EnvironmentSample.specimenCondition=Specimen condition +EnvironmentSample.location=Location of sampling site +EnvironmentSample.generalComment=General comment +EnvironmentSample.positivePathogenTests=Positive pathogen tests +EnvironmentSample.latestPathogenTest=Latest pathogen test +EnvironmentSample.numberOfTests=Number of tests # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents = Deleted events +eventDeletedEvents=Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1343,7 +1340,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants = Deleted event participants +eventParticipantDeletedEventParticipants=Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1356,7 +1353,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser = Reporting user +EventParticipant.reportingUser=Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1393,9 +1390,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink = Event participant ID -EventParticipantSelection.eventUuidLink = Event ID -EventParticipantSelection.resultingCaseUuidLink = Resulting case ID +EventParticipantSelection.eventParticipantUuidLink=Event participant ID +EventParticipantSelection.eventUuidLink=Event ID +EventParticipantSelection.resultingCaseUuidLink=Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1615,7 +1612,6 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message - #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1626,7 +1622,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList = List of new event participants +lineListingNewEventParticipantsList=List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1800,10 +1796,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples = See samples for this person -caseLinkToSamples = See samples for this case -contactLinkToSamples = See samples for this contact -eventParticipantLinkToSamples = See samples for this event participant +personLinkToSamples=See samples for this person +caseLinkToSamples=See samples for this case +contactLinkToSamples=See samples for this contact +eventParticipantLinkToSamples=See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2111,9 +2107,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity = Community of event participant -SampleExport.eventParticipantDistrict = District of event participant -SampleExport.eventParticipantRegion = Region of event participant +SampleExport.eventParticipantCommunity=Community of event participant +SampleExport.eventParticipantDistrict=District of event participant +SampleExport.eventParticipantRegion=Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2172,7 +2168,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser = Reporting user +Immunization.reportingUser=Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2215,10 +2211,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations = Active immunizations -immunizationArchivedImmunizations = Archived immunizations -immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations -immunizationDeletedImmunizations = Deleted immunizations +immunizationActiveImmunizations=Active immunizations +immunizationArchivedImmunizations=Archived immunizations +immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations +immunizationDeletedImmunizations=Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2461,7 +2457,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment = Associated environment +Task.environment=Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2514,7 +2510,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser = Reporting user +TravelEntry.reportingUser=Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -2881,17 +2877,15 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms = SMS -userRoleNotificationTypeEmail = EMAIL +userRoleNotificationTypeSms=SMS +userRoleNotificationTypeEmail=EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template - notificationType=Notification type -notificationType.group = Group -notificationType.caption = Caption -notificationType.description = Description - +notificationType.group=Group +notificationType.caption=Caption +notificationType.description=Description SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -2926,10 +2920,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails = Person contact details -environmentSampleNotShipped = Not shipped -environmentSampleShipped = Shipped -environmentSampleReceived = Received +TaskExport.personOtherContactDetails=Person contact details +environmentSampleNotShipped=Not shipped +environmentSampleShipped=Shipped +environmentSampleReceived=Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -2946,37 +2940,34 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents - # SpecialCaseAccess SpecialCaseAccess=Special case access -caze = Case -assignedTo = Assigned to -assignedBy = Assigned by -endDateTime = Access until -assignmentDate = Date assigned - +caze=Case +assignedTo=Assigned to +assignedBy=Assigned by +endDateTime=Access until +assignmentDate=Date assigned specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case - # SelfReport -SelfReport.type = Type -SelfReport.reportDate = Report date -SelfReport.disease = Disease -SelfReport.diseaseVariant = Disease variant -SelfReport.firstName = First name -SelfReport.lastName = Last name -SelfReport.sex = Sex -SelfReport.birthdateDD = Day of birth -SelfReport.birthdateMM = Month of birth -SelfReport.birthdateYYYY = Year of birth -SelfReport.nationalHealthId = National health ID -SelfReport.email = Email -SelfReport.phoneNumber = Phone number -SelfReport.address = Address -SelfReport.comment = Comment -SelfReport.responsibleUser = Responsible user -SelfReport.investigationStatus = Investigation status -SelfReport.processingStatus = Processing status +SelfReport.type=Type +SelfReport.reportDate=Report date +SelfReport.disease=Disease +SelfReport.diseaseVariant=Disease variant +SelfReport.firstName=First name +SelfReport.lastName=Last name +SelfReport.sex=Sex +SelfReport.birthdateDD=Day of birth +SelfReport.birthdateMM=Month of birth +SelfReport.birthdateYYYY=Year of birth +SelfReport.nationalHealthId=National health ID +SelfReport.email=Email +SelfReport.phoneNumber=Phone number +SelfReport.address=Address +SelfReport.comment=Comment +SelfReport.responsibleUser=Responsible user +SelfReport.investigationStatus=Investigation status +SelfReport.processingStatus=Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_no-NO.properties b/sormas-api/src/main/resources/captions_no-NO.properties index 7ca0f1f4687..1e611b51ccf 100644 --- a/sormas-api/src/main/resources/captions_no-NO.properties +++ b/sormas-api/src/main/resources/captions_no-NO.properties @@ -188,13 +188,13 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge = Okay, and continue to merge overview -actionOkAndGoToContactDirectory = Okay, and continue to contact directory -actionOkAndGoToContactDetails = Okay, and continue to contact -actionOkAndGoToPersonDirectory = Okay, and continue to person directory -actionExecuteAutomaticDeletion = Execute automatic deletion -actionDone = Done -actionConfirmAction = Confirm action +actionOkAndGoToMerge=Okay, and continue to merge overview +actionOkAndGoToContactDirectory=Okay, and continue to contact directory +actionOkAndGoToContactDetails=Okay, and continue to contact +actionOkAndGoToPersonDirectory=Okay, and continue to person directory +actionExecuteAutomaticDeletion=Execute automatic deletion +actionDone=Done +actionConfirmAction=Confirm action activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -248,10 +248,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows = Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups = Expired -aggregateReportNoAgeGroup = No age group -aggregateReportShowOnlyDuplicateReports = Display only duplicate reports +aggregateReportShowZeroRows=Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups=Expired +aggregateReportNoAgeGroup=No age group +aggregateReportShowOnlyDuplicateReports=Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -275,7 +275,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend = Send emails +bulkEmailSend=Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -434,6 +434,7 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name +CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1133,7 +1134,6 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: - # Environment Environment=Environment Environment.uuid=Environment ID @@ -1152,54 +1152,51 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location - environmentActiveEnvironments=Active environments -environmentArchivedEnvironments = Archived environments -environmentAllActiveAndArchivedEnvironments = All active and archived environments -environmentDeletedEnvironments = Deleted environments -environmentNewEnvironment= New environment +environmentArchivedEnvironments=Archived environments +environmentAllActiveAndArchivedEnvironments=All active and archived environments +environmentDeletedEnvironments=Deleted environments +environmentNewEnvironment=New environment environmentEnvironmentsList=Environments list - # EnvironmentSample -EnvironmentSample = Environment Sample -EnvironmentSample.uuid = Sample ID -EnvironmentSample.environment = Environment -EnvironmentSample.sampleDateTime = Date of sampling -EnvironmentSample.sampleMaterial = Sample material -EnvironmentSample.otherSampleMaterial = Specify sample material -EnvironmentSample.sampleVolume = Volume (in mL) -EnvironmentSample.fieldSampleId = Field sample ID -EnvironmentSample.turbidity = Turbidity (in NTU) -EnvironmentSample.phValue = pH of sample -EnvironmentSample.sampleTemperature = Temperature (in °C) -EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) -EnvironmentSample.laboratory = Laboratory -EnvironmentSample.laboratoryDetails = Laboratory details -EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested -EnvironmentSample.reportingUser = Reporting user -EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested -EnvironmentSample.weatherConditions = Weather conditions at time of sampling -EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched = Sent/dispatched -EnvironmentSample.dispatchDate = Dispatchment date -EnvironmentSample.dispatchDetails = Dispatchment details -EnvironmentSample.received = Received -EnvironmentSample.receivalDate = Receival date -EnvironmentSample.labSampleId = Lab sample ID -EnvironmentSample.specimenCondition = Specimen condition -EnvironmentSample.location = Location of sampling site -EnvironmentSample.generalComment = General comment -EnvironmentSample.positivePathogenTests = Positive pathogen tests -EnvironmentSample.latestPathogenTest = Latest pathogen test -EnvironmentSample.numberOfTests = Number of tests - +EnvironmentSample=Environment Sample +EnvironmentSample.uuid=Sample ID +EnvironmentSample.environment=Environment +EnvironmentSample.sampleDateTime=Date of sampling +EnvironmentSample.sampleMaterial=Sample material +EnvironmentSample.otherSampleMaterial=Specify sample material +EnvironmentSample.sampleVolume=Volume (in mL) +EnvironmentSample.fieldSampleId=Field sample ID +EnvironmentSample.turbidity=Turbidity (in NTU) +EnvironmentSample.phValue=pH of sample +EnvironmentSample.sampleTemperature=Temperature (in °C) +EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) +EnvironmentSample.laboratory=Laboratory +EnvironmentSample.laboratoryDetails=Laboratory details +EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested +EnvironmentSample.reportingUser=Reporting user +EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested +EnvironmentSample.weatherConditions=Weather conditions at time of sampling +EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched=Sent/dispatched +EnvironmentSample.dispatchDate=Dispatchment date +EnvironmentSample.dispatchDetails=Dispatchment details +EnvironmentSample.received=Received +EnvironmentSample.receivalDate=Receival date +EnvironmentSample.labSampleId=Lab sample ID +EnvironmentSample.specimenCondition=Specimen condition +EnvironmentSample.location=Location of sampling site +EnvironmentSample.generalComment=General comment +EnvironmentSample.positivePathogenTests=Positive pathogen tests +EnvironmentSample.latestPathogenTest=Latest pathogen test +EnvironmentSample.numberOfTests=Number of tests # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents = Deleted events +eventDeletedEvents=Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1343,7 +1340,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants = Deleted event participants +eventParticipantDeletedEventParticipants=Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1356,7 +1353,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser = Reporting user +EventParticipant.reportingUser=Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1393,9 +1390,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink = Event participant ID -EventParticipantSelection.eventUuidLink = Event ID -EventParticipantSelection.resultingCaseUuidLink = Resulting case ID +EventParticipantSelection.eventParticipantUuidLink=Event participant ID +EventParticipantSelection.eventUuidLink=Event ID +EventParticipantSelection.resultingCaseUuidLink=Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1615,7 +1612,6 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message - #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1626,7 +1622,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList = List of new event participants +lineListingNewEventParticipantsList=List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1800,10 +1796,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples = See samples for this person -caseLinkToSamples = See samples for this case -contactLinkToSamples = See samples for this contact -eventParticipantLinkToSamples = See samples for this event participant +personLinkToSamples=See samples for this person +caseLinkToSamples=See samples for this case +contactLinkToSamples=See samples for this contact +eventParticipantLinkToSamples=See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2111,9 +2107,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity = Community of event participant -SampleExport.eventParticipantDistrict = District of event participant -SampleExport.eventParticipantRegion = Region of event participant +SampleExport.eventParticipantCommunity=Community of event participant +SampleExport.eventParticipantDistrict=District of event participant +SampleExport.eventParticipantRegion=Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2172,7 +2168,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser = Reporting user +Immunization.reportingUser=Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2215,10 +2211,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations = Active immunizations -immunizationArchivedImmunizations = Archived immunizations -immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations -immunizationDeletedImmunizations = Deleted immunizations +immunizationActiveImmunizations=Active immunizations +immunizationArchivedImmunizations=Archived immunizations +immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations +immunizationDeletedImmunizations=Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2461,7 +2457,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment = Associated environment +Task.environment=Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2514,7 +2510,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser = Reporting user +TravelEntry.reportingUser=Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -2881,17 +2877,15 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms = SMS -userRoleNotificationTypeEmail = EMAIL +userRoleNotificationTypeSms=SMS +userRoleNotificationTypeEmail=EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template - notificationType=Notification type -notificationType.group = Group -notificationType.caption = Caption -notificationType.description = Description - +notificationType.group=Group +notificationType.caption=Caption +notificationType.description=Description SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -2926,10 +2920,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails = Person contact details -environmentSampleNotShipped = Not shipped -environmentSampleShipped = Shipped -environmentSampleReceived = Received +TaskExport.personOtherContactDetails=Person contact details +environmentSampleNotShipped=Not shipped +environmentSampleShipped=Shipped +environmentSampleReceived=Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -2946,37 +2940,34 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents - # SpecialCaseAccess SpecialCaseAccess=Special case access -caze = Case -assignedTo = Assigned to -assignedBy = Assigned by -endDateTime = Access until -assignmentDate = Date assigned - +caze=Case +assignedTo=Assigned to +assignedBy=Assigned by +endDateTime=Access until +assignmentDate=Date assigned specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case - # SelfReport -SelfReport.type = Type -SelfReport.reportDate = Report date -SelfReport.disease = Disease -SelfReport.diseaseVariant = Disease variant -SelfReport.firstName = First name -SelfReport.lastName = Last name -SelfReport.sex = Sex -SelfReport.birthdateDD = Day of birth -SelfReport.birthdateMM = Month of birth -SelfReport.birthdateYYYY = Year of birth -SelfReport.nationalHealthId = National health ID -SelfReport.email = Email -SelfReport.phoneNumber = Phone number -SelfReport.address = Address -SelfReport.comment = Comment -SelfReport.responsibleUser = Responsible user -SelfReport.investigationStatus = Investigation status -SelfReport.processingStatus = Processing status +SelfReport.type=Type +SelfReport.reportDate=Report date +SelfReport.disease=Disease +SelfReport.diseaseVariant=Disease variant +SelfReport.firstName=First name +SelfReport.lastName=Last name +SelfReport.sex=Sex +SelfReport.birthdateDD=Day of birth +SelfReport.birthdateMM=Month of birth +SelfReport.birthdateYYYY=Year of birth +SelfReport.nationalHealthId=National health ID +SelfReport.email=Email +SelfReport.phoneNumber=Phone number +SelfReport.address=Address +SelfReport.comment=Comment +SelfReport.responsibleUser=Responsible user +SelfReport.investigationStatus=Investigation status +SelfReport.processingStatus=Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_pt-BR.properties b/sormas-api/src/main/resources/captions_pt-BR.properties index c47c0d603dc..b1a7411fd81 100644 --- a/sormas-api/src/main/resources/captions_pt-BR.properties +++ b/sormas-api/src/main/resources/captions_pt-BR.properties @@ -52,7 +52,7 @@ creationDate=Creation date changeDate=Date of last change notAvailableShort=NA inaccessibleValue=Confidential -includePartialBirthdates = Include partial birthdates +includePartialBirthdates=Include partial birthdates numberOfCharacters=Number of characters\: %d / %d remove=Remove notTestedYet=Not tested yet @@ -189,15 +189,15 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge = Okay, and continue to merge overview -actionOkAndGoToContactDirectory = Okay, and continue to contact directory -actionOkAndGoToContactDetails = Okay, and continue to contact -actionOkAndGoToPersonDirectory = Okay, and continue to person directory -actionExecuteAutomaticDeletion = Execute automatic deletion -actionDone = Done -actionConfirmAction = Confirm action -actionAefiSelectPrimarySuspectVaccination = Select Suspect Vaccination -actionAefiAssignNewReportingIdNumber = "Assign New AEFI ID" +actionOkAndGoToMerge=Okay, and continue to merge overview +actionOkAndGoToContactDirectory=Okay, and continue to contact directory +actionOkAndGoToContactDetails=Okay, and continue to contact +actionOkAndGoToPersonDirectory=Okay, and continue to person directory +actionExecuteAutomaticDeletion=Execute automatic deletion +actionDone=Done +actionConfirmAction=Confirm action +actionAefiSelectPrimarySuspectVaccination=Select Suspect Vaccination +actionAefiAssignNewReportingIdNumber="Assign New AEFI ID" activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -251,10 +251,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows = Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups = Expired -aggregateReportNoAgeGroup = No age group -aggregateReportShowOnlyDuplicateReports = Display only duplicate reports +aggregateReportShowZeroRows=Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups=Expired +aggregateReportNoAgeGroup=No age group +aggregateReportShowOnlyDuplicateReports=Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -278,7 +278,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend = Send emails +bulkEmailSend=Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -437,6 +437,7 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name +CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1036,7 +1037,6 @@ aefiDashboardAefiInvestigationDiscarded=Investigation Discarded aefiDashboardAefiClassificationRelatedToVaccination=Related to vaccine or vaccination aefiDashboardAefiClassificationCoincidentalAdverseEvent=Coincidental adverse event aefiDashboardAefiClassificationUndetermined=Undetermined - captionDefault=Default defaultRegion=Default Region defaultDistrict=Default District @@ -1154,22 +1154,20 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: - # Entity columns -EntityColumn.ENTITY = Entity -EntityColumn.FIELD_ID = Field ID -EntityColumn.FIELD = Field -EntityColumn.TYPE = Type -EntityColumn.DATA_PROTECTION = Data protection -EntityColumn.CAPTION = Caption -EntityColumn.DESCRIPTION = Description -EntityColumn.REQUIRED = Required -EntityColumn.NEW_DISEASE = New disease -EntityColumn.DISEASES = Diseases -EntityColumn.OUTBREAKS = Outbreaks -EntityColumn.IGNORED_COUNTRIES = Ignored countries -EntityColumn.EXCLUSIVE_COUNTRIES = Exclusive countries - +EntityColumn.ENTITY=Entity +EntityColumn.FIELD_ID=Field ID +EntityColumn.FIELD=Field +EntityColumn.TYPE=Type +EntityColumn.DATA_PROTECTION=Data protection +EntityColumn.CAPTION=Caption +EntityColumn.DESCRIPTION=Description +EntityColumn.REQUIRED=Required +EntityColumn.NEW_DISEASE=New disease +EntityColumn.DISEASES=Diseases +EntityColumn.OUTBREAKS=Outbreaks +EntityColumn.IGNORED_COUNTRIES=Ignored countries +EntityColumn.EXCLUSIVE_COUNTRIES=Exclusive countries # Environment Environment=Environment Environment.uuid=Environment ID @@ -1188,54 +1186,51 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location - environmentActiveEnvironments=Active environments -environmentArchivedEnvironments = Archived environments -environmentAllActiveAndArchivedEnvironments = All active and archived environments -environmentDeletedEnvironments = Deleted environments -environmentNewEnvironment= New environment +environmentArchivedEnvironments=Archived environments +environmentAllActiveAndArchivedEnvironments=All active and archived environments +environmentDeletedEnvironments=Deleted environments +environmentNewEnvironment=New environment environmentEnvironmentsList=Environments list - # EnvironmentSample -EnvironmentSample = Environment Sample -EnvironmentSample.uuid = Sample ID -EnvironmentSample.environment = Environment -EnvironmentSample.sampleDateTime = Date of sampling -EnvironmentSample.sampleMaterial = Sample material -EnvironmentSample.otherSampleMaterial = Specify sample material -EnvironmentSample.sampleVolume = Volume (in mL) -EnvironmentSample.fieldSampleId = Field sample ID -EnvironmentSample.turbidity = Turbidity (in NTU) -EnvironmentSample.phValue = pH of sample -EnvironmentSample.sampleTemperature = Temperature (in °C) -EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) -EnvironmentSample.laboratory = Laboratory -EnvironmentSample.laboratoryDetails = Laboratory details -EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested -EnvironmentSample.reportingUser = Reporting user -EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested -EnvironmentSample.weatherConditions = Weather conditions at time of sampling -EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched = Sent/dispatched -EnvironmentSample.dispatchDate = Dispatchment date -EnvironmentSample.dispatchDetails = Dispatchment details -EnvironmentSample.received = Received -EnvironmentSample.receivalDate = Receival date -EnvironmentSample.labSampleId = Lab sample ID -EnvironmentSample.specimenCondition = Specimen condition -EnvironmentSample.location = Location of sampling site -EnvironmentSample.generalComment = General comment -EnvironmentSample.positivePathogenTests = Positive pathogen tests -EnvironmentSample.latestPathogenTest = Latest pathogen test -EnvironmentSample.numberOfTests = Number of tests - +EnvironmentSample=Environment Sample +EnvironmentSample.uuid=Sample ID +EnvironmentSample.environment=Environment +EnvironmentSample.sampleDateTime=Date of sampling +EnvironmentSample.sampleMaterial=Sample material +EnvironmentSample.otherSampleMaterial=Specify sample material +EnvironmentSample.sampleVolume=Volume (in mL) +EnvironmentSample.fieldSampleId=Field sample ID +EnvironmentSample.turbidity=Turbidity (in NTU) +EnvironmentSample.phValue=pH of sample +EnvironmentSample.sampleTemperature=Temperature (in °C) +EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) +EnvironmentSample.laboratory=Laboratory +EnvironmentSample.laboratoryDetails=Laboratory details +EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested +EnvironmentSample.reportingUser=Reporting user +EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested +EnvironmentSample.weatherConditions=Weather conditions at time of sampling +EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched=Sent/dispatched +EnvironmentSample.dispatchDate=Dispatchment date +EnvironmentSample.dispatchDetails=Dispatchment details +EnvironmentSample.received=Received +EnvironmentSample.receivalDate=Receival date +EnvironmentSample.labSampleId=Lab sample ID +EnvironmentSample.specimenCondition=Specimen condition +EnvironmentSample.location=Location of sampling site +EnvironmentSample.generalComment=General comment +EnvironmentSample.positivePathogenTests=Positive pathogen tests +EnvironmentSample.latestPathogenTest=Latest pathogen test +EnvironmentSample.numberOfTests=Number of tests # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents = Deleted events +eventDeletedEvents=Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1379,7 +1374,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants = Deleted event participants +eventParticipantDeletedEventParticipants=Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1392,7 +1387,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser = Reporting user +EventParticipant.reportingUser=Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1429,9 +1424,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink = Event participant ID -EventParticipantSelection.eventUuidLink = Event ID -EventParticipantSelection.resultingCaseUuidLink = Resulting case ID +EventParticipantSelection.eventParticipantUuidLink=Event participant ID +EventParticipantSelection.eventUuidLink=Event ID +EventParticipantSelection.resultingCaseUuidLink=Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1651,7 +1646,6 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message - #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1662,7 +1656,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList = List of new event participants +lineListingNewEventParticipantsList=List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1838,10 +1832,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples = See samples for this person -caseLinkToSamples = See samples for this case -contactLinkToSamples = See samples for this contact -eventParticipantLinkToSamples = See samples for this event participant +personLinkToSamples=See samples for this person +caseLinkToSamples=See samples for this case +contactLinkToSamples=See samples for this contact +eventParticipantLinkToSamples=See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2149,9 +2143,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity = Community of event participant -SampleExport.eventParticipantDistrict = District of event participant -SampleExport.eventParticipantRegion = Region of event participant +SampleExport.eventParticipantCommunity=Community of event participant +SampleExport.eventParticipantDistrict=District of event participant +SampleExport.eventParticipantRegion=Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2210,7 +2204,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser = Reporting user +Immunization.reportingUser=Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2253,10 +2247,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations = Active immunizations -immunizationArchivedImmunizations = Archived immunizations -immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations -immunizationDeletedImmunizations = Deleted immunizations +immunizationActiveImmunizations=Active immunizations +immunizationArchivedImmunizations=Archived immunizations +immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations +immunizationDeletedImmunizations=Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2321,10 +2315,10 @@ aefiVaccinationsDiluentInformation=Diluent Information aefiVaccinationsDiluentBatchLotNumber=Batch/Lot number aefiVaccinationsDiluentExpiryDate=Expiry date aefiVaccinationsDiluentTimeOfReconstitution=Reconstitution time -aefiActiveAdverseEvents = Active adverse events -aefiArchivedAdverseEvents = Archived adverse events -aefiAllActiveAndArchivedAdverseEvents = All active and archived adverse events -aefiDeletedAdverseEvents = Deleted adverse events +aefiActiveAdverseEvents=Active adverse events +aefiArchivedAdverseEvents=Archived adverse events +aefiAllActiveAndArchivedAdverseEvents=All active and archived adverse events +aefiDeletedAdverseEvents=Deleted adverse events # Adverse Events AdverseEvents.severeLocalReaction=Severe local reaction AdverseEvents.severeLocalReactionMoreThanThreeDays=>3 days @@ -2575,13 +2569,13 @@ aefiInvestigationMedicalCareDetailsInstruction=**Instructions ? Attach copies of aefiInvestigationReconstitutionProcedure=Reconstitution procedure aefiInvestigationOfThoseAffected=Of those effected, how many are aefiAefiInvestigationList=Adverse Event Investigations -aefiNewAefiInvestigation = New Investigation +aefiNewAefiInvestigation=New Investigation aefiAefiInvestigationDataView=Adverse Event Investigation aefiNewAefiInvestigationStageTitle=Investigation -aefiActiveInvestigations = Active AEFI investigations -aefiArchivedInvestigations = Archived AEFI investigations -aefiAllActiveAndArchivedInvestigations = All active and archived AEFI investigations -aefiDeletedInvestigations = Deleted AEFI investigations +aefiActiveInvestigations=Active AEFI investigations +aefiArchivedInvestigations=Archived AEFI investigations +aefiAllActiveAndArchivedInvestigations=All active and archived AEFI investigations +aefiDeletedInvestigations=Deleted AEFI investigations titleAefiInvestigationBasicDetails=Section A\: Basic details titleAefiInvestigationRelevantPatientInformation=Section B\: Relevant patient information prior to immunization titleAefiInvestigationFirstExaminationDetails=Section C\: Details of first examination** of serious AEFI case @@ -2854,7 +2848,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment = Associated environment +Task.environment=Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2907,7 +2901,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser = Reporting user +TravelEntry.reportingUser=Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -3278,17 +3272,15 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms = SMS -userRoleNotificationTypeEmail = EMAIL +userRoleNotificationTypeSms=SMS +userRoleNotificationTypeEmail=EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template - notificationType=Notification type -notificationType.group = Group -notificationType.caption = Caption -notificationType.description = Description - +notificationType.group=Group +notificationType.caption=Caption +notificationType.description=Description SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -3323,10 +3315,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails = Person contact details -environmentSampleNotShipped = Not shipped -environmentSampleShipped = Shipped -environmentSampleReceived = Received +TaskExport.personOtherContactDetails=Person contact details +environmentSampleNotShipped=Not shipped +environmentSampleShipped=Shipped +environmentSampleReceived=Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -3343,48 +3335,45 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents - # SpecialCaseAccess SpecialCaseAccess=Special case access -caze = Case -assignedTo = Assigned to -assignedBy = Assigned by -endDateTime = Access until -assignmentDate = Date assigned - +caze=Case +assignedTo=Assigned to +assignedBy=Assigned by +endDateTime=Access until +assignmentDate=Date assigned specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case - # SelfReport -SelfReport = Self report -SelfReport.type = Type -SelfReport.reportDate = Report date -SelfReport.caseReference = Case reference number -SelfReport.disease = Disease -SelfReport.diseaseDetails = Disease details -SelfReport.diseaseVariant = Disease variant -SelfReport.diseaseVariantDetails = Disease variant details -SelfReport.firstName = First name -SelfReport.lastName = Last name -SelfReport.sex = Sex -SelfReport.birthDate = Birth date -SelfReport.birthdateDD = Day of birth -SelfReport.birthdateMM = Month of birth -SelfReport.birthdateYYYY = Year of birth -SelfReport.nationalHealthId = National health ID -SelfReport.email = Email -SelfReport.phoneNumber = Phone number -SelfReport.address = Address -SelfReport.dateOfTest = Date of test -SelfReport.dateOfSymptoms = Date of symptoms -SelfReport.workplace = Workplace -SelfReport.dateWorkplace = Date workplace -SelfReport.isolationDate = Date of isolation -SelfReport.contactDate = Date of contact -SelfReport.comment = Comment -SelfReport.responsibleUser = Responsible user -SelfReport.investigationStatus = Investigation status -SelfReport.processingStatus = Processing status +SelfReport=Self report +SelfReport.type=Type +SelfReport.reportDate=Report date +SelfReport.caseReference=Case reference number +SelfReport.disease=Disease +SelfReport.diseaseDetails=Disease details +SelfReport.diseaseVariant=Disease variant +SelfReport.diseaseVariantDetails=Disease variant details +SelfReport.firstName=First name +SelfReport.lastName=Last name +SelfReport.sex=Sex +SelfReport.birthDate=Birth date +SelfReport.birthdateDD=Day of birth +SelfReport.birthdateMM=Month of birth +SelfReport.birthdateYYYY=Year of birth +SelfReport.nationalHealthId=National health ID +SelfReport.email=Email +SelfReport.phoneNumber=Phone number +SelfReport.address=Address +SelfReport.dateOfTest=Date of test +SelfReport.dateOfSymptoms=Date of symptoms +SelfReport.workplace=Workplace +SelfReport.dateWorkplace=Date workplace +SelfReport.isolationDate=Date of isolation +SelfReport.contactDate=Date of contact +SelfReport.comment=Comment +SelfReport.responsibleUser=Responsible user +SelfReport.investigationStatus=Investigation status +SelfReport.processingStatus=Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_pt-CV.properties b/sormas-api/src/main/resources/captions_pt-CV.properties index af425ed745a..18dcee62e0c 100644 --- a/sormas-api/src/main/resources/captions_pt-CV.properties +++ b/sormas-api/src/main/resources/captions_pt-CV.properties @@ -52,7 +52,7 @@ creationDate=Creation date changeDate=Date of last change notAvailableShort=NA inaccessibleValue=Confidential -includePartialBirthdates = Include partial birthdates +includePartialBirthdates=Include partial birthdates numberOfCharacters=Number of characters\: %d / %d remove=Remove notTestedYet=Not tested yet @@ -189,15 +189,15 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge = Okay, and continue to merge overview -actionOkAndGoToContactDirectory = Okay, and continue to contact directory -actionOkAndGoToContactDetails = Okay, and continue to contact -actionOkAndGoToPersonDirectory = Okay, and continue to person directory -actionExecuteAutomaticDeletion = Execute automatic deletion -actionDone = Done -actionConfirmAction = Confirm action -actionAefiSelectPrimarySuspectVaccination = Select Suspect Vaccination -actionAefiAssignNewReportingIdNumber = "Assign New AEFI ID" +actionOkAndGoToMerge=Okay, and continue to merge overview +actionOkAndGoToContactDirectory=Okay, and continue to contact directory +actionOkAndGoToContactDetails=Okay, and continue to contact +actionOkAndGoToPersonDirectory=Okay, and continue to person directory +actionExecuteAutomaticDeletion=Execute automatic deletion +actionDone=Done +actionConfirmAction=Confirm action +actionAefiSelectPrimarySuspectVaccination=Select Suspect Vaccination +actionAefiAssignNewReportingIdNumber="Assign New AEFI ID" activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -251,10 +251,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows = Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups = Expired -aggregateReportNoAgeGroup = No age group -aggregateReportShowOnlyDuplicateReports = Display only duplicate reports +aggregateReportShowZeroRows=Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups=Expired +aggregateReportNoAgeGroup=No age group +aggregateReportShowOnlyDuplicateReports=Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -278,7 +278,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend = Send emails +bulkEmailSend=Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -437,6 +437,7 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name +CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1036,7 +1037,6 @@ aefiDashboardAefiInvestigationDiscarded=Investigation Discarded aefiDashboardAefiClassificationRelatedToVaccination=Related to vaccine or vaccination aefiDashboardAefiClassificationCoincidentalAdverseEvent=Coincidental adverse event aefiDashboardAefiClassificationUndetermined=Undetermined - captionDefault=Default defaultRegion=Default Region defaultDistrict=Default District @@ -1154,22 +1154,20 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: - # Entity columns -EntityColumn.ENTITY = Entity -EntityColumn.FIELD_ID = Field ID -EntityColumn.FIELD = Field -EntityColumn.TYPE = Type -EntityColumn.DATA_PROTECTION = Data protection -EntityColumn.CAPTION = Caption -EntityColumn.DESCRIPTION = Description -EntityColumn.REQUIRED = Required -EntityColumn.NEW_DISEASE = New disease -EntityColumn.DISEASES = Diseases -EntityColumn.OUTBREAKS = Outbreaks -EntityColumn.IGNORED_COUNTRIES = Ignored countries -EntityColumn.EXCLUSIVE_COUNTRIES = Exclusive countries - +EntityColumn.ENTITY=Entity +EntityColumn.FIELD_ID=Field ID +EntityColumn.FIELD=Field +EntityColumn.TYPE=Type +EntityColumn.DATA_PROTECTION=Data protection +EntityColumn.CAPTION=Caption +EntityColumn.DESCRIPTION=Description +EntityColumn.REQUIRED=Required +EntityColumn.NEW_DISEASE=New disease +EntityColumn.DISEASES=Diseases +EntityColumn.OUTBREAKS=Outbreaks +EntityColumn.IGNORED_COUNTRIES=Ignored countries +EntityColumn.EXCLUSIVE_COUNTRIES=Exclusive countries # Environment Environment=Environment Environment.uuid=Environment ID @@ -1188,54 +1186,51 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location - environmentActiveEnvironments=Active environments -environmentArchivedEnvironments = Archived environments -environmentAllActiveAndArchivedEnvironments = All active and archived environments -environmentDeletedEnvironments = Deleted environments -environmentNewEnvironment= New environment +environmentArchivedEnvironments=Archived environments +environmentAllActiveAndArchivedEnvironments=All active and archived environments +environmentDeletedEnvironments=Deleted environments +environmentNewEnvironment=New environment environmentEnvironmentsList=Environments list - # EnvironmentSample -EnvironmentSample = Environment Sample -EnvironmentSample.uuid = Sample ID -EnvironmentSample.environment = Environment -EnvironmentSample.sampleDateTime = Date of sampling -EnvironmentSample.sampleMaterial = Sample material -EnvironmentSample.otherSampleMaterial = Specify sample material -EnvironmentSample.sampleVolume = Volume (in mL) -EnvironmentSample.fieldSampleId = Field sample ID -EnvironmentSample.turbidity = Turbidity (in NTU) -EnvironmentSample.phValue = pH of sample -EnvironmentSample.sampleTemperature = Temperature (in °C) -EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) -EnvironmentSample.laboratory = Laboratory -EnvironmentSample.laboratoryDetails = Laboratory details -EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested -EnvironmentSample.reportingUser = Reporting user -EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested -EnvironmentSample.weatherConditions = Weather conditions at time of sampling -EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched = Sent/dispatched -EnvironmentSample.dispatchDate = Dispatchment date -EnvironmentSample.dispatchDetails = Dispatchment details -EnvironmentSample.received = Received -EnvironmentSample.receivalDate = Receival date -EnvironmentSample.labSampleId = Lab sample ID -EnvironmentSample.specimenCondition = Specimen condition -EnvironmentSample.location = Location of sampling site -EnvironmentSample.generalComment = General comment -EnvironmentSample.positivePathogenTests = Positive pathogen tests -EnvironmentSample.latestPathogenTest = Latest pathogen test -EnvironmentSample.numberOfTests = Number of tests - +EnvironmentSample=Environment Sample +EnvironmentSample.uuid=Sample ID +EnvironmentSample.environment=Environment +EnvironmentSample.sampleDateTime=Date of sampling +EnvironmentSample.sampleMaterial=Sample material +EnvironmentSample.otherSampleMaterial=Specify sample material +EnvironmentSample.sampleVolume=Volume (in mL) +EnvironmentSample.fieldSampleId=Field sample ID +EnvironmentSample.turbidity=Turbidity (in NTU) +EnvironmentSample.phValue=pH of sample +EnvironmentSample.sampleTemperature=Temperature (in °C) +EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) +EnvironmentSample.laboratory=Laboratory +EnvironmentSample.laboratoryDetails=Laboratory details +EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested +EnvironmentSample.reportingUser=Reporting user +EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested +EnvironmentSample.weatherConditions=Weather conditions at time of sampling +EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched=Sent/dispatched +EnvironmentSample.dispatchDate=Dispatchment date +EnvironmentSample.dispatchDetails=Dispatchment details +EnvironmentSample.received=Received +EnvironmentSample.receivalDate=Receival date +EnvironmentSample.labSampleId=Lab sample ID +EnvironmentSample.specimenCondition=Specimen condition +EnvironmentSample.location=Location of sampling site +EnvironmentSample.generalComment=General comment +EnvironmentSample.positivePathogenTests=Positive pathogen tests +EnvironmentSample.latestPathogenTest=Latest pathogen test +EnvironmentSample.numberOfTests=Number of tests # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents = Deleted events +eventDeletedEvents=Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1379,7 +1374,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants = Deleted event participants +eventParticipantDeletedEventParticipants=Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1392,7 +1387,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser = Reporting user +EventParticipant.reportingUser=Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1429,9 +1424,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink = Event participant ID -EventParticipantSelection.eventUuidLink = Event ID -EventParticipantSelection.resultingCaseUuidLink = Resulting case ID +EventParticipantSelection.eventParticipantUuidLink=Event participant ID +EventParticipantSelection.eventUuidLink=Event ID +EventParticipantSelection.resultingCaseUuidLink=Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1651,7 +1646,6 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message - #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1662,7 +1656,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList = List of new event participants +lineListingNewEventParticipantsList=List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1838,10 +1832,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples = See samples for this person -caseLinkToSamples = See samples for this case -contactLinkToSamples = See samples for this contact -eventParticipantLinkToSamples = See samples for this event participant +personLinkToSamples=See samples for this person +caseLinkToSamples=See samples for this case +contactLinkToSamples=See samples for this contact +eventParticipantLinkToSamples=See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2149,9 +2143,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity = Community of event participant -SampleExport.eventParticipantDistrict = District of event participant -SampleExport.eventParticipantRegion = Region of event participant +SampleExport.eventParticipantCommunity=Community of event participant +SampleExport.eventParticipantDistrict=District of event participant +SampleExport.eventParticipantRegion=Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2210,7 +2204,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser = Reporting user +Immunization.reportingUser=Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2253,10 +2247,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations = Active immunizations -immunizationArchivedImmunizations = Archived immunizations -immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations -immunizationDeletedImmunizations = Deleted immunizations +immunizationActiveImmunizations=Active immunizations +immunizationArchivedImmunizations=Archived immunizations +immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations +immunizationDeletedImmunizations=Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2321,10 +2315,10 @@ aefiVaccinationsDiluentInformation=Diluent Information aefiVaccinationsDiluentBatchLotNumber=Batch/Lot number aefiVaccinationsDiluentExpiryDate=Expiry date aefiVaccinationsDiluentTimeOfReconstitution=Reconstitution time -aefiActiveAdverseEvents = Active adverse events -aefiArchivedAdverseEvents = Archived adverse events -aefiAllActiveAndArchivedAdverseEvents = All active and archived adverse events -aefiDeletedAdverseEvents = Deleted adverse events +aefiActiveAdverseEvents=Active adverse events +aefiArchivedAdverseEvents=Archived adverse events +aefiAllActiveAndArchivedAdverseEvents=All active and archived adverse events +aefiDeletedAdverseEvents=Deleted adverse events # Adverse Events AdverseEvents.severeLocalReaction=Severe local reaction AdverseEvents.severeLocalReactionMoreThanThreeDays=>3 days @@ -2575,13 +2569,13 @@ aefiInvestigationMedicalCareDetailsInstruction=**Instructions ? Attach copies of aefiInvestigationReconstitutionProcedure=Reconstitution procedure aefiInvestigationOfThoseAffected=Of those effected, how many are aefiAefiInvestigationList=Adverse Event Investigations -aefiNewAefiInvestigation = New Investigation +aefiNewAefiInvestigation=New Investigation aefiAefiInvestigationDataView=Adverse Event Investigation aefiNewAefiInvestigationStageTitle=Investigation -aefiActiveInvestigations = Active AEFI investigations -aefiArchivedInvestigations = Archived AEFI investigations -aefiAllActiveAndArchivedInvestigations = All active and archived AEFI investigations -aefiDeletedInvestigations = Deleted AEFI investigations +aefiActiveInvestigations=Active AEFI investigations +aefiArchivedInvestigations=Archived AEFI investigations +aefiAllActiveAndArchivedInvestigations=All active and archived AEFI investigations +aefiDeletedInvestigations=Deleted AEFI investigations titleAefiInvestigationBasicDetails=Section A\: Basic details titleAefiInvestigationRelevantPatientInformation=Section B\: Relevant patient information prior to immunization titleAefiInvestigationFirstExaminationDetails=Section C\: Details of first examination** of serious AEFI case @@ -2854,7 +2848,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment = Associated environment +Task.environment=Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2907,7 +2901,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser = Reporting user +TravelEntry.reportingUser=Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -3278,17 +3272,15 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms = SMS -userRoleNotificationTypeEmail = EMAIL +userRoleNotificationTypeSms=SMS +userRoleNotificationTypeEmail=EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template - notificationType=Notification type -notificationType.group = Group -notificationType.caption = Caption -notificationType.description = Description - +notificationType.group=Group +notificationType.caption=Caption +notificationType.description=Description SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -3323,10 +3315,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails = Person contact details -environmentSampleNotShipped = Not shipped -environmentSampleShipped = Shipped -environmentSampleReceived = Received +TaskExport.personOtherContactDetails=Person contact details +environmentSampleNotShipped=Not shipped +environmentSampleShipped=Shipped +environmentSampleReceived=Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -3343,48 +3335,45 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents - # SpecialCaseAccess SpecialCaseAccess=Special case access -caze = Case -assignedTo = Assigned to -assignedBy = Assigned by -endDateTime = Access until -assignmentDate = Date assigned - +caze=Case +assignedTo=Assigned to +assignedBy=Assigned by +endDateTime=Access until +assignmentDate=Date assigned specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case - # SelfReport -SelfReport = Self report -SelfReport.type = Type -SelfReport.reportDate = Report date -SelfReport.caseReference = Case reference number -SelfReport.disease = Disease -SelfReport.diseaseDetails = Disease details -SelfReport.diseaseVariant = Disease variant -SelfReport.diseaseVariantDetails = Disease variant details -SelfReport.firstName = First name -SelfReport.lastName = Last name -SelfReport.sex = Sex -SelfReport.birthDate = Birth date -SelfReport.birthdateDD = Day of birth -SelfReport.birthdateMM = Month of birth -SelfReport.birthdateYYYY = Year of birth -SelfReport.nationalHealthId = National health ID -SelfReport.email = Email -SelfReport.phoneNumber = Phone number -SelfReport.address = Address -SelfReport.dateOfTest = Date of test -SelfReport.dateOfSymptoms = Date of symptoms -SelfReport.workplace = Workplace -SelfReport.dateWorkplace = Date workplace -SelfReport.isolationDate = Date of isolation -SelfReport.contactDate = Date of contact -SelfReport.comment = Comment -SelfReport.responsibleUser = Responsible user -SelfReport.investigationStatus = Investigation status -SelfReport.processingStatus = Processing status +SelfReport=Self report +SelfReport.type=Type +SelfReport.reportDate=Report date +SelfReport.caseReference=Case reference number +SelfReport.disease=Disease +SelfReport.diseaseDetails=Disease details +SelfReport.diseaseVariant=Disease variant +SelfReport.diseaseVariantDetails=Disease variant details +SelfReport.firstName=First name +SelfReport.lastName=Last name +SelfReport.sex=Sex +SelfReport.birthDate=Birth date +SelfReport.birthdateDD=Day of birth +SelfReport.birthdateMM=Month of birth +SelfReport.birthdateYYYY=Year of birth +SelfReport.nationalHealthId=National health ID +SelfReport.email=Email +SelfReport.phoneNumber=Phone number +SelfReport.address=Address +SelfReport.dateOfTest=Date of test +SelfReport.dateOfSymptoms=Date of symptoms +SelfReport.workplace=Workplace +SelfReport.dateWorkplace=Date workplace +SelfReport.isolationDate=Date of isolation +SelfReport.contactDate=Date of contact +SelfReport.comment=Comment +SelfReport.responsibleUser=Responsible user +SelfReport.investigationStatus=Investigation status +SelfReport.processingStatus=Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_pt-PT.properties b/sormas-api/src/main/resources/captions_pt-PT.properties index 8f71f66ae35..a06254ea16f 100644 --- a/sormas-api/src/main/resources/captions_pt-PT.properties +++ b/sormas-api/src/main/resources/captions_pt-PT.properties @@ -188,13 +188,13 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge = Okay, and continue to merge overview -actionOkAndGoToContactDirectory = Okay, and continue to contact directory -actionOkAndGoToContactDetails = Okay, and continue to contact -actionOkAndGoToPersonDirectory = Okay, and continue to person directory -actionExecuteAutomaticDeletion = Execute automatic deletion -actionDone = Done -actionConfirmAction = Confirm action +actionOkAndGoToMerge=Okay, and continue to merge overview +actionOkAndGoToContactDirectory=Okay, and continue to contact directory +actionOkAndGoToContactDetails=Okay, and continue to contact +actionOkAndGoToPersonDirectory=Okay, and continue to person directory +actionExecuteAutomaticDeletion=Execute automatic deletion +actionDone=Done +actionConfirmAction=Confirm action activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -248,10 +248,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows = Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups = Expired -aggregateReportNoAgeGroup = No age group -aggregateReportShowOnlyDuplicateReports = Display only duplicate reports +aggregateReportShowZeroRows=Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups=Expired +aggregateReportNoAgeGroup=No age group +aggregateReportShowOnlyDuplicateReports=Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -275,7 +275,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend = Send emails +bulkEmailSend=Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -434,6 +434,7 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name +CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1133,7 +1134,6 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: - # Environment Environment=Environment Environment.uuid=Environment ID @@ -1152,54 +1152,51 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location - environmentActiveEnvironments=Active environments -environmentArchivedEnvironments = Archived environments -environmentAllActiveAndArchivedEnvironments = All active and archived environments -environmentDeletedEnvironments = Deleted environments -environmentNewEnvironment= New environment +environmentArchivedEnvironments=Archived environments +environmentAllActiveAndArchivedEnvironments=All active and archived environments +environmentDeletedEnvironments=Deleted environments +environmentNewEnvironment=New environment environmentEnvironmentsList=Environments list - # EnvironmentSample -EnvironmentSample = Environment Sample -EnvironmentSample.uuid = Sample ID -EnvironmentSample.environment = Environment -EnvironmentSample.sampleDateTime = Date of sampling -EnvironmentSample.sampleMaterial = Sample material -EnvironmentSample.otherSampleMaterial = Specify sample material -EnvironmentSample.sampleVolume = Volume (in mL) -EnvironmentSample.fieldSampleId = Field sample ID -EnvironmentSample.turbidity = Turbidity (in NTU) -EnvironmentSample.phValue = pH of sample -EnvironmentSample.sampleTemperature = Temperature (in °C) -EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) -EnvironmentSample.laboratory = Laboratory -EnvironmentSample.laboratoryDetails = Laboratory details -EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested -EnvironmentSample.reportingUser = Reporting user -EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested -EnvironmentSample.weatherConditions = Weather conditions at time of sampling -EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched = Sent/dispatched -EnvironmentSample.dispatchDate = Dispatchment date -EnvironmentSample.dispatchDetails = Dispatchment details -EnvironmentSample.received = Received -EnvironmentSample.receivalDate = Receival date -EnvironmentSample.labSampleId = Lab sample ID -EnvironmentSample.specimenCondition = Specimen condition -EnvironmentSample.location = Location of sampling site -EnvironmentSample.generalComment = General comment -EnvironmentSample.positivePathogenTests = Positive pathogen tests -EnvironmentSample.latestPathogenTest = Latest pathogen test -EnvironmentSample.numberOfTests = Number of tests - +EnvironmentSample=Environment Sample +EnvironmentSample.uuid=Sample ID +EnvironmentSample.environment=Environment +EnvironmentSample.sampleDateTime=Date of sampling +EnvironmentSample.sampleMaterial=Sample material +EnvironmentSample.otherSampleMaterial=Specify sample material +EnvironmentSample.sampleVolume=Volume (in mL) +EnvironmentSample.fieldSampleId=Field sample ID +EnvironmentSample.turbidity=Turbidity (in NTU) +EnvironmentSample.phValue=pH of sample +EnvironmentSample.sampleTemperature=Temperature (in °C) +EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) +EnvironmentSample.laboratory=Laboratory +EnvironmentSample.laboratoryDetails=Laboratory details +EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested +EnvironmentSample.reportingUser=Reporting user +EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested +EnvironmentSample.weatherConditions=Weather conditions at time of sampling +EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched=Sent/dispatched +EnvironmentSample.dispatchDate=Dispatchment date +EnvironmentSample.dispatchDetails=Dispatchment details +EnvironmentSample.received=Received +EnvironmentSample.receivalDate=Receival date +EnvironmentSample.labSampleId=Lab sample ID +EnvironmentSample.specimenCondition=Specimen condition +EnvironmentSample.location=Location of sampling site +EnvironmentSample.generalComment=General comment +EnvironmentSample.positivePathogenTests=Positive pathogen tests +EnvironmentSample.latestPathogenTest=Latest pathogen test +EnvironmentSample.numberOfTests=Number of tests # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents = Deleted events +eventDeletedEvents=Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1343,7 +1340,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants = Deleted event participants +eventParticipantDeletedEventParticipants=Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1356,7 +1353,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser = Reporting user +EventParticipant.reportingUser=Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1393,9 +1390,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink = Event participant ID -EventParticipantSelection.eventUuidLink = Event ID -EventParticipantSelection.resultingCaseUuidLink = Resulting case ID +EventParticipantSelection.eventParticipantUuidLink=Event participant ID +EventParticipantSelection.eventUuidLink=Event ID +EventParticipantSelection.resultingCaseUuidLink=Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1615,7 +1612,6 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message - #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1626,7 +1622,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList = List of new event participants +lineListingNewEventParticipantsList=List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1800,10 +1796,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples = See samples for this person -caseLinkToSamples = See samples for this case -contactLinkToSamples = See samples for this contact -eventParticipantLinkToSamples = See samples for this event participant +personLinkToSamples=See samples for this person +caseLinkToSamples=See samples for this case +contactLinkToSamples=See samples for this contact +eventParticipantLinkToSamples=See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2111,9 +2107,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity = Community of event participant -SampleExport.eventParticipantDistrict = District of event participant -SampleExport.eventParticipantRegion = Region of event participant +SampleExport.eventParticipantCommunity=Community of event participant +SampleExport.eventParticipantDistrict=District of event participant +SampleExport.eventParticipantRegion=Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2172,7 +2168,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser = Reporting user +Immunization.reportingUser=Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2215,10 +2211,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations = Active immunizations -immunizationArchivedImmunizations = Archived immunizations -immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations -immunizationDeletedImmunizations = Deleted immunizations +immunizationActiveImmunizations=Active immunizations +immunizationArchivedImmunizations=Archived immunizations +immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations +immunizationDeletedImmunizations=Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2461,7 +2457,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment = Associated environment +Task.environment=Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2514,7 +2510,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser = Reporting user +TravelEntry.reportingUser=Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -2881,17 +2877,15 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms = SMS -userRoleNotificationTypeEmail = EMAIL +userRoleNotificationTypeSms=SMS +userRoleNotificationTypeEmail=EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template - notificationType=Notification type -notificationType.group = Group -notificationType.caption = Caption -notificationType.description = Description - +notificationType.group=Group +notificationType.caption=Caption +notificationType.description=Description SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -2926,10 +2920,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails = Person contact details -environmentSampleNotShipped = Not shipped -environmentSampleShipped = Shipped -environmentSampleReceived = Received +TaskExport.personOtherContactDetails=Person contact details +environmentSampleNotShipped=Not shipped +environmentSampleShipped=Shipped +environmentSampleReceived=Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -2946,37 +2940,34 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents - # SpecialCaseAccess SpecialCaseAccess=Special case access -caze = Case -assignedTo = Assigned to -assignedBy = Assigned by -endDateTime = Access until -assignmentDate = Date assigned - +caze=Case +assignedTo=Assigned to +assignedBy=Assigned by +endDateTime=Access until +assignmentDate=Date assigned specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case - # SelfReport -SelfReport.type = Type -SelfReport.reportDate = Report date -SelfReport.disease = Disease -SelfReport.diseaseVariant = Disease variant -SelfReport.firstName = First name -SelfReport.lastName = Last name -SelfReport.sex = Sex -SelfReport.birthdateDD = Day of birth -SelfReport.birthdateMM = Month of birth -SelfReport.birthdateYYYY = Year of birth -SelfReport.nationalHealthId = National health ID -SelfReport.email = Email -SelfReport.phoneNumber = Phone number -SelfReport.address = Address -SelfReport.comment = Comment -SelfReport.responsibleUser = Responsible user -SelfReport.investigationStatus = Investigation status -SelfReport.processingStatus = Processing status +SelfReport.type=Type +SelfReport.reportDate=Report date +SelfReport.disease=Disease +SelfReport.diseaseVariant=Disease variant +SelfReport.firstName=First name +SelfReport.lastName=Last name +SelfReport.sex=Sex +SelfReport.birthdateDD=Day of birth +SelfReport.birthdateMM=Month of birth +SelfReport.birthdateYYYY=Year of birth +SelfReport.nationalHealthId=National health ID +SelfReport.email=Email +SelfReport.phoneNumber=Phone number +SelfReport.address=Address +SelfReport.comment=Comment +SelfReport.responsibleUser=Responsible user +SelfReport.investigationStatus=Investigation status +SelfReport.processingStatus=Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_ro-RO.properties b/sormas-api/src/main/resources/captions_ro-RO.properties index 7ca0f1f4687..1e611b51ccf 100644 --- a/sormas-api/src/main/resources/captions_ro-RO.properties +++ b/sormas-api/src/main/resources/captions_ro-RO.properties @@ -188,13 +188,13 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge = Okay, and continue to merge overview -actionOkAndGoToContactDirectory = Okay, and continue to contact directory -actionOkAndGoToContactDetails = Okay, and continue to contact -actionOkAndGoToPersonDirectory = Okay, and continue to person directory -actionExecuteAutomaticDeletion = Execute automatic deletion -actionDone = Done -actionConfirmAction = Confirm action +actionOkAndGoToMerge=Okay, and continue to merge overview +actionOkAndGoToContactDirectory=Okay, and continue to contact directory +actionOkAndGoToContactDetails=Okay, and continue to contact +actionOkAndGoToPersonDirectory=Okay, and continue to person directory +actionExecuteAutomaticDeletion=Execute automatic deletion +actionDone=Done +actionConfirmAction=Confirm action activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -248,10 +248,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows = Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups = Expired -aggregateReportNoAgeGroup = No age group -aggregateReportShowOnlyDuplicateReports = Display only duplicate reports +aggregateReportShowZeroRows=Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups=Expired +aggregateReportNoAgeGroup=No age group +aggregateReportShowOnlyDuplicateReports=Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -275,7 +275,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend = Send emails +bulkEmailSend=Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -434,6 +434,7 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name +CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1133,7 +1134,6 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: - # Environment Environment=Environment Environment.uuid=Environment ID @@ -1152,54 +1152,51 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location - environmentActiveEnvironments=Active environments -environmentArchivedEnvironments = Archived environments -environmentAllActiveAndArchivedEnvironments = All active and archived environments -environmentDeletedEnvironments = Deleted environments -environmentNewEnvironment= New environment +environmentArchivedEnvironments=Archived environments +environmentAllActiveAndArchivedEnvironments=All active and archived environments +environmentDeletedEnvironments=Deleted environments +environmentNewEnvironment=New environment environmentEnvironmentsList=Environments list - # EnvironmentSample -EnvironmentSample = Environment Sample -EnvironmentSample.uuid = Sample ID -EnvironmentSample.environment = Environment -EnvironmentSample.sampleDateTime = Date of sampling -EnvironmentSample.sampleMaterial = Sample material -EnvironmentSample.otherSampleMaterial = Specify sample material -EnvironmentSample.sampleVolume = Volume (in mL) -EnvironmentSample.fieldSampleId = Field sample ID -EnvironmentSample.turbidity = Turbidity (in NTU) -EnvironmentSample.phValue = pH of sample -EnvironmentSample.sampleTemperature = Temperature (in °C) -EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) -EnvironmentSample.laboratory = Laboratory -EnvironmentSample.laboratoryDetails = Laboratory details -EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested -EnvironmentSample.reportingUser = Reporting user -EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested -EnvironmentSample.weatherConditions = Weather conditions at time of sampling -EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched = Sent/dispatched -EnvironmentSample.dispatchDate = Dispatchment date -EnvironmentSample.dispatchDetails = Dispatchment details -EnvironmentSample.received = Received -EnvironmentSample.receivalDate = Receival date -EnvironmentSample.labSampleId = Lab sample ID -EnvironmentSample.specimenCondition = Specimen condition -EnvironmentSample.location = Location of sampling site -EnvironmentSample.generalComment = General comment -EnvironmentSample.positivePathogenTests = Positive pathogen tests -EnvironmentSample.latestPathogenTest = Latest pathogen test -EnvironmentSample.numberOfTests = Number of tests - +EnvironmentSample=Environment Sample +EnvironmentSample.uuid=Sample ID +EnvironmentSample.environment=Environment +EnvironmentSample.sampleDateTime=Date of sampling +EnvironmentSample.sampleMaterial=Sample material +EnvironmentSample.otherSampleMaterial=Specify sample material +EnvironmentSample.sampleVolume=Volume (in mL) +EnvironmentSample.fieldSampleId=Field sample ID +EnvironmentSample.turbidity=Turbidity (in NTU) +EnvironmentSample.phValue=pH of sample +EnvironmentSample.sampleTemperature=Temperature (in °C) +EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) +EnvironmentSample.laboratory=Laboratory +EnvironmentSample.laboratoryDetails=Laboratory details +EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested +EnvironmentSample.reportingUser=Reporting user +EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested +EnvironmentSample.weatherConditions=Weather conditions at time of sampling +EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched=Sent/dispatched +EnvironmentSample.dispatchDate=Dispatchment date +EnvironmentSample.dispatchDetails=Dispatchment details +EnvironmentSample.received=Received +EnvironmentSample.receivalDate=Receival date +EnvironmentSample.labSampleId=Lab sample ID +EnvironmentSample.specimenCondition=Specimen condition +EnvironmentSample.location=Location of sampling site +EnvironmentSample.generalComment=General comment +EnvironmentSample.positivePathogenTests=Positive pathogen tests +EnvironmentSample.latestPathogenTest=Latest pathogen test +EnvironmentSample.numberOfTests=Number of tests # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents = Deleted events +eventDeletedEvents=Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1343,7 +1340,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants = Deleted event participants +eventParticipantDeletedEventParticipants=Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1356,7 +1353,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser = Reporting user +EventParticipant.reportingUser=Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1393,9 +1390,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink = Event participant ID -EventParticipantSelection.eventUuidLink = Event ID -EventParticipantSelection.resultingCaseUuidLink = Resulting case ID +EventParticipantSelection.eventParticipantUuidLink=Event participant ID +EventParticipantSelection.eventUuidLink=Event ID +EventParticipantSelection.resultingCaseUuidLink=Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1615,7 +1612,6 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message - #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1626,7 +1622,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList = List of new event participants +lineListingNewEventParticipantsList=List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1800,10 +1796,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples = See samples for this person -caseLinkToSamples = See samples for this case -contactLinkToSamples = See samples for this contact -eventParticipantLinkToSamples = See samples for this event participant +personLinkToSamples=See samples for this person +caseLinkToSamples=See samples for this case +contactLinkToSamples=See samples for this contact +eventParticipantLinkToSamples=See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2111,9 +2107,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity = Community of event participant -SampleExport.eventParticipantDistrict = District of event participant -SampleExport.eventParticipantRegion = Region of event participant +SampleExport.eventParticipantCommunity=Community of event participant +SampleExport.eventParticipantDistrict=District of event participant +SampleExport.eventParticipantRegion=Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2172,7 +2168,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser = Reporting user +Immunization.reportingUser=Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2215,10 +2211,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations = Active immunizations -immunizationArchivedImmunizations = Archived immunizations -immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations -immunizationDeletedImmunizations = Deleted immunizations +immunizationActiveImmunizations=Active immunizations +immunizationArchivedImmunizations=Archived immunizations +immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations +immunizationDeletedImmunizations=Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2461,7 +2457,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment = Associated environment +Task.environment=Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2514,7 +2510,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser = Reporting user +TravelEntry.reportingUser=Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -2881,17 +2877,15 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms = SMS -userRoleNotificationTypeEmail = EMAIL +userRoleNotificationTypeSms=SMS +userRoleNotificationTypeEmail=EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template - notificationType=Notification type -notificationType.group = Group -notificationType.caption = Caption -notificationType.description = Description - +notificationType.group=Group +notificationType.caption=Caption +notificationType.description=Description SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -2926,10 +2920,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails = Person contact details -environmentSampleNotShipped = Not shipped -environmentSampleShipped = Shipped -environmentSampleReceived = Received +TaskExport.personOtherContactDetails=Person contact details +environmentSampleNotShipped=Not shipped +environmentSampleShipped=Shipped +environmentSampleReceived=Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -2946,37 +2940,34 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents - # SpecialCaseAccess SpecialCaseAccess=Special case access -caze = Case -assignedTo = Assigned to -assignedBy = Assigned by -endDateTime = Access until -assignmentDate = Date assigned - +caze=Case +assignedTo=Assigned to +assignedBy=Assigned by +endDateTime=Access until +assignmentDate=Date assigned specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case - # SelfReport -SelfReport.type = Type -SelfReport.reportDate = Report date -SelfReport.disease = Disease -SelfReport.diseaseVariant = Disease variant -SelfReport.firstName = First name -SelfReport.lastName = Last name -SelfReport.sex = Sex -SelfReport.birthdateDD = Day of birth -SelfReport.birthdateMM = Month of birth -SelfReport.birthdateYYYY = Year of birth -SelfReport.nationalHealthId = National health ID -SelfReport.email = Email -SelfReport.phoneNumber = Phone number -SelfReport.address = Address -SelfReport.comment = Comment -SelfReport.responsibleUser = Responsible user -SelfReport.investigationStatus = Investigation status -SelfReport.processingStatus = Processing status +SelfReport.type=Type +SelfReport.reportDate=Report date +SelfReport.disease=Disease +SelfReport.diseaseVariant=Disease variant +SelfReport.firstName=First name +SelfReport.lastName=Last name +SelfReport.sex=Sex +SelfReport.birthdateDD=Day of birth +SelfReport.birthdateMM=Month of birth +SelfReport.birthdateYYYY=Year of birth +SelfReport.nationalHealthId=National health ID +SelfReport.email=Email +SelfReport.phoneNumber=Phone number +SelfReport.address=Address +SelfReport.comment=Comment +SelfReport.responsibleUser=Responsible user +SelfReport.investigationStatus=Investigation status +SelfReport.processingStatus=Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_ru-RU.properties b/sormas-api/src/main/resources/captions_ru-RU.properties index bad31362c6e..43c414f1e1d 100644 --- a/sormas-api/src/main/resources/captions_ru-RU.properties +++ b/sormas-api/src/main/resources/captions_ru-RU.properties @@ -52,7 +52,7 @@ creationDate=Дата создания changeDate=Date of last change notAvailableShort=не применимо inaccessibleValue=Конфиденциально -includePartialBirthdates = Include partial birthdates +includePartialBirthdates=Include partial birthdates numberOfCharacters=Количество символов\: %d / %d remove=Удалить notTestedYet=Тест пока не осуществлён @@ -189,15 +189,15 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge = Okay, and continue to merge overview -actionOkAndGoToContactDirectory = Okay, and continue to contact directory -actionOkAndGoToContactDetails = Okay, and continue to contact -actionOkAndGoToPersonDirectory = Okay, and continue to person directory -actionExecuteAutomaticDeletion = Execute automatic deletion -actionDone = Done -actionConfirmAction = Confirm action -actionAefiSelectPrimarySuspectVaccination = Select Suspect Vaccination -actionAefiAssignNewReportingIdNumber = "Assign New AEFI ID" +actionOkAndGoToMerge=Okay, and continue to merge overview +actionOkAndGoToContactDirectory=Okay, and continue to contact directory +actionOkAndGoToContactDetails=Okay, and continue to contact +actionOkAndGoToPersonDirectory=Okay, and continue to person directory +actionExecuteAutomaticDeletion=Execute automatic deletion +actionDone=Done +actionConfirmAction=Confirm action +actionAefiSelectPrimarySuspectVaccination=Select Suspect Vaccination +actionAefiAssignNewReportingIdNumber="Assign New AEFI ID" activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -251,10 +251,10 @@ aggregateReportDiscardSelection=Отменить выбор aggregateReportEditAggregateReport=Редактировать сводный отчет aggregateReportEditReport=Редактировать отчет aggregateReportReportFound=Найден сводный отчет -aggregateReportShowZeroRows = Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups = Expired -aggregateReportNoAgeGroup = No age group -aggregateReportShowOnlyDuplicateReports = Display only duplicate reports +aggregateReportShowZeroRows=Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups=Expired +aggregateReportNoAgeGroup=No age group +aggregateReportShowOnlyDuplicateReports=Display only duplicate reports aggregateReportNewAggregateReport=Новый сводный отчет aggregateReportNewCasesShort=C aggregateReportThisWeek=Эта неделя @@ -278,7 +278,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend = Send emails +bulkEmailSend=Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -437,6 +437,7 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name +CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1036,7 +1037,6 @@ aefiDashboardAefiInvestigationDiscarded=Investigation Discarded aefiDashboardAefiClassificationRelatedToVaccination=Related to vaccine or vaccination aefiDashboardAefiClassificationCoincidentalAdverseEvent=Coincidental adverse event aefiDashboardAefiClassificationUndetermined=Undetermined - captionDefault=Default defaultRegion=Default Region defaultDistrict=Default District @@ -1154,22 +1154,20 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: - # Entity columns -EntityColumn.ENTITY = Entity -EntityColumn.FIELD_ID = Field ID -EntityColumn.FIELD = Field -EntityColumn.TYPE = Type -EntityColumn.DATA_PROTECTION = Data protection -EntityColumn.CAPTION = Caption -EntityColumn.DESCRIPTION = Description -EntityColumn.REQUIRED = Required -EntityColumn.NEW_DISEASE = New disease -EntityColumn.DISEASES = Diseases -EntityColumn.OUTBREAKS = Outbreaks -EntityColumn.IGNORED_COUNTRIES = Ignored countries -EntityColumn.EXCLUSIVE_COUNTRIES = Exclusive countries - +EntityColumn.ENTITY=Entity +EntityColumn.FIELD_ID=Field ID +EntityColumn.FIELD=Field +EntityColumn.TYPE=Type +EntityColumn.DATA_PROTECTION=Data protection +EntityColumn.CAPTION=Caption +EntityColumn.DESCRIPTION=Description +EntityColumn.REQUIRED=Required +EntityColumn.NEW_DISEASE=New disease +EntityColumn.DISEASES=Diseases +EntityColumn.OUTBREAKS=Outbreaks +EntityColumn.IGNORED_COUNTRIES=Ignored countries +EntityColumn.EXCLUSIVE_COUNTRIES=Exclusive countries # Environment Environment=Environment Environment.uuid=Environment ID @@ -1188,54 +1186,51 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location - environmentActiveEnvironments=Active environments -environmentArchivedEnvironments = Archived environments -environmentAllActiveAndArchivedEnvironments = All active and archived environments -environmentDeletedEnvironments = Deleted environments -environmentNewEnvironment= New environment +environmentArchivedEnvironments=Archived environments +environmentAllActiveAndArchivedEnvironments=All active and archived environments +environmentDeletedEnvironments=Deleted environments +environmentNewEnvironment=New environment environmentEnvironmentsList=Environments list - # EnvironmentSample -EnvironmentSample = Environment Sample -EnvironmentSample.uuid = Sample ID -EnvironmentSample.environment = Environment -EnvironmentSample.sampleDateTime = Date of sampling -EnvironmentSample.sampleMaterial = Sample material -EnvironmentSample.otherSampleMaterial = Specify sample material -EnvironmentSample.sampleVolume = Volume (in mL) -EnvironmentSample.fieldSampleId = Field sample ID -EnvironmentSample.turbidity = Turbidity (in NTU) -EnvironmentSample.phValue = pH of sample -EnvironmentSample.sampleTemperature = Temperature (in °C) -EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) -EnvironmentSample.laboratory = Laboratory -EnvironmentSample.laboratoryDetails = Laboratory details -EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested -EnvironmentSample.reportingUser = Reporting user -EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested -EnvironmentSample.weatherConditions = Weather conditions at time of sampling -EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched = Sent/dispatched -EnvironmentSample.dispatchDate = Dispatchment date -EnvironmentSample.dispatchDetails = Dispatchment details -EnvironmentSample.received = Received -EnvironmentSample.receivalDate = Receival date -EnvironmentSample.labSampleId = Lab sample ID -EnvironmentSample.specimenCondition = Specimen condition -EnvironmentSample.location = Location of sampling site -EnvironmentSample.generalComment = General comment -EnvironmentSample.positivePathogenTests = Positive pathogen tests -EnvironmentSample.latestPathogenTest = Latest pathogen test -EnvironmentSample.numberOfTests = Number of tests - +EnvironmentSample=Environment Sample +EnvironmentSample.uuid=Sample ID +EnvironmentSample.environment=Environment +EnvironmentSample.sampleDateTime=Date of sampling +EnvironmentSample.sampleMaterial=Sample material +EnvironmentSample.otherSampleMaterial=Specify sample material +EnvironmentSample.sampleVolume=Volume (in mL) +EnvironmentSample.fieldSampleId=Field sample ID +EnvironmentSample.turbidity=Turbidity (in NTU) +EnvironmentSample.phValue=pH of sample +EnvironmentSample.sampleTemperature=Temperature (in °C) +EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) +EnvironmentSample.laboratory=Laboratory +EnvironmentSample.laboratoryDetails=Laboratory details +EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested +EnvironmentSample.reportingUser=Reporting user +EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested +EnvironmentSample.weatherConditions=Weather conditions at time of sampling +EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched=Sent/dispatched +EnvironmentSample.dispatchDate=Dispatchment date +EnvironmentSample.dispatchDetails=Dispatchment details +EnvironmentSample.received=Received +EnvironmentSample.receivalDate=Receival date +EnvironmentSample.labSampleId=Lab sample ID +EnvironmentSample.specimenCondition=Specimen condition +EnvironmentSample.location=Location of sampling site +EnvironmentSample.generalComment=General comment +EnvironmentSample.positivePathogenTests=Positive pathogen tests +EnvironmentSample.latestPathogenTest=Latest pathogen test +EnvironmentSample.numberOfTests=Number of tests # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents = Deleted events +eventDeletedEvents=Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1379,7 +1374,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants = Deleted event participants +eventParticipantDeletedEventParticipants=Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1392,7 +1387,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser = Reporting user +EventParticipant.reportingUser=Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1429,9 +1424,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink = Event participant ID -EventParticipantSelection.eventUuidLink = Event ID -EventParticipantSelection.resultingCaseUuidLink = Resulting case ID +EventParticipantSelection.eventParticipantUuidLink=Event participant ID +EventParticipantSelection.eventUuidLink=Event ID +EventParticipantSelection.resultingCaseUuidLink=Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1651,7 +1646,6 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message - #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1662,7 +1656,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList = List of new event participants +lineListingNewEventParticipantsList=List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1838,10 +1832,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples = See samples for this person -caseLinkToSamples = See samples for this case -contactLinkToSamples = See samples for this contact -eventParticipantLinkToSamples = See samples for this event participant +personLinkToSamples=See samples for this person +caseLinkToSamples=See samples for this case +contactLinkToSamples=See samples for this contact +eventParticipantLinkToSamples=See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2149,9 +2143,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity = Community of event participant -SampleExport.eventParticipantDistrict = District of event participant -SampleExport.eventParticipantRegion = Region of event participant +SampleExport.eventParticipantCommunity=Community of event participant +SampleExport.eventParticipantDistrict=District of event participant +SampleExport.eventParticipantRegion=Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2210,7 +2204,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser = Reporting user +Immunization.reportingUser=Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2253,10 +2247,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations = Active immunizations -immunizationArchivedImmunizations = Archived immunizations -immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations -immunizationDeletedImmunizations = Deleted immunizations +immunizationActiveImmunizations=Active immunizations +immunizationArchivedImmunizations=Archived immunizations +immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations +immunizationDeletedImmunizations=Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2321,10 +2315,10 @@ aefiVaccinationsDiluentInformation=Diluent Information aefiVaccinationsDiluentBatchLotNumber=Batch/Lot number aefiVaccinationsDiluentExpiryDate=Expiry date aefiVaccinationsDiluentTimeOfReconstitution=Reconstitution time -aefiActiveAdverseEvents = Active adverse events -aefiArchivedAdverseEvents = Archived adverse events -aefiAllActiveAndArchivedAdverseEvents = All active and archived adverse events -aefiDeletedAdverseEvents = Deleted adverse events +aefiActiveAdverseEvents=Active adverse events +aefiArchivedAdverseEvents=Archived adverse events +aefiAllActiveAndArchivedAdverseEvents=All active and archived adverse events +aefiDeletedAdverseEvents=Deleted adverse events # Adverse Events AdverseEvents.severeLocalReaction=Severe local reaction AdverseEvents.severeLocalReactionMoreThanThreeDays=>3 days @@ -2575,13 +2569,13 @@ aefiInvestigationMedicalCareDetailsInstruction=**Instructions ? Attach copies of aefiInvestigationReconstitutionProcedure=Reconstitution procedure aefiInvestigationOfThoseAffected=Of those effected, how many are aefiAefiInvestigationList=Adverse Event Investigations -aefiNewAefiInvestigation = New Investigation +aefiNewAefiInvestigation=New Investigation aefiAefiInvestigationDataView=Adverse Event Investigation aefiNewAefiInvestigationStageTitle=Investigation -aefiActiveInvestigations = Active AEFI investigations -aefiArchivedInvestigations = Archived AEFI investigations -aefiAllActiveAndArchivedInvestigations = All active and archived AEFI investigations -aefiDeletedInvestigations = Deleted AEFI investigations +aefiActiveInvestigations=Active AEFI investigations +aefiArchivedInvestigations=Archived AEFI investigations +aefiAllActiveAndArchivedInvestigations=All active and archived AEFI investigations +aefiDeletedInvestigations=Deleted AEFI investigations titleAefiInvestigationBasicDetails=Section A\: Basic details titleAefiInvestigationRelevantPatientInformation=Section B\: Relevant patient information prior to immunization titleAefiInvestigationFirstExaminationDetails=Section C\: Details of first examination** of serious AEFI case @@ -2854,7 +2848,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment = Associated environment +Task.environment=Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2907,7 +2901,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser = Reporting user +TravelEntry.reportingUser=Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -3278,17 +3272,15 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms = SMS -userRoleNotificationTypeEmail = EMAIL +userRoleNotificationTypeSms=SMS +userRoleNotificationTypeEmail=EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template - notificationType=Notification type -notificationType.group = Group -notificationType.caption = Caption -notificationType.description = Description - +notificationType.group=Group +notificationType.caption=Caption +notificationType.description=Description SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -3323,10 +3315,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails = Person contact details -environmentSampleNotShipped = Not shipped -environmentSampleShipped = Shipped -environmentSampleReceived = Received +TaskExport.personOtherContactDetails=Person contact details +environmentSampleNotShipped=Not shipped +environmentSampleShipped=Shipped +environmentSampleReceived=Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -3343,48 +3335,45 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents - # SpecialCaseAccess SpecialCaseAccess=Special case access -caze = Case -assignedTo = Assigned to -assignedBy = Assigned by -endDateTime = Access until -assignmentDate = Date assigned - +caze=Case +assignedTo=Assigned to +assignedBy=Assigned by +endDateTime=Access until +assignmentDate=Date assigned specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case - # SelfReport -SelfReport = Self report -SelfReport.type = Type -SelfReport.reportDate = Report date -SelfReport.caseReference = Case reference number -SelfReport.disease = Disease -SelfReport.diseaseDetails = Disease details -SelfReport.diseaseVariant = Disease variant -SelfReport.diseaseVariantDetails = Disease variant details -SelfReport.firstName = First name -SelfReport.lastName = Last name -SelfReport.sex = Sex -SelfReport.birthDate = Birth date -SelfReport.birthdateDD = Day of birth -SelfReport.birthdateMM = Month of birth -SelfReport.birthdateYYYY = Year of birth -SelfReport.nationalHealthId = National health ID -SelfReport.email = Email -SelfReport.phoneNumber = Phone number -SelfReport.address = Address -SelfReport.dateOfTest = Date of test -SelfReport.dateOfSymptoms = Date of symptoms -SelfReport.workplace = Workplace -SelfReport.dateWorkplace = Date workplace -SelfReport.isolationDate = Date of isolation -SelfReport.contactDate = Date of contact -SelfReport.comment = Comment -SelfReport.responsibleUser = Responsible user -SelfReport.investigationStatus = Investigation status -SelfReport.processingStatus = Processing status +SelfReport=Self report +SelfReport.type=Type +SelfReport.reportDate=Report date +SelfReport.caseReference=Case reference number +SelfReport.disease=Disease +SelfReport.diseaseDetails=Disease details +SelfReport.diseaseVariant=Disease variant +SelfReport.diseaseVariantDetails=Disease variant details +SelfReport.firstName=First name +SelfReport.lastName=Last name +SelfReport.sex=Sex +SelfReport.birthDate=Birth date +SelfReport.birthdateDD=Day of birth +SelfReport.birthdateMM=Month of birth +SelfReport.birthdateYYYY=Year of birth +SelfReport.nationalHealthId=National health ID +SelfReport.email=Email +SelfReport.phoneNumber=Phone number +SelfReport.address=Address +SelfReport.dateOfTest=Date of test +SelfReport.dateOfSymptoms=Date of symptoms +SelfReport.workplace=Workplace +SelfReport.dateWorkplace=Date workplace +SelfReport.isolationDate=Date of isolation +SelfReport.contactDate=Date of contact +SelfReport.comment=Comment +SelfReport.responsibleUser=Responsible user +SelfReport.investigationStatus=Investigation status +SelfReport.processingStatus=Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_sv-SE.properties b/sormas-api/src/main/resources/captions_sv-SE.properties index 7ca0f1f4687..1e611b51ccf 100644 --- a/sormas-api/src/main/resources/captions_sv-SE.properties +++ b/sormas-api/src/main/resources/captions_sv-SE.properties @@ -188,13 +188,13 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge = Okay, and continue to merge overview -actionOkAndGoToContactDirectory = Okay, and continue to contact directory -actionOkAndGoToContactDetails = Okay, and continue to contact -actionOkAndGoToPersonDirectory = Okay, and continue to person directory -actionExecuteAutomaticDeletion = Execute automatic deletion -actionDone = Done -actionConfirmAction = Confirm action +actionOkAndGoToMerge=Okay, and continue to merge overview +actionOkAndGoToContactDirectory=Okay, and continue to contact directory +actionOkAndGoToContactDetails=Okay, and continue to contact +actionOkAndGoToPersonDirectory=Okay, and continue to person directory +actionExecuteAutomaticDeletion=Execute automatic deletion +actionDone=Done +actionConfirmAction=Confirm action activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -248,10 +248,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows = Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups = Expired -aggregateReportNoAgeGroup = No age group -aggregateReportShowOnlyDuplicateReports = Display only duplicate reports +aggregateReportShowZeroRows=Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups=Expired +aggregateReportNoAgeGroup=No age group +aggregateReportShowOnlyDuplicateReports=Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -275,7 +275,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend = Send emails +bulkEmailSend=Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -434,6 +434,7 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name +CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1133,7 +1134,6 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: - # Environment Environment=Environment Environment.uuid=Environment ID @@ -1152,54 +1152,51 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location - environmentActiveEnvironments=Active environments -environmentArchivedEnvironments = Archived environments -environmentAllActiveAndArchivedEnvironments = All active and archived environments -environmentDeletedEnvironments = Deleted environments -environmentNewEnvironment= New environment +environmentArchivedEnvironments=Archived environments +environmentAllActiveAndArchivedEnvironments=All active and archived environments +environmentDeletedEnvironments=Deleted environments +environmentNewEnvironment=New environment environmentEnvironmentsList=Environments list - # EnvironmentSample -EnvironmentSample = Environment Sample -EnvironmentSample.uuid = Sample ID -EnvironmentSample.environment = Environment -EnvironmentSample.sampleDateTime = Date of sampling -EnvironmentSample.sampleMaterial = Sample material -EnvironmentSample.otherSampleMaterial = Specify sample material -EnvironmentSample.sampleVolume = Volume (in mL) -EnvironmentSample.fieldSampleId = Field sample ID -EnvironmentSample.turbidity = Turbidity (in NTU) -EnvironmentSample.phValue = pH of sample -EnvironmentSample.sampleTemperature = Temperature (in °C) -EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) -EnvironmentSample.laboratory = Laboratory -EnvironmentSample.laboratoryDetails = Laboratory details -EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested -EnvironmentSample.reportingUser = Reporting user -EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested -EnvironmentSample.weatherConditions = Weather conditions at time of sampling -EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched = Sent/dispatched -EnvironmentSample.dispatchDate = Dispatchment date -EnvironmentSample.dispatchDetails = Dispatchment details -EnvironmentSample.received = Received -EnvironmentSample.receivalDate = Receival date -EnvironmentSample.labSampleId = Lab sample ID -EnvironmentSample.specimenCondition = Specimen condition -EnvironmentSample.location = Location of sampling site -EnvironmentSample.generalComment = General comment -EnvironmentSample.positivePathogenTests = Positive pathogen tests -EnvironmentSample.latestPathogenTest = Latest pathogen test -EnvironmentSample.numberOfTests = Number of tests - +EnvironmentSample=Environment Sample +EnvironmentSample.uuid=Sample ID +EnvironmentSample.environment=Environment +EnvironmentSample.sampleDateTime=Date of sampling +EnvironmentSample.sampleMaterial=Sample material +EnvironmentSample.otherSampleMaterial=Specify sample material +EnvironmentSample.sampleVolume=Volume (in mL) +EnvironmentSample.fieldSampleId=Field sample ID +EnvironmentSample.turbidity=Turbidity (in NTU) +EnvironmentSample.phValue=pH of sample +EnvironmentSample.sampleTemperature=Temperature (in °C) +EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) +EnvironmentSample.laboratory=Laboratory +EnvironmentSample.laboratoryDetails=Laboratory details +EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested +EnvironmentSample.reportingUser=Reporting user +EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested +EnvironmentSample.weatherConditions=Weather conditions at time of sampling +EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched=Sent/dispatched +EnvironmentSample.dispatchDate=Dispatchment date +EnvironmentSample.dispatchDetails=Dispatchment details +EnvironmentSample.received=Received +EnvironmentSample.receivalDate=Receival date +EnvironmentSample.labSampleId=Lab sample ID +EnvironmentSample.specimenCondition=Specimen condition +EnvironmentSample.location=Location of sampling site +EnvironmentSample.generalComment=General comment +EnvironmentSample.positivePathogenTests=Positive pathogen tests +EnvironmentSample.latestPathogenTest=Latest pathogen test +EnvironmentSample.numberOfTests=Number of tests # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents = Deleted events +eventDeletedEvents=Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1343,7 +1340,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants = Deleted event participants +eventParticipantDeletedEventParticipants=Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1356,7 +1353,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser = Reporting user +EventParticipant.reportingUser=Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1393,9 +1390,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink = Event participant ID -EventParticipantSelection.eventUuidLink = Event ID -EventParticipantSelection.resultingCaseUuidLink = Resulting case ID +EventParticipantSelection.eventParticipantUuidLink=Event participant ID +EventParticipantSelection.eventUuidLink=Event ID +EventParticipantSelection.resultingCaseUuidLink=Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1615,7 +1612,6 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message - #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1626,7 +1622,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList = List of new event participants +lineListingNewEventParticipantsList=List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1800,10 +1796,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples = See samples for this person -caseLinkToSamples = See samples for this case -contactLinkToSamples = See samples for this contact -eventParticipantLinkToSamples = See samples for this event participant +personLinkToSamples=See samples for this person +caseLinkToSamples=See samples for this case +contactLinkToSamples=See samples for this contact +eventParticipantLinkToSamples=See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2111,9 +2107,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity = Community of event participant -SampleExport.eventParticipantDistrict = District of event participant -SampleExport.eventParticipantRegion = Region of event participant +SampleExport.eventParticipantCommunity=Community of event participant +SampleExport.eventParticipantDistrict=District of event participant +SampleExport.eventParticipantRegion=Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2172,7 +2168,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser = Reporting user +Immunization.reportingUser=Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2215,10 +2211,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations = Active immunizations -immunizationArchivedImmunizations = Archived immunizations -immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations -immunizationDeletedImmunizations = Deleted immunizations +immunizationActiveImmunizations=Active immunizations +immunizationArchivedImmunizations=Archived immunizations +immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations +immunizationDeletedImmunizations=Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2461,7 +2457,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment = Associated environment +Task.environment=Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2514,7 +2510,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser = Reporting user +TravelEntry.reportingUser=Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -2881,17 +2877,15 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms = SMS -userRoleNotificationTypeEmail = EMAIL +userRoleNotificationTypeSms=SMS +userRoleNotificationTypeEmail=EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template - notificationType=Notification type -notificationType.group = Group -notificationType.caption = Caption -notificationType.description = Description - +notificationType.group=Group +notificationType.caption=Caption +notificationType.description=Description SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -2926,10 +2920,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails = Person contact details -environmentSampleNotShipped = Not shipped -environmentSampleShipped = Shipped -environmentSampleReceived = Received +TaskExport.personOtherContactDetails=Person contact details +environmentSampleNotShipped=Not shipped +environmentSampleShipped=Shipped +environmentSampleReceived=Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -2946,37 +2940,34 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents - # SpecialCaseAccess SpecialCaseAccess=Special case access -caze = Case -assignedTo = Assigned to -assignedBy = Assigned by -endDateTime = Access until -assignmentDate = Date assigned - +caze=Case +assignedTo=Assigned to +assignedBy=Assigned by +endDateTime=Access until +assignmentDate=Date assigned specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case - # SelfReport -SelfReport.type = Type -SelfReport.reportDate = Report date -SelfReport.disease = Disease -SelfReport.diseaseVariant = Disease variant -SelfReport.firstName = First name -SelfReport.lastName = Last name -SelfReport.sex = Sex -SelfReport.birthdateDD = Day of birth -SelfReport.birthdateMM = Month of birth -SelfReport.birthdateYYYY = Year of birth -SelfReport.nationalHealthId = National health ID -SelfReport.email = Email -SelfReport.phoneNumber = Phone number -SelfReport.address = Address -SelfReport.comment = Comment -SelfReport.responsibleUser = Responsible user -SelfReport.investigationStatus = Investigation status -SelfReport.processingStatus = Processing status +SelfReport.type=Type +SelfReport.reportDate=Report date +SelfReport.disease=Disease +SelfReport.diseaseVariant=Disease variant +SelfReport.firstName=First name +SelfReport.lastName=Last name +SelfReport.sex=Sex +SelfReport.birthdateDD=Day of birth +SelfReport.birthdateMM=Month of birth +SelfReport.birthdateYYYY=Year of birth +SelfReport.nationalHealthId=National health ID +SelfReport.email=Email +SelfReport.phoneNumber=Phone number +SelfReport.address=Address +SelfReport.comment=Comment +SelfReport.responsibleUser=Responsible user +SelfReport.investigationStatus=Investigation status +SelfReport.processingStatus=Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_sw-KE.properties b/sormas-api/src/main/resources/captions_sw-KE.properties index 7ca0f1f4687..1e611b51ccf 100644 --- a/sormas-api/src/main/resources/captions_sw-KE.properties +++ b/sormas-api/src/main/resources/captions_sw-KE.properties @@ -188,13 +188,13 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge = Okay, and continue to merge overview -actionOkAndGoToContactDirectory = Okay, and continue to contact directory -actionOkAndGoToContactDetails = Okay, and continue to contact -actionOkAndGoToPersonDirectory = Okay, and continue to person directory -actionExecuteAutomaticDeletion = Execute automatic deletion -actionDone = Done -actionConfirmAction = Confirm action +actionOkAndGoToMerge=Okay, and continue to merge overview +actionOkAndGoToContactDirectory=Okay, and continue to contact directory +actionOkAndGoToContactDetails=Okay, and continue to contact +actionOkAndGoToPersonDirectory=Okay, and continue to person directory +actionExecuteAutomaticDeletion=Execute automatic deletion +actionDone=Done +actionConfirmAction=Confirm action activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -248,10 +248,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows = Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups = Expired -aggregateReportNoAgeGroup = No age group -aggregateReportShowOnlyDuplicateReports = Display only duplicate reports +aggregateReportShowZeroRows=Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups=Expired +aggregateReportNoAgeGroup=No age group +aggregateReportShowOnlyDuplicateReports=Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -275,7 +275,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend = Send emails +bulkEmailSend=Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -434,6 +434,7 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name +CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1133,7 +1134,6 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: - # Environment Environment=Environment Environment.uuid=Environment ID @@ -1152,54 +1152,51 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location - environmentActiveEnvironments=Active environments -environmentArchivedEnvironments = Archived environments -environmentAllActiveAndArchivedEnvironments = All active and archived environments -environmentDeletedEnvironments = Deleted environments -environmentNewEnvironment= New environment +environmentArchivedEnvironments=Archived environments +environmentAllActiveAndArchivedEnvironments=All active and archived environments +environmentDeletedEnvironments=Deleted environments +environmentNewEnvironment=New environment environmentEnvironmentsList=Environments list - # EnvironmentSample -EnvironmentSample = Environment Sample -EnvironmentSample.uuid = Sample ID -EnvironmentSample.environment = Environment -EnvironmentSample.sampleDateTime = Date of sampling -EnvironmentSample.sampleMaterial = Sample material -EnvironmentSample.otherSampleMaterial = Specify sample material -EnvironmentSample.sampleVolume = Volume (in mL) -EnvironmentSample.fieldSampleId = Field sample ID -EnvironmentSample.turbidity = Turbidity (in NTU) -EnvironmentSample.phValue = pH of sample -EnvironmentSample.sampleTemperature = Temperature (in °C) -EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) -EnvironmentSample.laboratory = Laboratory -EnvironmentSample.laboratoryDetails = Laboratory details -EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested -EnvironmentSample.reportingUser = Reporting user -EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested -EnvironmentSample.weatherConditions = Weather conditions at time of sampling -EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched = Sent/dispatched -EnvironmentSample.dispatchDate = Dispatchment date -EnvironmentSample.dispatchDetails = Dispatchment details -EnvironmentSample.received = Received -EnvironmentSample.receivalDate = Receival date -EnvironmentSample.labSampleId = Lab sample ID -EnvironmentSample.specimenCondition = Specimen condition -EnvironmentSample.location = Location of sampling site -EnvironmentSample.generalComment = General comment -EnvironmentSample.positivePathogenTests = Positive pathogen tests -EnvironmentSample.latestPathogenTest = Latest pathogen test -EnvironmentSample.numberOfTests = Number of tests - +EnvironmentSample=Environment Sample +EnvironmentSample.uuid=Sample ID +EnvironmentSample.environment=Environment +EnvironmentSample.sampleDateTime=Date of sampling +EnvironmentSample.sampleMaterial=Sample material +EnvironmentSample.otherSampleMaterial=Specify sample material +EnvironmentSample.sampleVolume=Volume (in mL) +EnvironmentSample.fieldSampleId=Field sample ID +EnvironmentSample.turbidity=Turbidity (in NTU) +EnvironmentSample.phValue=pH of sample +EnvironmentSample.sampleTemperature=Temperature (in °C) +EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) +EnvironmentSample.laboratory=Laboratory +EnvironmentSample.laboratoryDetails=Laboratory details +EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested +EnvironmentSample.reportingUser=Reporting user +EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested +EnvironmentSample.weatherConditions=Weather conditions at time of sampling +EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched=Sent/dispatched +EnvironmentSample.dispatchDate=Dispatchment date +EnvironmentSample.dispatchDetails=Dispatchment details +EnvironmentSample.received=Received +EnvironmentSample.receivalDate=Receival date +EnvironmentSample.labSampleId=Lab sample ID +EnvironmentSample.specimenCondition=Specimen condition +EnvironmentSample.location=Location of sampling site +EnvironmentSample.generalComment=General comment +EnvironmentSample.positivePathogenTests=Positive pathogen tests +EnvironmentSample.latestPathogenTest=Latest pathogen test +EnvironmentSample.numberOfTests=Number of tests # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents = Deleted events +eventDeletedEvents=Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1343,7 +1340,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants = Deleted event participants +eventParticipantDeletedEventParticipants=Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1356,7 +1353,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser = Reporting user +EventParticipant.reportingUser=Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1393,9 +1390,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink = Event participant ID -EventParticipantSelection.eventUuidLink = Event ID -EventParticipantSelection.resultingCaseUuidLink = Resulting case ID +EventParticipantSelection.eventParticipantUuidLink=Event participant ID +EventParticipantSelection.eventUuidLink=Event ID +EventParticipantSelection.resultingCaseUuidLink=Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1615,7 +1612,6 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message - #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1626,7 +1622,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList = List of new event participants +lineListingNewEventParticipantsList=List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1800,10 +1796,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples = See samples for this person -caseLinkToSamples = See samples for this case -contactLinkToSamples = See samples for this contact -eventParticipantLinkToSamples = See samples for this event participant +personLinkToSamples=See samples for this person +caseLinkToSamples=See samples for this case +contactLinkToSamples=See samples for this contact +eventParticipantLinkToSamples=See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2111,9 +2107,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity = Community of event participant -SampleExport.eventParticipantDistrict = District of event participant -SampleExport.eventParticipantRegion = Region of event participant +SampleExport.eventParticipantCommunity=Community of event participant +SampleExport.eventParticipantDistrict=District of event participant +SampleExport.eventParticipantRegion=Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2172,7 +2168,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser = Reporting user +Immunization.reportingUser=Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2215,10 +2211,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations = Active immunizations -immunizationArchivedImmunizations = Archived immunizations -immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations -immunizationDeletedImmunizations = Deleted immunizations +immunizationActiveImmunizations=Active immunizations +immunizationArchivedImmunizations=Archived immunizations +immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations +immunizationDeletedImmunizations=Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2461,7 +2457,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment = Associated environment +Task.environment=Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2514,7 +2510,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser = Reporting user +TravelEntry.reportingUser=Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -2881,17 +2877,15 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms = SMS -userRoleNotificationTypeEmail = EMAIL +userRoleNotificationTypeSms=SMS +userRoleNotificationTypeEmail=EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template - notificationType=Notification type -notificationType.group = Group -notificationType.caption = Caption -notificationType.description = Description - +notificationType.group=Group +notificationType.caption=Caption +notificationType.description=Description SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -2926,10 +2920,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails = Person contact details -environmentSampleNotShipped = Not shipped -environmentSampleShipped = Shipped -environmentSampleReceived = Received +TaskExport.personOtherContactDetails=Person contact details +environmentSampleNotShipped=Not shipped +environmentSampleShipped=Shipped +environmentSampleReceived=Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -2946,37 +2940,34 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents - # SpecialCaseAccess SpecialCaseAccess=Special case access -caze = Case -assignedTo = Assigned to -assignedBy = Assigned by -endDateTime = Access until -assignmentDate = Date assigned - +caze=Case +assignedTo=Assigned to +assignedBy=Assigned by +endDateTime=Access until +assignmentDate=Date assigned specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case - # SelfReport -SelfReport.type = Type -SelfReport.reportDate = Report date -SelfReport.disease = Disease -SelfReport.diseaseVariant = Disease variant -SelfReport.firstName = First name -SelfReport.lastName = Last name -SelfReport.sex = Sex -SelfReport.birthdateDD = Day of birth -SelfReport.birthdateMM = Month of birth -SelfReport.birthdateYYYY = Year of birth -SelfReport.nationalHealthId = National health ID -SelfReport.email = Email -SelfReport.phoneNumber = Phone number -SelfReport.address = Address -SelfReport.comment = Comment -SelfReport.responsibleUser = Responsible user -SelfReport.investigationStatus = Investigation status -SelfReport.processingStatus = Processing status +SelfReport.type=Type +SelfReport.reportDate=Report date +SelfReport.disease=Disease +SelfReport.diseaseVariant=Disease variant +SelfReport.firstName=First name +SelfReport.lastName=Last name +SelfReport.sex=Sex +SelfReport.birthdateDD=Day of birth +SelfReport.birthdateMM=Month of birth +SelfReport.birthdateYYYY=Year of birth +SelfReport.nationalHealthId=National health ID +SelfReport.email=Email +SelfReport.phoneNumber=Phone number +SelfReport.address=Address +SelfReport.comment=Comment +SelfReport.responsibleUser=Responsible user +SelfReport.investigationStatus=Investigation status +SelfReport.processingStatus=Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_tr-TR.properties b/sormas-api/src/main/resources/captions_tr-TR.properties index 7ca0f1f4687..1e611b51ccf 100644 --- a/sormas-api/src/main/resources/captions_tr-TR.properties +++ b/sormas-api/src/main/resources/captions_tr-TR.properties @@ -188,13 +188,13 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge = Okay, and continue to merge overview -actionOkAndGoToContactDirectory = Okay, and continue to contact directory -actionOkAndGoToContactDetails = Okay, and continue to contact -actionOkAndGoToPersonDirectory = Okay, and continue to person directory -actionExecuteAutomaticDeletion = Execute automatic deletion -actionDone = Done -actionConfirmAction = Confirm action +actionOkAndGoToMerge=Okay, and continue to merge overview +actionOkAndGoToContactDirectory=Okay, and continue to contact directory +actionOkAndGoToContactDetails=Okay, and continue to contact +actionOkAndGoToPersonDirectory=Okay, and continue to person directory +actionExecuteAutomaticDeletion=Execute automatic deletion +actionDone=Done +actionConfirmAction=Confirm action activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -248,10 +248,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows = Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups = Expired -aggregateReportNoAgeGroup = No age group -aggregateReportShowOnlyDuplicateReports = Display only duplicate reports +aggregateReportShowZeroRows=Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups=Expired +aggregateReportNoAgeGroup=No age group +aggregateReportShowOnlyDuplicateReports=Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -275,7 +275,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend = Send emails +bulkEmailSend=Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -434,6 +434,7 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name +CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1133,7 +1134,6 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: - # Environment Environment=Environment Environment.uuid=Environment ID @@ -1152,54 +1152,51 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location - environmentActiveEnvironments=Active environments -environmentArchivedEnvironments = Archived environments -environmentAllActiveAndArchivedEnvironments = All active and archived environments -environmentDeletedEnvironments = Deleted environments -environmentNewEnvironment= New environment +environmentArchivedEnvironments=Archived environments +environmentAllActiveAndArchivedEnvironments=All active and archived environments +environmentDeletedEnvironments=Deleted environments +environmentNewEnvironment=New environment environmentEnvironmentsList=Environments list - # EnvironmentSample -EnvironmentSample = Environment Sample -EnvironmentSample.uuid = Sample ID -EnvironmentSample.environment = Environment -EnvironmentSample.sampleDateTime = Date of sampling -EnvironmentSample.sampleMaterial = Sample material -EnvironmentSample.otherSampleMaterial = Specify sample material -EnvironmentSample.sampleVolume = Volume (in mL) -EnvironmentSample.fieldSampleId = Field sample ID -EnvironmentSample.turbidity = Turbidity (in NTU) -EnvironmentSample.phValue = pH of sample -EnvironmentSample.sampleTemperature = Temperature (in °C) -EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) -EnvironmentSample.laboratory = Laboratory -EnvironmentSample.laboratoryDetails = Laboratory details -EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested -EnvironmentSample.reportingUser = Reporting user -EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested -EnvironmentSample.weatherConditions = Weather conditions at time of sampling -EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched = Sent/dispatched -EnvironmentSample.dispatchDate = Dispatchment date -EnvironmentSample.dispatchDetails = Dispatchment details -EnvironmentSample.received = Received -EnvironmentSample.receivalDate = Receival date -EnvironmentSample.labSampleId = Lab sample ID -EnvironmentSample.specimenCondition = Specimen condition -EnvironmentSample.location = Location of sampling site -EnvironmentSample.generalComment = General comment -EnvironmentSample.positivePathogenTests = Positive pathogen tests -EnvironmentSample.latestPathogenTest = Latest pathogen test -EnvironmentSample.numberOfTests = Number of tests - +EnvironmentSample=Environment Sample +EnvironmentSample.uuid=Sample ID +EnvironmentSample.environment=Environment +EnvironmentSample.sampleDateTime=Date of sampling +EnvironmentSample.sampleMaterial=Sample material +EnvironmentSample.otherSampleMaterial=Specify sample material +EnvironmentSample.sampleVolume=Volume (in mL) +EnvironmentSample.fieldSampleId=Field sample ID +EnvironmentSample.turbidity=Turbidity (in NTU) +EnvironmentSample.phValue=pH of sample +EnvironmentSample.sampleTemperature=Temperature (in °C) +EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) +EnvironmentSample.laboratory=Laboratory +EnvironmentSample.laboratoryDetails=Laboratory details +EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested +EnvironmentSample.reportingUser=Reporting user +EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested +EnvironmentSample.weatherConditions=Weather conditions at time of sampling +EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched=Sent/dispatched +EnvironmentSample.dispatchDate=Dispatchment date +EnvironmentSample.dispatchDetails=Dispatchment details +EnvironmentSample.received=Received +EnvironmentSample.receivalDate=Receival date +EnvironmentSample.labSampleId=Lab sample ID +EnvironmentSample.specimenCondition=Specimen condition +EnvironmentSample.location=Location of sampling site +EnvironmentSample.generalComment=General comment +EnvironmentSample.positivePathogenTests=Positive pathogen tests +EnvironmentSample.latestPathogenTest=Latest pathogen test +EnvironmentSample.numberOfTests=Number of tests # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents = Deleted events +eventDeletedEvents=Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1343,7 +1340,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants = Deleted event participants +eventParticipantDeletedEventParticipants=Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1356,7 +1353,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser = Reporting user +EventParticipant.reportingUser=Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1393,9 +1390,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink = Event participant ID -EventParticipantSelection.eventUuidLink = Event ID -EventParticipantSelection.resultingCaseUuidLink = Resulting case ID +EventParticipantSelection.eventParticipantUuidLink=Event participant ID +EventParticipantSelection.eventUuidLink=Event ID +EventParticipantSelection.resultingCaseUuidLink=Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1615,7 +1612,6 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message - #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1626,7 +1622,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList = List of new event participants +lineListingNewEventParticipantsList=List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1800,10 +1796,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples = See samples for this person -caseLinkToSamples = See samples for this case -contactLinkToSamples = See samples for this contact -eventParticipantLinkToSamples = See samples for this event participant +personLinkToSamples=See samples for this person +caseLinkToSamples=See samples for this case +contactLinkToSamples=See samples for this contact +eventParticipantLinkToSamples=See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2111,9 +2107,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity = Community of event participant -SampleExport.eventParticipantDistrict = District of event participant -SampleExport.eventParticipantRegion = Region of event participant +SampleExport.eventParticipantCommunity=Community of event participant +SampleExport.eventParticipantDistrict=District of event participant +SampleExport.eventParticipantRegion=Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2172,7 +2168,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser = Reporting user +Immunization.reportingUser=Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2215,10 +2211,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations = Active immunizations -immunizationArchivedImmunizations = Archived immunizations -immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations -immunizationDeletedImmunizations = Deleted immunizations +immunizationActiveImmunizations=Active immunizations +immunizationArchivedImmunizations=Archived immunizations +immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations +immunizationDeletedImmunizations=Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2461,7 +2457,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment = Associated environment +Task.environment=Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2514,7 +2510,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser = Reporting user +TravelEntry.reportingUser=Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -2881,17 +2877,15 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms = SMS -userRoleNotificationTypeEmail = EMAIL +userRoleNotificationTypeSms=SMS +userRoleNotificationTypeEmail=EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template - notificationType=Notification type -notificationType.group = Group -notificationType.caption = Caption -notificationType.description = Description - +notificationType.group=Group +notificationType.caption=Caption +notificationType.description=Description SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -2926,10 +2920,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails = Person contact details -environmentSampleNotShipped = Not shipped -environmentSampleShipped = Shipped -environmentSampleReceived = Received +TaskExport.personOtherContactDetails=Person contact details +environmentSampleNotShipped=Not shipped +environmentSampleShipped=Shipped +environmentSampleReceived=Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -2946,37 +2940,34 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents - # SpecialCaseAccess SpecialCaseAccess=Special case access -caze = Case -assignedTo = Assigned to -assignedBy = Assigned by -endDateTime = Access until -assignmentDate = Date assigned - +caze=Case +assignedTo=Assigned to +assignedBy=Assigned by +endDateTime=Access until +assignmentDate=Date assigned specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case - # SelfReport -SelfReport.type = Type -SelfReport.reportDate = Report date -SelfReport.disease = Disease -SelfReport.diseaseVariant = Disease variant -SelfReport.firstName = First name -SelfReport.lastName = Last name -SelfReport.sex = Sex -SelfReport.birthdateDD = Day of birth -SelfReport.birthdateMM = Month of birth -SelfReport.birthdateYYYY = Year of birth -SelfReport.nationalHealthId = National health ID -SelfReport.email = Email -SelfReport.phoneNumber = Phone number -SelfReport.address = Address -SelfReport.comment = Comment -SelfReport.responsibleUser = Responsible user -SelfReport.investigationStatus = Investigation status -SelfReport.processingStatus = Processing status +SelfReport.type=Type +SelfReport.reportDate=Report date +SelfReport.disease=Disease +SelfReport.diseaseVariant=Disease variant +SelfReport.firstName=First name +SelfReport.lastName=Last name +SelfReport.sex=Sex +SelfReport.birthdateDD=Day of birth +SelfReport.birthdateMM=Month of birth +SelfReport.birthdateYYYY=Year of birth +SelfReport.nationalHealthId=National health ID +SelfReport.email=Email +SelfReport.phoneNumber=Phone number +SelfReport.address=Address +SelfReport.comment=Comment +SelfReport.responsibleUser=Responsible user +SelfReport.investigationStatus=Investigation status +SelfReport.processingStatus=Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_uk-UA.properties b/sormas-api/src/main/resources/captions_uk-UA.properties index 7ca0f1f4687..1e611b51ccf 100644 --- a/sormas-api/src/main/resources/captions_uk-UA.properties +++ b/sormas-api/src/main/resources/captions_uk-UA.properties @@ -188,13 +188,13 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge = Okay, and continue to merge overview -actionOkAndGoToContactDirectory = Okay, and continue to contact directory -actionOkAndGoToContactDetails = Okay, and continue to contact -actionOkAndGoToPersonDirectory = Okay, and continue to person directory -actionExecuteAutomaticDeletion = Execute automatic deletion -actionDone = Done -actionConfirmAction = Confirm action +actionOkAndGoToMerge=Okay, and continue to merge overview +actionOkAndGoToContactDirectory=Okay, and continue to contact directory +actionOkAndGoToContactDetails=Okay, and continue to contact +actionOkAndGoToPersonDirectory=Okay, and continue to person directory +actionExecuteAutomaticDeletion=Execute automatic deletion +actionDone=Done +actionConfirmAction=Confirm action activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -248,10 +248,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows = Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups = Expired -aggregateReportNoAgeGroup = No age group -aggregateReportShowOnlyDuplicateReports = Display only duplicate reports +aggregateReportShowZeroRows=Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups=Expired +aggregateReportNoAgeGroup=No age group +aggregateReportShowOnlyDuplicateReports=Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -275,7 +275,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend = Send emails +bulkEmailSend=Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -434,6 +434,7 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name +CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1133,7 +1134,6 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: - # Environment Environment=Environment Environment.uuid=Environment ID @@ -1152,54 +1152,51 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location - environmentActiveEnvironments=Active environments -environmentArchivedEnvironments = Archived environments -environmentAllActiveAndArchivedEnvironments = All active and archived environments -environmentDeletedEnvironments = Deleted environments -environmentNewEnvironment= New environment +environmentArchivedEnvironments=Archived environments +environmentAllActiveAndArchivedEnvironments=All active and archived environments +environmentDeletedEnvironments=Deleted environments +environmentNewEnvironment=New environment environmentEnvironmentsList=Environments list - # EnvironmentSample -EnvironmentSample = Environment Sample -EnvironmentSample.uuid = Sample ID -EnvironmentSample.environment = Environment -EnvironmentSample.sampleDateTime = Date of sampling -EnvironmentSample.sampleMaterial = Sample material -EnvironmentSample.otherSampleMaterial = Specify sample material -EnvironmentSample.sampleVolume = Volume (in mL) -EnvironmentSample.fieldSampleId = Field sample ID -EnvironmentSample.turbidity = Turbidity (in NTU) -EnvironmentSample.phValue = pH of sample -EnvironmentSample.sampleTemperature = Temperature (in °C) -EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) -EnvironmentSample.laboratory = Laboratory -EnvironmentSample.laboratoryDetails = Laboratory details -EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested -EnvironmentSample.reportingUser = Reporting user -EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested -EnvironmentSample.weatherConditions = Weather conditions at time of sampling -EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched = Sent/dispatched -EnvironmentSample.dispatchDate = Dispatchment date -EnvironmentSample.dispatchDetails = Dispatchment details -EnvironmentSample.received = Received -EnvironmentSample.receivalDate = Receival date -EnvironmentSample.labSampleId = Lab sample ID -EnvironmentSample.specimenCondition = Specimen condition -EnvironmentSample.location = Location of sampling site -EnvironmentSample.generalComment = General comment -EnvironmentSample.positivePathogenTests = Positive pathogen tests -EnvironmentSample.latestPathogenTest = Latest pathogen test -EnvironmentSample.numberOfTests = Number of tests - +EnvironmentSample=Environment Sample +EnvironmentSample.uuid=Sample ID +EnvironmentSample.environment=Environment +EnvironmentSample.sampleDateTime=Date of sampling +EnvironmentSample.sampleMaterial=Sample material +EnvironmentSample.otherSampleMaterial=Specify sample material +EnvironmentSample.sampleVolume=Volume (in mL) +EnvironmentSample.fieldSampleId=Field sample ID +EnvironmentSample.turbidity=Turbidity (in NTU) +EnvironmentSample.phValue=pH of sample +EnvironmentSample.sampleTemperature=Temperature (in °C) +EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) +EnvironmentSample.laboratory=Laboratory +EnvironmentSample.laboratoryDetails=Laboratory details +EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested +EnvironmentSample.reportingUser=Reporting user +EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested +EnvironmentSample.weatherConditions=Weather conditions at time of sampling +EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched=Sent/dispatched +EnvironmentSample.dispatchDate=Dispatchment date +EnvironmentSample.dispatchDetails=Dispatchment details +EnvironmentSample.received=Received +EnvironmentSample.receivalDate=Receival date +EnvironmentSample.labSampleId=Lab sample ID +EnvironmentSample.specimenCondition=Specimen condition +EnvironmentSample.location=Location of sampling site +EnvironmentSample.generalComment=General comment +EnvironmentSample.positivePathogenTests=Positive pathogen tests +EnvironmentSample.latestPathogenTest=Latest pathogen test +EnvironmentSample.numberOfTests=Number of tests # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents = Deleted events +eventDeletedEvents=Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1343,7 +1340,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants = Deleted event participants +eventParticipantDeletedEventParticipants=Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1356,7 +1353,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser = Reporting user +EventParticipant.reportingUser=Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1393,9 +1390,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink = Event participant ID -EventParticipantSelection.eventUuidLink = Event ID -EventParticipantSelection.resultingCaseUuidLink = Resulting case ID +EventParticipantSelection.eventParticipantUuidLink=Event participant ID +EventParticipantSelection.eventUuidLink=Event ID +EventParticipantSelection.resultingCaseUuidLink=Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1615,7 +1612,6 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message - #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1626,7 +1622,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList = List of new event participants +lineListingNewEventParticipantsList=List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1800,10 +1796,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples = See samples for this person -caseLinkToSamples = See samples for this case -contactLinkToSamples = See samples for this contact -eventParticipantLinkToSamples = See samples for this event participant +personLinkToSamples=See samples for this person +caseLinkToSamples=See samples for this case +contactLinkToSamples=See samples for this contact +eventParticipantLinkToSamples=See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2111,9 +2107,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity = Community of event participant -SampleExport.eventParticipantDistrict = District of event participant -SampleExport.eventParticipantRegion = Region of event participant +SampleExport.eventParticipantCommunity=Community of event participant +SampleExport.eventParticipantDistrict=District of event participant +SampleExport.eventParticipantRegion=Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2172,7 +2168,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser = Reporting user +Immunization.reportingUser=Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2215,10 +2211,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations = Active immunizations -immunizationArchivedImmunizations = Archived immunizations -immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations -immunizationDeletedImmunizations = Deleted immunizations +immunizationActiveImmunizations=Active immunizations +immunizationArchivedImmunizations=Archived immunizations +immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations +immunizationDeletedImmunizations=Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2461,7 +2457,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment = Associated environment +Task.environment=Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2514,7 +2510,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser = Reporting user +TravelEntry.reportingUser=Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -2881,17 +2877,15 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms = SMS -userRoleNotificationTypeEmail = EMAIL +userRoleNotificationTypeSms=SMS +userRoleNotificationTypeEmail=EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template - notificationType=Notification type -notificationType.group = Group -notificationType.caption = Caption -notificationType.description = Description - +notificationType.group=Group +notificationType.caption=Caption +notificationType.description=Description SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -2926,10 +2920,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails = Person contact details -environmentSampleNotShipped = Not shipped -environmentSampleShipped = Shipped -environmentSampleReceived = Received +TaskExport.personOtherContactDetails=Person contact details +environmentSampleNotShipped=Not shipped +environmentSampleShipped=Shipped +environmentSampleReceived=Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -2946,37 +2940,34 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents - # SpecialCaseAccess SpecialCaseAccess=Special case access -caze = Case -assignedTo = Assigned to -assignedBy = Assigned by -endDateTime = Access until -assignmentDate = Date assigned - +caze=Case +assignedTo=Assigned to +assignedBy=Assigned by +endDateTime=Access until +assignmentDate=Date assigned specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case - # SelfReport -SelfReport.type = Type -SelfReport.reportDate = Report date -SelfReport.disease = Disease -SelfReport.diseaseVariant = Disease variant -SelfReport.firstName = First name -SelfReport.lastName = Last name -SelfReport.sex = Sex -SelfReport.birthdateDD = Day of birth -SelfReport.birthdateMM = Month of birth -SelfReport.birthdateYYYY = Year of birth -SelfReport.nationalHealthId = National health ID -SelfReport.email = Email -SelfReport.phoneNumber = Phone number -SelfReport.address = Address -SelfReport.comment = Comment -SelfReport.responsibleUser = Responsible user -SelfReport.investigationStatus = Investigation status -SelfReport.processingStatus = Processing status +SelfReport.type=Type +SelfReport.reportDate=Report date +SelfReport.disease=Disease +SelfReport.diseaseVariant=Disease variant +SelfReport.firstName=First name +SelfReport.lastName=Last name +SelfReport.sex=Sex +SelfReport.birthdateDD=Day of birth +SelfReport.birthdateMM=Month of birth +SelfReport.birthdateYYYY=Year of birth +SelfReport.nationalHealthId=National health ID +SelfReport.email=Email +SelfReport.phoneNumber=Phone number +SelfReport.address=Address +SelfReport.comment=Comment +SelfReport.responsibleUser=Responsible user +SelfReport.investigationStatus=Investigation status +SelfReport.processingStatus=Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_zh-CN.properties b/sormas-api/src/main/resources/captions_zh-CN.properties index c8a23ea0a16..62ad03f7aae 100644 --- a/sormas-api/src/main/resources/captions_zh-CN.properties +++ b/sormas-api/src/main/resources/captions_zh-CN.properties @@ -52,7 +52,7 @@ creationDate=创建日期 changeDate=Date of last change notAvailableShort=不可用 inaccessibleValue=保密 -includePartialBirthdates = Include partial birthdates +includePartialBirthdates=Include partial birthdates numberOfCharacters=字符数： %d / %d remove=移除 notTestedYet=尚未测试。 @@ -189,15 +189,15 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge = Okay, and continue to merge overview -actionOkAndGoToContactDirectory = Okay, and continue to contact directory -actionOkAndGoToContactDetails = Okay, and continue to contact -actionOkAndGoToPersonDirectory = Okay, and continue to person directory -actionExecuteAutomaticDeletion = Execute automatic deletion -actionDone = Done -actionConfirmAction = Confirm action -actionAefiSelectPrimarySuspectVaccination = Select Suspect Vaccination -actionAefiAssignNewReportingIdNumber = "Assign New AEFI ID" +actionOkAndGoToMerge=Okay, and continue to merge overview +actionOkAndGoToContactDirectory=Okay, and continue to contact directory +actionOkAndGoToContactDetails=Okay, and continue to contact +actionOkAndGoToPersonDirectory=Okay, and continue to person directory +actionExecuteAutomaticDeletion=Execute automatic deletion +actionDone=Done +actionConfirmAction=Confirm action +actionAefiSelectPrimarySuspectVaccination=Select Suspect Vaccination +actionAefiAssignNewReportingIdNumber="Assign New AEFI ID" activityAsCaseFlightNumber=航班号 ActivityAsCase=Activity as case ActivityAsCase.startDate=活动开始 @@ -251,10 +251,10 @@ aggregateReportDiscardSelection=放弃选择 aggregateReportEditAggregateReport=编辑汇总报表 aggregateReportEditReport=编辑报表 aggregateReportReportFound=找到聚合报告 -aggregateReportShowZeroRows = Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups = Expired -aggregateReportNoAgeGroup = No age group -aggregateReportShowOnlyDuplicateReports = Display only duplicate reports +aggregateReportShowZeroRows=Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups=Expired +aggregateReportNoAgeGroup=No age group +aggregateReportShowOnlyDuplicateReports=Display only duplicate reports aggregateReportNewAggregateReport=新的累计报告 aggregateReportNewCasesShort=C aggregateReportThisWeek=本周 @@ -278,7 +278,7 @@ days=days # Bulk actions bulkActions=批量操作 bulkEditAssignee=Edit assignee -bulkEmailSend = Send emails +bulkEmailSend=Send emails bulkCancelFollowUp=取消后续行动 bulkCaseClassification=更改案例分类 bulkCaseOutcome=更改案例结果 @@ -437,6 +437,7 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name +CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1036,7 +1037,6 @@ aefiDashboardAefiInvestigationDiscarded=Investigation Discarded aefiDashboardAefiClassificationRelatedToVaccination=Related to vaccine or vaccination aefiDashboardAefiClassificationCoincidentalAdverseEvent=Coincidental adverse event aefiDashboardAefiClassificationUndetermined=Undetermined - captionDefault=Default defaultRegion=Default Region defaultDistrict=Default District @@ -1154,22 +1154,20 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: - # Entity columns -EntityColumn.ENTITY = Entity -EntityColumn.FIELD_ID = Field ID -EntityColumn.FIELD = Field -EntityColumn.TYPE = Type -EntityColumn.DATA_PROTECTION = Data protection -EntityColumn.CAPTION = Caption -EntityColumn.DESCRIPTION = Description -EntityColumn.REQUIRED = Required -EntityColumn.NEW_DISEASE = New disease -EntityColumn.DISEASES = Diseases -EntityColumn.OUTBREAKS = Outbreaks -EntityColumn.IGNORED_COUNTRIES = Ignored countries -EntityColumn.EXCLUSIVE_COUNTRIES = Exclusive countries - +EntityColumn.ENTITY=Entity +EntityColumn.FIELD_ID=Field ID +EntityColumn.FIELD=Field +EntityColumn.TYPE=Type +EntityColumn.DATA_PROTECTION=Data protection +EntityColumn.CAPTION=Caption +EntityColumn.DESCRIPTION=Description +EntityColumn.REQUIRED=Required +EntityColumn.NEW_DISEASE=New disease +EntityColumn.DISEASES=Diseases +EntityColumn.OUTBREAKS=Outbreaks +EntityColumn.IGNORED_COUNTRIES=Ignored countries +EntityColumn.EXCLUSIVE_COUNTRIES=Exclusive countries # Environment Environment=Environment Environment.uuid=Environment ID @@ -1188,54 +1186,51 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location - environmentActiveEnvironments=Active environments -environmentArchivedEnvironments = Archived environments -environmentAllActiveAndArchivedEnvironments = All active and archived environments -environmentDeletedEnvironments = Deleted environments -environmentNewEnvironment= New environment +environmentArchivedEnvironments=Archived environments +environmentAllActiveAndArchivedEnvironments=All active and archived environments +environmentDeletedEnvironments=Deleted environments +environmentNewEnvironment=New environment environmentEnvironmentsList=Environments list - # EnvironmentSample -EnvironmentSample = Environment Sample -EnvironmentSample.uuid = Sample ID -EnvironmentSample.environment = Environment -EnvironmentSample.sampleDateTime = Date of sampling -EnvironmentSample.sampleMaterial = Sample material -EnvironmentSample.otherSampleMaterial = Specify sample material -EnvironmentSample.sampleVolume = Volume (in mL) -EnvironmentSample.fieldSampleId = Field sample ID -EnvironmentSample.turbidity = Turbidity (in NTU) -EnvironmentSample.phValue = pH of sample -EnvironmentSample.sampleTemperature = Temperature (in °C) -EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) -EnvironmentSample.laboratory = Laboratory -EnvironmentSample.laboratoryDetails = Laboratory details -EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested -EnvironmentSample.reportingUser = Reporting user -EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested -EnvironmentSample.weatherConditions = Weather conditions at time of sampling -EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched = Sent/dispatched -EnvironmentSample.dispatchDate = Dispatchment date -EnvironmentSample.dispatchDetails = Dispatchment details -EnvironmentSample.received = Received -EnvironmentSample.receivalDate = Receival date -EnvironmentSample.labSampleId = Lab sample ID -EnvironmentSample.specimenCondition = Specimen condition -EnvironmentSample.location = Location of sampling site -EnvironmentSample.generalComment = General comment -EnvironmentSample.positivePathogenTests = Positive pathogen tests -EnvironmentSample.latestPathogenTest = Latest pathogen test -EnvironmentSample.numberOfTests = Number of tests - +EnvironmentSample=Environment Sample +EnvironmentSample.uuid=Sample ID +EnvironmentSample.environment=Environment +EnvironmentSample.sampleDateTime=Date of sampling +EnvironmentSample.sampleMaterial=Sample material +EnvironmentSample.otherSampleMaterial=Specify sample material +EnvironmentSample.sampleVolume=Volume (in mL) +EnvironmentSample.fieldSampleId=Field sample ID +EnvironmentSample.turbidity=Turbidity (in NTU) +EnvironmentSample.phValue=pH of sample +EnvironmentSample.sampleTemperature=Temperature (in °C) +EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) +EnvironmentSample.laboratory=Laboratory +EnvironmentSample.laboratoryDetails=Laboratory details +EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested +EnvironmentSample.reportingUser=Reporting user +EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested +EnvironmentSample.weatherConditions=Weather conditions at time of sampling +EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched=Sent/dispatched +EnvironmentSample.dispatchDate=Dispatchment date +EnvironmentSample.dispatchDetails=Dispatchment details +EnvironmentSample.received=Received +EnvironmentSample.receivalDate=Receival date +EnvironmentSample.labSampleId=Lab sample ID +EnvironmentSample.specimenCondition=Specimen condition +EnvironmentSample.location=Location of sampling site +EnvironmentSample.generalComment=General comment +EnvironmentSample.positivePathogenTests=Positive pathogen tests +EnvironmentSample.latestPathogenTest=Latest pathogen test +EnvironmentSample.numberOfTests=Number of tests # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents = Deleted events +eventDeletedEvents=Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1379,7 +1374,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants = Deleted event participants +eventParticipantDeletedEventParticipants=Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1392,7 +1387,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser = Reporting user +EventParticipant.reportingUser=Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1429,9 +1424,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink = Event participant ID -EventParticipantSelection.eventUuidLink = Event ID -EventParticipantSelection.resultingCaseUuidLink = Resulting case ID +EventParticipantSelection.eventParticipantUuidLink=Event participant ID +EventParticipantSelection.eventUuidLink=Event ID +EventParticipantSelection.resultingCaseUuidLink=Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1651,7 +1646,6 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message - #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1662,7 +1656,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList = List of new event participants +lineListingNewEventParticipantsList=List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1838,10 +1832,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples = See samples for this person -caseLinkToSamples = See samples for this case -contactLinkToSamples = See samples for this contact -eventParticipantLinkToSamples = See samples for this event participant +personLinkToSamples=See samples for this person +caseLinkToSamples=See samples for this case +contactLinkToSamples=See samples for this contact +eventParticipantLinkToSamples=See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2149,9 +2143,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity = Community of event participant -SampleExport.eventParticipantDistrict = District of event participant -SampleExport.eventParticipantRegion = Region of event participant +SampleExport.eventParticipantCommunity=Community of event participant +SampleExport.eventParticipantDistrict=District of event participant +SampleExport.eventParticipantRegion=Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2210,7 +2204,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=免疫 Immunization.reportDate=Date of report -Immunization.reportingUser = Reporting user +Immunization.reportingUser=Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2253,10 +2247,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations = Active immunizations -immunizationArchivedImmunizations = Archived immunizations -immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations -immunizationDeletedImmunizations = Deleted immunizations +immunizationActiveImmunizations=Active immunizations +immunizationArchivedImmunizations=Archived immunizations +immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations +immunizationDeletedImmunizations=Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2321,10 +2315,10 @@ aefiVaccinationsDiluentInformation=Diluent Information aefiVaccinationsDiluentBatchLotNumber=Batch/Lot number aefiVaccinationsDiluentExpiryDate=Expiry date aefiVaccinationsDiluentTimeOfReconstitution=Reconstitution time -aefiActiveAdverseEvents = Active adverse events -aefiArchivedAdverseEvents = Archived adverse events -aefiAllActiveAndArchivedAdverseEvents = All active and archived adverse events -aefiDeletedAdverseEvents = Deleted adverse events +aefiActiveAdverseEvents=Active adverse events +aefiArchivedAdverseEvents=Archived adverse events +aefiAllActiveAndArchivedAdverseEvents=All active and archived adverse events +aefiDeletedAdverseEvents=Deleted adverse events # Adverse Events AdverseEvents.severeLocalReaction=Severe local reaction AdverseEvents.severeLocalReactionMoreThanThreeDays=>3 days @@ -2575,13 +2569,13 @@ aefiInvestigationMedicalCareDetailsInstruction=**Instructions ? Attach copies of aefiInvestigationReconstitutionProcedure=Reconstitution procedure aefiInvestigationOfThoseAffected=Of those effected, how many are aefiAefiInvestigationList=Adverse Event Investigations -aefiNewAefiInvestigation = New Investigation +aefiNewAefiInvestigation=New Investigation aefiAefiInvestigationDataView=Adverse Event Investigation aefiNewAefiInvestigationStageTitle=Investigation -aefiActiveInvestigations = Active AEFI investigations -aefiArchivedInvestigations = Archived AEFI investigations -aefiAllActiveAndArchivedInvestigations = All active and archived AEFI investigations -aefiDeletedInvestigations = Deleted AEFI investigations +aefiActiveInvestigations=Active AEFI investigations +aefiArchivedInvestigations=Archived AEFI investigations +aefiAllActiveAndArchivedInvestigations=All active and archived AEFI investigations +aefiDeletedInvestigations=Deleted AEFI investigations titleAefiInvestigationBasicDetails=Section A\: Basic details titleAefiInvestigationRelevantPatientInformation=Section B\: Relevant patient information prior to immunization titleAefiInvestigationFirstExaminationDetails=Section C\: Details of first examination** of serious AEFI case @@ -2854,7 +2848,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment = Associated environment +Task.environment=Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2907,7 +2901,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser = Reporting user +TravelEntry.reportingUser=Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -3278,17 +3272,15 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms = SMS -userRoleNotificationTypeEmail = EMAIL +userRoleNotificationTypeSms=SMS +userRoleNotificationTypeEmail=EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template - notificationType=Notification type -notificationType.group = Group -notificationType.caption = Caption -notificationType.description = Description - +notificationType.group=Group +notificationType.caption=Caption +notificationType.description=Description SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -3323,10 +3315,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails = Person contact details -environmentSampleNotShipped = Not shipped -environmentSampleShipped = Shipped -environmentSampleReceived = Received +TaskExport.personOtherContactDetails=Person contact details +environmentSampleNotShipped=Not shipped +environmentSampleShipped=Shipped +environmentSampleReceived=Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -3343,48 +3335,45 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents - # SpecialCaseAccess SpecialCaseAccess=Special case access -caze = Case -assignedTo = Assigned to -assignedBy = Assigned by -endDateTime = Access until -assignmentDate = Date assigned - +caze=Case +assignedTo=Assigned to +assignedBy=Assigned by +endDateTime=Access until +assignmentDate=Date assigned specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case - # SelfReport -SelfReport = Self report -SelfReport.type = Type -SelfReport.reportDate = Report date -SelfReport.caseReference = Case reference number -SelfReport.disease = Disease -SelfReport.diseaseDetails = Disease details -SelfReport.diseaseVariant = Disease variant -SelfReport.diseaseVariantDetails = Disease variant details -SelfReport.firstName = First name -SelfReport.lastName = Last name -SelfReport.sex = Sex -SelfReport.birthDate = Birth date -SelfReport.birthdateDD = Day of birth -SelfReport.birthdateMM = Month of birth -SelfReport.birthdateYYYY = Year of birth -SelfReport.nationalHealthId = National health ID -SelfReport.email = Email -SelfReport.phoneNumber = Phone number -SelfReport.address = Address -SelfReport.dateOfTest = Date of test -SelfReport.dateOfSymptoms = Date of symptoms -SelfReport.workplace = Workplace -SelfReport.dateWorkplace = Date workplace -SelfReport.isolationDate = Date of isolation -SelfReport.contactDate = Date of contact -SelfReport.comment = Comment -SelfReport.responsibleUser = Responsible user -SelfReport.investigationStatus = Investigation status -SelfReport.processingStatus = Processing status +SelfReport=Self report +SelfReport.type=Type +SelfReport.reportDate=Report date +SelfReport.caseReference=Case reference number +SelfReport.disease=Disease +SelfReport.diseaseDetails=Disease details +SelfReport.diseaseVariant=Disease variant +SelfReport.diseaseVariantDetails=Disease variant details +SelfReport.firstName=First name +SelfReport.lastName=Last name +SelfReport.sex=Sex +SelfReport.birthDate=Birth date +SelfReport.birthdateDD=Day of birth +SelfReport.birthdateMM=Month of birth +SelfReport.birthdateYYYY=Year of birth +SelfReport.nationalHealthId=National health ID +SelfReport.email=Email +SelfReport.phoneNumber=Phone number +SelfReport.address=Address +SelfReport.dateOfTest=Date of test +SelfReport.dateOfSymptoms=Date of symptoms +SelfReport.workplace=Workplace +SelfReport.dateWorkplace=Date workplace +SelfReport.isolationDate=Date of isolation +SelfReport.contactDate=Date of contact +SelfReport.comment=Comment +SelfReport.responsibleUser=Responsible user +SelfReport.investigationStatus=Investigation status +SelfReport.processingStatus=Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_zu-ZA.properties b/sormas-api/src/main/resources/captions_zu-ZA.properties index 111a929df1f..d52e7461ff0 100644 --- a/sormas-api/src/main/resources/captions_zu-ZA.properties +++ b/sormas-api/src/main/resources/captions_zu-ZA.properties @@ -14,7 +14,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . ############################################################################### - # General Captions all=All city=City @@ -56,7 +55,6 @@ facility=Facility pointOfEntry=Point of entry remove=Remove reportingUser=Reporting user - # About about=About aboutDocuments=Documents @@ -68,14 +66,12 @@ aboutDataDictionary=Data Dictionary (XLSX) aboutSormasWebsite=Official SORMAS Website aboutTechnicalManual=Technical Manual (PDF) aboutWhatsNew=What's New? - # Action actionNewAction=New action actionNoActions=There are no actions for this %s actionCreatingLabel=Created at %s by %s actionLastModifiedByLabel=Updated at %s by %s actionStatusChangeDate=updated at %s - Action=Action Action.title=Title Action.description=Description @@ -88,13 +84,12 @@ Action.actionContext=Action context Action.actionStatus=Action status Action.lastModifiedBy=Last modified by Action.actionMeasure=Measure - # Actions actionApplyDateFilter=Apply date filter actionArchive=Archive actionAssignNewEpidNumber=Assign new epid number actionBack=Back -actionSend = Send +actionSend=Send actionCancel=Cancel actionClear=Clear actionClearAll=Clear all @@ -133,10 +128,8 @@ actionBackToNationOverview=Back to Nation Overview actionSettings=User Settings actionNewForm=New Form actionOverwrite=Overwrite - # AdditionalTest additionalTestNewTest=New test result - AdditionalTest=Additional test AdditionalTest.altSgpt=ALT/SGPT (U/L) AdditionalTest.arterialVenousBloodGas=Arterial/venous blood gas @@ -160,7 +153,6 @@ AdditionalTest.testDateTime=Date and time of result AdditionalTest.totalBilirubin=Total bilirubin (umol/L) AdditionalTest.urea=Urea (mmol/L) AdditionalTest.wbcCount=WBC count (x10^9/L) - aggregateReportDeathsShort=D aggregateReportLabConfirmationsShort=L aggregateReportLastWeek=Last Week @@ -177,13 +169,11 @@ AggregateReport.labConfirmations=Lab confirmations AggregateReport.deaths=Deaths AggregateReport.healthFacility=Facility AggregateReport.pointOfEntry=Point of Entry - -areaActiveAreas = Active areas -areaArchivedAreas = Archived areas -areaAllAreas = All areas -Area.archived = Archived -Area.externalId = External ID - +areaActiveAreas=Active areas +areaArchivedAreas=Archived areas +areaAllAreas=All areas +Area.archived=Archived +Area.externalId=External ID # Bulk actions bulkActions=Bulk Actions bulkCancelFollowUp=Cancel follow-up @@ -201,7 +191,6 @@ bulkFacility=Change facility bulkInvestigationStatus=Change investigation status bulkLostToFollowUp=Set to lost to follow-up bulkSurveillanceOfficer=Change surveillance officer - # Campaign campaignActiveCampaigns=Active campaigns campaignAllCampaigns=All campaigns @@ -221,7 +210,6 @@ campaignDashboardChartHeight=Height in % campaignDashboardOrder=Order campaignSearch=Search Campaign campaignDiagramGroupBy=Group by - Campaign=Campaign Campaign.name=Name Campaign.description=Description @@ -234,13 +222,11 @@ Campaign.area=Area Campaign.region=Region Campaign.district=District Campaign.community=Community - -CampaignFormData.campaign = Campaign -CampaignFormData.campaignFormMeta = Form -CampaignFormData.formDate = Form date -CampaignFormData.area = Area +CampaignFormData.campaign=Campaign +CampaignFormData.campaignFormMeta=Form +CampaignFormData.formDate=Form date +CampaignFormData.area=Area CampaignFormData.edit=Edit - # CaseData caseCasesList=Cases list caseInfrastructureDataChanged=Infrastructure data has changed @@ -290,9 +276,8 @@ convertEventParticipantToCase=Create case from event participant with positive t convertContactToCase=Create case from contact with positive test result? caseSearchSpecificCase=Search specific case caseSearchCase=Search case -caseSelect= Select case +caseSelect=Select case caseCreateNew=Create new case - CaseData=Case CaseData.additionalDetails=General comment CaseData.caseClassification=Case classification @@ -315,6 +300,7 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name +CaseData.disease=Disease CaseData.district=Responsible district CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -435,7 +421,6 @@ CaseData.notACaseReasonPhysicianInformation=Information provided by physician CaseData.notACaseReasonDifferentPathogen=Verification of different pathogen CaseData.notACaseReasonOther=Other CaseData.notACaseReasonDetails=Reason details - # CaseExport CaseExport.address=Address CaseExport.addressRegion=Address Region @@ -481,7 +466,6 @@ CaseExport.lastCooperativeVisitSymptomatic=Symptomatic at last cooperative visit CaseExport.lastCooperativeVisitSymptoms=Symptoms at last cooperative visit CaseExport.traveled=Traveled outside of district CaseExport.burialAttended=Visited a burial - # CaseHospitalization CaseHospitalization=Hospitalization CaseHospitalization.admissionDate=Date of visit or admission @@ -496,12 +480,9 @@ CaseHospitalization.previousHospitalizations=Previous hospitalizations CaseHospitalization.intensiveCareUnit=Stay in the intensive care unit CaseHospitalization.intensiveCareUnitStart=Start of the stay CaseHospitalization.intensiveCareUnitEnd=End of the stay - - # CaseImport caseImportErrorDescription=Error description caseImportMergeCase=Override existing case with changes from the imported case? - # CasePreviousHospitalization CasePreviousHospitalization=Previous hospitalization CasePreviousHospitalization.admissionAndDischargeDate=Date of admission & discharge @@ -513,10 +494,8 @@ CasePreviousHospitalization.healthFacility=Hospital CasePreviousHospitalization.healthFacilityDetails=Hospital name & description CasePreviousHospitalization.isolated=Isolation CasePreviousHospitalization.prevHospPeriod=Period of hospitalization - # ClinicalVisit clinicalVisitNewClinicalVisit=New clinical assessment - ClinicalVisit=Clinical assessment ClinicalVisit.bloodPressure=Blood pressure ClinicalVisit.heartRate=Heart rate @@ -524,28 +503,22 @@ ClinicalVisit.temperature=Temperature ClinicalVisit.visitDateTime=Date and time of visit ClinicalVisit.visitingPerson=Attending clinician ClinicalVisit.visitRemarks=Clinician remarks - ClinicalVisitExport.caseUuid=Case ID ClinicalVisitExport.caseName=Case name - columnAdditionalTests=Additional tests columnDiseaseShort=Disease columnNumberOfPendingTasks=Pending tasks - # Community Community.archived=Archived Community.externalID=External ID - communityActiveCommunities=Active communities communityArchivedCommunities=Archived communities communityAllCommunities=All communities - # Configuration Configuration.Facilities=Facilities Configuration.Outbreaks=Outbreaks Configuration.PointsOfEntry=Points of Entry Configuration.LineListing=Line Listing - # Contact contactCancelFollowUp=Cancel follow-up contactCaseContacts=Case contacts @@ -582,10 +555,9 @@ contactOnlyWithSharedEventWithSourceCase=Only contacts with source case linked t contactOnlyWithSourceCaseInGivenEvent=Only contacts whose source case is linked to this event contactFollowUpDay=Day contactQuarantineNotOrdered=No quarantine ordered -contactCreatePIAAccount = PIA -contactPersonPhoneNumber = Contact Person's Phone Number -contactSourceCase = Source case - +contactCreatePIAAccount=PIA +contactPersonPhoneNumber=Contact Person's Phone Number +contactSourceCase=Source case Contact=Contact Contact.additionalDetails=General comment Contact.caseClassification=Classification of the source case @@ -602,10 +574,10 @@ Contact.community=Responsible community Contact.contactClassification=Contact classification Contact.contactOfficer=Responsible contact officer Contact.contactOfficerUuid=Responsible contact officer -Contact.contactIdentificationSource = Contact identification source -Contact.contactIdentificationSourceDetails = Contact identification source details -Contact.tracingApp = Tracing app -Contact.tracingAppDetails = Tracing app details, e.g. name +Contact.contactIdentificationSource=Contact identification source +Contact.contactIdentificationSourceDetails=Contact identification source details +Contact.tracingApp=Tracing app +Contact.tracingAppDetails=Tracing app details, e.g. name Contact.contactProximity=Type of contact - if multiple pick the closest contact proximity Contact.contactStatus=Contact status Contact.description=Description of how contact took place @@ -676,7 +648,6 @@ Contact.prohibitionToWork=Prohibition to work Contact.prohibitionToWorkFrom=Prohibition to work from Contact.prohibitionToWorkUntil=Prohibition to work until Contact.reportingDistrict=Reporting district - # ContactExport ContactExport.address=Address ContactExport.addressDistrict=Address District @@ -695,7 +666,6 @@ ContactExport.sourceCaseUuid=Source case ID ContactExport.traveled=Traveled outside of district ContactExport.travelHistory=Travel history ContactExport.quarantineInformation=Quarantine information - # Dashboard dashboardAlive=Alive dashboardApplyCustomFilter=Apply custom filter @@ -819,14 +789,12 @@ dashboardAggregatedNumber=Count dashboardProportion=Proportion (%) dashboardViewAsColumnChart=View as Column Chart dashboardViewAsBarChart=View as Bar Chart - defaultRegion=Default Region defaultDistrict=Default District defaultCommunity=Default Community defaultFacility=Default Facility defaultLaboratory=Default Laboratory defaultPointOfEntry=Default Point Of Entry - devModeCaseCount=Number of generated cases devModeCaseDisease=Disease of the cases devModeCaseDistrict=District of the cases @@ -857,7 +825,6 @@ devModeEventStartDate=Earliest event start date devModeGenerateCases=Generate Cases devModeGenerateContacts=Generate Contacts devModeGenerateEvents=Generate Events - DiseaseBurden.caseCount=New cases DiseaseBurden.caseDeathCount=Fatalities DiseaseBurden.casesDifference=Dynamic @@ -865,20 +832,16 @@ DiseaseBurden.caseFatalityRate=CFR DiseaseBurden.eventCount=Number of events DiseaseBurden.outbreakDistrictCount=Outbreak districts DiseaseBurden.previousCaseCount=Previous cases - # District districtActiveDistricts=Active districts districtArchivedDistricts=Archived districts districtAllDistricts=All districts - District.archived=Archived District.epidCode=Epid code District.growthRate=Growth rate District.population=Population District.externalID=External ID - epiDataNoSourceContacts=No source contacts have been created for this case - EpiData=Epidemiological data EpiData.areaInfectedAnimals=Residing, working or travelling to an area where infected animals have been confirmed EpiData.exposureDetailsKnown=Exposure details known @@ -886,11 +849,9 @@ EpiData.exposures=Exposures EpiData.highTransmissionRiskArea=Residing or working in an area with high risk of transmission of the disease, e.g. closed residential and camp-like settings EpiData.largeOutbreaksArea=Residing or travelling to countries/territories/areas experiencing larger outbreaks of local transmission EpiData.contactWithSourceCaseKnown=Contacts with source case known - # Documents documentUploadDocument=New document documentNoDocuments=There are no documents for this %s - # DocumentTemplate DocumentTemplate=Document Template DocumentTemplate.buttonUploadTemplate=Upload Template @@ -907,7 +868,6 @@ DocumentTemplate.exampleTemplateCases=Example Template Cases DocumentTemplate.exampleTemplateContacts=Example Template Contacts DocumentTemplate.exampleTemplateEventHandout=Example Template Event Handout DocumentTemplate.exampleTemplateEventParticipants=Example Template Event Participants - # Event eventActiveEvents=Active events eventArchivedEvents=Archived events @@ -935,7 +895,6 @@ eventUnlinkEvent=Unlink event eventOpenSuperordinateEvent=Open event eventEditEvent=Edit event eventLinkToEventsWithinTheSameFacility=See events within the same facility - Event=Event Event.caseCount=Cases Event.contactCount=Contacts @@ -992,7 +951,6 @@ Event.typeOfPlaceText=Specify other event place Event.uuid=Event ID Event.transregionalOutbreak=Transregional outbreak Event.diseaseTransmissionMode=Primary mode of transmission - # Event action EventAction.eventUuid=Event id EventAction.eventTitle=Event title @@ -1009,18 +967,14 @@ EventAction.actionChangeDate=Action change date EventAction.actionStatus=Action status EventAction.actionPriority=Action priority EventAction.actionLastModifiedBy=Action last modified by - # Event action export EventActionExport.eventDate=Date of event - #Event export - # EventParticipant eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant - EventParticipant=Event participant EventParticipant.contactCount=Contact count EventParticipant.event=Event @@ -1034,7 +988,6 @@ EventParticipant.person=Person EventParticipant.uuid=Event participant ID EventParticipant.region=Responsible region EventParticipant.district=Responsible district - #EventParticipant export EventParticipantExport.eventParticipantU=Event disease EventParticipantExport.eventDisease=Event disease @@ -1059,7 +1012,6 @@ EventParticipantExport.sampleInformation=Sample information EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID - # Expo export=Export exportBasic=Basic Export @@ -1074,16 +1026,13 @@ exportCaseManagement=Case Management Export exportCaseCustom=Custom Case Export exportNewExportConfiguration=New Export Configuration exportEditExportConfiguration=Edit Export Configuration - ExportConfiguration.NAME=Configuration name ExportConfiguration.myExports=My exports ExportConfiguration.sharedExports=Shared exports ExportConfiguration.sharedToPublic=Shared to public - exposureFlightNumber=Flight number exposureTimePeriod=Time period exposureSourceCaseName=Name of source case - Exposure.startDate=Start of exposure Exposure.endDate=End of exposure Exposure.exposureType=Type of activity @@ -1134,16 +1083,13 @@ Exposure.prophylaxisDate=Date of prophylaxis Exposure.riskArea=Risk area as defined by public health institution Exposure.exposureDate=Exposure date Exposure.exposureRole=Role - # Facility facilityActiveFacilities=Active facilities facilityArchivedFacilities=Archived facilities facilityAllFacilities=All facilities - Facility.CONFIGURED_FACILITY=Configured facility Facility.NO_FACILITY=Home or other place Facility.OTHER_FACILITY=Other facility - Facility.archived=Archived Facility.city=City Facility.community=Community @@ -1156,22 +1102,18 @@ Facility.publicOwnership=Public ownership Facility.region=Region Facility.type=Facility type Facility.typeGroup=Facility category - FeatureConfiguration.districtName=District FeatureConfiguration.enabled=Line listing enabled? FeatureConfiguration.endDate=End date - # Formats formatNumberOfVisitsFormat=%d (%d missed) formatNumberOfVisitsLongFormat=%d visits (%d missed) formatSimpleNumberFormat=%d - # FollowUp FollowUp.uuid=Follow-up ID FollowUp.person=Follow-up person FollowUp.reportDate=Date of report FollowUp.followUpUntil=Follow-up until - # HealthConditions HealthConditions=Health conditions HealthConditions.tuberculosis=Tuberculosis @@ -1197,7 +1139,6 @@ HealthConditions.formerSmoker=Former smoker\t\t HealthConditions.asthma=Asthma HealthConditions.sickleCellDisease=Sickle cell disease\t HealthConditions.immunodeficiencyIncludingHiv=Immunodeficiency including HIV - # Import importDetailed=Detailed Import importDownloadCaseImportTemplate=Download Case Import Template @@ -1214,7 +1155,6 @@ importLineListing=Line Listing Import importProcessed=%d/%d Processed importSkips=%d Skipped importCancelImport=Cancel import - #Lab Message LabMessage=Lab Message LabMessage.labMessageDetails=Lab message details @@ -1236,12 +1176,10 @@ LabMessage.sampleMaterial=Type of sample LabMessage.sampleReceivedDate=Sample received LabMessage.specimenCondition=Specimen condition LabMessage.testedDisease=Tested disease - -labMessageFetch= Fetch lab messages +labMessageFetch=Fetch lab messages labMessageProcess=Process labMessageProcessed=Processed labMessageUnprocessed=Unprocessed - #Line listing lineListingAddLine=Add line lineListingInfrastructureData=Take over infrastructure data from last line @@ -1254,7 +1192,6 @@ lineListingEnableAll=Enable all lineListingDisableAllShort=Disable all lineListingEndDate=End date lineListingSetEndDateForAll=Set end date for all - # Location Location=Location Location.additionalInformation=Additional information @@ -1272,31 +1209,27 @@ Location.latLonAccuracy=GPS accuracy in m Location.longitude=GPS longitude Location.postalCode=Postal code Location.street=Street - # Login Login.doLogIn=Log in Login.login=Login Login.password=password Login.username=username - #LoginSidebar LoginSidebar.diseaseDetection=Disease Detection LoginSidebar.diseasePrevention=Disease Prevention LoginSidebar.outbreakResponse=Outbreak Response LoginSidebar.poweredBy=Powered By - # Messaging messagesSendSMS=Send SMS messagesSentBy=Sent by messagesNoSmsSentForCase=No SMS sent to case person messagesNoPhoneNumberForCasePerson=Case person has no phone number -messagesSms = SMS -messagesEmail = Email -messagesSendingSms = Send new SMS -messagesNumberOfMissingPhoneNumbers = Number of selected cases without phone number\: %s -messagesCharacters = Characters\: %d / 160 -messagesNumberOfMessages = Nr. of messages\: %d - +messagesSms=SMS +messagesEmail=Email +messagesSendingSms=Send new SMS +messagesNumberOfMissingPhoneNumbers=Number of selected cases without phone number\: %s +messagesCharacters=Characters\: %d / 160 +messagesNumberOfMessages=Nr. of messages\: %d # Main Menu mainMenuAbout=About mainMenuCampaigns=Campaigns @@ -1312,7 +1245,6 @@ mainMenuStatistics=Statistics mainMenuTasks=Tasks mainMenuUsers=Users mainMenuAggregateReports=mSERS - MaternalHistory.childrenNumber=Total number of children MaternalHistory.ageAtBirth=Mother's age at birth of infant patient MaternalHistory.conjunctivitis=Conjunctivitis @@ -1339,19 +1271,16 @@ MaternalHistory.otherComplications=Other complications MaternalHistory.otherComplicationsOnset=Date of onset MaternalHistory.otherComplicationsMonth=Month of pregnancy MaternalHistory.otherComplicationsDetails=Complication details - # Outbreak outbreakAffectedDistricts=Affected districts outbreakNoOutbreak=No outbreak outbreakNormal=Normal outbreakOutbreak=Outbreak - # PathogenTest pathogenTestCreateNew=Create new pathogen test pathogenTestNewResult=New result pathogenTestNewTest=New test result pathogenTestSelect=Select pathogen test - PathogenTest=Pathogen test PathogenTests=Pathogen tests PathogenTest.fourFoldIncreaseAntibodyTiter=4 fold increase of antibody titer @@ -1368,7 +1297,6 @@ PathogenTest.testedDiseaseDetails=Tested disease name PathogenTest.typingId=Typing ID PathogenTest.serotype=Serotype PathogenTest.cqValue=CQ/CT Value - # Person personPersonsList=Person list personCreateNew=Create a new person @@ -1381,7 +1309,6 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person - Person=Person Person.address=Home address Person.addresses=Addresses @@ -1453,11 +1380,9 @@ Person.otherSalutation=Other salutation Person.birthName=Birth name Person.birthCountry=Country of birth Person.citizenship=Citizenship - pointOfEntryActivePointsOfEntry=Active points of entry pointOfEntryArchivedPointsOfEntry=Archived points of entry pointOfEntryAllPointsOfEntry=All points of entry - PointOfEntry.OTHER_AIRPORT=Other airport PointOfEntry.OTHER_SEAPORT=Other seaport PointOfEntry.OTHER_GROUND_CROSSING=Other ground crossing @@ -1467,10 +1392,8 @@ PointOfEntry.active=Active? PointOfEntry.latitude=Latitude PointOfEntry.longitude=Longitude PointOfEntry.externalID=External ID - populationDataMaleTotal=Male total populationDataFemaleTotal=Female total - PortHealthInfo=Port health information PortHealthInfo.airlineName=Airline name PortHealthInfo.flightNumber=Flight number @@ -1494,10 +1417,8 @@ PortHealthInfo.conveyanceTypeDetails=Specify the conveyance type PortHealthInfo.departureLocation=Start location of travel PortHealthInfo.finalDestination=Final destination PortHealthInfo.details=Point of entry details - # Prescription prescriptionNewPrescription=New prescription - Prescription.additionalNotes=Additional notes Prescription.dose=Dose Prescription.drugIntakeDetails=Drug name @@ -1513,33 +1434,27 @@ Prescription.prescriptionType=Prescription type Prescription.route=Route Prescription.routeDetails=Route specification Prescription.typeOfDrug=Type of drug - PrescriptionExport.caseUuid=Case ID PrescriptionExport.caseName=Case name - # Country countryActiveCountries=Active countries countryArchivedCountries=Archived countries countryAllCountries=All countries - Country.archived=Archived Country.externalId=External ID Country.defaultName=Default name Country.displayName=Name Country.isoCode=ISO code Country.unoCode=UNO code - # Region regionActiveRegions=Active regions regionArchivedRegions=Archived regions regionAllRegions=All regions - Region.archived=Archived Region.epidCode=Epid code Region.growthRate=Growth rate Region.population=Population Region.externalID=External ID - # Sample sampleCreateNew=Create new sample sampleIncludeTestOnCreation=Create test result for this sample now @@ -1566,7 +1481,6 @@ sampleActiveSamples=Active samples sampleArchivedSamples=Archived samples sampleAllSamples=All samples sampleAssociationType=Sample type - Sample=Sample Sample.additionalTestingRequested=Request additional tests to be performed? Sample.additionalTestingStatus=Additional testing status @@ -1616,23 +1530,22 @@ Sample.testType=Type of test Sample.typeOfTest=Type of test Sample.uuid=Sample ID Sample.samplePurpose=Purpose of the Sample - SampleExport.additionalTestingRequested=Have additional tests been requested? SampleExport.personAddressCaption=Address of case/contact/event participant person SampleExport.personAge=Age of case/contact/event participant person SampleExport.caseDistrict=District of case SampleExport.caseCommunity=Community of case SampleExport.caseFacility=Facility of case -SampleExport.contactRegion = Region of contact -SampleExport.contactDistrict = District of contact -SampleExport.contactCommunity = Community of contact +SampleExport.contactRegion=Region of contact +SampleExport.contactDistrict=District of contact +SampleExport.contactCommunity=Community of contact SampleExport.caseOutcome=Outcome of case SampleExport.caseRegion=Region of case SampleExport.caseReportDate=Case report date SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID -SampleExport.contactUuid = Contact UUID -SampleExport.contactReportDate = Contact report date +SampleExport.contactUuid=Contact UUID +SampleExport.contactReportDate=Contact report date SampleExport.id=Sample SN SampleExport.sampleReportDate=Sample report date SampleExport.noTestPossibleReason=No test possible reason @@ -1684,7 +1597,6 @@ SampleExport.testDateTime=Date and time of latest additional test SampleExport.totalBilirubin=Total bilirubin of latest additional test SampleExport.urea=Urea of latest additional test SampleExport.wbcCount=WBC count of latest additional test - # Statistics statisticsAddFilter=Add filter statisticsAttribute=Attribute @@ -1707,13 +1619,11 @@ statisticsStatistics=Statistics statisticsVisualizationType=Type statisticsIncidenceDivisor=Incidence divisor statisticsDataDisplayed=Data displayed - # Symptoms symptomsLesionsLocations=Localization of the lesions symptomsMaxTemperature=Maximum body temperature in ° C symptomsSetClearedToNo=Set cleared to No symptomsSetClearedToUnknown=Set cleared to Unknown - Symptoms=Symptoms Symptoms.abdominalPain=Abdominal pain Symptoms.alteredConsciousness=Altered level of consciousness @@ -1901,7 +1811,6 @@ Symptoms.palpitations=Palpitations Symptoms.dizzinessStandingUp=Dizziness (when standing up from a sitting or lying position) Symptoms.highOrLowBloodPressure=Blood pressure too high or too low (measured) Symptoms.urinaryRetention=Urinary retention - # Task taskMyTasks=My tasks taskNewTask=New task @@ -1910,7 +1819,6 @@ taskOfficerTasks=Officer tasks taskActiveTasks=Active tasks taskArchivedTasks=Archived tasks taskAllTasks=All tasks - Task=Task Task.assigneeReply=Comments on execution Task.assigneeUser=Assigned to @@ -1928,9 +1836,7 @@ Task.suggestedStart=Suggested start Task.taskContext=Task context Task.taskStatus=Task status Task.taskType=Task type - # TestReport - TestReport.testDateTime=Date and time of result TestReport.testLabCity=Lab city TestReport.testLabExternalId=Lab external ID @@ -1938,12 +1844,10 @@ TestReport.testLabName=Lab name TestReport.testLabPostalCode=Lab postal code TestReport.testResult=Test result TestReport.testType=Type of test - # Treatment treatmentCreateTreatment=Create treatment treatmentNewTreatment=New treatment treatmentOpenPrescription=Open prescription - Treatment.additionalNotes=Additional notes Treatment.dose=Dose Treatment.drugIntakeDetails=Drug name @@ -1957,10 +1861,8 @@ Treatment.treatmentDetails=Treatment details Treatment.treatmentType=Treatment type Treatment.typeOfDrug=Type of drug Treatment.treatmentRoute=Treatment route - TreatmentExport.caseUuid=Case ID TreatmentExport.caseName=Case name - # User userNewUser=New user userResetPassword=Create new password @@ -1970,7 +1872,6 @@ syncUsers=Sync Users syncErrors=%d Error(s) syncSuccessful=%d Synced syncProcessed=%d/%d Processed - User=User User.active=Active? User.associatedOfficer=Associated officer @@ -1985,20 +1886,16 @@ User.userName=User name User.userRoles=User roles User.address=Address User.uuid=UUID - # Views View.actions=Action Directory - View.aggregatereports=Aggregate Reporting (mSERS) View.aggregatereports.sub= - View.campaign.campaigns=Campaign Directory View.campaign.campaigns.short=Campaigns View.campaign.campaigndata=Campaign Data View.campaign.campaigndata.short=Campaign Data View.campaign.campaigndata.dataform=Campaign Data Form View.campaign.campaigndata.dataform.short=Data Form - View.cases=Case Directory View.cases.merge=Merge Duplicate Cases View.cases.archive=Case Archive @@ -2014,10 +1911,8 @@ View.cases.clinicalcourse=Clinical Course View.cases.maternalhistory=Maternal History View.cases.porthealthinfo=Port Health Information View.cases.visits=Case Visits - View.persons=Person Directory View.persons.data=Person Information - View.configuration.communities=Communities Configuration View.configuration.communities.short=Communities View.configuration.districts=Districts Configuration @@ -2048,7 +1943,6 @@ View.configuration.populationdata=Population Data View.configuration.populationdata.short=Population View.configuration.linelisting=Line Listing Configuration View.configuration.linelisting.short=Line Listing - View.contacts=Contact Directory View.contacts.archive=Contact Archive View.contacts.epidata=Contact Epidemiological Data @@ -2056,11 +1950,9 @@ View.contacts.data=Contact Information View.contacts.person=Contact Person View.contacts.sub= View.contacts.visits=Contact Visits - View.dashboard.contacts=Contacts Dashboard View.dashboard.surveillance=Surveillance Dashboard View.dashboard.campaigns=Campaigns Dashboard - View.events=Event Directory View.events.archive=Event Archive View.events.data=Event Information @@ -2068,30 +1960,22 @@ View.events.eventactions=Event Actions View.events.eventparticipants=Event Participants View.events.sub= View.events.eventparticipants.data=Event Participant Information - View.samples.labMessages=Lab Message Directory - View.reports=Weekly Reports View.reports.sub= - View.samples=Sample Directory View.samples.archive=Sample Archive View.samples.data=Sample Information View.samples.sub= - View.statistics=Statistics View.statistics.database-export=Database export - View.tasks=Task Management View.tasks.archive=Task Archive View.tasks.sub= - View.users=User Management View.users.sub= - # Visit visitNewVisit=New visit - Visit=Visit Visit.person=Visited person Visit.symptoms=Symptoms @@ -2103,24 +1987,19 @@ Visit.visitUser=Visiting officer Visit.disease=Disease Visit.reportLat=Report latitude Visit.reportLon=Report longitude - # WeeklyReport weeklyReportNoReport=Missing report weeklyReportOfficerInformants=Informants weeklyReportsInDistrict=Weekly Reports in %s weeklyReportRegionOfficers=Officers weeklyReportRegionInformants=Informants - WeeklyReport.epiWeek=Epi Week WeeklyReport.year=Year - # WeeklyReportEntry WeeklyReportEntry.numberOfCases=Cases reported - # WeeklyReportInformantSummary WeeklyReportInformantSummary.informantReportDate=Informant report submission WeeklyReportInformantSummary.totalCaseCount=Cases reported by informant - # WeeklyReportOfficerSummary WeeklyReportOfficerSummary.informants=Number of informants WeeklyReportOfficerSummary.informantReports=Number of informant reports @@ -2129,7 +2008,6 @@ WeeklyReportOfficerSummary.informantZeroReports=Number of informant zero reports WeeklyReportOfficerSummary.officer=Officer WeeklyReportOfficerSummary.officerReportDate=Officer report submission WeeklyReportOfficerSummary.totalCaseCount=Cases reported by officer - # WeeklyReportRegionSummary WeeklyReportRegionSummary.informants=Number of informants WeeklyReportRegionSummary.informantReports=Number of informant reports @@ -2139,7 +2017,6 @@ WeeklyReportRegionSummary.officers=Number of officers WeeklyReportRegionSummary.officerReports=Number of officers reports WeeklyReportRegionSummary.officerReportPercentage=Percentage WeeklyReportRegionSummary.officerZeroReports=Number of officer zero reports - # SORMAS to SORMAS SormasToSormasOptions.organization=Orgainzation SormasToSormasOptions.withAssociatedContacts=Share associated contacts @@ -2160,23 +2037,17 @@ sormasToSormasSharedWith=Shared with sormasToSormasSharedBy=By sormasToSormasSharedDate=On sormasToSormasSentFrom=Sent from - BAGExport=BAG Export - # Survnet Gateway SurvnetGateway.title=SurvNet SurvnetGateway.send=send to own SurvNet instance SurvnetGateway.unableToSend=Unable to send SurvnetGateway.confirmSend=Confirm sending SurvnetGateway.sendShort=Send to SurvNet - patientDiaryRegistrationError=Could not register person in the patient diary. patientDiaryPersonNotExportable=Cannot export the person to the patient diary. The person needs a valid birthdate and either a valid phone number or email address. - showPlacesOnMap=Show - changeUserEmail=Change user email - VaccinationInfo.vaccination=Vaccination status for this disease VaccinationInfo.firstVaccinationDate=Date of first vaccination VaccinationInfo.lastVaccinationDate=Date of last vaccination diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java index b12a5974d43..3c422ae972e 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java @@ -45,6 +45,7 @@ public PatchFieldHelper(PathAliasHelper pathAliasHelper) { public PathFailureCause checkIfPathIsInvalid(String path) { PathFailureCause dataPatchFailureCause = null; + // TODO: check it would be required to distinguish read / write: per example Immunization can be read and write but write does not reach this code. if (!startsWithAllowedPrefix(path)) { dataPatchFailureCause = PathFailureCause.UNSUPPORTED_PREFIX; } else if (fieldIsForbidden(path)) { diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java index a80f68d5e66..271f9f73c24 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java @@ -59,6 +59,10 @@ public class PathAliasHelper { dictionary.put("Continent", "Person.address.continent"); dictionary.put("User", "CaseData.followUpStatusChangeUser"); + logger.error("Immunization was added here, this is wrong. TODO: FIX-ME"); + // TODO: + dictionary.put("Immunization", "Immunization"); + return dictionary; } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java index 21010380f27..1479c1192c6 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java @@ -80,7 +80,6 @@ public PartialRetrievalResponse retrievePartial(PartialRetrievalRequest request) Set fieldsToRetrieve = request.getFieldsToRetrieve(); - Tuple> targetType = Tuple.of(null, new Tuple<>(null, null)); List>> results = fieldsToRetrieve.stream().flatMap(originalFieldName -> { PathFailureCause pathFailureCause = patchFieldHelper.checkIfPathIsInvalid(originalFieldName); @@ -102,7 +101,7 @@ public PartialRetrievalResponse retrievePartial(PartialRetrievalRequest request) // TODO: handle multiple path format. // if (!patchFieldHelper.isMultipleFieldFormat(physicalPathName)) { - String aliasPath = pathAliasHelper.toAliasPath(physicalPathName); + String aliasPath = pathAliasHelper.toAliasPath(pathWithoutAlias); Optional adequateBean = getAdequateBean(pathWithoutAlias, caseData); if (adequateBean.isEmpty()) { @@ -119,7 +118,12 @@ public PartialRetrievalResponse retrievePartial(PartialRetrievalRequest request) Tuple, Object> fieldInfo = propertyType.getFirst(); - String translatedFieldName = I18nProperties.getCaption(pathWithoutAlias, physicalPathName); + // Some fields are translated only by there "physical-path" from root level + // example: Person.firstName has translation key "firstName" + // example: CaseData.disease has translation key "firstName" + String translatedFieldName = Optional.ofNullable(I18nProperties.getCaption(aliasPath, null)) + .or(() -> Optional.ofNullable(I18nProperties.getCaption(physicalPathName, null))) + .orElseGet(() -> I18nProperties.getDescription(aliasPath, aliasPath)); return Stream.of( Tuple.of( diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/TypeToDisplayRegistry.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/TypeToDisplayRegistry.java index 8315ef3378f..63664442f07 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/TypeToDisplayRegistry.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/TypeToDisplayRegistry.java @@ -3,6 +3,8 @@ import java.util.List; import java.util.stream.Collectors; +import javax.annotation.Nullable; +import javax.annotation.PostConstruct; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Instance; import javax.inject.Inject; @@ -15,6 +17,7 @@ public class TypeToDisplayRegistry { private final static Logger logger = LoggerFactory.getLogger(TypeToDisplayRegistry.class); + public static final String EMPTY_STRING = ""; private List orderedInstances; @@ -24,15 +27,21 @@ public class TypeToDisplayRegistry { public TypeToDisplayRegistry() { } - public TypeToDisplayRegistry(Instance instances) { + @PostConstruct + void init() { orderedInstances = instances.stream().sorted().collect(Collectors.toList()); } @NotNull - public String toDisplayValue(@NotNull Object value) { + public String toDisplayValue(@Nullable Object value) { + if (value == null) { + logger.info("Input value was null, using default empty value"); + return EMPTY_STRING; + } + Class valueType = value.getClass(); TypeToDisplayValueMapper matchingMapper = orderedInstances.stream() - .filter(mapper -> mapper.supportedTypes().contains(valueType)) + .filter(mapper -> mapper.supports(valueType)) .findAny() .orElseThrow( (() -> new IllegalStateException( diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/TypeToDisplayValueMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/TypeToDisplayValueMapper.java index a61e80c9e95..85b63c297e6 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/TypeToDisplayValueMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/TypeToDisplayValueMapper.java @@ -12,7 +12,29 @@ public interface TypeToDisplayValueMapper extends Comparable> supportedTypes(); + Set> getSupportedTypes(); + + /** + * Specifies if the targetType is supported by this mapper. + * + * @param targetType + * @return + */ + default boolean supports(@NotNull Class targetType) { + + boolean directlySupportedType = getSupportedTypes().contains(targetType); + + if (directlySupportedType) { + return true; + } + + for (Class supported : getSupportedTypes()) { + if (supported.isAssignableFrom(targetType)) { + return true; + } + } + return false; + } /** * Allows you to override default mappers. diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/CustomizableEnumToDisplayValueMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/CustomizableEnumToDisplayValueMapper.java index 66eb1040e1b..cbe4e5fddab 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/CustomizableEnumToDisplayValueMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/CustomizableEnumToDisplayValueMapper.java @@ -18,7 +18,7 @@ public String toDisplayValue(Object value) { } @Override - public Set> supportedTypes() { + public Set> getSupportedTypes() { return SUPPORTED_TYPES; } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/DateToDisplayValueMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/DateToDisplayValueMapper.java index 8db48969513..b108c0fd878 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/DateToDisplayValueMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/DateToDisplayValueMapper.java @@ -19,7 +19,7 @@ public String toDisplayValue(Object value) { } @Override - public Set> supportedTypes() { + public Set> getSupportedTypes() { return SUPPORTED_TYPES; } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/EnumToDisplayValueMapperImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/EnumToDisplayValueMapperImpl.java index fe36a8a362a..79020d1cf7d 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/EnumToDisplayValueMapperImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/EnumToDisplayValueMapperImpl.java @@ -18,7 +18,7 @@ public String toDisplayValue(Object value) { } @Override - public Set> supportedTypes() { + public Set> getSupportedTypes() { return SUPPORTED_TYPES; } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/ObjectToDisplayValueMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/ObjectToDisplayValueMapper.java index 288ec569223..7e552dffc42 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/ObjectToDisplayValueMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/ObjectToDisplayValueMapper.java @@ -17,7 +17,7 @@ public String toDisplayValue(Object value) { } @Override - public Set> supportedTypes() { + public Set> getSupportedTypes() { return SUPPORTED_TYPES; } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/PrimitivesToDisplayValueMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/PrimitivesToDisplayValueMapper.java index 2e878a6f285..58758801413 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/PrimitivesToDisplayValueMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/PrimitivesToDisplayValueMapper.java @@ -27,7 +27,7 @@ public class PrimitivesToDisplayValueMapper implements TypeToDisplayValueMapper boolean.class); @Override - public Set> supportedTypes() { + public Set> getSupportedTypes() { return SUPPORTED_TYPES; } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/ReferenceDtoToDisplayValueMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/ReferenceDtoToDisplayValueMapper.java index b2e519b5d70..c0d3bfe3a7b 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/ReferenceDtoToDisplayValueMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/ReferenceDtoToDisplayValueMapper.java @@ -18,7 +18,7 @@ public String toDisplayValue(Object value) { } @Override - public Set> supportedTypes() { + public Set> getSupportedTypes() { return SUPPORTED_TYPES; } diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImplTest.java index 6acfe0dc227..4ac2201ae93 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImplTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImplTest.java @@ -9,6 +9,10 @@ import de.symeda.sormas.api.Language; import de.symeda.sormas.api.caze.CaseDataDto; import de.symeda.sormas.api.i18n.I18nProperties; +import de.symeda.sormas.api.immunization.ImmunizationDto; +import de.symeda.sormas.api.immunization.ImmunizationStatus; +import de.symeda.sormas.api.patch.partial_retrieval.DisplayableFieldInfo; +import de.symeda.sormas.api.patch.partial_retrieval.DisplayablePartialRetrievalResponse; import de.symeda.sormas.api.patch.partial_retrieval.FieldInfo; import de.symeda.sormas.api.patch.partial_retrieval.PartialRetrievalRequest; import de.symeda.sormas.api.patch.partial_retrieval.PartialRetrievalResponse; @@ -20,6 +24,59 @@ class PartialRetrieverImplTest extends AbstractBeanTest { + @Test + void immunization_and_vaccine() { + // PREPARE + Disease disease = Disease.RESPIRATORY_SYNCYTIAL_VIRUS; + CaseDataDto originalCase = creator.createUnclassifiedCase(disease); + + ImmunizationDto immunizationDto = ImmunizationDto.build(originalCase.getPerson()); + immunizationDto.setRelatedCase(originalCase.toReference()); + immunizationDto.setImmunizationStatus(ImmunizationStatus.ACQUIRED); + immunizationDto.setReportingUser(originalCase.getReportingUser()); + getImmunizationFacade().save(immunizationDto); + + String immunizationStatusFieldName = toFieldName(ImmunizationDto.I18N_PREFIX, ImmunizationDto.IMMUNIZATION_STATUS); + + // EXECUTE + DisplayablePartialRetrievalResponse actual = victim().retrievePartialForDisplay( + new PartialRetrievalRequest().setCaseUuid(originalCase.getUuid()).setFieldsToRetrieve(Set.of(immunizationStatusFieldName))); + + // CHECK + DisplayableFieldInfo immunizationStatusFieldInfo = actual.getFieldInfoDictionary().get(immunizationStatusFieldName); + Assertions.assertAll( + () -> Assertions.assertTrue(actual.getFailuresDescriptions().isEmpty()), + + () -> Assertions.assertNotNull(immunizationStatusFieldInfo), + + () -> Assertions.assertEquals("Immunization status", immunizationStatusFieldInfo.getTranslatedFieldName()), + () -> Assertions.assertEquals("Acquired", immunizationStatusFieldInfo.getTranslatedFieldValue())); + } + + @Test + void displayable_partial_retrieve() { + // PREPARE + I18nProperties.setUserLanguage(Language.DE); + Disease disease = Disease.ANTHRAX; + CaseDataDto originalCase = creator.createUnclassifiedCase(disease); + + String caseDiseaseFieldName = toFieldName(CaseDataDto.I18N_PREFIX, CaseDataDto.DISEASE); + + // EXECUTE + DisplayablePartialRetrievalResponse actual = victim().retrievePartialForDisplay( + new PartialRetrievalRequest().setCaseUuid(originalCase.getUuid()).setFieldsToRetrieve(Set.of(caseDiseaseFieldName))); + + // CHECK + DisplayableFieldInfo caseDiseaseFieldInfo = actual.getFieldInfoDictionary().get(caseDiseaseFieldName); + Assertions.assertAll( + () -> Assertions.assertTrue(actual.getFailuresDescriptions().isEmpty()), + + () -> Assertions.assertNotNull(caseDiseaseFieldInfo), + + () -> Assertions.assertEquals("Krankheit", caseDiseaseFieldInfo.getTranslatedFieldName()), + () -> Assertions.assertEquals("Milzbrand", caseDiseaseFieldInfo.getTranslatedFieldValue())); + } + @Test void retrievePartial_german() { // PREPARE @@ -48,7 +105,7 @@ void retrievePartial_german() { () -> Assertions.assertEquals(disease, caseDiseaseFieldInfo.getFieldValue()), () -> Assertions.assertTrue(actual.getFieldInfoDictionary().containsKey(symptomsAbdominalPain)), - () -> Assertions.assertEquals("Krankheit", symptomsAbdominalPainFieldInfo.getTranslatedFieldName()), + () -> Assertions.assertEquals("Abdominalschmerzen", symptomsAbdominalPainFieldInfo.getTranslatedFieldName()), () -> Assertions.assertEquals(originalCase.getSymptoms().getAbdominalPain(), symptomsAbdominalPainFieldInfo.getFieldValue())); } From 9d48180fc89d8665f5051bbaa11631cebfb48b45 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Fri, 13 Mar 2026 08:25:51 +0100 Subject: [PATCH 051/134] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20registry=20mapped?= =?UTF-8?q?=20type?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/patch/mapping/ValuePatchMapper.java | 62 +++------------- .../sormas/api/utils/OrderedRegisterable.java | 72 +++++++++++++++++++ .../TypeToDisplayValueMapper.java | 55 +++----------- 3 files changed, 94 insertions(+), 95 deletions(-) create mode 100644 sormas-api/src/main/java/de/symeda/sormas/api/utils/OrderedRegisterable.java diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValuePatchMapper.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValuePatchMapper.java index d34e53526bb..baf0dc157cf 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValuePatchMapper.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValuePatchMapper.java @@ -1,23 +1,13 @@ package de.symeda.sormas.api.patch.mapping; -import java.util.Set; - import javax.validation.constraints.NotNull; -// TODO: check if "in-value-type" must be checked: add self check ? +import de.symeda.sormas.api.utils.OrderedRegisterable; /** * Contract to specify how a type must be mapped into a value, NOT field specific. */ -public interface ValuePatchMapper extends Comparable { - - int HIGH_PRECEDENCE = Integer.MIN_VALUE; - int LOW_PRECEDENCE = Integer.MAX_VALUE; - - /** - * Can be used to add it to the default precedences values and a keep some "space between" the implementations ordering. - */ - int ORDER_CHUNK = 20; +public interface ValuePatchMapper extends OrderedRegisterable { /** * @@ -36,47 +26,17 @@ default ValueMappingResult map(Object value, @NotNull Class targetType return this.map(new ValuePatchRequest().setValue(value).setTargetType(targetType)); } - @NotNull - ValueMappingResult map(ValuePatchRequest request); - - @NotNull - Set> getSupportedTypes(); - /** - * Specifies if the targetType is supported by this mapper. - * - * @param targetType - * @return - */ - default boolean supports(@NotNull Class targetType) { - - boolean directlySupportedType = getSupportedTypes().contains(targetType); - - if (directlySupportedType) { - return true; - } - - for (Class supported : getSupportedTypes()) { - if (supported.isAssignableFrom(targetType)) { - return true; - } - } - return false; - } - - /** - * Allows you to override default mappers. - * {@link #HIGH_PRECEDENCE} means this mapper will be used (among) first. - * {@link #LOW_PRECEDENCE} means this mapper will be used (among) last. * - * @return defaults to LOW_PRECEDENCE + * @param request + * to specif how the value should be mapped. + * @return actual value + * @param + * target type + * @throws RuntimeException + * in case of the value couldn't be mapped. */ - default int getOrder() { - return LOW_PRECEDENCE; - } + @NotNull + ValueMappingResult map(ValuePatchRequest request); - @Override - default int compareTo(ValuePatchMapper o) { - return Integer.compare(this.getOrder(), o.getOrder()); - } } diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/utils/OrderedRegisterable.java b/sormas-api/src/main/java/de/symeda/sormas/api/utils/OrderedRegisterable.java new file mode 100644 index 00000000000..e50b472a832 --- /dev/null +++ b/sormas-api/src/main/java/de/symeda/sormas/api/utils/OrderedRegisterable.java @@ -0,0 +1,72 @@ +package de.symeda.sormas.api.utils; + +import java.util.Set; + +import javax.validation.constraints.NotNull; + +/** + * Can be used to define ordered mappers (same order by default) that supports specific type and that perform whatever action on this type. + * Makes it simpler to register them into registries with: {@link Comparable} and the {@link #supports(Class)}. + * + * @param + * type of interface that extends this class. + */ +public interface OrderedRegisterable> extends Comparable { + + int HIGH_PRECEDENCE = Integer.MIN_VALUE; + + int LOW_PRECEDENCE = Integer.MAX_VALUE; + + /** + * Can be used to add it to the default precedences values and a keep some "space between" the implementations ordering. + */ + int ORDER_CHUNK = 20; + + /** + * Meant to be implemented by classes implementing this {@link OrderedRegisterable} contract but to be used. + * For usages prefer {@link #supports(Class)}. + * + * @return types that are supported by this class. + */ + @NotNull + Set> getSupportedTypes(); + + /** + * Specifies if the targetType is supported by this class. + * + * @param targetType + * can be a child class. + * @return true if the class will be able to perform some action with this type. + */ + default boolean supports(@NotNull Class targetType) { + + boolean directlySupportedType = getSupportedTypes().contains(targetType); + + if (directlySupportedType) { + return true; + } + + for (Class supported : getSupportedTypes()) { + if (supported.isAssignableFrom(targetType)) { + return true; + } + } + return false; + } + + /** + * Allows you to override default mappers. + * {@link #HIGH_PRECEDENCE} means this mapper will be used (among) first. + * {@link #LOW_PRECEDENCE} means this mapper will be used (among) last. + * + * @return defaults to LOW_PRECEDENCE + */ + default int getOrder() { + return LOW_PRECEDENCE; + } + + @Override + default int compareTo(SELF o) { + return Integer.compare(this.getOrder(), o.getOrder()); + } +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/TypeToDisplayValueMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/TypeToDisplayValueMapper.java index 85b63c297e6..6dd6896e0d3 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/TypeToDisplayValueMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/TypeToDisplayValueMapper.java @@ -1,54 +1,21 @@ package de.symeda.sormas.backend.patch.partial_retrieval; -import java.util.Set; - import javax.validation.constraints.NotNull; -public interface TypeToDisplayValueMapper extends Comparable { - - int HIGH_PRECEDENCE = Integer.MIN_VALUE; - - int LOW_PRECEDENCE = Integer.MAX_VALUE; - - String toDisplayValue(@NotNull Object value); - - Set> getSupportedTypes(); +import de.symeda.sormas.api.utils.OrderedRegisterable; - /** - * Specifies if the targetType is supported by this mapper. - * - * @param targetType - * @return - */ - default boolean supports(@NotNull Class targetType) { - - boolean directlySupportedType = getSupportedTypes().contains(targetType); - - if (directlySupportedType) { - return true; - } - - for (Class supported : getSupportedTypes()) { - if (supported.isAssignableFrom(targetType)) { - return true; - } - } - return false; - } +/** + * Allows to specify how a specific value for a type must be "stringified" for display purposes. + */ +public interface TypeToDisplayValueMapper extends OrderedRegisterable { /** - * Allows you to override default mappers. - * {@link #HIGH_PRECEDENCE} means this mapper will be used (among) first. - * {@link #LOW_PRECEDENCE} means this mapper will be used (among) last. - * - * @return defaults to LOW_PRECEDENCE + * Will be used to be displayed as it to an user. + * + * @param value + * untyped value that is supported by this mapper. + * @return va */ - default int getOrder() { - return LOW_PRECEDENCE; - } + String toDisplayValue(@NotNull Object value); - @Override - default int compareTo(TypeToDisplayValueMapper o) { - return Integer.compare(this.getOrder(), o.getOrder()); - } } From c62e94168e846169840da88d85c402a1f9b95bc0 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Fri, 13 Mar 2026 09:59:33 +0100 Subject: [PATCH 052/134] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20registry=20mapped?= =?UTF-8?q?=20type.=20Added=20failure=20for=20invalid=20path=20type?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../de/symeda/sormas/api/patch/DataPatchFailureCause.java | 1 + .../patch/partial_retrieval/PartialRetrievalFailureCause.java | 1 + .../java/de/symeda/sormas/backend/patch/PatchFieldHelper.java | 4 +++- .../java/de/symeda/sormas/backend/patch/PathFailureCause.java | 1 + .../backend/patch/partial_retrieval/PartialRetrieverImpl.java | 2 +- 5 files changed, 7 insertions(+), 2 deletions(-) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java index 0b34f24a5a8..af49732addf 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java @@ -63,6 +63,7 @@ public enum DataPatchFailureCause { */ UNSUPPORTED_TARGET_TYPE, + INVALID_PATH_FORMAT, /** * This means there is a hole in the implementation. */ diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetrievalFailureCause.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetrievalFailureCause.java index 13a3978bea6..c27d776118d 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetrievalFailureCause.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetrievalFailureCause.java @@ -36,6 +36,7 @@ public enum PartialRetrievalFailureCause { */ FORBIDDEN_FIELD, + INVALID_PATH_FORMAT, /** * This means there is a hole in the implementation. */ diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java index 3c422ae972e..03434325b45 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java @@ -46,7 +46,9 @@ public PathFailureCause checkIfPathIsInvalid(String path) { PathFailureCause dataPatchFailureCause = null; // TODO: check it would be required to distinguish read / write: per example Immunization can be read and write but write does not reach this code. - if (!startsWithAllowedPrefix(path)) { + if (!path.contains(PATH_SEPARATOR)) { + dataPatchFailureCause = PathFailureCause.INVALID_PATH_FORMAT; + } else if (!startsWithAllowedPrefix(path)) { dataPatchFailureCause = PathFailureCause.UNSUPPORTED_PREFIX; } else if (fieldIsForbidden(path)) { dataPatchFailureCause = PathFailureCause.FORBIDDEN_FIELD; diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PathFailureCause.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PathFailureCause.java index 2815d7a615f..9b0b0b79e5f 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PathFailureCause.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PathFailureCause.java @@ -7,6 +7,7 @@ public enum PathFailureCause { + INVALID_PATH_FORMAT(DataPatchFailureCause.INVALID_PATH_FORMAT, PartialRetrievalFailureCause.INVALID_PATH_FORMAT), FORBIDDEN_NON_UNIQUE_ALIAS(DataPatchFailureCause.FORBIDDEN_NON_UNIQUE_ALIAS, PartialRetrievalFailureCause.FORBIDDEN_NON_UNIQUE_ALIAS), UNSUPPORTED_PREFIX(DataPatchFailureCause.UNSUPPORTED_PREFIX, PartialRetrievalFailureCause.UNSUPPORTED_PREFIX), FORBIDDEN_FIELD(DataPatchFailureCause.FORBIDDEN_FIELD, PartialRetrievalFailureCause.FORBIDDEN_FIELD), diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java index 1479c1192c6..75d66a3dc4a 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java @@ -144,7 +144,7 @@ public PartialRetrievalResponse retrievePartial(PartialRetrievalRequest request) .collect(Collectors.toMap(Tuple::getFirst, a -> a.getSecond().getFirst())); Map failures = results.stream() - .filter(a -> a.getSecond().getSecond() != null) + .filter(tuple -> tuple.getSecond().getSecond() != null) .collect(Collectors.toMap(Tuple::getFirst, a -> a.getSecond().getSecond())); return new PartialRetrievalResponse().setFailuresDictionary(failures).setFieldInfoDictionary(successes); From 9bcbc642a8fc6ac14ece73ac0d1edf9dc428be55 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Fri, 13 Mar 2026 10:16:27 +0100 Subject: [PATCH 053/134] before breaking partial retriever --- .../sormas/backend/patch/DataPatcherImpl.java | 7 +--- .../backend/patch/PatchFieldHelper.java | 41 ++++++++++++++++++- .../PartialRetrieverImpl.java | 26 ++++-------- 3 files changed, 50 insertions(+), 24 deletions(-) diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java index 54ed0d594ec..4a61166ee51 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java @@ -15,8 +15,7 @@ import javax.annotation.Nullable; import javax.ejb.EJB; -import javax.ejb.LocalBean; -import javax.ejb.Stateless; +import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; import org.apache.commons.lang3.StringUtils; @@ -54,9 +53,7 @@ import de.symeda.sormas.backend.patch.mapping.ValueMapperRegistry; import de.symeda.sormas.backend.util.CollectorUtils; -// TODO: test integration vaccines -@Stateless -@LocalBean +@ApplicationScoped public class DataPatcherImpl implements DataPatcher { public static final String PERSON_FIELD_NAME_PREFIX = "Person."; diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java index 03434325b45..f66da031211 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java @@ -1,6 +1,9 @@ package de.symeda.sormas.backend.patch; +import java.util.Arrays; import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; import javax.annotation.Nullable; import javax.enterprise.context.ApplicationScoped; @@ -41,14 +44,44 @@ public PatchFieldHelper(PathAliasHelper pathAliasHelper) { this.pathAliasHelper = pathAliasHelper; } + public Set> extractFieldTuples(Set fields, Set additionalSupportedPrefixes) { + return fields.stream().map(path -> Tuple.of(path, checkIfPathIsInvalidImpl(path, additionalSupportedPrefixes))).flatMap(tuple -> { + + String originalPath = tuple.getFirst(); + + if (tuple.getSecond() != null || !isMultipleFieldFormat(originalPath)) { + return Stream.of(tuple); + } + + return splitMultipleFieldsPath(originalPath).map(splitPath -> Tuple.of(splitPath, (PathFailureCause) null)); + + }).collect(Collectors.toSet()); + } + + @NotNull + private Stream splitMultipleFieldsPath(String path) { + int openingParenthesisIndex = path.indexOf("("); + String prefix = path.substring(0, openingParenthesisIndex); + + int closeParen = path.indexOf(')'); + + String restPath = path.substring(openingParenthesisIndex + 1, closeParen); + + return Arrays.stream(restPath.split("\\|")).map(suffix -> prefix + suffix); + } + @Nullable public PathFailureCause checkIfPathIsInvalid(String path) { + return checkIfPathIsInvalidImpl(path, Set.of()); + } + + private PathFailureCause checkIfPathIsInvalidImpl(String path, Set additionalSupportedPrefixes) { PathFailureCause dataPatchFailureCause = null; // TODO: check it would be required to distinguish read / write: per example Immunization can be read and write but write does not reach this code. if (!path.contains(PATH_SEPARATOR)) { dataPatchFailureCause = PathFailureCause.INVALID_PATH_FORMAT; - } else if (!startsWithAllowedPrefix(path)) { + } else if (!startsWithAllowedPrefix(path) || pathStartsWithPrefix(path, additionalSupportedPrefixes)) { dataPatchFailureCause = PathFailureCause.UNSUPPORTED_PREFIX; } else if (fieldIsForbidden(path)) { dataPatchFailureCause = PathFailureCause.FORBIDDEN_FIELD; @@ -68,7 +101,11 @@ private boolean fieldIsForbidden(String path) { } private boolean startsWithAllowedPrefix(String path) { - return pathAliasHelper.supportedPrefixes().stream().anyMatch(path::startsWith); + return pathStartsWithPrefix(path, pathAliasHelper.supportedPrefixes()); + } + + private static boolean pathStartsWithPrefix(String path, Set strings) { + return strings.stream().anyMatch(path::startsWith); } public boolean isMultipleFieldFormat(String path) { diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java index 75d66a3dc4a..f126d526cf7 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java @@ -1,6 +1,5 @@ package de.symeda.sormas.backend.patch.partial_retrieval; -import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.Optional; @@ -66,7 +65,7 @@ public class PartialRetrieverImpl implements PartialRetriever { @Override public PartialRetrievalResponse retrievePartial(PartialRetrievalRequest request) { - CaseDataDto caseData = businessDtoFacade.getCaseDataDtoNullable(request.getCaseUuid()); + CaseDataDto caseData = businessDtoFacade.getCaseDataDto(request.getCaseUuid()); /* * Implementation steps: @@ -141,11 +140,11 @@ public PartialRetrievalResponse retrievePartial(PartialRetrievalRequest request) Map successes = results.stream() .filter(tuple -> tuple.getSecond().getSecond() == null) - .collect(Collectors.toMap(Tuple::getFirst, a -> a.getSecond().getFirst())); + .collect(Collectors.toMap(Tuple::getFirst, tuple -> tuple.getSecond().getFirst())); Map failures = results.stream() .filter(tuple -> tuple.getSecond().getSecond() != null) - .collect(Collectors.toMap(Tuple::getFirst, a -> a.getSecond().getSecond())); + .collect(Collectors.toMap(Tuple::getFirst, tuple -> tuple.getSecond().getSecond())); return new PartialRetrievalResponse().setFailuresDictionary(failures).setFieldInfoDictionary(successes); } @@ -160,7 +159,12 @@ public DisplayablePartialRetrievalResponse retrievePartialForDisplay(PartialRetr FieldInfo fieldInfo = entry.getValue(); return new DisplayableFieldInfo().setTranslatedFieldName(fieldInfo.getTranslatedFieldName()) .setTranslatedFieldValue(typeToDisplayRegistry.toDisplayValue(fieldInfo.getFieldValue())); - }))); + }))) + .setFailuresDescriptions( + partialRetrievalResponse.getFailuresDictionary() + .entrySet() + .stream() + .collect(Collectors.toMap(Map.Entry::getKey, entry -> I18nProperties.getEnumCaption(entry.getValue())))); } private Optional getAdequateBean(@NotNull String aliasPath, @NotNull CaseDataDto caseData) { @@ -188,18 +192,6 @@ private Optional getAdequateBean(@NotNull String aliasPath, @NotNull } } - @NotNull - private Stream splitMultipleFieldsPath(String path) { - int openingParenthesisIndex = path.indexOf("("); - String prefix = path.substring(0, openingParenthesisIndex); - - int closeParen = path.indexOf(')'); - - String restPath = path.substring(openingParenthesisIndex + 1, closeParen); - - return Arrays.stream(restPath.split("\\|")).map(suffix -> prefix + suffix); - } - private FieldVisibilityCheckers getFieldVisibilityCheckers(Disease disease) { return FieldVisibilityCheckers.withCountry(configFacade.getCountryLocale()) .andWithDisease(disease) From 69fb1797aeee4c5d0d70ccd10df965e70f2aae9d Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Fri, 13 Mar 2026 10:56:25 +0100 Subject: [PATCH 054/134] in my understanding works as it should --- .../backend/patch/BusinessDtoFacade.java | 14 +++ .../backend/patch/PatchFieldHelper.java | 6 +- .../backend/patch/alias/PathAliasHelper.java | 4 - .../PartialRetrieverImpl.java | 90 ++++++++----------- .../PartialRetrieverImplTest.java | 29 ++++-- 5 files changed, 76 insertions(+), 67 deletions(-) diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java index 336b6b0b210..aec75c31728 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java @@ -5,7 +5,9 @@ import java.util.List; import java.util.Map; import java.util.Optional; +import java.util.Set; import java.util.function.Function; +import java.util.stream.Collectors; import javax.annotation.Nullable; import javax.annotation.PostConstruct; @@ -17,6 +19,7 @@ import de.symeda.sormas.api.caze.CaseDataDto; import de.symeda.sormas.api.immunization.ImmunizationDto; import de.symeda.sormas.api.person.PersonDto; +import de.symeda.sormas.api.vaccination.VaccinationDto; import de.symeda.sormas.backend.caze.CaseFacadeEjb; import de.symeda.sormas.backend.immunization.ImmunizationFacadeEjb; import de.symeda.sormas.backend.person.PersonFacadeEjb; @@ -72,6 +75,13 @@ private void registerFetchByI18nOperations() { ImmunizationDto.I18N_PREFIX, caseDataDto -> immunizationFacade.getByPersonUuids(Collections.singletonList(caseDataDto.getPerson().getUuid()))); + registerFetchByI18n( + VaccinationDto.I18N_PREFIX, + caseDataDto -> immunizationFacade.getByPersonUuids(Collections.singletonList(caseDataDto.getPerson().getUuid())) + .stream() + .flatMap(immunization -> immunization.getVaccinations().stream()) + .collect(Collectors.toList())); + } private void registerFetchByI18n(String i18nName, Function> fct) { @@ -103,6 +113,10 @@ public List fetchByI18nName(@NotNull String i18nName, CaseD .apply(caseDataDto); } + public Set fetchablePrefixes() { + return dtoRetrieverByI18nDictionary.keySet(); + } + public T save(@NotNull EntityDto entityDto) { Class entityDtoClass = entityDto.getClass(); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java index f66da031211..8e32e5a28d0 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java @@ -81,7 +81,7 @@ private PathFailureCause checkIfPathIsInvalidImpl(String path, Set addit // TODO: check it would be required to distinguish read / write: per example Immunization can be read and write but write does not reach this code. if (!path.contains(PATH_SEPARATOR)) { dataPatchFailureCause = PathFailureCause.INVALID_PATH_FORMAT; - } else if (!startsWithAllowedPrefix(path) || pathStartsWithPrefix(path, additionalSupportedPrefixes)) { + } else if (!(startsWithAllowedPrefix(path) || pathStartsWithAllowedPrefix(path, additionalSupportedPrefixes))) { dataPatchFailureCause = PathFailureCause.UNSUPPORTED_PREFIX; } else if (fieldIsForbidden(path)) { dataPatchFailureCause = PathFailureCause.FORBIDDEN_FIELD; @@ -101,10 +101,10 @@ private boolean fieldIsForbidden(String path) { } private boolean startsWithAllowedPrefix(String path) { - return pathStartsWithPrefix(path, pathAliasHelper.supportedPrefixes()); + return pathStartsWithAllowedPrefix(path, pathAliasHelper.supportedPrefixes()); } - private static boolean pathStartsWithPrefix(String path, Set strings) { + private static boolean pathStartsWithAllowedPrefix(String path, Set strings) { return strings.stream().anyMatch(path::startsWith); } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java index 271f9f73c24..a80f68d5e66 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java @@ -59,10 +59,6 @@ public class PathAliasHelper { dictionary.put("Continent", "Person.address.continent"); dictionary.put("User", "CaseData.followUpStatusChangeUser"); - logger.error("Immunization was added here, this is wrong. TODO: FIX-ME"); - // TODO: - dictionary.put("Immunization", "Immunization"); - return dictionary; } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java index f126d526cf7..83106fc87d0 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java @@ -3,9 +3,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; -import java.util.Set; import java.util.stream.Collectors; -import java.util.stream.Stream; import javax.ejb.EJB; import javax.enterprise.context.ApplicationScoped; @@ -67,76 +65,59 @@ public PartialRetrievalResponse retrievePartial(PartialRetrievalRequest request) CaseDataDto caseData = businessDtoFacade.getCaseDataDto(request.getCaseUuid()); - /* - * Implementation steps: - * - Iterate over fields - * - Validate if allowed - * - Un-alias to get physical for Reflection - * - Alias to get Field ID for I18N - * - Get type - * - Get value - */ + List>> results = + patchFieldHelper.extractFieldTuples(request.getFieldsToRetrieve(), businessDtoFacade.fetchablePrefixes()).stream().map(tuple -> { - Set fieldsToRetrieve = request.getFieldsToRetrieve(); + String originalFieldName = tuple.getFirst(); + PathFailureCause pathFailureCause = tuple.getSecond(); - List>> results = fieldsToRetrieve.stream().flatMap(originalFieldName -> { + Tuple unAliasedTuple = patchFieldHelper.resolveAlias(originalFieldName); - PathFailureCause pathFailureCause = patchFieldHelper.checkIfPathIsInvalid(originalFieldName); + PartialRetrievalFailureCause failureCause = Optional.ofNullable(pathFailureCause) + .map(PathFailureCause::getRelatedRetrieveFailureCause) + .or(() -> Optional.ofNullable(unAliasedTuple.getSecond()).map(PathFailureCause::getRelatedRetrieveFailureCause)) + .orElse(null); - Tuple unAliasedTuple = patchFieldHelper.resolveAlias(originalFieldName); + if (failureCause != null) { + return Tuple.of(originalFieldName, new Tuple<>((FieldInfo) null, failureCause)); + } - PartialRetrievalFailureCause failureCause = Optional.ofNullable(pathFailureCause) - .map(PathFailureCause::getRelatedRetrieveFailureCause) - .or(() -> Optional.ofNullable(unAliasedTuple.getSecond()).map(PathFailureCause::getRelatedRetrieveFailureCause)) - .orElse(null); + String pathWithoutAlias = unAliasedTuple.getFirst(); + String physicalPathName = pathWithoutAlias.substring(pathWithoutAlias.indexOf('.') + 1); - if (failureCause != null) { - return Stream.of(Tuple.of(originalFieldName, new Tuple<>((FieldInfo) null, failureCause))); - } - - String pathWithoutAlias = unAliasedTuple.getFirst(); - String physicalPathName = pathWithoutAlias.substring(pathWithoutAlias.indexOf('.') + 1); - - // TODO: handle multiple path format. -// if (!patchFieldHelper.isMultipleFieldFormat(physicalPathName)) { + String aliasPath = pathAliasHelper.toAliasPath(pathWithoutAlias); + Optional adequateBean = getAdequateBean(pathWithoutAlias, caseData); - String aliasPath = pathAliasHelper.toAliasPath(pathWithoutAlias); - Optional adequateBean = getAdequateBean(pathWithoutAlias, caseData); + if (adequateBean.isEmpty()) { + return Tuple.of(originalFieldName, new Tuple<>((FieldInfo) null, PartialRetrievalFailureCause.ENTITY_COULD_NOT_BE_FOUND)); + } - if (adequateBean.isEmpty()) { - return Stream.of(Tuple.of(originalFieldName, new Tuple<>((FieldInfo) null, PartialRetrievalFailureCause.ENTITY_COULD_NOT_BE_FOUND))); - } - - Tuple, Object>, PropertyAccessFailure> propertyType = PropertyAccessor - .getPropertyTypeAndValue(adequateBean.orElseThrow(), physicalPathName, getFieldVisibilityCheckers(caseData.getDisease())); + Tuple, Object>, PropertyAccessFailure> propertyType = PropertyAccessor + .getPropertyTypeAndValue(adequateBean.orElseThrow(), physicalPathName, getFieldVisibilityCheckers(caseData.getDisease())); - PropertyAccessFailure propertyAccessFailure = propertyType.getSecond(); - if (propertyAccessFailure != null) { - return Stream.of(Tuple.of(originalFieldName, new Tuple<>((FieldInfo) null, propertyAccessFailure.getRelatedRetrieveFailureCause()))); - } + PropertyAccessFailure propertyAccessFailure = propertyType.getSecond(); + if (propertyAccessFailure != null) { + return Tuple.of(originalFieldName, new Tuple<>((FieldInfo) null, propertyAccessFailure.getRelatedRetrieveFailureCause())); + } - Tuple, Object> fieldInfo = propertyType.getFirst(); + Tuple, Object> fieldInfo = propertyType.getFirst(); - // Some fields are translated only by there "physical-path" from root level - // example: Person.firstName has translation key "firstName" - // example: CaseData.disease has translation key "firstName" - String translatedFieldName = Optional.ofNullable(I18nProperties.getCaption(aliasPath, null)) - .or(() -> Optional.ofNullable(I18nProperties.getCaption(physicalPathName, null))) - .orElseGet(() -> I18nProperties.getDescription(aliasPath, aliasPath)); + // Some fields are translated only by there "physical-path" from root level + // example: Person.firstName has translation key "firstName" + // example: CaseData.disease has translation key "firstName" + String translatedFieldName = Optional.ofNullable(I18nProperties.getCaption(aliasPath, null)) + .or(() -> Optional.ofNullable(I18nProperties.getCaption(physicalPathName, null))) + .orElseGet(() -> I18nProperties.getDescription(aliasPath, aliasPath)); - return Stream.of( - Tuple.of( + return Tuple.of( originalFieldName, new Tuple<>( new FieldInfo().setFieldType(fieldInfo.getFirst()) .setFieldValue(fieldInfo.getSecond()) .setTranslatedFieldName(translatedFieldName), - (PartialRetrievalFailureCause) null))); -// } -// -// return splitMultipleFieldsPath(physicalPathName).map(a -> ); + (PartialRetrievalFailureCause) null)); - }).collect(Collectors.toList()); + }).collect(Collectors.toList()); Map successes = results.stream() .filter(tuple -> tuple.getSecond().getSecond() == null) @@ -153,7 +134,6 @@ public PartialRetrievalResponse retrievePartial(PartialRetrievalRequest request) public DisplayablePartialRetrievalResponse retrievePartialForDisplay(PartialRetrievalRequest request) { PartialRetrievalResponse partialRetrievalResponse = retrievePartial(request); - // TODO: translate failures. return new DisplayablePartialRetrievalResponse().setFieldInfoDictionary( partialRetrievalResponse.getFieldInfoDictionary().entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, entry -> { FieldInfo fieldInfo = entry.getValue(); diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImplTest.java index 4ac2201ae93..8444ae46291 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImplTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImplTest.java @@ -1,5 +1,6 @@ package de.symeda.sormas.backend.patch.partial_retrieval; +import java.util.List; import java.util.Set; import org.junit.jupiter.api.Assertions; @@ -8,6 +9,7 @@ import de.symeda.sormas.api.Disease; import de.symeda.sormas.api.Language; import de.symeda.sormas.api.caze.CaseDataDto; +import de.symeda.sormas.api.caze.Vaccine; import de.symeda.sormas.api.i18n.I18nProperties; import de.symeda.sormas.api.immunization.ImmunizationDto; import de.symeda.sormas.api.immunization.ImmunizationStatus; @@ -20,41 +22,58 @@ import de.symeda.sormas.api.person.PersonDto; import de.symeda.sormas.api.person.PersonReferenceDto; import de.symeda.sormas.api.symptoms.SymptomsDto; +import de.symeda.sormas.api.user.UserReferenceDto; +import de.symeda.sormas.api.vaccination.VaccinationDto; import de.symeda.sormas.backend.AbstractBeanTest; class PartialRetrieverImplTest extends AbstractBeanTest { @Test - void immunization_and_vaccine() { + void retrievePartialForDisplay_immunization_and_vaccine() { // PREPARE Disease disease = Disease.RESPIRATORY_SYNCYTIAL_VIRUS; CaseDataDto originalCase = creator.createUnclassifiedCase(disease); + UserReferenceDto reportingUser = originalCase.getReportingUser(); ImmunizationDto immunizationDto = ImmunizationDto.build(originalCase.getPerson()); immunizationDto.setRelatedCase(originalCase.toReference()); immunizationDto.setImmunizationStatus(ImmunizationStatus.ACQUIRED); - immunizationDto.setReportingUser(originalCase.getReportingUser()); + immunizationDto.setReportingUser(reportingUser); + VaccinationDto vaccination = VaccinationDto.build(reportingUser); + vaccination.setVaccineName(Vaccine.COMIRNATY); + vaccination.setOtherVaccineName("actual vaccine name"); + immunizationDto.setVaccinations(List.of(vaccination)); getImmunizationFacade().save(immunizationDto); String immunizationStatusFieldName = toFieldName(ImmunizationDto.I18N_PREFIX, ImmunizationDto.IMMUNIZATION_STATUS); + String vaccineCombinedFieldName = + toFieldName(VaccinationDto.I18N_PREFIX, String.format("(%s|%s)", VaccinationDto.VACCINE_NAME, VaccinationDto.OTHER_VACCINE_NAME)); // EXECUTE DisplayablePartialRetrievalResponse actual = victim().retrievePartialForDisplay( - new PartialRetrievalRequest().setCaseUuid(originalCase.getUuid()).setFieldsToRetrieve(Set.of(immunizationStatusFieldName))); + new PartialRetrievalRequest().setCaseUuid(originalCase.getUuid()) + .setFieldsToRetrieve(Set.of(immunizationStatusFieldName, vaccineCombinedFieldName))); // CHECK DisplayableFieldInfo immunizationStatusFieldInfo = actual.getFieldInfoDictionary().get(immunizationStatusFieldName); + DisplayableFieldInfo vaccineNameFieldInfo = actual.getFieldInfoDictionary().get("Vaccination.vaccineName"); + DisplayableFieldInfo otherVaccineNameFieldInfo = actual.getFieldInfoDictionary().get("Vaccination.otherVaccineName"); Assertions.assertAll( () -> Assertions.assertTrue(actual.getFailuresDescriptions().isEmpty()), () -> Assertions.assertNotNull(immunizationStatusFieldInfo), () -> Assertions.assertEquals("Immunization status", immunizationStatusFieldInfo.getTranslatedFieldName()), - () -> Assertions.assertEquals("Acquired", immunizationStatusFieldInfo.getTranslatedFieldValue())); + () -> Assertions.assertEquals("Acquired", immunizationStatusFieldInfo.getTranslatedFieldValue()), + + () -> Assertions.assertEquals("Pfizer-BioNTech COVID-19 vaccine", vaccineNameFieldInfo.getTranslatedFieldValue()), + () -> Assertions.assertEquals("actual vaccine name", otherVaccineNameFieldInfo.getTranslatedFieldValue()), + + () -> Assertions.assertEquals(3, actual.getFieldInfoDictionary().size())); } @Test - void displayable_partial_retrieve() { + void retrievePartialForDisplay() { // PREPARE I18nProperties.setUserLanguage(Language.DE); Disease disease = Disease.ANTHRAX; From aedb4e47124f24f2aab08e4cba77ddadef937cc4 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Mon, 16 Mar 2026 09:03:31 +0100 Subject: [PATCH 055/134] =?UTF-8?q?=E2=99=BB=EF=B8=8F=F0=9F=93=9D=20minor?= =?UTF-8?q?=20API=20enhancements?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ExternalMessageSurveyResponseRequest.java | 21 ++- .../survey/ExternalSurveyResponseData.java | 2 +- .../partial_retrieval/PartialRetriever.java | 21 ++- .../sormas/api/survey/SurveyFacade.java | 2 + .../external/SurveyAnswerPatchRequest.java | 141 ------------------ .../external/views/ExternalSurveyView.java | 3 + .../external/views/QuestionAnswersView.java | 36 ++++- .../backend/survey/SurveyFacadeEjb.java | 17 ++- 8 files changed, 89 insertions(+), 154 deletions(-) delete mode 100644 sormas-api/src/main/java/de/symeda/sormas/api/survey/external/SurveyAnswerPatchRequest.java diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseRequest.java b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseRequest.java index 9356e255884..fb65b1996e5 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseRequest.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseRequest.java @@ -61,6 +61,12 @@ public class ExternalMessageSurveyResponseRequest { */ private boolean allowFallbackValues = true; + /** + * Could imagine that the cron in addition to the webhook could process elements twice. + * Set false to force a refresh: data etc. + */ + private boolean skipIfAlreadyProcessed = true; + public String getToken() { return token; } @@ -162,6 +168,15 @@ public ExternalMessageSurveyResponseRequest setAllowFallbackValues(boolean allow return this; } + public boolean isSkipIfAlreadyProcessed() { + return skipIfAlreadyProcessed; + } + + public ExternalMessageSurveyResponseRequest setSkipIfAlreadyProcessed(boolean skipIfAlreadyProcessed) { + this.skipIfAlreadyProcessed = skipIfAlreadyProcessed; + return this; + } + @Override public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) @@ -169,6 +184,7 @@ public boolean equals(Object o) { ExternalMessageSurveyResponseRequest that = (ExternalMessageSurveyResponseRequest) o; return patchedInCaseOfFailures == that.patchedInCaseOfFailures && allowFallbackValues == that.allowFallbackValues + && skipIfAlreadyProcessed == that.skipIfAlreadyProcessed && Objects.equals(token, that.token) && Objects.equals(externalSurveyId, that.externalSurveyId) && Objects.equals(externalRespondentId, that.externalRespondentId) @@ -193,7 +209,8 @@ public int hashCode() { patchDictionary, origin, inputLanguages, - allowFallbackValues); + allowFallbackValues, + skipIfAlreadyProcessed); } @Override @@ -202,6 +219,6 @@ public String toString() { + ", externalRespondentId='" + externalRespondentId + '\'' + ", responseReceivedDate=" + responseReceivedDate + ", patchedInCaseOfFailures=" + patchedInCaseOfFailures + ", replacementStrategy=" + replacementStrategy + ", emptyValueBehavior=" + emptyValueBehavior + ", patchDictionary=" + patchDictionary + ", origin='" + origin + '\'' + ", inputLanguages=" + inputLanguages - + ", allowFallbackValues=" + allowFallbackValues + '}'; + + ", allowFallbackValues=" + allowFallbackValues + ", skipIfAlreadyProcessed=" + skipIfAlreadyProcessed + '}'; } } diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalSurveyResponseData.java b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalSurveyResponseData.java index e7991e16cb8..916bcfdf55c 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalSurveyResponseData.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalSurveyResponseData.java @@ -20,7 +20,7 @@ public class ExternalSurveyResponseData { private ExternalMessageSurveyResponseWrapper original; /** - * May be present in case the original had failures and a new request-response was specified using + * May be present in case the original had failures and a new request-response was specified by some user. */ @Nullable private ExternalMessageSurveyResponseWrapper updated; diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetriever.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetriever.java index 02a7de8cd24..d4571e2aff5 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetriever.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetriever.java @@ -1,18 +1,25 @@ package de.symeda.sormas.api.patch.partial_retrieval; +/** + * Can be used to retrieve partial data linked to a case. + */ public interface PartialRetriever { /** - * TODO: - * - Reuse the single FieldPatcher for that purpose ? Create additional interface to retrieve the value for the supported field. - * - I18n using Field ID: must be retrieved by the - * - Field type using Property accessor: should be done in one shot to avoid too much - * - * + * Use this to fetch the actual values in their concrete types. + * * @param request - * @return + * to configure retrieval. + * @return response with actual values in their concrete types and possibly errors. */ PartialRetrievalResponse retrievePartial(PartialRetrievalRequest request); + /** + * Use this to fetch the actual values in displayable string format. + * + * @param request + * to configure retrieval. + * @return response with actual values in displayable string format and possibly translated errors. + */ DisplayablePartialRetrievalResponse retrievePartialForDisplay(PartialRetrievalRequest request); } diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/survey/SurveyFacade.java b/sormas-api/src/main/java/de/symeda/sormas/api/survey/SurveyFacade.java index 7506a1cd09d..d285c1e2c8f 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/survey/SurveyFacade.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/survey/SurveyFacade.java @@ -70,4 +70,6 @@ void sendDocument(SurveyDocumentOptionsDto surveyOptions) DocumentVariables getDocumentVariables(SurveyReferenceDto surveyRef) throws DocumentTemplateException; List getAllAsReference(); + + List getAll(); } diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/SurveyAnswerPatchRequest.java b/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/SurveyAnswerPatchRequest.java deleted file mode 100644 index 26bab902011..00000000000 --- a/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/SurveyAnswerPatchRequest.java +++ /dev/null @@ -1,141 +0,0 @@ -package de.symeda.sormas.api.survey.external; - -import java.time.OffsetDateTime; -import java.util.Map; - -import javax.validation.constraints.NotNull; - -import de.symeda.sormas.api.patch.DataReplacementStrategy; -import de.symeda.sormas.api.patch.EmptyValueBehavior; - -/** - * Request sent to SORMAS to update the information. - */ -public class SurveyAnswerPatchRequest { - - @NotNull - private String surveyId; - - @NotNull - private String token; - - @NotNull - private String respondentId; - - @NotNull - private OffsetDateTime answerDate; - - @NotNull - private DataReplacementStrategy dataReplacementStrategy = DataReplacementStrategy.IF_NOT_ALREADY_PRESENT; - - @NotNull - private EmptyValueBehavior emptyValueBehavior = EmptyValueBehavior.IGNORE; - - /** - * Key is a field to replace and value is the actual value that will be replaced. - *

- * Values will be applied according to the dataReplacementType. - */ - @NotNull - private Map patchDictionary; - - /** - * Could imagine that the cron in addition to the webhook could process elements twice. - * Set to false to force a refresh: data etc. - */ - private boolean skipIfAlreadyProcessed = true; - - /** - * In case 1 or more fields cannot be mapped, should the entire patch fail (nothing applied). - * True: means will not be applied in case of error, false: patching will still be applied. - */ - private boolean failOnError = false; - - public String getSurveyId() { - return surveyId; - } - - public SurveyAnswerPatchRequest setSurveyId(String surveyId) { - this.surveyId = surveyId; - return this; - } - - public String getToken() { - return token; - } - - public SurveyAnswerPatchRequest setToken(String token) { - this.token = token; - return this; - } - - public String getRespondentId() { - return respondentId; - } - - public SurveyAnswerPatchRequest setRespondentId(String respondentId) { - this.respondentId = respondentId; - return this; - } - - public OffsetDateTime getAnswerDate() { - return answerDate; - } - - public SurveyAnswerPatchRequest setAnswerDate(OffsetDateTime answerDate) { - this.answerDate = answerDate; - return this; - } - - public DataReplacementStrategy getDataReplacementType() { - return dataReplacementStrategy; - } - - public SurveyAnswerPatchRequest setDataReplacementType(DataReplacementStrategy dataReplacementStrategy) { - this.dataReplacementStrategy = dataReplacementStrategy; - return this; - } - - public EmptyValueBehavior getEmptyValueBehavior() { - return emptyValueBehavior; - } - - public SurveyAnswerPatchRequest setEmptyValueBehavior(EmptyValueBehavior emptyValueBehavior) { - this.emptyValueBehavior = emptyValueBehavior; - return this; - } - - public Map getPatchDictionary() { - return patchDictionary; - } - - public SurveyAnswerPatchRequest setPatchDictionary(Map patchDictionary) { - this.patchDictionary = patchDictionary; - return this; - } - - public boolean isSkipIfAlreadyProcessed() { - return skipIfAlreadyProcessed; - } - - public SurveyAnswerPatchRequest setSkipIfAlreadyProcessed(boolean skipIfAlreadyProcessed) { - this.skipIfAlreadyProcessed = skipIfAlreadyProcessed; - return this; - } - - public boolean isFailOnError() { - return failOnError; - } - - public SurveyAnswerPatchRequest setFailOnError(boolean failOnError) { - this.failOnError = failOnError; - return this; - } - - @Override - public String toString() { - return "SurveyAnswerPatchRequest{" + "surveyId='" + surveyId + '\'' + ", token='" + token + '\'' + ", respondentId='" + respondentId + '\'' - + ", answerDate=" + answerDate + ", dataReplacementType=" + dataReplacementStrategy + ", emptyValueBehavior=" + emptyValueBehavior - + ", patchDictionary=" + patchDictionary + ", skipIfAlreadyProcessed=" + skipIfAlreadyProcessed + ", failOnError=" + failOnError + '}'; - } -} diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/views/ExternalSurveyView.java b/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/views/ExternalSurveyView.java index 8df8fe9f80a..f91981b086e 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/views/ExternalSurveyView.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/views/ExternalSurveyView.java @@ -2,9 +2,12 @@ import java.util.List; +import de.symeda.sormas.api.audit.AuditedClass; + /** * View used to display an external Survey in an tool-agnostic manner. */ +@AuditedClass public class ExternalSurveyView { private List questionAnswersViews; diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/views/QuestionAnswersView.java b/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/views/QuestionAnswersView.java index c907c73ca8e..cff9292648e 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/views/QuestionAnswersView.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/views/QuestionAnswersView.java @@ -2,10 +2,13 @@ import java.util.ArrayList; import java.util.List; +import java.util.Objects; import javax.annotation.Nullable; import javax.validation.constraints.NotNull; +import com.fasterxml.jackson.annotation.JsonIgnore; + public class QuestionAnswersView { @NotNull @@ -14,6 +17,10 @@ public class QuestionAnswersView { @Nullable private String answer; + @JsonIgnore + @Nullable + private String answerText; + /** * Some questions can be grouped together. * Example: PersonalInfo: @@ -49,8 +56,35 @@ public QuestionAnswersView setSubquestions(List subquestion return this; } + @Nullable + public String getAnswerText() { + return answerText; + } + + public QuestionAnswersView setAnswerText(@Nullable String answerText) { + this.answerText = answerText; + return this; + } + + @Override + public boolean equals(Object o) { + if (o == null || getClass() != o.getClass()) + return false; + QuestionAnswersView that = (QuestionAnswersView) o; + return Objects.equals(question, that.question) + && Objects.equals(answer, that.answer) + && Objects.equals(answerText, that.answerText) + && Objects.equals(subquestions, that.subquestions); + } + + @Override + public int hashCode() { + return Objects.hash(question, answer, answerText, subquestions); + } + @Override public String toString() { - return "QuestionAnswersView{" + "question='" + question + '\'' + ", answer='" + answer + '\'' + ", subquestions=" + subquestions + '}'; + return "QuestionAnswersView{" + "question='" + question + '\'' + ", answer='" + answer + '\'' + ", answerText='" + answerText + '\'' + + ", subquestions=" + subquestions + '}'; } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyFacadeEjb.java index 81e4c5fb7e3..286930345fa 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyFacadeEjb.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyFacadeEjb.java @@ -207,12 +207,25 @@ public void uploadEmailTemplate(@NotNull SurveyReferenceDto surveyReference, Doc @Override public List getAllAsReference() { + return getAllOrderedByName().map(SurveyFacadeEjb::toReferenceDto).collect(Collectors.toList()); + } + + @Override + public List getAll() { + return getAllOrderedByName().map(this::toDto).collect(Collectors.toList()); + } + + private Stream getAllOrderedByName() { CriteriaBuilder cb = em.getCriteriaBuilder(); CriteriaQuery cq = cb.createQuery(Survey.class); Root from = cq.from(Survey.class); cq.orderBy(cb.desc(from.get(Survey.NAME))); - return em.createQuery(cq).getResultList().stream().map(SurveyFacadeEjb::toReferenceDto).collect(Collectors.toList()); + return getAsStream(cq); + } + + private @org.jetbrains.annotations.NotNull Stream getAsStream(CriteriaQuery cq) { + return em.createQuery(cq).getResultList().stream(); } @Override @@ -229,7 +242,7 @@ public List getByExternalIdsAsReference(List externalId) { cq.where(cb.equal(from.get(Survey.EXTERNAL_ID), externalId)); cq.orderBy(cb.desc(from.get(Survey.NAME))); - return em.createQuery(cq).getResultList().stream().map(this::toDto).collect(Collectors.toList()); + return getAsStream(cq).map(this::toDto).collect(Collectors.toList()); } @Override From 5fe7e6d7684d9053aaee7a5e5d2533e85abb882e Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Tue, 17 Mar 2026 07:28:44 +0100 Subject: [PATCH 056/134] =?UTF-8?q?=F0=9F=9A=A7=20Added=20symptoms=20in=20?= =?UTF-8?q?SymptomsDto=20only=20for=20now.=20TODO:=20-=20add=20into=20enti?= =?UTF-8?q?ty=20-=20Add=20translations=20-=20mapping=20-=20sql=20migration?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../de/symeda/sormas/api/caze/Vaccine.java | 18 +++-- .../ExternalMessageFacade.java | 22 +++--- .../sormas/api/survey/SurveyFacade.java | 4 +- .../sormas/api/symptoms/SymptomsDto.java | 77 +++++++++++++++++++ .../sormas/backend/common/CronService.java | 18 +++++ .../ExternalMessageFacadeEjb.java | 39 ++++++++-- .../AutomaticSurveyResponseProcessor.java | 16 ++-- .../sormas/backend/sample/SampleService.java | 2 + .../backend/survey/SurveyFacadeEjb.java | 22 +++--- 9 files changed, 178 insertions(+), 40 deletions(-) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/caze/Vaccine.java b/sormas-api/src/main/java/de/symeda/sormas/api/caze/Vaccine.java index 8fc000913bb..2723cf55ac0 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/caze/Vaccine.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/caze/Vaccine.java @@ -68,20 +68,26 @@ public enum Vaccine { @Diseases(value = { Disease.MONKEYPOX }) LC_16(VaccineManufacturer.KM_BIOLOGICS), - @Diseases(value = {Disease.INVASIVE_PNEUMOCOCCAL_INFECTION}) + @Diseases(value = { + Disease.INVASIVE_PNEUMOCOCCAL_INFECTION }) PREVENAR_13_PFIZER(VaccineManufacturer.PFIZER, "PCV13"), - @Diseases(value = {Disease.INVASIVE_PNEUMOCOCCAL_INFECTION}) - VAXNEUVANCE_MERCK(VaccineManufacturer.MERCK,"PCV15"), - @Diseases(value = {Disease.INVASIVE_PNEUMOCOCCAL_INFECTION}) + @Diseases(value = { + Disease.INVASIVE_PNEUMOCOCCAL_INFECTION }) + VAXNEUVANCE_MERCK(VaccineManufacturer.MERCK, "PCV15"), + @Diseases(value = { + Disease.INVASIVE_PNEUMOCOCCAL_INFECTION }) PREVNAR_20_PFIZER(VaccineManufacturer.PFIZER, "PCV20"), - @Diseases(value = {Disease.INVASIVE_PNEUMOCOCCAL_INFECTION}) - PNEUMOVAX_23_MERCK(VaccineManufacturer.MERCK,"PPV23"), + @Diseases(value = { + Disease.INVASIVE_PNEUMOCOCCAL_INFECTION }) + PNEUMOVAX_23_MERCK(VaccineManufacturer.MERCK, "PPV23"), @Diseases(value = { Disease.MONKEYPOX }) MVA_BN(VaccineManufacturer.BAVARIAN_NORDIC), UNKNOWN, OTHER; + // TODO: add RSV and Pertusis members + "ALL" check Chris and or Wikipedia. + @Nullable private VaccineManufacturer manufacturer; @Nullable diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageFacade.java b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageFacade.java index 6802e5640ba..4e213447372 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageFacade.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageFacade.java @@ -3,12 +3,11 @@ import java.util.Date; import java.util.List; +import javax.annotation.Nullable; import javax.ejb.Remote; import javax.naming.NamingException; import javax.validation.Valid; -import org.apache.commons.collections4.CollectionUtils; - import de.symeda.sormas.api.PermanentlyDeletableFacade; import de.symeda.sormas.api.ReferenceDto; import de.symeda.sormas.api.caze.surveillancereport.SurveillanceReportReferenceDto; @@ -24,18 +23,19 @@ public interface ExternalMessageFacade extends PermanentlyDeletableFacade { ExternalMessageDto saveAndProcessLabmessage(@Valid ExternalMessageDto dto); - default ExternalMessageDto saveAndProcessSurveyResponse(@Valid ExternalMessageDto dto) { - List dtos = saveAndProcessSurveyResponses(List.of(dto)); - - if (CollectionUtils.size(dtos) != 1) { - throw new IllegalStateException(String.format("Expecting a single response but got [%s]", dtos)); - } + /** + * Will attempt to fetch and refresh. + * + * @param since + * if not specified + * @return external messages that have been saved. + */ + List saveAndProcessSurveyResponses(@Nullable Date since); - return dtos.get(0); + default List saveAndProcessSurveyResponses() { + return saveAndProcessSurveyResponses(null); } - List saveAndProcessSurveyResponses(@Valid List dtos); - void validate(ExternalMessageDto dto); // Also returns deleted lab messages diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/survey/SurveyFacade.java b/sormas-api/src/main/java/de/symeda/sormas/api/survey/SurveyFacade.java index d285c1e2c8f..56c9d109676 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/survey/SurveyFacade.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/survey/SurveyFacade.java @@ -41,7 +41,7 @@ void uploadDocumentTemplate(@NotNull SurveyReferenceDto surveyRef, DocumentTempl SurveyDto getByUuid(String uuid); - List getByExternalIdsAsReference(List externalId); + List getByExternalIds(List externalId); long count(SurveyCriteria criteria); @@ -71,5 +71,5 @@ void sendDocument(SurveyDocumentOptionsDto surveyOptions) List getAllAsReference(); - List getAll(); + List getAllWithExternalSurveyId(); } diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/symptoms/SymptomsDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/symptoms/SymptomsDto.java index 3917b1b460f..8131ad7b847 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/symptoms/SymptomsDto.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/symptoms/SymptomsDto.java @@ -2723,6 +2723,29 @@ public static SymptomsDto build() { @SymptomGrouping(SymptomGroup.GASTROINTESTINAL) private SymptomState bloating; + // TODO: newly added fields for ngSurvey + private SymptomState lossOfAppetite; + + @Diseases({ + GIARDIASIS }) + private SymptomState flatulence; + + @Diseases({ + GIARDIASIS }) + private SymptomState smellyBurps; + + @Diseases({ + PERTUSSIS }) + private SymptomState coughingAttacks; + + @Diseases({ + PERTUSSIS }) + private SymptomState coughingAtNight; + + @Diseases({ + CRYPTOSPORIDIOSIS }) + private SymptomState abdominalCramps; + private DiagnosisType diagnosis; private InfectionSite majorSite; private String otherMajorSiteDetails; @@ -4627,4 +4650,58 @@ public SymptomState getBloating() { public void setBloating(SymptomState bloating) { this.bloating = bloating; } + + public SymptomState getLossOfAppetite() { + return lossOfAppetite; + } + + public SymptomsDto setLossOfAppetite(SymptomState lossOfAppetite) { + this.lossOfAppetite = lossOfAppetite; + return this; + } + + public SymptomState getFlatulence() { + return flatulence; + } + + public SymptomsDto setFlatulence(SymptomState flatulence) { + this.flatulence = flatulence; + return this; + } + + public SymptomState getSmellyBurps() { + return smellyBurps; + } + + public SymptomsDto setSmellyBurps(SymptomState smellyBurps) { + this.smellyBurps = smellyBurps; + return this; + } + + public SymptomState getCoughingAttacks() { + return coughingAttacks; + } + + public SymptomsDto setCoughingAttacks(SymptomState coughingAttacks) { + this.coughingAttacks = coughingAttacks; + return this; + } + + public SymptomState getCoughingAtNight() { + return coughingAtNight; + } + + public SymptomsDto setCoughingAtNight(SymptomState coughingAtNight) { + this.coughingAtNight = coughingAtNight; + return this; + } + + public SymptomState getAbdominalCramps() { + return abdominalCramps; + } + + public SymptomsDto setAbdominalCramps(SymptomState abdominalCramps) { + this.abdominalCramps = abdominalCramps; + return this; + } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/common/CronService.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/common/CronService.java index 8322f593574..2e138a296cd 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/common/CronService.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/common/CronService.java @@ -20,6 +20,8 @@ import java.nio.file.Files; import java.nio.file.attribute.BasicFileAttributes; import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; import javax.annotation.security.RunAs; import javax.ejb.EJB; @@ -30,6 +32,7 @@ import org.slf4j.LoggerFactory; import de.symeda.sormas.api.common.DeletableEntityType; +import de.symeda.sormas.api.externalmessage.ExternalMessageDto; import de.symeda.sormas.api.feature.FeatureType; import de.symeda.sormas.api.feature.FeatureTypeProperty; import de.symeda.sormas.api.importexport.ImportExportUtils; @@ -229,6 +232,21 @@ public void fetchExternalMessages() { } } + @Schedule(hour = "*", minute = "*/5", persistent = false) + public void fetchSurveyResponses() { + if (!featureConfigurationFacade.isFeatureEnabled(FeatureType.EXTERNAL_MESSAGES)) { + logger.info("External messages are disabled, survey responses will not be fetched"); + return; + } + + List externalMessageDtos = externalMessageFacade.saveAndProcessSurveyResponses(); + + if (logger.isInfoEnabled()) { + List reportIds = externalMessageDtos.stream().map(ExternalMessageDto::getReportId).collect(Collectors.toList()); + logger.info("Following response ids were saved: [{}]", reportIds); + } + } + @Schedule(hour = "1", minute = "40", second = "0", persistent = false) public void updateImmunizationStatuses() { if (featureConfigurationFacade.isFeatureEnabled(FeatureType.IMMUNIZATION_STATUS_AUTOMATION)) { diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java index 5585a9202c5..739e67ee027 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java @@ -90,10 +90,12 @@ import de.symeda.sormas.api.i18n.Validations; import de.symeda.sormas.api.sample.PathogenTestResultType; import de.symeda.sormas.api.sample.SampleReferenceDto; +import de.symeda.sormas.api.systemconfiguration.SystemConfigurationValueFacade; import de.symeda.sormas.api.systemevents.SystemEventDto; import de.symeda.sormas.api.systemevents.SystemEventType; import de.symeda.sormas.api.user.UserReferenceDto; import de.symeda.sormas.api.user.UserRight; +import de.symeda.sormas.api.utils.DateHelper; import de.symeda.sormas.api.utils.SortProperty; import de.symeda.sormas.api.utils.ValidationRuntimeException; import de.symeda.sormas.api.utils.dataprocessing.ProcessingResult; @@ -168,6 +170,8 @@ public class ExternalMessageFacadeEjb implements ExternalMessageFacade { private FeatureConfigurationFacadeEjbLocal featureConfigurationFacade; @Inject private AutomaticSurveyResponseProcessor automaticSurveyResponseProcessor; + @EJB + private SystemConfigurationValueFacade systemConfigurationValueFacade; ExternalMessage fillOrBuildEntity(@NotNull ExternalMessageDto source, ExternalMessage target, boolean checkChangeDate) { @@ -318,10 +322,20 @@ public ExternalMessageDto saveAndProcessLabmessage(@Valid ExternalMessageDto lab } @Override - public List saveAndProcessSurveyResponses(List dtos) { + public List saveAndProcessSurveyResponses(Date since) { + + if (since == null) { + // TODO: configurable date value. + logger.error("Since date should be configurable"); + since = DateHelper.addDays(new Date(), -7); + } + + ExternalMessageAdapterFacade externalLabResultsFacade = getSurveyExternalMessageFacade(); + ExternalMessageResult> externalMessagesResult = externalLabResultsFacade.getExternalMessages(since); + List surveyResponses = externalMessagesResult.getValue(); List savedDtos; try { - List processingResults = automaticSurveyResponseProcessor.processSurveyResponses(dtos); + List processingResults = automaticSurveyResponseProcessor.processSurveyResponses(surveyResponses); processingResults.forEach(wrapper -> { ProcessingResultStatus result = wrapper.getResultStatus(); @@ -330,12 +344,12 @@ public List saveAndProcessSurveyResponses(List processSurveyResponses(List externalMessages) throws InterruptedException, ExecutionException { + // TODO: check if already processed + flag to determine if something should be done about it. + logger.error("TODO: check if already processed + flag to determine if something should be done about it"); + List surveyResponseWrappers = externalMessages.stream().map(ExternalMessageDto::getSurveyResponseData).collect(Collectors.toList()); - Map tokenByExternalTokenIdDictionary = surveyResponseWrappers.stream().map(responseData -> { - ExternalMessageSurveyResponseRequest request = responseData.getLatest().getRequest(); - return new Tuple<>(request.getExternalSurveyId(), request.getToken()); - }).collect(CollectorUtils.toOrderedNullSafeMap(Tuple::getFirst, Tuple::getSecond)); + Map tokenByExternalTokenIdDictionary = + externalMessages.stream().map(ExternalMessageDto::getSurveyResponseData).map(responseData -> { + ExternalMessageSurveyResponseRequest request = responseData.getLatest().getRequest(); + return new Tuple<>(request.getExternalSurveyId(), request.getToken()); + }).collect(CollectorUtils.toOrderedNullSafeMap(Tuple::getFirst, Tuple::getSecond)); List externalSurveyIds = new ArrayList<>(tokenByExternalTokenIdDictionary.keySet()); - List> collect = surveyFacade.getByExternalIdsAsReference(externalSurveyIds) + List> tokenBySurveyReferenceTuples = surveyFacade.getByExternalIds(externalSurveyIds) .stream() .map(survey -> new Tuple<>(survey.toReference(), tokenByExternalTokenIdDictionary.get(survey.getExternalId()))) .collect(Collectors.toList()); - List surveyTokens = surveyTokenFacade.getBySurveyReferenceTokenTuples(collect); + List surveyTokens = surveyTokenFacade.getBySurveyReferenceTokenTuples(tokenBySurveyReferenceTuples); return externalMessages.stream() .map((ExternalMessageDto externalMessage) -> tryProcessExternalMessage(externalMessage, surveyTokens)) diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/sample/SampleService.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/sample/SampleService.java index d651385dcff..458059e7624 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/sample/SampleService.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/sample/SampleService.java @@ -35,6 +35,7 @@ import java.util.stream.Collectors; import javax.ejb.EJB; +import javax.ejb.LocalBean; import javax.ejb.Stateless; import javax.ejb.TransactionAttribute; import javax.ejb.TransactionAttributeType; @@ -123,6 +124,7 @@ import de.symeda.sormas.backend.util.QueryHelper; @Stateless +@LocalBean public class SampleService extends AbstractDeletableAdoService implements JurisdictionFlagsService { diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyFacadeEjb.java index 286930345fa..b23c7e1a24d 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyFacadeEjb.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyFacadeEjb.java @@ -207,24 +207,26 @@ public void uploadEmailTemplate(@NotNull SurveyReferenceDto surveyReference, Doc @Override public List getAllAsReference() { - return getAllOrderedByName().map(SurveyFacadeEjb::toReferenceDto).collect(Collectors.toList()); - } + CriteriaBuilder cb = em.getCriteriaBuilder(); + CriteriaQuery cq = cb.createQuery(Survey.class); + Root from = cq.from(Survey.class); + cq.orderBy(cb.desc(from.get(Survey.NAME))); - @Override - public List getAll() { - return getAllOrderedByName().map(this::toDto).collect(Collectors.toList()); + return getAsStream(cq).map(SurveyFacadeEjb::toReferenceDto).collect(Collectors.toList()); } - private Stream getAllOrderedByName() { + @Override + public List getAllWithExternalSurveyId() { CriteriaBuilder cb = em.getCriteriaBuilder(); CriteriaQuery cq = cb.createQuery(Survey.class); Root from = cq.from(Survey.class); - cq.orderBy(cb.desc(from.get(Survey.NAME))); + cq.where(cb.isNotNull(from.get(Survey.EXTERNAL_ID))); + cq.orderBy(cb.desc(from.get(Survey.ID))); - return getAsStream(cq); + return getAsStream(cq).map(this::toDto).collect(Collectors.toList()); } - private @org.jetbrains.annotations.NotNull Stream getAsStream(CriteriaQuery cq) { + private Stream getAsStream(CriteriaQuery cq) { return em.createQuery(cq).getResultList().stream(); } @@ -235,7 +237,7 @@ public SurveyDto getByUuid(String uuid) { } @Override - public List getByExternalIdsAsReference(List externalId) { + public List getByExternalIds(List externalId) { CriteriaBuilder cb = em.getCriteriaBuilder(); CriteriaQuery cq = cb.createQuery(Survey.class); Root from = cq.from(Survey.class); From fd6b19732a1da1d023ccc277a3f093ecd7fc7a91 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Tue, 17 Mar 2026 08:06:02 +0100 Subject: [PATCH 057/134] =?UTF-8?q?=F0=9F=9A=A7=20=E2=9C=A8=20:=20naive=20?= =?UTF-8?q?UI=20implementation=20for=20processing=20external=20messages=20?= =?UTF-8?q?of=20type=20SURVEY=5FRESPONSE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ExternalMessageFacade.java | 23 + .../de/symeda/sormas/api/i18n/Captions.java | 55 +- .../sormas/api/i18n/I18nProperties.java | 12 + .../de/symeda/sormas/api/i18n/Strings.java | 12 +- .../api/patch/mapping/FieldCustomMapper.java | 7 +- .../api/patch/mapping/FieldPatchRequest.java | 3 + .../patch/mapping/GroupedFieldsMapper.java | 2 +- .../api/patch/mapping/ValuePatchRequest.java | 2 +- .../patch/partial_retrieval/FieldInfo.java | 3 + .../PartialRetrievalFailureCause.java | 3 + .../src/main/resources/captions.properties | 13 + .../src/main/resources/strings.properties | 3473 ++++++++--------- .../ExternalMessageFacadeEjb.java | 66 + .../ExternalMessageController.java | 53 +- .../externalmessage/ExternalMessageGrid.java | 2 + .../SurveyResponseDetailsWindow.java | 207 + .../SurveyResponseFailureEditor.java | 187 + .../SurveyResponseFailurePanel.java | 98 + 18 files changed, 2424 insertions(+), 1797 deletions(-) create mode 100644 sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseDetailsWindow.java create mode 100644 sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailureEditor.java create mode 100644 sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailurePanel.java diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageFacade.java b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageFacade.java index 4e213447372..2c02dcdb55e 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageFacade.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageFacade.java @@ -2,6 +2,7 @@ import java.util.Date; import java.util.List; +import java.util.Map; import javax.annotation.Nullable; import javax.ejb.Remote; @@ -12,6 +13,7 @@ import de.symeda.sormas.api.ReferenceDto; import de.symeda.sormas.api.caze.surveillancereport.SurveillanceReportReferenceDto; import de.symeda.sormas.api.common.Page; +import de.symeda.sormas.api.patch.partial_retrieval.DisplayablePartialRetrievalResponse; import de.symeda.sormas.api.sample.SampleReferenceDto; import de.symeda.sormas.api.user.UserReferenceDto; import de.symeda.sormas.api.utils.SortProperty; @@ -84,4 +86,25 @@ default List saveAndProcessSurveyResponses() { boolean existsForwardedExternalMessageWith(String reportId); ExternalMessageDto getForSurveillanceReport(SurveillanceReportReferenceDto surveillanceReport); + + /** + * Re-submits a survey response with a corrected patch dictionary after previous processing failures. + * + * @param uuid + * UUID of the external message (must be of type SURVEY_RESPONSE) + * @param correctedDictionary + * the corrected field path -> value map to apply + * @return updated ExternalMessageDto after reprocessing + */ + ExternalMessageDto reprocessSurveyResponse(String uuid, Map correctedDictionary); + + /** + * Retrieves display-ready field information (translated names and current case values) for all fields + * in the survey response patch dictionary. Used by the UI to render the detail/editor windows. + * + * @param externalMessageUuid + * UUID of the external message (must be of type SURVEY_RESPONSE with a processed result) + * @return displayable field info keyed by field path + */ + DisplayablePartialRetrievalResponse retrieveSurveyResponseFieldsForDisplay(String externalMessageUuid); } diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java index 5296951170c..9702a41ff4d 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java @@ -335,9 +335,11 @@ public interface Captions { String AefiInvestigation_aefiClassificationDetails = "AefiInvestigation.aefiClassificationDetails"; String AefiInvestigation_aefiClassificationSubType = "AefiInvestigation.aefiClassificationSubType"; String AefiInvestigation_allCasesInClusterReceivedVaccineFromSameVial = "AefiInvestigation.allCasesInClusterReceivedVaccineFromSameVial"; - String AefiInvestigation_allCasesInClusterReceivedVaccineFromSameVialDetails = "AefiInvestigation.allCasesInClusterReceivedVaccineFromSameVialDetails"; + String AefiInvestigation_allCasesInClusterReceivedVaccineFromSameVialDetails = + "AefiInvestigation.allCasesInClusterReceivedVaccineFromSameVialDetails"; String AefiInvestigation_anyOtherItemInRefrigerator = "AefiInvestigation.anyOtherItemInRefrigerator"; - String AefiInvestigation_anyStorageTemperatureDeviationOutsideTwoToEightDegrees = "AefiInvestigation.anyStorageTemperatureDeviationOutsideTwoToEightDegrees"; + String AefiInvestigation_anyStorageTemperatureDeviationOutsideTwoToEightDegrees = + "AefiInvestigation.anyStorageTemperatureDeviationOutsideTwoToEightDegrees"; String AefiInvestigation_autopsyDate = "AefiInvestigation.autopsyDate"; String AefiInvestigation_autopsyDone = "AefiInvestigation.autopsyDone"; String AefiInvestigation_autopsyPlannedDateTime = "AefiInvestigation.autopsyPlannedDateTime"; @@ -373,7 +375,8 @@ public interface Captions { String AefiInvestigation_errorPrescribingVaccine = "AefiInvestigation.errorPrescribingVaccine"; String AefiInvestigation_errorPrescribingVaccineDetails = "AefiInvestigation.errorPrescribingVaccineDetails"; String AefiInvestigation_eventIsAStressResponseRelatedToImmunization = "AefiInvestigation.eventIsAStressResponseRelatedToImmunization"; - String AefiInvestigation_eventIsAStressResponseRelatedToImmunizationDetails = "AefiInvestigation.eventIsAStressResponseRelatedToImmunizationDetails"; + String AefiInvestigation_eventIsAStressResponseRelatedToImmunizationDetails = + "AefiInvestigation.eventIsAStressResponseRelatedToImmunizationDetails"; String AefiInvestigation_externalId = "AefiInvestigation.externalId"; String AefiInvestigation_familyHistoryOfDiseaseOrAllergy = "AefiInvestigation.familyHistoryOfDiseaseOrAllergy"; String AefiInvestigation_familyHistoryOfDiseaseOrAllergyDetails = "AefiInvestigation.familyHistoryOfDiseaseOrAllergyDetails"; @@ -381,8 +384,10 @@ public interface Captions { String AefiInvestigation_formCompletionDate = "AefiInvestigation.formCompletionDate"; String AefiInvestigation_historyOfAllergyToVaccineDrugOrFood = "AefiInvestigation.historyOfAllergyToVaccineDrugOrFood"; String AefiInvestigation_historyOfAllergyToVaccineDrugOrFoodDetails = "AefiInvestigation.historyOfAllergyToVaccineDrugOrFoodDetails"; - String AefiInvestigation_historyOfHospitalizationInLastThirtyDaysWithCause = "AefiInvestigation.historyOfHospitalizationInLastThirtyDaysWithCause"; - String AefiInvestigation_historyOfHospitalizationInLastThirtyDaysWithCauseDetails = "AefiInvestigation.historyOfHospitalizationInLastThirtyDaysWithCauseDetails"; + String AefiInvestigation_historyOfHospitalizationInLastThirtyDaysWithCause = + "AefiInvestigation.historyOfHospitalizationInLastThirtyDaysWithCause"; + String AefiInvestigation_historyOfHospitalizationInLastThirtyDaysWithCauseDetails = + "AefiInvestigation.historyOfHospitalizationInLastThirtyDaysWithCauseDetails"; String AefiInvestigation_hospitalizationDate = "AefiInvestigation.hospitalizationDate"; String AefiInvestigation_injectionTechniqueAdditionalDetails = "AefiInvestigation.injectionTechniqueAdditionalDetails"; String AefiInvestigation_investigationCaseId = "AefiInvestigation.investigationCaseId"; @@ -394,13 +399,17 @@ public interface Captions { String AefiInvestigation_keySymptomDateTime = "AefiInvestigation.keySymptomDateTime"; String AefiInvestigation_lastTrainingReceivedByVaccinatorDate = "AefiInvestigation.lastTrainingReceivedByVaccinatorDate"; String AefiInvestigation_nonTouchTechniqueFollowed = "AefiInvestigation.nonTouchTechniqueFollowed"; - String AefiInvestigation_numberImmunizedConcernedVaccineSameBatchNumberLocationDetails = "AefiInvestigation.numberImmunizedConcernedVaccineSameBatchNumberLocationDetails"; - String AefiInvestigation_numberImmunizedConcernedVaccineSameBatchNumberOtherLocations = "AefiInvestigation.numberImmunizedConcernedVaccineSameBatchNumberOtherLocations"; + String AefiInvestigation_numberImmunizedConcernedVaccineSameBatchNumberLocationDetails = + "AefiInvestigation.numberImmunizedConcernedVaccineSameBatchNumberLocationDetails"; + String AefiInvestigation_numberImmunizedConcernedVaccineSameBatchNumberOtherLocations = + "AefiInvestigation.numberImmunizedConcernedVaccineSameBatchNumberOtherLocations"; String AefiInvestigation_numberImmunizedFromConcernedVaccineVial = "AefiInvestigation.numberImmunizedFromConcernedVaccineVial"; String AefiInvestigation_numberImmunizedWithConcernedVaccineInSameSession = "AefiInvestigation.numberImmunizedWithConcernedVaccineInSameSession"; - String AefiInvestigation_numberOfAefiReportedFromVaccineDistributionCenterLastThirtyDays = "AefiInvestigation.numberOfAefiReportedFromVaccineDistributionCenterLastThirtyDays"; + String AefiInvestigation_numberOfAefiReportedFromVaccineDistributionCenterLastThirtyDays = + "AefiInvestigation.numberOfAefiReportedFromVaccineDistributionCenterLastThirtyDays"; String AefiInvestigation_numberOfCasesDetectedInCluster = "AefiInvestigation.numberOfCasesDetectedInCluster"; - String AefiInvestigation_numberOfSimilarEventsReportedSamePeriodAndLocality = "AefiInvestigation.numberOfSimilarEventsReportedSamePeriodAndLocality"; + String AefiInvestigation_numberOfSimilarEventsReportedSamePeriodAndLocality = + "AefiInvestigation.numberOfSimilarEventsReportedSamePeriodAndLocality"; String AefiInvestigation_numberOfThoseAffectedNotVaccinated = "AefiInvestigation.numberOfThoseAffectedNotVaccinated"; String AefiInvestigation_numberOfThoseAffectedVaccinated = "AefiInvestigation.numberOfThoseAffectedVaccinated"; String AefiInvestigation_numberOfThoseAffectedVaccinatedUnknown = "AefiInvestigation.numberOfThoseAffectedVaccinatedUnknown"; @@ -421,7 +430,8 @@ public interface Captions { String AefiInvestigation_placeOfVaccination = "AefiInvestigation.placeOfVaccination"; String AefiInvestigation_placeOfVaccinationDetails = "AefiInvestigation.placeOfVaccinationDetails"; String AefiInvestigation_preExistingIllnessThirtyDaysOrCongenitalDisorder = "AefiInvestigation.preExistingIllnessThirtyDaysOrCongenitalDisorder"; - String AefiInvestigation_preExistingIllnessThirtyDaysOrCongenitalDisorderDetails = "AefiInvestigation.preExistingIllnessThirtyDaysOrCongenitalDisorderDetails"; + String AefiInvestigation_preExistingIllnessThirtyDaysOrCongenitalDisorderDetails = + "AefiInvestigation.preExistingIllnessThirtyDaysOrCongenitalDisorderDetails"; String AefiInvestigation_provisionalOrFinalDiagnosis = "AefiInvestigation.provisionalOrFinalDiagnosis"; String AefiInvestigation_reconstitutionAdditionalDetails = "AefiInvestigation.reconstitutionAdditionalDetails"; String AefiInvestigation_reportDate = "AefiInvestigation.reportDate"; @@ -441,14 +451,17 @@ public interface Captions { String AefiInvestigation_responsibleRegion = "AefiInvestigation.responsibleRegion"; String AefiInvestigation_sameReconstitutionSyringeForEachVaccination = "AefiInvestigation.sameReconstitutionSyringeForEachVaccination"; String AefiInvestigation_sameReconstitutionSyringeForEachVaccineVial = "AefiInvestigation.sameReconstitutionSyringeForEachVaccineVial"; - String AefiInvestigation_sameReconstitutionSyringeUsedForMultipleVialsOfSameVaccine = "AefiInvestigation.sameReconstitutionSyringeUsedForMultipleVialsOfSameVaccine"; - String AefiInvestigation_sameReconstitutionSyringeUsedForReconstitutingDifferentVaccines = "AefiInvestigation.sameReconstitutionSyringeUsedForReconstitutingDifferentVaccines"; + String AefiInvestigation_sameReconstitutionSyringeUsedForMultipleVialsOfSameVaccine = + "AefiInvestigation.sameReconstitutionSyringeUsedForMultipleVialsOfSameVaccine"; + String AefiInvestigation_sameReconstitutionSyringeUsedForReconstitutingDifferentVaccines = + "AefiInvestigation.sameReconstitutionSyringeUsedForReconstitutingDifferentVaccines"; String AefiInvestigation_seriousAefiInfoSource = "AefiInvestigation.seriousAefiInfoSource"; String AefiInvestigation_seriousAefiInfoSourceDetails = "AefiInvestigation.seriousAefiInfoSourceDetails"; String AefiInvestigation_seriousAefiVerbalAutopsyInfoSourceDetails = "AefiInvestigation.seriousAefiVerbalAutopsyInfoSourceDetails"; String AefiInvestigation_signsAndSymptomsFromTimeOfVaccination = "AefiInvestigation.signsAndSymptomsFromTimeOfVaccination"; String AefiInvestigation_similarEventsReportedSamePeriodAndLocality = "AefiInvestigation.similarEventsReportedSamePeriodAndLocality"; - String AefiInvestigation_similarEventsReportedSamePeriodAndLocalityDetails = "AefiInvestigation.similarEventsReportedSamePeriodAndLocalityDetails"; + String AefiInvestigation_similarEventsReportedSamePeriodAndLocalityDetails = + "AefiInvestigation.similarEventsReportedSamePeriodAndLocalityDetails"; String AefiInvestigation_statusOnDateOfInvestigation = "AefiInvestigation.statusOnDateOfInvestigation"; String AefiInvestigation_storageTemperatureMonitoringAdditionalDetails = "AefiInvestigation.storageTemperatureMonitoringAdditionalDetails"; String AefiInvestigation_syringesUsedAdditionalDetails = "AefiInvestigation.syringesUsedAdditionalDetails"; @@ -467,7 +480,8 @@ public interface Captions { String AefiInvestigation_vaccinationFacilityDetails = "AefiInvestigation.vaccinationFacilityDetails"; String AefiInvestigation_vaccineAdministeredIncorrectly = "AefiInvestigation.vaccineAdministeredIncorrectly"; String AefiInvestigation_vaccineAdministeredIncorrectlyDetails = "AefiInvestigation.vaccineAdministeredIncorrectlyDetails"; - String AefiInvestigation_vaccineCarrierReturnedFromSiteOnSameDateAsVaccination = "AefiInvestigation.vaccineCarrierReturnedFromSiteOnSameDateAsVaccination"; + String AefiInvestigation_vaccineCarrierReturnedFromSiteOnSameDateAsVaccination = + "AefiInvestigation.vaccineCarrierReturnedFromSiteOnSameDateAsVaccination"; String AefiInvestigation_vaccineCarrierSentToSiteOnSameDateAsVaccination = "AefiInvestigation.vaccineCarrierSentToSiteOnSameDateAsVaccination"; String AefiInvestigation_vaccineCarrierType = "AefiInvestigation.vaccineCarrierType"; String AefiInvestigation_vaccineCarrierTypeDetails = "AefiInvestigation.vaccineCarrierTypeDetails"; @@ -1953,6 +1967,19 @@ public interface Captions { String externalMessageNoDisease = "externalMessageNoDisease"; String externalMessageNoNewMessages = "externalMessageNoNewMessages"; String externalMessageProcess = "externalMessageProcess"; + String surveyResponseField = "surveyResponseField"; + String surveyResponseSubmittedValue = "surveyResponseSubmittedValue"; + String surveyResponseCurrentCaseValue = "surveyResponseCurrentCaseValue"; + String surveyResponseFailureCause = "surveyResponseFailureCause"; + String surveyResponseDescription = "surveyResponseDescription"; + String surveyResponseCaseLink = "surveyResponseCaseLink"; + String surveyResponseApplied = "surveyResponseApplied"; + String surveyResponseMetadata = "surveyResponseMetadata"; + String surveyResponsePatchDictionary = "surveyResponsePatchDictionary"; + String surveyResponseProcessingResult = "surveyResponseProcessingResult"; + String surveyResponseValidFields = "surveyResponseValidFields"; + String actionCorrectAndReprocess = "actionCorrectAndReprocess"; + String actionSaveAndReprocess = "actionSaveAndReprocess"; String externalMessageRelatedEntriesFound = "externalMessageRelatedEntriesFound"; String externalMessagesList = "externalMessagesList"; String externalMessageValueNotSpecified = "externalMessageValueNotSpecified"; diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/I18nProperties.java b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/I18nProperties.java index 065e72719e9..4dc2c9179a5 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/I18nProperties.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/I18nProperties.java @@ -57,6 +57,9 @@ public final class I18nProperties { private final ResourceBundle continentProperties; private final ResourceBundle subcontinentProperties; + /** + * Used internally when bundle type is specified so extract the value from the adequate properties file. + */ private final Map resourceBundlesDictionary; private static I18nProperties getInstance(Language language) { @@ -430,6 +433,15 @@ public static ResourceBundle loadProperties(String propertiesGroup, Locale local return new ResourceBundle(java.util.ResourceBundle.getBundle(propertiesGroup, locale, new UTF8Control())); } + /** + * Meant to be used for "matching purposes", you have a value, but you don't know which value it belongs to. + * + * @param request + * to return the adequate dictionary. + * @return dictionary with key being the "physical value" of the property key and value the + * translated value in the specified language. + * Example: (key: value) continent.AUSTRALIA.name: Australia (Continent) -> AUSTRALIA: Australia (Continent) + */ public static Map buildKeyValueDictionary(I18nPropertiesRequest request) { Language language = request.getLanguage() != null ? request.getLanguage() : Language.EN; diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java index f394e776e05..d8fefdffbde 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java @@ -855,6 +855,12 @@ public interface Strings { String headingShareRequestEventParticipants = "headingShareRequestEventParticipants"; String headingShareRequestEvents = "headingShareRequestEvents"; String headingShowExternalMessage = "headingShowExternalMessage"; + String headingSurveyResponseDetails = "headingSurveyResponseDetails"; + String headingSurveyResponseFailures = "headingSurveyResponseFailures"; + String headingSurveyResponseCorrectAndReprocess = "headingSurveyResponseCorrectAndReprocess"; + String messageSurveyResponseAllFieldsApplied = "messageSurveyResponseAllFieldsApplied"; + String messageSurveyResponseNotYetProcessed = "messageSurveyResponseNotYetProcessed"; + String messageSurveyResponseReprocessed = "messageSurveyResponseReprocessed"; String headingSignsAndSymptoms = "headingSignsAndSymptoms"; String headingSimilarImmunization = "headingSimilarImmunization"; String headingSimilarPerson = "headingSimilarPerson"; @@ -1117,7 +1123,8 @@ public interface Strings { String infoPickOrCreatePathogenTest = "infoPickOrCreatePathogenTest"; String infoPickOrCreateSample = "infoPickOrCreateSample"; String infoPickOrCreateSuperordinateEventForEvent = "infoPickOrCreateSuperordinateEventForEvent"; - String infoPickorMergeEventParticipantDuplicateEventParticipantByPersonByEvent = "infoPickorMergeEventParticipantDuplicateEventParticipantByPersonByEvent"; + String infoPickorMergeEventParticipantDuplicateEventParticipantByPersonByEvent = + "infoPickorMergeEventParticipantDuplicateEventParticipantByPersonByEvent"; String infoPlaceOfStayInHospital = "infoPlaceOfStayInHospital"; String infoPopulationCollectionDate = "infoPopulationCollectionDate"; String infoPopulationDataView = "infoPopulationDataView"; @@ -1159,7 +1166,8 @@ public interface Strings { String infoSystemConfigurationValueDescriptionSmsAuthKey = "infoSystemConfigurationValueDescriptionSmsAuthKey"; String infoSystemConfigurationValueDescriptionSmsAuthSecret = "infoSystemConfigurationValueDescriptionSmsAuthSecret"; String infoSystemConfigurationValueDescriptionSmsSenderName = "infoSystemConfigurationValueDescriptionSmsSenderName"; - String infoSystemConfigurationValueDescriptionUseDeterminedVaccinationStatus = "infoSystemConfigurationValueDescriptionUseDeterminedVaccinationStatus"; + String infoSystemConfigurationValueDescriptionUseDeterminedVaccinationStatus = + "infoSystemConfigurationValueDescriptionUseDeterminedVaccinationStatus"; String infoTasksWithMultipleJurisdictionsSelected = "infoTasksWithMultipleJurisdictionsSelected"; String infoUploadDocumentTemplate = "infoUploadDocumentTemplate"; String infoUsageOfEditableCampaignGrids = "infoUsageOfEditableCampaignGrids"; diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldCustomMapper.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldCustomMapper.java index b70f76e48d0..40b4d14db3f 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldCustomMapper.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldCustomMapper.java @@ -7,14 +7,13 @@ import de.symeda.sormas.api.patch.DataPatchFailure; /** - * The patch logic was designed to be generic, nevertheless some SORMAS - fields require specific adaptions. + * Allows to patch a single SORMAS fields in a specific manner, because default type mapping doesn't fit. + * Example: a field is displayed a single field in UI but is stored as multiple values in DTO / entities. */ public interface FieldCustomMapper { /* - * Implement for: - * - Phone number - email - * - BirthDate + * In case of failure returns the triggered failure otherwise successfully patch the value on the specific object. */ Optional map(FieldPatchRequest request); diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldPatchRequest.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldPatchRequest.java index 904c894f9c9..35509a1df2d 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldPatchRequest.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/FieldPatchRequest.java @@ -14,10 +14,13 @@ public final class FieldPatchRequest { @NotNull private String fieldName; + @NotNull private Object target; + @NotNull private Object value; + @NotNull private DataReplacementStrategy replacementType; diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsMapper.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsMapper.java index 96d98061940..506cf9d3b42 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsMapper.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsMapper.java @@ -27,7 +27,7 @@ public interface GroupedFieldsMapper { GroupedFieldsResponse aggregatedPatch(@NotNull GroupedFieldsRequest request); /** - * Specifies the prefixes that are supported by this grouped mapper. + * Specifies the prefixes that are supported by this mapper instance. * * @return supported prefixes. */ diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValuePatchRequest.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValuePatchRequest.java index 3491ceea57c..db670ece62e 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValuePatchRequest.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/ValuePatchRequest.java @@ -20,7 +20,7 @@ public class ValuePatchRequest { private Class targetType; /** - * Languages translations will be fetched in that order, so can have minor performance impact. + * To be able to support I18n inputs the input languages can be passed, system locale by default. */ @Nullable private List inputLanguages; diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/FieldInfo.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/FieldInfo.java index aeab1192ad8..d40607f916e 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/FieldInfo.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/FieldInfo.java @@ -2,6 +2,9 @@ import java.util.Objects; +/** + * Half technical and half user-friendly representation of a field. + */ public class FieldInfo { private String translatedFieldName; diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetrievalFailureCause.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetrievalFailureCause.java index c27d776118d..06a58bbb9cd 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetrievalFailureCause.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetrievalFailureCause.java @@ -2,6 +2,9 @@ public enum PartialRetrievalFailureCause { + /** + * More specific technical error but similar {@link this#TECHNICAL}. + */ ENTITY_COULD_NOT_BE_FOUND, /** diff --git a/sormas-api/src/main/resources/captions.properties b/sormas-api/src/main/resources/captions.properties index 57c02d09063..4f11d5f800f 100644 --- a/sormas-api/src/main/resources/captions.properties +++ b/sormas-api/src/main/resources/captions.properties @@ -1712,6 +1712,19 @@ ExternalMessage.personPhoneNumberType=Phone number type ExternalMessage.personCountry=Country externalMessageFetch=Fetch messages externalMessageProcess=Process +surveyResponseField=Field +surveyResponseSubmittedValue=Submitted Value +surveyResponseCurrentCaseValue=Current Case Value +surveyResponseFailureCause=Failure Cause +surveyResponseDescription=Description +surveyResponseCaseLink=Case +surveyResponseApplied=Applied +surveyResponseMetadata=Metadata +surveyResponsePatchDictionary=Patch Dictionary +surveyResponseProcessingResult=Processing Result +surveyResponseValidFields=Valid Fields (already applied) +actionCorrectAndReprocess=Correct & Reprocess +actionSaveAndReprocess=Save & Reprocess externalMessageNoDisease=No disease found externalMessageNoNewMessages=No new messages available externalMessageForwardedMessageFound=Related forwarded message(s) found diff --git a/sormas-api/src/main/resources/strings.properties b/sormas-api/src/main/resources/strings.properties index fa32068fd7d..f5ead3ec8c5 100644 --- a/sormas-api/src/main/resources/strings.properties +++ b/sormas-api/src/main/resources/strings.properties @@ -15,224 +15,219 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . ############################################################################### - # Any text presented to the user that is not a caption or can be used in # various places (e.g. as part of a larger text or caption) - # General Strings -active = Active -address = Address -all = All -and = and -at = at -between = between -bpm = bpm -by = by -comparedTo = compared to %s -disabled = Disabled -done = Done -edit = Edit -enabled = Enabled -epiWeek = Epi Week -fileName = File Name -forCase = for case -forContact = for contact -forEventParticipant = for event participant -forEnvironment = for environment -inactive = Inactive -inColumn = in column -lastTwoDays = last two days -lastTwoWeeks = last two weeks -lastTwoYears = last two years -lastWeek = last week -lastYear = last year -mmhg = mmHg -no = No -notAnswered = Not answered -of = of -on = on -or = or -pathogenTestDeletedDuringLabMessageConversion = Pathogen test has been deleted during the conversion process of the associated lab message; -pleaseSpecify = Please specify -previousPeriod = previous period -quarantineEnd = Quarantine ends at the end of follow-up -quarterShort = Q -reportedBy = Reported By -reportedOn = Reported on -reportingUser = Reporting user: -step = Step -setTo = Set to -toCase = to case -notSpecified = Not specified -week = Week -weekShort = Wk -year = Year -years = years -yes = Yes -yesterday = yesterday -none = None -total = Total -until = until -min = Min -max = Max -average = Average -month = Month -day = Day -text = Text -number = Number -date = Date -nameOf = Name of %s -uuidOf = UUID of %s -listOf = List of %s -mapOf = Map of <%s , %s> -warning = Warning -notApplicable = Not applicable - +active=Active +address=Address +all=All +and=and +at=at +between=between +bpm=bpm +by=by +comparedTo=compared to %s +disabled=Disabled +done=Done +edit=Edit +enabled=Enabled +epiWeek=Epi Week +fileName=File Name +forCase=for case +forContact=for contact +forEventParticipant=for event participant +forEnvironment=for environment +inactive=Inactive +inColumn=in column +lastTwoDays=last two days +lastTwoWeeks=last two weeks +lastTwoYears=last two years +lastWeek=last week +lastYear=last year +mmhg=mmHg +no=No +notAnswered=Not answered +of=of +on=on +or=or +pathogenTestDeletedDuringLabMessageConversion=Pathogen test has been deleted during the conversion process of the associated lab message; +pleaseSpecify=Please specify +previousPeriod=previous period +quarantineEnd=Quarantine ends at the end of follow-up +quarterShort=Q +reportedBy=Reported By +reportedOn=Reported on +reportingUser=Reporting user: +step=Step +setTo=Set to +toCase=to case +notSpecified=Not specified +week=Week +weekShort=Wk +year=Year +years=years +yes=Yes +yesterday=yesterday +none=None +total=Total +until=until +min=Min +max=Max +average=Average +month=Month +day=Day +text=Text +number=Number +date=Date +nameOf=Name of %s +uuidOf=UUID of %s +listOf=List of %s +mapOf=Map of <%s , %s> +warning=Warning +notApplicable=Not applicable # Aggregate Report -aggregateReportLegend = %s = %s; %s = %s; %s = %s - +aggregateReportLegend=%s = %s; %s = %s; %s = %s # Classification -classificationAllOf = all of -classificationClassificationRules = SORMAS Case Classification Rules -classificationConfirmed = Confirmed Classification -classificationConfirmedNoSymptoms = Confirmed Classification - No symptoms -classificationConfirmedUnknownSymptoms = Confirmed Classification - Unknown symptoms -classificationCriteriaForTestType = for test type -classificationCriteriaForExposureType = for exposure type -classificationCriteriaRestrictedToExposureType = Exposure to -classificationDaysBeforeCaseStart = days before symptom onset/case report date -classificationEventCluster = Case linked to a cluster event -classificationForDisease = for -classificationGeneratedFor = Generated for SORMAS -classificationInfoText = ... when the case meets the following requirements:
-classificationInfoNumberText = ... when the case meets %s of the following requirements:
-classificationNoneOf = none of -classificationNotWithin = not within -classificationOneNegativeTestResult = One negative lab result -classificationOneOf = one of -classificationOnePositiveTestResult = One positive lab result of -classificationOneOtherPositiveTestResult = One other positive lab result -classificationPersonAged = Person aged -classificationNotACase = Not a case Classification -classificationProbable = Probable Classification -classificationRulesFor = Classification Rules For -classificationSymptomsAllOf = All symptoms -classificationSymptomsAnyOf = Any symptom -classificationSuspect = Possible Classification -classificationYearsOrLess = years or less -classificationYearsOrMore = years or more -classificationLastVaccinationDateWithin = Last vaccination date within - +classificationAllOf=all of +classificationClassificationRules=SORMAS Case Classification Rules +classificationConfirmed=Confirmed Classification +classificationConfirmedNoSymptoms=Confirmed Classification - No symptoms +classificationConfirmedUnknownSymptoms=Confirmed Classification - Unknown symptoms +classificationCriteriaForTestType=for test type +classificationCriteriaForExposureType=for exposure type +classificationCriteriaRestrictedToExposureType=Exposure to +classificationDaysBeforeCaseStart=days before symptom onset/case report date +classificationEventCluster=Case linked to a cluster event +classificationForDisease=for +classificationGeneratedFor=Generated for SORMAS +classificationInfoText=... when the case meets the following requirements:
+classificationInfoNumberText=... when the case meets %s of the following requirements:
+classificationNoneOf=none of +classificationNotWithin=not within +classificationOneNegativeTestResult=One negative lab result +classificationOneOf=one of +classificationOnePositiveTestResult=One positive lab result of +classificationOneOtherPositiveTestResult=One other positive lab result +classificationPersonAged=Person aged +classificationNotACase=Not a case Classification +classificationProbable=Probable Classification +classificationRulesFor=Classification Rules For +classificationSymptomsAllOf=All symptoms +classificationSymptomsAnyOf=Any symptom +classificationSuspect=Possible Classification +classificationYearsOrLess=years or less +classificationYearsOrMore=years or more +classificationLastVaccinationDateWithin=Last vaccination date within # Confirmation -close = Close -confirmationAlsoAdjustQuarantine = You have extended the follow-up. Should the end of the quarantine be adjusted accordingly? -confirmationArchiveCampaign = Are you sure you want to archive this campaign? This will not remove it from the system or any statistics, but only hide it from the normal campaign directory. -confirmationArchiveCase = Are you sure you want to archive this case? This will not remove it from the system or any statistics, but only hide it from the normal case directory. -confirmationArchiveCaseWithContacts = Archive related contacts along with the archived case -confirmationDearchiveCaseWithContacts = Dearchive related contacts along with the dearchived case -confirmationArchiveCases = Are you sure you want to archive all %d selected cases? -confirmationArchiveContact = Are you sure you want to archive this contact? This will not remove it from the system or any statistics, but only hide it from the normal contact directory. -confirmationArchiveContacts = Are you sure you want to archive all %d selected contacts? -confirmationArchiveEnvironment = Are you sure you want to archive this environment? This will not remove it from the system or any statistics, but only hide it from the normal environment directory. -confirmationArchiveEnvironments = Are you sure you want to archive all %d selected environments? -confirmationArchiveEvent = Are you sure you want to archive this event? This will not remove it from the system or any statistics, but only hide it from the normal event directory. -confirmationArchiveEvents = Are you sure you want to archive all %d selected events? -confirmationArchiveEventParticipant = Are you sure you want to archive this event participant? This will not remove it from the system or any statistics, but only hide it from the list of event participants. -confirmationArchiveImmunization = Are you sure you want to archive this immunization? This will not remove it from the system or any statistics, but only hide it from the normal immunization directory. -confirmationArchiveAdverseEvent = Are you sure you want to archive this adverse event? This will not remove it from the system or any statistics, but only hide it from the normal adverse events directory. -confirmationArchiveAdverseEventInvestigation = Are you sure you want to archive this adverse event investigation? This will not remove it from the system or any statistics, but only hide it from the normal adverse events investigation directory. -confirmationArchiveTask = Are you sure you want to archive this task? This will not remove it from the system or any statistics, but only hide it from the normal task management. -confirmationArchiveTasks = Are you sure you want to archive all %d selected tasks? -confirmationArchiveTravelEntry = Are you sure you want to archive this travel entry? This will not remove it from the system or any statistics, but only hide it from the normal travel entry directory. -confirmationArchiveEventGroup = Are you sure you want to archive this event group? This will not remove it from the system or any statistics, but only hide it from the normal event group directory. -confirmationCancelFollowUp = Are you sure you want to cancel the follow-up of all %d selected contacts? -confirmationChangeCaseDisease = Really change case disease? -confirmationDearchiveCampaign = Are you sure you want to de-archive this campaign? This will make it appear in the normal campaign directory again. -confirmationDearchiveCase = Are you sure you want to de-archive this case? This will make it appear in the normal case directory again. -confirmationDearchiveCases = Are you sure you want to de-archive all %d selected cases? -confirmationDearchiveContact = Are you sure you want to de-archive this contact? This will make it appear in the normal contact directory again. -confirmationDearchiveContacts = Are you sure you want to de-archive all %d selected contacts? -confirmationDearchiveEnvironment = Are you sure you want to de-archive this environment? This will make it appear in the normal environment directory again. -confirmationDearchiveEnvironments = Are you sure you want to de-archive all %d selected environments? -confirmationDearchiveEvent = Are you sure you want to de-archive this event? This will make it appear in the normal event directory again. -confirmationDearchiveEvents = Are you sure you want to de-archive all %d selected events? -confirmationDearchiveEventParticipant = Are you sure you want to de-archive this event participant? This will make it appear in the normal event participant list again. -confirmationDearchiveEventGroup = Are you sure you want to de-archive this event group? This will make it appear in the normal event group directory again. -confirmationDeleteCases = Are you sure you want to delete all %d selected cases?

If referenced by other data in the system, those references will be removed, which cannot be automatically undone. -confirmationDeleteContacts = Are you sure you want to delete all %d selected contacts?

If referenced by other data in the system, those references will be removed, which cannot be automatically undone. -confirmationDeleteEntities = Are you sure you want to delete all %d selected %s?

If referenced by other data in the system, those references will be removed, which cannot be automatically undone. -confirmationRestoreEntities = Are you sure you want to restore all %d selected %s? -confirmationDeleteEntity = Are you sure you want to delete this %s?

If referenced by other data in the system, those references will be removed, which cannot be automatically undone. -confirmationDeleteEntityWithDetails = Are you sure you want to delete this %s?
%s
If referenced by other data in the system, those references will be removed, which cannot be automatically undone. -confirmationDeleteEventParticipants = Are you sure you want to delete all %d selected event participants?

If referenced by other data in the system, those references will be removed, which cannot be automatically undone. -confirmationDeleteEvents = Are you sure you want to delete all %d selected events?

If referenced by other data in the system, those references will be removed, which cannot be automatically undone. -confirmationDeleteTravelEntries = Are you sure you want to delete all %d selected travel entries?

If referenced by other data in the system, those references will be removed, which cannot be automatically undone. -confirmationDeleteFile = Are you sure you want to delete "%s"? -confirmationDeletePathogenTests = Are you sure you want to delete all %d selected pathogen tests? If referenced by other data in the system, those references will be removed, which cannot be automatically undone. -confirmationDeletePrescriptions = Are you sure you want to delete all %d selected prescriptions? -confirmationDeleteSamples = Are you sure you want to delete all %d selected samples? If referenced by other data in the system, those references will be removed, which cannot be automatically undone. -confirmationDeleteTasks = Are you sure you want to delete all %d selected tasks? -confirmationDeleteTreatments = Are you sure you want to delete all %d selected treatments? -confirmationDeleteVisits = Are you sure you want to delete all %d selected visits? -confirmationDeletePrescriptionWithTreatment = The prescriptions you want to delete are linked to treatments. Do you want to delete the prescriptions alone or together with the linked treatments? -confirmationDeleteUserRole = Are you sure you want to remove this user role, used by %d users? -confirmationLostToFollowUp = Are you sure you want to set the follow-up of all %d selected contacts to lost to follow-up? -confirmationPickCaseAndDeleteOther = Are you sure that the case you did not select is a duplicate of this case? The case you did not select and all contacts, samples, tasks and other data linked to it will be deleted. -confirmationPickContactAndDeleteOther = Are you sure that the contact you did not select is a duplicate of this contact? The contact you did not select and all samples, tasks and other data linked to it will be deleted. -confirmationMergeCaseAndDeleteOther = Are you sure that the case you did not select is a duplicate of this case? The case you selected will be updated with information from the case you did not select, and the latter will then be deleted. -confirmationMergeContactAndDeleteOther = Are you sure that the contact you did not select is a duplicate of this contact? The contact you selected will be updated with information from the contact you did not select, and the latter will then be deleted. -confirmationUpdateCompleteness = Are you sure you want to update the completeness values of all cases in the list? This might take some time. -confirmationEnterBulkEditMode = There are currently more than %d items in the list. It is recommended to use some filters first because entering bulk edit mode with this many items might slow down your system. Do you still want to proceed? -confirmationDisableAllLineListingRegion = Are you sure you want to disable line listing for this disease? Line listing will be canceled for all districts. -confirmationDisableAllLineListingNational = Are you sure you want to disable line listing for this disease? Line listing will be canceled for all districts in all regions. -confirmationArchiveArea = Are you sure you want to archive this area? -confirmationDearchiveArea = Are you sure you want to de-archive this area? -confirmationArchiveContinent = Are you sure you want to archive this continent? -confirmationDearchiveContinent = Are you sure you want to de-archive this continent? -confirmationArchiveSubcontinent = Are you sure you want to archive this subcontinent? -confirmationDearchiveSubcontinent = Are you sure you want to de-archive this subcontinent? -confirmationArchiveCountry = Are you sure you want to archive this country? -confirmationDearchiveCountry = Are you sure you want to de-archive this country? -confirmationArchiveRegion = Are you sure you want to archive this region? -confirmationDearchiveRegion = Are you sure you want to de-archive this region? -confirmationArchiveDistrict = Are you sure you want to archive this district? -confirmationDearchiveDistrict = Are you sure you want to de-archive this district? -confirmationArchiveCommunity = Are you sure you want to archive this community? -confirmationDearchiveCommunity = Are you sure you want to de-archive this community? -confirmationArchiveFacility = Are you sure you want to archive this facility? -confirmationDearchiveFacility = Are you sure you want to de-archive this facility? -confirmationArchiveLaboratory = Are you sure you want to archive this laboratory? -confirmationDearchiveLaboratory = Are you sure you want to de-archive this laboratory? -confirmationArchivePointOfEntry = Are you sure you want to archive this point of entry? -confirmationDearchivePointOfEntry = Are you sure you want to de-archive this point of entry? -confirmationArchiveAreas = Are you sure you want to archive all %d selected areas? -confirmationDearchiveAreas = Are you sure you want to de-archive all %d selected areas? -confirmationArchiveContinents = Are you sure you want to archive all %d selected continents? -confirmationDearchiveContinents = Are you sure you want to de-archive all %d selected continents? -confirmationArchiveSubcontinents = Are you sure you want to archive all %d selected subcontinents? -confirmationDearchiveSubcontinents = Are you sure you want to de-archive all %d selected subcontinents? -confirmationArchiveCountries = Are you sure you want to archive all %d selected countries? -confirmationDearchiveCountries = Are you sure you want to de-archive all %d selected countries? -confirmationArchiveRegions = Are you sure you want to archive all %d selected regions? -confirmationDearchiveRegions = Are you sure you want to de-archive all %d selected regions? -confirmationArchiveDistricts = Are you sure you want to archive all %d selected districts? -confirmationDearchiveDistricts = Are you sure you want to de-archive all %d selected districts? -confirmationArchiveCommunities = Are you sure you want to archive all %d selected communities? -confirmationDearchiveCommunities = Are you sure you want to de-archive all %d selected communities? -confirmationArchiveFacilities = Are you sure you want to archive all %d selected facilities? -confirmationDearchiveFacilities = Are you sure you want to de-archive all %d selected facilities? -confirmationDearchiveImmunization = Are you sure you want to de-archive this immunization? This will make it appear in the normal immunization directory again. -confirmationDearchiveAdverseEvent = Are you sure you want to de-archive this adverse event? This will make it appear in the normal adverse events directory again. -confirmationDearchiveAdverseEventInvestigation = Are you sure you want to de-archive this adverse event investigation? This will make it appear in the normal adverse events investigation directory again. -confirmationArchiveLaboratories = Are you sure you want to archive all %d selected laboratories? -confirmationDearchiveLaboratories = Are you sure you want to de-archive all %d selected laboratories? -confirmationDearchiveTask = Are you sure you want to de-archive this task? This will make it appear in the normal task directory again. -confirmationDearchiveTasks = Are you sure you want to de-archive all %d selected tasks? -confirmationDearchiveTravelEntry = Are you sure you want to de-archive this travel entry? This will make it appear in the normal travel entry directory again. -confirmationArchivePointsOfEntry = Are you sure you want to archive all %d selected points of entry? -confirmationDearchivePointsOfEntry = Are you sure you want to de-archive all %d selected points of entry? -confirmationContactSourceCaseDiscardUnsavedChanges = Changing or removing the source case of a contact will discard all unsaved changes you have made to the contact. Are you sure you want to continue? -confirmationRemoveUserAsOfficer = The user roles of this user have changed. Saving this user will remove it from any case or contact that they are assigned to as surveillance officer or contact officer. Do you still want to save the user? +close=Close +confirmationAlsoAdjustQuarantine=You have extended the follow-up. Should the end of the quarantine be adjusted accordingly? +confirmationArchiveCampaign=Are you sure you want to archive this campaign? This will not remove it from the system or any statistics, but only hide it from the normal campaign directory. +confirmationArchiveCase=Are you sure you want to archive this case? This will not remove it from the system or any statistics, but only hide it from the normal case directory. +confirmationArchiveCaseWithContacts=Archive related contacts along with the archived case +confirmationDearchiveCaseWithContacts=Dearchive related contacts along with the dearchived case +confirmationArchiveCases=Are you sure you want to archive all %d selected cases? +confirmationArchiveContact=Are you sure you want to archive this contact? This will not remove it from the system or any statistics, but only hide it from the normal contact directory. +confirmationArchiveContacts=Are you sure you want to archive all %d selected contacts? +confirmationArchiveEnvironment=Are you sure you want to archive this environment? This will not remove it from the system or any statistics, but only hide it from the normal environment directory. +confirmationArchiveEnvironments=Are you sure you want to archive all %d selected environments? +confirmationArchiveEvent=Are you sure you want to archive this event? This will not remove it from the system or any statistics, but only hide it from the normal event directory. +confirmationArchiveEvents=Are you sure you want to archive all %d selected events? +confirmationArchiveEventParticipant=Are you sure you want to archive this event participant? This will not remove it from the system or any statistics, but only hide it from the list of event participants. +confirmationArchiveImmunization=Are you sure you want to archive this immunization? This will not remove it from the system or any statistics, but only hide it from the normal immunization directory. +confirmationArchiveAdverseEvent=Are you sure you want to archive this adverse event? This will not remove it from the system or any statistics, but only hide it from the normal adverse events directory. +confirmationArchiveAdverseEventInvestigation=Are you sure you want to archive this adverse event investigation? This will not remove it from the system or any statistics, but only hide it from the normal adverse events investigation directory. +confirmationArchiveTask=Are you sure you want to archive this task? This will not remove it from the system or any statistics, but only hide it from the normal task management. +confirmationArchiveTasks=Are you sure you want to archive all %d selected tasks? +confirmationArchiveTravelEntry=Are you sure you want to archive this travel entry? This will not remove it from the system or any statistics, but only hide it from the normal travel entry directory. +confirmationArchiveEventGroup=Are you sure you want to archive this event group? This will not remove it from the system or any statistics, but only hide it from the normal event group directory. +confirmationCancelFollowUp=Are you sure you want to cancel the follow-up of all %d selected contacts? +confirmationChangeCaseDisease=Really change case disease? +confirmationDearchiveCampaign=Are you sure you want to de-archive this campaign? This will make it appear in the normal campaign directory again. +confirmationDearchiveCase=Are you sure you want to de-archive this case? This will make it appear in the normal case directory again. +confirmationDearchiveCases=Are you sure you want to de-archive all %d selected cases? +confirmationDearchiveContact=Are you sure you want to de-archive this contact? This will make it appear in the normal contact directory again. +confirmationDearchiveContacts=Are you sure you want to de-archive all %d selected contacts? +confirmationDearchiveEnvironment=Are you sure you want to de-archive this environment? This will make it appear in the normal environment directory again. +confirmationDearchiveEnvironments=Are you sure you want to de-archive all %d selected environments? +confirmationDearchiveEvent=Are you sure you want to de-archive this event? This will make it appear in the normal event directory again. +confirmationDearchiveEvents=Are you sure you want to de-archive all %d selected events? +confirmationDearchiveEventParticipant=Are you sure you want to de-archive this event participant? This will make it appear in the normal event participant list again. +confirmationDearchiveEventGroup=Are you sure you want to de-archive this event group? This will make it appear in the normal event group directory again. +confirmationDeleteCases=Are you sure you want to delete all %d selected cases?

If referenced by other data in the system, those references will be removed, which cannot be automatically undone. +confirmationDeleteContacts=Are you sure you want to delete all %d selected contacts?

If referenced by other data in the system, those references will be removed, which cannot be automatically undone. +confirmationDeleteEntities=Are you sure you want to delete all %d selected %s?

If referenced by other data in the system, those references will be removed, which cannot be automatically undone. +confirmationRestoreEntities=Are you sure you want to restore all %d selected %s? +confirmationDeleteEntity=Are you sure you want to delete this %s?

If referenced by other data in the system, those references will be removed, which cannot be automatically undone. +confirmationDeleteEntityWithDetails=Are you sure you want to delete this %s?
%s
If referenced by other data in the system, those references will be removed, which cannot be automatically undone. +confirmationDeleteEventParticipants=Are you sure you want to delete all %d selected event participants?

If referenced by other data in the system, those references will be removed, which cannot be automatically undone. +confirmationDeleteEvents=Are you sure you want to delete all %d selected events?

If referenced by other data in the system, those references will be removed, which cannot be automatically undone. +confirmationDeleteTravelEntries=Are you sure you want to delete all %d selected travel entries?

If referenced by other data in the system, those references will be removed, which cannot be automatically undone. +confirmationDeleteFile=Are you sure you want to delete "%s"? +confirmationDeletePathogenTests=Are you sure you want to delete all %d selected pathogen tests? If referenced by other data in the system, those references will be removed, which cannot be automatically undone. +confirmationDeletePrescriptions=Are you sure you want to delete all %d selected prescriptions? +confirmationDeleteSamples=Are you sure you want to delete all %d selected samples? If referenced by other data in the system, those references will be removed, which cannot be automatically undone. +confirmationDeleteTasks=Are you sure you want to delete all %d selected tasks? +confirmationDeleteTreatments=Are you sure you want to delete all %d selected treatments? +confirmationDeleteVisits=Are you sure you want to delete all %d selected visits? +confirmationDeletePrescriptionWithTreatment=The prescriptions you want to delete are linked to treatments. Do you want to delete the prescriptions alone or together with the linked treatments? +confirmationDeleteUserRole=Are you sure you want to remove this user role, used by %d users? +confirmationLostToFollowUp=Are you sure you want to set the follow-up of all %d selected contacts to lost to follow-up? +confirmationPickCaseAndDeleteOther=Are you sure that the case you did not select is a duplicate of this case? The case you did not select and all contacts, samples, tasks and other data linked to it will be deleted. +confirmationPickContactAndDeleteOther=Are you sure that the contact you did not select is a duplicate of this contact? The contact you did not select and all samples, tasks and other data linked to it will be deleted. +confirmationMergeCaseAndDeleteOther=Are you sure that the case you did not select is a duplicate of this case? The case you selected will be updated with information from the case you did not select, and the latter will then be deleted. +confirmationMergeContactAndDeleteOther=Are you sure that the contact you did not select is a duplicate of this contact? The contact you selected will be updated with information from the contact you did not select, and the latter will then be deleted. +confirmationUpdateCompleteness=Are you sure you want to update the completeness values of all cases in the list? This might take some time. +confirmationEnterBulkEditMode=There are currently more than %d items in the list. It is recommended to use some filters first because entering bulk edit mode with this many items might slow down your system. Do you still want to proceed? +confirmationDisableAllLineListingRegion=Are you sure you want to disable line listing for this disease? Line listing will be canceled for all districts. +confirmationDisableAllLineListingNational=Are you sure you want to disable line listing for this disease? Line listing will be canceled for all districts in all regions. +confirmationArchiveArea=Are you sure you want to archive this area? +confirmationDearchiveArea=Are you sure you want to de-archive this area? +confirmationArchiveContinent=Are you sure you want to archive this continent? +confirmationDearchiveContinent=Are you sure you want to de-archive this continent? +confirmationArchiveSubcontinent=Are you sure you want to archive this subcontinent? +confirmationDearchiveSubcontinent=Are you sure you want to de-archive this subcontinent? +confirmationArchiveCountry=Are you sure you want to archive this country? +confirmationDearchiveCountry=Are you sure you want to de-archive this country? +confirmationArchiveRegion=Are you sure you want to archive this region? +confirmationDearchiveRegion=Are you sure you want to de-archive this region? +confirmationArchiveDistrict=Are you sure you want to archive this district? +confirmationDearchiveDistrict=Are you sure you want to de-archive this district? +confirmationArchiveCommunity=Are you sure you want to archive this community? +confirmationDearchiveCommunity=Are you sure you want to de-archive this community? +confirmationArchiveFacility=Are you sure you want to archive this facility? +confirmationDearchiveFacility=Are you sure you want to de-archive this facility? +confirmationArchiveLaboratory=Are you sure you want to archive this laboratory? +confirmationDearchiveLaboratory=Are you sure you want to de-archive this laboratory? +confirmationArchivePointOfEntry=Are you sure you want to archive this point of entry? +confirmationDearchivePointOfEntry=Are you sure you want to de-archive this point of entry? +confirmationArchiveAreas=Are you sure you want to archive all %d selected areas? +confirmationDearchiveAreas=Are you sure you want to de-archive all %d selected areas? +confirmationArchiveContinents=Are you sure you want to archive all %d selected continents? +confirmationDearchiveContinents=Are you sure you want to de-archive all %d selected continents? +confirmationArchiveSubcontinents=Are you sure you want to archive all %d selected subcontinents? +confirmationDearchiveSubcontinents=Are you sure you want to de-archive all %d selected subcontinents? +confirmationArchiveCountries=Are you sure you want to archive all %d selected countries? +confirmationDearchiveCountries=Are you sure you want to de-archive all %d selected countries? +confirmationArchiveRegions=Are you sure you want to archive all %d selected regions? +confirmationDearchiveRegions=Are you sure you want to de-archive all %d selected regions? +confirmationArchiveDistricts=Are you sure you want to archive all %d selected districts? +confirmationDearchiveDistricts=Are you sure you want to de-archive all %d selected districts? +confirmationArchiveCommunities=Are you sure you want to archive all %d selected communities? +confirmationDearchiveCommunities=Are you sure you want to de-archive all %d selected communities? +confirmationArchiveFacilities=Are you sure you want to archive all %d selected facilities? +confirmationDearchiveFacilities=Are you sure you want to de-archive all %d selected facilities? +confirmationDearchiveImmunization=Are you sure you want to de-archive this immunization? This will make it appear in the normal immunization directory again. +confirmationDearchiveAdverseEvent=Are you sure you want to de-archive this adverse event? This will make it appear in the normal adverse events directory again. +confirmationDearchiveAdverseEventInvestigation=Are you sure you want to de-archive this adverse event investigation? This will make it appear in the normal adverse events investigation directory again. +confirmationArchiveLaboratories=Are you sure you want to archive all %d selected laboratories? +confirmationDearchiveLaboratories=Are you sure you want to de-archive all %d selected laboratories? +confirmationDearchiveTask=Are you sure you want to de-archive this task? This will make it appear in the normal task directory again. +confirmationDearchiveTasks=Are you sure you want to de-archive all %d selected tasks? +confirmationDearchiveTravelEntry=Are you sure you want to de-archive this travel entry? This will make it appear in the normal travel entry directory again. +confirmationArchivePointsOfEntry=Are you sure you want to archive all %d selected points of entry? +confirmationDearchivePointsOfEntry=Are you sure you want to de-archive all %d selected points of entry? +confirmationContactSourceCaseDiscardUnsavedChanges=Changing or removing the source case of a contact will discard all unsaved changes you have made to the contact. Are you sure you want to continue? +confirmationRemoveUserAsOfficer=The user roles of this user have changed. Saving this user will remove it from any case or contact that they are assigned to as surveillance officer or contact officer. Do you still want to save the user? confirmationExtendQuarantine=Are you sure you want to extend the quarantine? confirmationReduceQuarantine=Are you sure you want to reduce the quarantine? confirmationExtendFollowUp=Would you also want the follow-up period to be extended accordingly? @@ -241,178 +236,176 @@ confirmationRemoveGridRowMessage=Are you sure you want to remove this row? confirmationRemoveGridRowConfirm=Yes confirmationRemoveGridRowCancel=No confirmationSetMissingGeoCoordinates=This action will fill in geo coordinates for every person which has an address given, but no geo coordinates entered. Please be aware that this action affects all persons in your jurisdiction, regardless of the filters set below. Warning: Depending on the number of persons, this method might take quite long. -confirmationLocationFacilityAddressOverride = The selected facility has location details that are different from the ones you are currently editing. Do you want to overwrite them with those from the facility? +confirmationLocationFacilityAddressOverride=The selected facility has location details that are different from the ones you are currently editing. Do you want to overwrite them with those from the facility? confirmationCancelExternalFollowUpPopup=Are you sure you want to cancel external follow-ups in the eDiary? -confirmationUnlinkCaseFromEvent = Are you sure you want to unlink this case from this event? -confirmationUnlinkEventFromEnvironment = Are you sure you want to unlink this event from this environment? -confirmationUnlinkEnvironmentFromEvent = Are you sure you want to unlink this environment from this event? -confirmationDeleteExternalMessages = Are you sure you want to delete all %d selected messages? -confirmationUnclearExternalMessage = Are you sure you want to mark this message as unclear? -confirmationManuallyForwardedExternalMessage = Are you sure you want to mark this message as forwarded? +confirmationUnlinkCaseFromEvent=Are you sure you want to unlink this case from this event? +confirmationUnlinkEventFromEnvironment=Are you sure you want to unlink this event from this environment? +confirmationUnlinkEnvironmentFromEvent=Are you sure you want to unlink this environment from this event? +confirmationDeleteExternalMessages=Are you sure you want to delete all %d selected messages? +confirmationUnclearExternalMessage=Are you sure you want to mark this message as unclear? +confirmationManuallyForwardedExternalMessage=Are you sure you want to mark this message as forwarded? confirmationManualDeleteCoreEntity=You are about to mark this data for deletion. If referenced by other data in the system, those references will be removed, which cannot be automatically undone. -confirmationFetchExternalMessages = Another user seems to be fetching messages at the moment. If you choose to proceed, this may result in duplicate messages. Are you sure you want to proceed? -confirmationRejectSormasToSormasShareRequest = Are you sure you want to reject the share request? -confirmationEnableUsers = Are you sure you want to enable all %d selected users? -confirmationDisableUsers = Are you sure you want to disable all %d selected users? -confirmationRevokeSormasToSormasShareRequest = Are you sure you want to revoke the share request? -confirmationSinceExternalMessages = This is the first time messages will be fetched. Do you want to select the start date from which to fetch messages? If you select no, all messages will be retrieved. +confirmationFetchExternalMessages=Another user seems to be fetching messages at the moment. If you choose to proceed, this may result in duplicate messages. Are you sure you want to proceed? +confirmationRejectSormasToSormasShareRequest=Are you sure you want to reject the share request? +confirmationEnableUsers=Are you sure you want to enable all %d selected users? +confirmationDisableUsers=Are you sure you want to disable all %d selected users? +confirmationRevokeSormasToSormasShareRequest=Are you sure you want to revoke the share request? +confirmationSinceExternalMessages=This is the first time messages will be fetched. Do you want to select the start date from which to fetch messages? If you select no, all messages will be retrieved. confirmationSeeAllPersons=Are you sure you want to search persons for all association types? This could result in a slow response. -confirmationExternalMessageCorrection = This message contains corrections to a previous one.
Do you want process those corrections from this message? -confirmationVaccinationStatusUpdate = Deleting this vaccination has lead to at least one case no longer having a valid vaccination. Do you want to remove the vaccination status from all affected cases? -confirmExternalMessageCorrectionThrough = No other new or changed information could automatically be determined from the message. Do you want to manually add or edit more information? -confirmationDeleteCaseContacts = Do you also want to delete all contacts of this case? -confirmationCancelBulkAction = Do you really want to cancel the bulk operation? The operation will be stopped after the current batch has been processed. - +confirmationExternalMessageCorrection=This message contains corrections to a previous one.
Do you want process those corrections from this message? +confirmationVaccinationStatusUpdate=Deleting this vaccination has lead to at least one case no longer having a valid vaccination. Do you want to remove the vaccination status from all affected cases? +confirmExternalMessageCorrectionThrough=No other new or changed information could automatically be determined from the message. Do you want to manually add or edit more information? +confirmationDeleteCaseContacts=Do you also want to delete all contacts of this case? +confirmationCancelBulkAction=Do you really want to cancel the bulk operation? The operation will be stopped after the current batch has been processed. # Entities entityAction=Action entityActions=Actions -entityActivityAsCase = Activity as Case +entityActivityAsCase=Activity as Case entityAdditionalTest=Additional test entityAdditionalTests=Additional tests -entityAggregateReports = Aggregate Reports -entityAreas = Areas +entityAggregateReports=Aggregate Reports +entityAreas=Areas entityAutomaticSoftDeletion=Entity was automatically deleted -entityBagCases = BAG cases -entityBagContacts = BAG contacts +entityBagCases=BAG cases +entityBagContacts=BAG contacts entityBurial=Burial entityCampaign=Campaign -entityCampaignData = Campaign Data +entityCampaignData=Campaign Data entityCampaignDataForm=campaign data form -entityCampaignFormData = Campaign form data -entityCampaignFormMeta = Campaign form meta +entityCampaignFormData=Campaign form data +entityCampaignFormMeta=Campaign form meta entityCampaigns=Campaigns entityCase=Case -entityCaseManagement = Case management -entityCaseVisits = Case visits +entityCaseManagement=Case management +entityCaseVisits=Case visits entityCases=Cases entityClinicalVisit=Clinical assessment entityClinicalVisits=Clinical assessments -entityCommunities = Communities +entityCommunities=Communities entityContact=Contact -entityContactFollowUps = Contact follow ups -entityContactVisits = Contact visits +entityContactFollowUps=Contact follow ups +entityContactVisits=Contact visits entityContacts=Contacts entityContinents=Continents -entityCountries = Countries -entityCustomizableEnumValues = Customizable enum values -entityDataDictionary= Data dictionary -entityDataProtectionDictionary= Data protection dictionary -entityDiseaseClassifications = Disease classifications -entityDiseaseConfigurations = Disease configurations +entityCountries=Countries +entityCustomizableEnumValues=Customizable enum values +entityDataDictionary=Data dictionary +entityDataProtectionDictionary=Data protection dictionary +entityDiseaseClassifications=Disease classifications +entityDiseaseConfigurations=Disease configurations entityDistrict=District entityDistricts=Districts entityDocuments=Documents -entityEnvironment = Environment -entityEnvironmentSample = Environment sample -entityEnvironmentSamples = Environment samples -entityEnvironments = Environments +entityEnvironment=Environment +entityEnvironmentSample=Environment sample +entityEnvironmentSamples=Environment samples +entityEnvironments=Environments entityEvent=Event -entityEventActions = Events actions +entityEventActions=Events actions entityEventGroup=Event group entityEventGroups=Event groups entityEventParticipant=Event participant entityEventParticipants=Event participants entityEvents=Events -entityExposure = Exposure -entityExternalMessages = External messages -entityFacilities = Facilities -entityFeatureConfigurations = Feature configurations -entityGathering = Social event -entityImmunization = Immunization -entityImmunizations = Immunizations -entityOutbreaks = Outbreaks -entityPathogenTests = Pathogen tests -entityPersonContactDetail = Person contact details -entityPersons = Persons -entityPointsOfEntry = Points of entry -entityPrescription = Prescription -entityPrescriptions = Prescriptions -entityQuarantineOrder = Quarantine Order -entityRegion = Region -entityRegions = Regions -entitySample = Sample -entitySamples = Samples -entitySelfReport = Self report -entitySelfReports = Self Reports -entityStatistics = Statistics +entityExposure=Exposure +entityExternalMessages=External messages +entityFacilities=Facilities +entityFeatureConfigurations=Feature configurations +entityGathering=Social event +entityImmunization=Immunization +entityImmunizations=Immunizations +entityOutbreaks=Outbreaks +entityPathogenTests=Pathogen tests +entityPersonContactDetail=Person contact details +entityPersons=Persons +entityPointsOfEntry=Points of entry +entityPrescription=Prescription +entityPrescriptions=Prescriptions +entityQuarantineOrder=Quarantine Order +entityRegion=Region +entityRegions=Regions +entitySample=Sample +entitySamples=Samples +entitySelfReport=Self report +entitySelfReports=Self Reports +entityStatistics=Statistics entitySubcontinents=Subcontinents -entityTask = Task -entityTasks = Tasks -entityTravelEntries = Travel Entries -entityTravelEntry = Travel entry -entityTreatment = Treatment -entityTreatments = Treatments -entityUser = User -entityUserRoles = User roles -entityUsers = Users -entityVaccinations = Vaccinations -entityVisits = Visits -entityWeeklyReports = Weekly reports -entityOutbreaks = Outbreaks -entityCustomizableEnumValues = Customizable enum values -entityCampaignFormMeta = Campaign form meta -entityCampaignFormData = Campaign form data -entityAdverseEvent = Adverse event -entityAdverseEvents = Adverse events -entityAdverseEventInvestigation = Adverse event investigation -entityAdverseEventInvestigations = Adverse event investigations -entityEpipulseExport = Epipulse export - +entityTask=Task +entityTasks=Tasks +entityTravelEntries=Travel Entries +entityTravelEntry=Travel entry +entityTreatment=Treatment +entityTreatments=Treatments +entityUser=User +entityUserRoles=User roles +entityUsers=Users +entityVaccinations=Vaccinations +entityVisits=Visits +entityWeeklyReports=Weekly reports +entityOutbreaks=Outbreaks +entityCustomizableEnumValues=Customizable enum values +entityCampaignFormMeta=Campaign form meta +entityCampaignFormData=Campaign form data +entityAdverseEvent=Adverse event +entityAdverseEvents=Adverse events +entityAdverseEventInvestigation=Adverse event investigation +entityAdverseEventInvestigations=Adverse event investigations +entityEpipulseExport=Epipulse export # Error Messages errorAccessDenied=You do not have the required rights to view this page. errorEntityOutdated=The data could not be saved because it has been changed in the meantime. errorFieldValidationFailed=Please check the entered data. At least one field has errors. errorIntegerFieldValidationFailed=Please check the entered data. At least one of the fields where an integer was expected contains something else. -errorLabResultsAdapterNotFound = The external lab results adapter could not be found. Please make sure it is installed in your system and specified properly in your sormas.properties. +errorLabResultsAdapterNotFound=The external lab results adapter could not be found. Please make sure it is installed in your system and specified properly in your sormas.properties. errorNoAccessToWeb=Your user account does not have access to the web application errorNotRequiredRights=You do not have the required rights to perform this action. -errorOccurred = An error has occurred -errorProblemOccurred = A problem has occurred -errorViewNotFound = You tried to navigate to a view (%s) that does not exist. -errorWasReported = An unexpected error occurred. Please contact your supervisor or administrator and inform them about it. -errorInvalidValue = Invalid value -errorCaseDuplicateDeletion = The duplicate case could not be deleted due to an internal error. -errorCaseMerging = The cases could not be merged due to an internal error. -errorContactDuplicateDeletion = The duplicate contact could not be deleted due to an internal error. -errorContactMerging = The contacts could not be merged due to an internal error. -errorSormasToSormasShare = The data could not be shared due to some errors. -errorSormasToSormasRequestToken = Could not request token. -errorSormasToSormasServerAccess = The selected health department is not configured. Please contact an admin and tell them about this issue. -errorSormasToSormasSend = Unexpected error occurred while sharing. Please contact an admin and tell them about this issue. -errorSormasToSormasConnection = Connection refused by the target health department. -errorSormasToSormasDataMissing = Share request data is missing -errorSormasToSormasResult = Unexpected error occurred while getting share result. Please contact the recipient health department and tell them about this issue. Please also contact your admin and tell them about this issue. -errorSormasToSormasCertNotGenerated = Sormas to sormas certificate is not yet generated. Please contact an admin and tell them about this issue. -errorSormasToSormasEncrypt = Could not encrypt the data. Please contact an admin and tell them about this issue. -errorSormasToSormasDecrypt = Could not decrypt the shared data. Please contact an admin and tell them about this issue. -unexpectedErrorSormasToSormasAccept = The share request could not be marked as accepted on the source system.

The following error occurred: %s.

Please contact your admin and the admin of the source system and tell them about this issue. -errorSormasToSormasAccept = The share request could not be accepted. -errorSormasToSormasDeleteFromExternalSurveillanceTool = Failed to delete entities from external surveillance tool. -errorSormasToSormasInvalidRequestMethod = Invalid HTTP verb used -errorSormasToSormasLoadShares = Failed to load shares -errorSormasToSormasRequestProcessed = The request is already processed. -errorSormasToSormasShareContactWithoutCase = You can not share this contact because you need a source case. Please link the contact to a case. -errorSormasToSormasShareContactWithUnsharedSourceCase = If you want to share this contact, you have to send the associated case first to the same target system.
Please note that you can send the case and exclude personal data. -errorSormasToSormasAcceptContactsWithoutCaseShared = The contact %s cannot be accepted, because it was sent without a case. Please reject the contact and ask the source system to send the linked case first. -errorSormasToSormasAcceptContactsBeforeAcceptSourceCase = The contact %s cannot be accepted, because the contact belongs to a case that has not yet been accepted. Please accept the linked case first.
It is shared within the request %s. -errorSormasToSormasExistingPendingRequest = There is already a pending request to the same organization. Please revoke it before sending a new one. -errorSormasToSormasSharequestNotFound = The share request could not be found. It was either revoked by the source system or it has been rejected by someone else. -errorQuarantineOnlySupportedEntities = Quarantine can only be issued for cases, contacts, event participants and travel entries. -errorQuarantineBulkOnlySupportedEntities = Bulk quarantine can only be issued for cases, contacts, event participants. -errorCreatingTemplateDirectory = Could not create template directory. -errorDeletingDocumentTemplate = Error deleting document template -errorDeletingDocument = Error deleting document -errorDocumentGeneration = Error while generating document: %s -errorDocumentGenerationMultipleDiseasses = The selected entries has different diseases. -errorIllegalFilename = Illegal file name: %s -errorFileNotFound = File '%s' not found -errorReadingTemplate = Error reading template '%s' -errorReadingDocument = Error reading document '%s' -errorProcessingTemplate = Error processing template. +errorOccurred=An error has occurred +errorProblemOccurred=A problem has occurred +errorViewNotFound=You tried to navigate to a view (%s) that does not exist. +errorWasReported=An unexpected error occurred. Please contact your supervisor or administrator and inform them about it. +errorInvalidValue=Invalid value +errorCaseDuplicateDeletion=The duplicate case could not be deleted due to an internal error. +errorCaseMerging=The cases could not be merged due to an internal error. +errorContactDuplicateDeletion=The duplicate contact could not be deleted due to an internal error. +errorContactMerging=The contacts could not be merged due to an internal error. +errorSormasToSormasShare=The data could not be shared due to some errors. +errorSormasToSormasRequestToken=Could not request token. +errorSormasToSormasServerAccess=The selected health department is not configured. Please contact an admin and tell them about this issue. +errorSormasToSormasSend=Unexpected error occurred while sharing. Please contact an admin and tell them about this issue. +errorSormasToSormasConnection=Connection refused by the target health department. +errorSormasToSormasDataMissing=Share request data is missing +errorSormasToSormasResult=Unexpected error occurred while getting share result. Please contact the recipient health department and tell them about this issue. Please also contact your admin and tell them about this issue. +errorSormasToSormasCertNotGenerated=Sormas to sormas certificate is not yet generated. Please contact an admin and tell them about this issue. +errorSormasToSormasEncrypt=Could not encrypt the data. Please contact an admin and tell them about this issue. +errorSormasToSormasDecrypt=Could not decrypt the shared data. Please contact an admin and tell them about this issue. +unexpectedErrorSormasToSormasAccept=The share request could not be marked as accepted on the source system.

The following error occurred: %s.

Please contact your admin and the admin of the source system and tell them about this issue. +errorSormasToSormasAccept=The share request could not be accepted. +errorSormasToSormasDeleteFromExternalSurveillanceTool=Failed to delete entities from external surveillance tool. +errorSormasToSormasInvalidRequestMethod=Invalid HTTP verb used +errorSormasToSormasLoadShares=Failed to load shares +errorSormasToSormasRequestProcessed=The request is already processed. +errorSormasToSormasShareContactWithoutCase=You can not share this contact because you need a source case. Please link the contact to a case. +errorSormasToSormasShareContactWithUnsharedSourceCase=If you want to share this contact, you have to send the associated case first to the same target system.
Please note that you can send the case and exclude personal data. +errorSormasToSormasAcceptContactsWithoutCaseShared=The contact %s cannot be accepted, because it was sent without a case. Please reject the contact and ask the source system to send the linked case first. +errorSormasToSormasAcceptContactsBeforeAcceptSourceCase=The contact %s cannot be accepted, because the contact belongs to a case that has not yet been accepted. Please accept the linked case first.
It is shared within the request %s. +errorSormasToSormasExistingPendingRequest=There is already a pending request to the same organization. Please revoke it before sending a new one. +errorSormasToSormasSharequestNotFound=The share request could not be found. It was either revoked by the source system or it has been rejected by someone else. +errorQuarantineOnlySupportedEntities=Quarantine can only be issued for cases, contacts, event participants and travel entries. +errorQuarantineBulkOnlySupportedEntities=Bulk quarantine can only be issued for cases, contacts, event participants. +errorCreatingTemplateDirectory=Could not create template directory. +errorDeletingDocumentTemplate=Error deleting document template +errorDeletingDocument=Error deleting document +errorDocumentGeneration=Error while generating document: %s +errorDocumentGenerationMultipleDiseasses=The selected entries has different diseases. +errorIllegalFilename=Illegal file name: %s +errorFileNotFound=File '%s' not found +errorReadingTemplate=Error reading template '%s' +errorReadingDocument=Error reading document '%s' +errorProcessingTemplate=Error processing template. errorUploadGeneratedDocument=Could not upload the generated document. errorUploadGeneratedDocumentExceedsFileSizeLimit=Cannot upload the generated document because it exceeds the file size limit configured in the system. -errorTemplateFileCorrupt = The template file is corrupt. -errorWritingTemplate = Could not write template file. +errorTemplateFileCorrupt=The template file is corrupt. +errorWritingTemplate=Could not write template file. errorCampaignDiagramTotalsCalculationError=At least part of the percentage values for the diagram '%s' could not be calculated. Please check the diagram definitions for errors. errorNoPopulationDataLocations=No population data was found for the following locations: %s errorNoPopulationDataFound=There is no population data available. Switching to absolute data view @@ -422,447 +415,452 @@ errorExternalSurveillanceToolNonCoronavirusCase=Could not send the selected case errorExternalSurveillanceToolCasesNotSharable=%d of the selected %d cases can not be sent to the external reporting tool.
Please make sure that all of the cases below are owned and allowed to be shared with the external reporting tool. Then, re-try sending or only send the ones that can be sent. errorExternalSurveillanceToolNonClusterEvent=Could not send the selected events to the reporting tool because the event %s is not a %s cluster. errorExternalSurveillanceToolEventNotOwned=%d of the selected events can not be sent to the external reporting tool.
Please make sure that all of the events below are owned. Then, re-try sending or only send the ones that can be sent. -errorEventFromAnotherJurisdiction = The event is related to a jurisdiction you don't have access to -errorEventsFromAnotherJurisdiction = At least one of the selected events is related to a jurisdiction you don't have access to -errorEventUnlinkEventGroupFromAnotherJurisdiction = The event group has an event related to a jurisdiction you don't have access to -errorCaseNotEditable = The case is not editable anymore -errorCaseNotEditableOutsideJurisdiction = The case outside the user's jurisdiction can not be edited -errorEntityNotEditable = This entity is not editable anymore -errorCampaignNotEditable = This campaign is not editable anymore -errorContactNotEditable = The contact is not editable anymore -errorContactNotEditableOutsideJurisdiction = The contact outside the user's jurisdiction can not be edited -errorEventNotEditable = This event is not editable any more -errorEventParticipantNotEditable = This event participant is not editable any more -errorSampleNotEditable = This sample is not editable any more -errorImmunizationNotEditable = This immunization is not editable any more -errorForbidden = You do not have the necessary user rights to perform this action -errorNoRightsForChangingField = You have no rights for changing %s -errorNoRightsForChangingMultipleFields = You have no rights for changing %s and related fields -errorNotFound = The requested entity was not found -errorDeleteUserRoleUsedAlone = Cannot delete user role, because the following users would remain without a user role:

%s

Please give them a different role and re-try to delete this one. -errorSurveillanceReportNotEditable = This report is not editable any more -errorEnvironmentSampleNotEditable = This environment sample is not editable anymore -errorEnvironmentSampleNoDispatchRight = You do not have the necessary user right to change the dispatch status of this environment sample -errorEnvironmentSampleNoReceivalRight = You do not have the necessary user right to change the receival status of this environment sample -errorSendingExternalEmail = Email could not be sent. Please contact an admin and notify them about this problem. +errorEventFromAnotherJurisdiction=The event is related to a jurisdiction you don't have access to +errorEventsFromAnotherJurisdiction=At least one of the selected events is related to a jurisdiction you don't have access to +errorEventUnlinkEventGroupFromAnotherJurisdiction=The event group has an event related to a jurisdiction you don't have access to +errorCaseNotEditable=The case is not editable anymore +errorCaseNotEditableOutsideJurisdiction=The case outside the user's jurisdiction can not be edited +errorEntityNotEditable=This entity is not editable anymore +errorCampaignNotEditable=This campaign is not editable anymore +errorContactNotEditable=The contact is not editable anymore +errorContactNotEditableOutsideJurisdiction=The contact outside the user's jurisdiction can not be edited +errorEventNotEditable=This event is not editable any more +errorEventParticipantNotEditable=This event participant is not editable any more +errorSampleNotEditable=This sample is not editable any more +errorImmunizationNotEditable=This immunization is not editable any more +errorForbidden=You do not have the necessary user rights to perform this action +errorNoRightsForChangingField=You have no rights for changing %s +errorNoRightsForChangingMultipleFields=You have no rights for changing %s and related fields +errorNotFound=The requested entity was not found +errorDeleteUserRoleUsedAlone=Cannot delete user role, because the following users would remain without a user role:

%s

Please give them a different role and re-try to delete this one. +errorSurveillanceReportNotEditable=This report is not editable any more +errorEnvironmentSampleNotEditable=This environment sample is not editable anymore +errorEnvironmentSampleNoDispatchRight=You do not have the necessary user right to change the dispatch status of this environment sample +errorEnvironmentSampleNoReceivalRight=You do not have the necessary user right to change the receival status of this environment sample +errorSendingExternalEmail=Email could not be sent. Please contact an admin and notify them about this problem. errorExternalEmailAttachmentCannotEncrypt=Can't send email with attachments. The person has no national health id or primary phone number to send the password to or the SMS service is not set up in the system. -errorAdverseEventNotEditable = This adverse event is not editable anymore -errorAdverseEventInvestigationNotEditable = This adverse event investigation is not editable anymore +errorAdverseEventNotEditable=This adverse event is not editable anymore +errorAdverseEventInvestigationNotEditable=This adverse event investigation is not editable anymore errorExternalEmailMissingPersonEmailAddress=This person does not have an email address errorDocumentTemplateWorkflowChangeNotAllowed=The workflow of this document template cannot be changed. errorSurveyTokenNotAvailable=There is no available survey token for this survey. - # headings -headingAccessDenied = Access denied -headingActivityAsCase = Activity as Case -headingAdditionalTests = Additional tests -headingAllContacts = All Contacts -headingAnimalContacts = Animal Contacts -headingArchiveCampaign = Archive Campaign -headingArchiveCase = Archive case -headingArchiveContact = Archive contact -headingArchiveEnvironment = Archive environment -headingArchiveEvent = Archive event -headingArchiveEventParticipant = Archive event participant -headingArchiveEventGroup = Archive event group -headingArchiveImmunization = Archive immunization -headingArchiveAdverseEvent = Archive adverse event -headingArchiveAdverseEventInvestigation = Archive adverse event investigation -headingArchiveTravelEntry = Archive travel entry -headingAutomaticVaccinationStatusDetermination = Automatic Vaccination Status Determination -headingCampaignBasics = Campaign basics -headingCampaignData = Campaign data -headingCampaignDashboard = Campaign dashboard -headingCaseData = Case data +headingAccessDenied=Access denied +headingActivityAsCase=Activity as Case +headingAdditionalTests=Additional tests +headingAllContacts=All Contacts +headingAnimalContacts=Animal Contacts +headingArchiveCampaign=Archive Campaign +headingArchiveCase=Archive case +headingArchiveContact=Archive contact +headingArchiveEnvironment=Archive environment +headingArchiveEvent=Archive event +headingArchiveEventParticipant=Archive event participant +headingArchiveEventGroup=Archive event group +headingArchiveImmunization=Archive immunization +headingArchiveAdverseEvent=Archive adverse event +headingArchiveAdverseEventInvestigation=Archive adverse event investigation +headingArchiveTravelEntry=Archive travel entry +headingAutomaticVaccinationStatusDetermination=Automatic Vaccination Status Determination +headingCampaignBasics=Campaign basics +headingCampaignData=Campaign data +headingCampaignDashboard=Campaign dashboard +headingCaseData=Case data headingCaseFatalityRate=Case Fatality Rate -headingCaseFound = Case found -headingCaseImport = Case Import -headingCaseNotifiedBy = Notified by -headingPointOfEntryImport = Point of Entry Import -headingCaseStatusMap = Case Status Map -headingCasesDeleted = Cases deleted -headingCasesNotDeleted = None of the cases were deleted -headingCasesNotRestored = None of the cases were restored -headingCaseConversion = Conversion to case -headingChangeCaseDisease = Change case disease -headingCasesGuide = Guide: Case Directory -headingChangePathogenTestResult = Change pathogen test result -headingClinicalMeasurements = Clinical measurements -headingClinicalVisitsDeleted = Clinical assessments deleted -headingComplications = Complications -headingClinicalPresentation = Clinical Presentation -headingConfirmArchiving = Confirm archiving -headingConfirmDearchiving = Confirm de-archiving -headingConfirmDeletion = Confirm Deletion -headingConfirmMerging = Confirm Merging -headingConfirmUpdateCompleteness = Update completeness values -headingContactData = Contact data -headingContactsArchived = Contacts archived -headingContactsDearchived = Contacts de-archived -headingConfirmEnabling = Confirm enabling -headingConfirmDisabling = Confirm disabling -headingUnderFollowUp = Under Follow-up -headingContactInformation = Contact information -headingContactMap = Contact Map -headingContactsDeleted = Contacts deleted -headingContactsNotDeleted = None of the contacts were deleted -headingContactsNotLinked = None of the contacts were linked -headingCasesNotLinked = None of the cases were linked -headingContactsNotRestored = = None of the contacts were restored -headingCreateAdditionalTest = Create new additional test results -headingCreateEntry = Create entry -headingCreateNewAction = Create new action -headingCreateNewAggregateReport = Create a new aggregated report -headingCreateNewCampaign = Create new campaign -headingCreateNewCase = Create new case -headingCreateNewCaseIssue = Case creation issue -headingCreateNewClinicalVisit = Create new clinical assessment -headingCreateNewContact = Create new contact -headingCreateNewContactIssue = Contact creation issue -headingSearchSample = Sample search issue +headingCaseFound=Case found +headingCaseImport=Case Import +headingCaseNotifiedBy=Notified by +headingPointOfEntryImport=Point of Entry Import +headingCaseStatusMap=Case Status Map +headingCasesDeleted=Cases deleted +headingCasesNotDeleted=None of the cases were deleted +headingCasesNotRestored=None of the cases were restored +headingCaseConversion=Conversion to case +headingChangeCaseDisease=Change case disease +headingCasesGuide=Guide: Case Directory +headingChangePathogenTestResult=Change pathogen test result +headingClinicalMeasurements=Clinical measurements +headingClinicalVisitsDeleted=Clinical assessments deleted +headingComplications=Complications +headingClinicalPresentation=Clinical Presentation +headingConfirmArchiving=Confirm archiving +headingConfirmDearchiving=Confirm de-archiving +headingConfirmDeletion=Confirm Deletion +headingConfirmMerging=Confirm Merging +headingConfirmUpdateCompleteness=Update completeness values +headingContactData=Contact data +headingContactsArchived=Contacts archived +headingContactsDearchived=Contacts de-archived +headingConfirmEnabling=Confirm enabling +headingConfirmDisabling=Confirm disabling +headingUnderFollowUp=Under Follow-up +headingContactInformation=Contact information +headingContactMap=Contact Map +headingContactsDeleted=Contacts deleted +headingContactsNotDeleted=None of the contacts were deleted +headingContactsNotLinked=None of the contacts were linked +headingCasesNotLinked=None of the cases were linked +headingContactsNotRestored== None of the contacts were restored +headingCreateAdditionalTest=Create new additional test results +headingCreateEntry=Create entry +headingCreateNewAction=Create new action +headingCreateNewAggregateReport=Create a new aggregated report +headingCreateNewCampaign=Create new campaign +headingCreateNewCase=Create new case +headingCreateNewCaseIssue=Case creation issue +headingCreateNewClinicalVisit=Create new clinical assessment +headingCreateNewContact=Create new contact +headingCreateNewContactIssue=Contact creation issue +headingSearchSample=Sample search issue headingCreateNewTravelEntry=Create new travel entry -headingCreateNewEnvironment = Create new environment -headingCreateNewEvent = Create new event -headingCreateNewEventParticipant = Add new event participant -headingCreateNewEventGroup = Create new event group -headingCreateNewFacility = Create new facility -headingCreateNewImmunization = Create new immunization -headingCreateNewPerson = Create new person -headingCreateNewPrescription = Create new prescription -headingCreateNewSample = Create new sample -headingCreateNewSurvey = Create new survey -headingCreateNewTask = Create new task -headingCreateNewTaskQuestion = Create new task? -headingCreateNewTreatment = Create new treatment -headingCreateNewUser = Create new user -headingCreateNewUserRole = Create new user role -headingCreateNewVisit = Create new visit -headingCreateNewEnvironmentSample = Create new environment sample -headingCreatePathogenTestResult = Create new pathogen test result -headingDatabaseExportFailed = Database export failed -headingDearchiveCampaign = De-Archive campaign -headingDearchiveCase = De-Archive case -headingDearchiveContact = De-Archive contact -headingDearchiveEnvironment = De-Archive environment -headingDearchiveEvent = De-Archive event -headingDearchiveEventParticipant = De-Archive event participant -headingDearchiveEventGroup = De-Archive event group -headingDearchiveImmunization = De-Archive immunization -headingDearchiveAdverseEvent = De-Archive adverse event -headingDearchiveAdverseEventInvestigation = De-Archive adverse event investigation -headingDearchiveTravelEntry = De-Archive travel entry -headingDefineOutbreakDistricts = Define which districts currently are affected by an outbreak. -headingDeleteConfirmation = Confirm deletion -headingRestoreConfirmation = Confirm restoration -headingDoseCount = Dose Count -headingDownloadDocumentTemplateGuide = Download the SORMAS Document Template Guide -headingDownloadEmailTemplateGuide = Download the SORMAS Email Template Guide -headingDownloadImportTemplate = Download the Import Template -headingDownloadErrorReport = Download Error Report -headingDownloadImportGuide = Download the SORMAS Import Guide and Data Dictionary -headingEditAction = Edit action -headingEditAdditionalTest = Edit additional test results -headingEditAggregateReport = Edit aggregated report -headingEditAssignee = Edit assignee -headingEditCampaign = Edit campaign -headingEditCases = Edit cases -headingEditClinicalVisit = Edit clinical assessment -headingEditContacts = Edit contacts -headingEditEventParticipant = Edit person -headingEditEvents = Edit events -headingEditPathogenTestResult = Edit pathogen test result -headingEditPrescription = Edit prescription -headingEditTask = Edit task -headingEditTreatment = Edit treatment -headingEditUser = Edit user -headingEditVaccination = Edit vaccination -headingEditVisit = Edit visit -headingEditCountry = Edit country -headingEditContinent = Edit continent -headingEditSample = Edit sample -headingEditSubcontinent = Edit subcontinent -headingEntitiesNotArchived = None of the entities were archived -headingEntitiesNotDearchived = None of the entities were dearchived -headingEntitiesNotEdited = None of the entities were edited -headingEntitiesNotSent = None of the entities were sent -headingEnvironmentalExposure = Environmental Exposure -headingEpiCurve = Epidemiological Curve -headingErrorReportNotAvailable = Error report not available -headingEventData = Event data -headingEventGroupData = Event group data -headingEventParticipantsDeleted = Event participants deleted -headingEventParticipantsNotDeleted = None of the event participants were deleted -headingEventParticipantsNotRestored = None of the event participants were restored -headingEventParticipantResponsibleJurisdictionUpdated = Event participant jurisdiction update -headingEventJurisdictionUpdated = Event jurisdiction update -headingEventsDeleted = Events deleted -headingEventsNotLinked = None of the events were linked -headingEventsNotDeleted = None of the events were deleted -headingEventsNotRestored = None of the events were restored -headingExportFailed = Export failed +headingCreateNewEnvironment=Create new environment +headingCreateNewEvent=Create new event +headingCreateNewEventParticipant=Add new event participant +headingCreateNewEventGroup=Create new event group +headingCreateNewFacility=Create new facility +headingCreateNewImmunization=Create new immunization +headingCreateNewPerson=Create new person +headingCreateNewPrescription=Create new prescription +headingCreateNewSample=Create new sample +headingCreateNewSurvey=Create new survey +headingCreateNewTask=Create new task +headingCreateNewTaskQuestion=Create new task? +headingCreateNewTreatment=Create new treatment +headingCreateNewUser=Create new user +headingCreateNewUserRole=Create new user role +headingCreateNewVisit=Create new visit +headingCreateNewEnvironmentSample=Create new environment sample +headingCreatePathogenTestResult=Create new pathogen test result +headingDatabaseExportFailed=Database export failed +headingDearchiveCampaign=De-Archive campaign +headingDearchiveCase=De-Archive case +headingDearchiveContact=De-Archive contact +headingDearchiveEnvironment=De-Archive environment +headingDearchiveEvent=De-Archive event +headingDearchiveEventParticipant=De-Archive event participant +headingDearchiveEventGroup=De-Archive event group +headingDearchiveImmunization=De-Archive immunization +headingDearchiveAdverseEvent=De-Archive adverse event +headingDearchiveAdverseEventInvestigation=De-Archive adverse event investigation +headingDearchiveTravelEntry=De-Archive travel entry +headingDefineOutbreakDistricts=Define which districts currently are affected by an outbreak. +headingDeleteConfirmation=Confirm deletion +headingRestoreConfirmation=Confirm restoration +headingDoseCount=Dose Count +headingDownloadDocumentTemplateGuide=Download the SORMAS Document Template Guide +headingDownloadEmailTemplateGuide=Download the SORMAS Email Template Guide +headingDownloadImportTemplate=Download the Import Template +headingDownloadErrorReport=Download Error Report +headingDownloadImportGuide=Download the SORMAS Import Guide and Data Dictionary +headingEditAction=Edit action +headingEditAdditionalTest=Edit additional test results +headingEditAggregateReport=Edit aggregated report +headingEditAssignee=Edit assignee +headingEditCampaign=Edit campaign +headingEditCases=Edit cases +headingEditClinicalVisit=Edit clinical assessment +headingEditContacts=Edit contacts +headingEditEventParticipant=Edit person +headingEditEvents=Edit events +headingEditPathogenTestResult=Edit pathogen test result +headingEditPrescription=Edit prescription +headingEditTask=Edit task +headingEditTreatment=Edit treatment +headingEditUser=Edit user +headingEditVaccination=Edit vaccination +headingEditVisit=Edit visit +headingEditCountry=Edit country +headingEditContinent=Edit continent +headingEditSample=Edit sample +headingEditSubcontinent=Edit subcontinent +headingEntitiesNotArchived=None of the entities were archived +headingEntitiesNotDearchived=None of the entities were dearchived +headingEntitiesNotEdited=None of the entities were edited +headingEntitiesNotSent=None of the entities were sent +headingEnvironmentalExposure=Environmental Exposure +headingEpiCurve=Epidemiological Curve +headingErrorReportNotAvailable=Error report not available +headingEventData=Event data +headingEventGroupData=Event group data +headingEventParticipantsDeleted=Event participants deleted +headingEventParticipantsNotDeleted=None of the event participants were deleted +headingEventParticipantsNotRestored=None of the event participants were restored +headingEventParticipantResponsibleJurisdictionUpdated=Event participant jurisdiction update +headingEventJurisdictionUpdated=Event jurisdiction update +headingEventsDeleted=Events deleted +headingEventsNotLinked=None of the events were linked +headingEventsNotDeleted=None of the events were deleted +headingEventsNotRestored=None of the events were restored +headingExportFailed=Export failed headingFatalities=Fatalities -headingFileExists = Duplicate File -headingFilters = Filters -headingStoppedFollowUp = Stopped Follow-up -headingFollowUpStatus = Follow-up status -headingHealthConditions = Pre-existing conditions -headingHospitalization = Current Hospitalization -headingProphylaxisLoc = Prophylaxis Details -headingPreviousHospitalizations = Previous Hospitalizations -headingImportCaseContacts = Import Case Contacts -headingImportCases = Import Cases -headingImportCommunities = Import Communities -headingImportContacts = Import Contacts -headingImportCampaign = Import campaign form data -headingImportCsvFile = Import CSV File -headingImportDistricts = Import Districts -headingImportError = Import error -headingImportEvent = Import events -headingImportEventParticipant = Import event participants -headingImportedCaseInfo = Imported Case Information -headingImportedPersonInfo = Imported Person Information -headingImportFailed = Import failed -headingImportFacilities = Import Facilities -headingImportPointsOfEntry = Import Points of Entry -headingImportPopulationData = Import Population Data -headingImportContinents = Import Continents -headingImportSubcontinents = Import subcontinents -headingImportCountries = Import Countries -headingImportAllCountries = Import Default Countries -headingImportAllContinents = Import Default Continents -headingImportAllSubcontinents = Import Default Subcontinents -headingImportAreas = Import Areas -headingImmunizationSelection = Immunization Selection -headingImportRegions= Import Regions -headingImportTravelEntries = Import Travel Entries -headingImportEnvironments = Import Environments -headingImportSelfReports = Import Self Reports -headingIncorrectDateRange = Incorrect date range -headingInformationSource = Source of Information -headingInfrastructureLocked = Infrastructure locked -headingIntroduction = Introduction -headingLaboratorySample = Laboratory sample +headingFileExists=Duplicate File +headingFilters=Filters +headingStoppedFollowUp=Stopped Follow-up +headingFollowUpStatus=Follow-up status +headingHealthConditions=Pre-existing conditions +headingHospitalization=Current Hospitalization +headingProphylaxisLoc=Prophylaxis Details +headingPreviousHospitalizations=Previous Hospitalizations +headingImportCaseContacts=Import Case Contacts +headingImportCases=Import Cases +headingImportCommunities=Import Communities +headingImportContacts=Import Contacts +headingImportCampaign=Import campaign form data +headingImportCsvFile=Import CSV File +headingImportDistricts=Import Districts +headingImportError=Import error +headingImportEvent=Import events +headingImportEventParticipant=Import event participants +headingImportedCaseInfo=Imported Case Information +headingImportedPersonInfo=Imported Person Information +headingImportFailed=Import failed +headingImportFacilities=Import Facilities +headingImportPointsOfEntry=Import Points of Entry +headingImportPopulationData=Import Population Data +headingImportContinents=Import Continents +headingImportSubcontinents=Import subcontinents +headingImportCountries=Import Countries +headingImportAllCountries=Import Default Countries +headingImportAllContinents=Import Default Continents +headingImportAllSubcontinents=Import Default Subcontinents +headingImportAreas=Import Areas +headingImmunizationSelection=Immunization Selection +headingImportRegions=Import Regions +headingImportTravelEntries=Import Travel Entries +headingImportEnvironments=Import Environments +headingImportSelfReports=Import Self Reports +headingIncorrectDateRange=Incorrect date range +headingInformationSource=Source of Information +headingInfrastructureLocked=Infrastructure locked +headingIntroduction=Introduction +headingLaboratorySample=Laboratory sample headingLastReportedDistrict=Last reported district -headingLineListing = Line listing -headingLineListingImport = Line listing import -headingLocation = Location -headingLoginFailed = Login failed -headingMaternalHistory = Maternal history -headingMedicalInformation = Additional medical information -headingMissingDateFilter = Missing date filter +headingLineListing=Line listing +headingLineListingImport=Line listing import +headingLocation=Location +headingLoginFailed=Login failed +headingMaternalHistory=Maternal history +headingMedicalInformation=Additional medical information +headingMissingDateFilter=Missing date filter externalMessageMultipleSampleReports=Multiple samples -headingMyTasks = My Tasks -headingNewAccount = New account -headingNewCases = New Cases -headingNewEvents = New Events -headingNewPassword = New password -headingNewTestResults = New Test Results -headingNoCasesSelected = No cases selected -headingNoClinicalVisitsSelected = No clinical assessments selected -headingNoContactsSelected = No contacts selected -headingNoEnvironmentSelected = No environment selected -headingNoEventParticipantsSelected = No event participants selected -headingNoEventsSelected = No events selected -headingNoTravelEntriesSelected = No travel entries selected -headingNoImmunizationsSelected = No immunizations selected -headingNoFile = No file -headingNoPathogenTestsSelected = No pathogen tests selected -headingNoPrescriptionsSelected = No prescriptions selected -headingNoSamplesSelected = No samples selected -headingNoTasksSelected = No tasks selected -headingNoTreatmentsSelected = No treatments selected -headingNoVisitsSelected = No visits selected -headingNoUsersSelected = No users selected +headingMyTasks=My Tasks +headingNewAccount=New account +headingNewCases=New Cases +headingNewEvents=New Events +headingNewPassword=New password +headingNewTestResults=New Test Results +headingNoCasesSelected=No cases selected +headingNoClinicalVisitsSelected=No clinical assessments selected +headingNoContactsSelected=No contacts selected +headingNoEnvironmentSelected=No environment selected +headingNoEventParticipantsSelected=No event participants selected +headingNoEventsSelected=No events selected +headingNoTravelEntriesSelected=No travel entries selected +headingNoImmunizationsSelected=No immunizations selected +headingNoFile=No file +headingNoPathogenTestsSelected=No pathogen tests selected +headingNoPrescriptionsSelected=No prescriptions selected +headingNoSamplesSelected=No samples selected +headingNoTasksSelected=No tasks selected +headingNoTreatmentsSelected=No treatments selected +headingNoVisitsSelected=No visits selected +headingNoUsersSelected=No users selected headingOutbreakDistricts=Outbreak Districts -headingOutbreakIn = Outbreak in -headingPathogenTestsDeleted = Pathogen tests deleted -headingPaperFormDates = Reception dates of paper form -headingPersonData = Person data -headingPersonInformation = Person information -headingPersonOccupation = Occupation & education -headingPerinatalDetails = Perinatal details -headingPickEventGroup = Pick event group -headingPickEventParticipants = Pick or merge event participants -headingPickEventParticipantsIncompleteSelection = Incomplete selection -headingPickOrCreateCase = Pick or Create a Case -headingPickOrCreatePerson = Pick or create person -headingMergePersonError = Merge person error -headingMergeDuplicateEventParticipantSamePersonSameEvent = Duplicate event participants found -headingPickOrMergePerson = Pick or merge person -headingPickOrMergePersonConfirmation = Pick or merge person confirmation -headingSelectPerson = Select person -headingPickOrCreateEvent = Pick or create event -headingPickOrCreateEventGroup = Pick or create event group -headingPickOrCreateEntry = Pick or create entry -headingPickOrCreateImmunization = Pick or create immunization -headingPickOrCreatePathogenTest = Pick or create pathogen test -headingPickOrCreateSample = Pick or create sample -headingPickOrCreateEnvironment = Pick or create environment -headingPointOfEntryInformation = Point of entry information -headingPrescriptionsDeleted = Prescriptions deleted -headingRecovery = Recovery -headingReferSample = Refer sample to another laboratory -headingRequestedAdditionalTests = Requested additional tests: -headingRequestedPathogenTests = Requested pathogen tests: +headingOutbreakIn=Outbreak in +headingPathogenTestsDeleted=Pathogen tests deleted +headingPaperFormDates=Reception dates of paper form +headingPersonData=Person data +headingPersonInformation=Person information +headingPersonOccupation=Occupation & education +headingPerinatalDetails=Perinatal details +headingPickEventGroup=Pick event group +headingPickEventParticipants=Pick or merge event participants +headingPickEventParticipantsIncompleteSelection=Incomplete selection +headingPickOrCreateCase=Pick or Create a Case +headingPickOrCreatePerson=Pick or create person +headingMergePersonError=Merge person error +headingMergeDuplicateEventParticipantSamePersonSameEvent=Duplicate event participants found +headingPickOrMergePerson=Pick or merge person +headingPickOrMergePersonConfirmation=Pick or merge person confirmation +headingSelectPerson=Select person +headingPickOrCreateEvent=Pick or create event +headingPickOrCreateEventGroup=Pick or create event group +headingPickOrCreateEntry=Pick or create entry +headingPickOrCreateImmunization=Pick or create immunization +headingPickOrCreatePathogenTest=Pick or create pathogen test +headingPickOrCreateSample=Pick or create sample +headingPickOrCreateEnvironment=Pick or create environment +headingPointOfEntryInformation=Point of entry information +headingPrescriptionsDeleted=Prescriptions deleted +headingRecovery=Recovery +headingReferSample=Refer sample to another laboratory +headingRequestedAdditionalTests=Requested additional tests: +headingRequestedPathogenTests=Requested pathogen tests: headingResponsibleJurisdiction=Responsible jurisdiction -headingResults = Results -headingSamplesDeleted = Samples deleted -headingSamplesNotDeleted = None of the samples were deleted -headingSamplesNotRestored = None of the samples were restored -headingSaveNotification = Save notification +headingResults=Results +headingSamplesDeleted=Samples deleted +headingSamplesNotDeleted=None of the samples were deleted +headingSamplesNotRestored=None of the samples were restored +headingSaveNotification=Save notification headingSecurityAlert=Security Alert -headingSelectCampaign = Select a campaign -headingSetOutbreakStatus = Set status of all districts: -headingShowExternalMessage = Message -headingSelfReportSideComponent = Self reports -headingSignsAndSymptoms = Clinical Signs and Symptoms -headingSimilarImmunization = Similar immunizaton -headingSimilarPerson = There are other persons with similar national health Id -headingSyncUsers = Sync Users -headingTasksDeleted = Tasks deleted -headingTasksNotDeleted = None of the tasks were deleted -headingTemplateNotAvailable = Template not available -headingTests = Pathogen tests -headingTransferCase = Transfer case -headingTravelEntryData = Travel entry data -headingTravelEntriesDeleted = Travel entries deleted -headingTravelEntriesNotDeleted = None of the travel entries were deleted -headingTravelEntriesNotRestored = None of the travel entries were restored -headingReferCaseFromPointOfEntry = Refer case from point of entry -headingTreatments = Executed treatments -headingTreatmentsDeleted = Treatments deleted -headingUpdatePassword = Update password -headingUploadSuccess = Upload Successful -headingUserData = User data -headingVaccination = Vaccination -headingViewNotFound = The view could not be found -headingViewPathogenTestResult = View pathogen test result -headingViewPrescription = View prescription -headingViewAdditionalTest = View additional test results -headingViewClinicalVisit = View clinical assessment -headingViewSurveillanceReport = Report view -headingViewTask = View task -headingViewTreatment = View treatment -headingViewVaccination = View vaccination -headingViewVisit = View visit -headingVisits = Visits -headingVisitsDeleted = Visits deleted -headingVisitsNotCancelled= None of the follow-up visits were cancelled -headingVisitsNotDeleted = None of the visits were deleted -headingVisitsNotSetToLost= None of the follow-up visits were set to lost -headingVisualization = Visualization -headingWrongFileType = Wrong file type -headingWaterUse = Use of water -headingMissingEpiWeekFilter = Missing epi week filter -headingMergeGuide = Guide: Merging Duplicate Cases -headingContactMergeGuide = Guide: Merging Duplicate Contacts +headingSelectCampaign=Select a campaign +headingSetOutbreakStatus=Set status of all districts: +headingShowExternalMessage=Message +headingSurveyResponseDetails=Survey Response Details +headingSurveyResponseFailures=Processing Failures +headingSurveyResponseCorrectAndReprocess=Correct Survey Response Failures +messageSurveyResponseAllFieldsApplied=All fields were applied successfully. +messageSurveyResponseNotYetProcessed=Survey response has not been processed yet. +messageSurveyResponseReprocessed=Survey response has been reprocessed. +headingSelfReportSideComponent=Self reports +headingSignsAndSymptoms=Clinical Signs and Symptoms +headingSimilarImmunization=Similar immunizaton +headingSimilarPerson=There are other persons with similar national health Id +headingSyncUsers=Sync Users +headingTasksDeleted=Tasks deleted +headingTasksNotDeleted=None of the tasks were deleted +headingTemplateNotAvailable=Template not available +headingTests=Pathogen tests +headingTransferCase=Transfer case +headingTravelEntryData=Travel entry data +headingTravelEntriesDeleted=Travel entries deleted +headingTravelEntriesNotDeleted=None of the travel entries were deleted +headingTravelEntriesNotRestored=None of the travel entries were restored +headingReferCaseFromPointOfEntry=Refer case from point of entry +headingTreatments=Executed treatments +headingTreatmentsDeleted=Treatments deleted +headingUpdatePassword=Update password +headingUploadSuccess=Upload Successful +headingUserData=User data +headingVaccination=Vaccination +headingViewNotFound=The view could not be found +headingViewPathogenTestResult=View pathogen test result +headingViewPrescription=View prescription +headingViewAdditionalTest=View additional test results +headingViewClinicalVisit=View clinical assessment +headingViewSurveillanceReport=Report view +headingViewTask=View task +headingViewTreatment=View treatment +headingViewVaccination=View vaccination +headingViewVisit=View visit +headingVisits=Visits +headingVisitsDeleted=Visits deleted +headingVisitsNotCancelled=None of the follow-up visits were cancelled +headingVisitsNotDeleted=None of the visits were deleted +headingVisitsNotSetToLost=None of the follow-up visits were set to lost +headingVisualization=Visualization +headingWrongFileType=Wrong file type +headingWaterUse=Use of water +headingMissingEpiWeekFilter=Missing epi week filter +headingMergeGuide=Guide: Merging Duplicate Cases +headingContactMergeGuide=Guide: Merging Duplicate Contacts # %d: 1 or 2; %s: Person name -headingComparisonCase = Case %d: %s -headingCaseComparison = Case Comparison -headingConfirmChoice = Confirm Your Choice -headingHowToMergeCases = How to Merge Cases -headingHowToMergeContacts = How to Merge Contacts -headingExplanationOfTerms = Explanation of Terms -headingCompleteness = Completeness -headingDataImport = Data import -headingDisableLineListing = Disable Line Listing? -headingEditLineListing = Edit Line Listing -headingInvalidDateEntered = Invalid Date Entered -headingDearchivingNotPossible = De-archiving not possible -headingNoRowsSelected = No rows selected -headingUserSettings = User Settings -headingContactsPerCase = Contacts per Case -headingQuarantineForCases = Quarantine data for cases -headingCasesResultingFromContacts = Cases resulting from contacts -headingcasesWithReferenceDefinitionFulfilled = Cases with reference definition fulfilled -headingCasesInQuarantine = Cases in Quarantine -headingCasesPlacedInQuarantine = Cases placed in Quarantine -headingCasesRestored = Cases restored -headingContactsRestored = Contacts restored -headingEventsRestored = Events restored -headingEventParticipantsRestored = Event participants restored -headingImmunizationsDeleted = Immunizations deleted -headingImmunizationsNotDeleted = None of the immunizations were deleted -headingImmunizationsNotRestored = None of the immunizations were restored -headingImmunizationsRestored = Immunizations restored -headingSamplesRestored = Samples restored -headingTravelEntriesRestored = Travel entries restored -headingContactsInQuarantine = Contacts in Quarantine -headingContactsPlacedInQuarantine = Contacts placed in Quarantine -headingContactsCancelFollowUp = Confirm canceling follow-up for contacts -headingContactsLostToFollowUp = Confirm setting contacts to lost to follow-up -headingPickOrCreateContact = Pick or create contact -headingNewSourceCases = New Cases not Previously Known to Be Contacts -headingNoCaseFound = No case found -headingNoEventFound = No event found -headingEventNotDeleted = Event not deleted -headingSomeCasesNotRestored = Some cases were not restored -headingSomeContactsNotRestored = Some contacts were not restored -headingSomeEntitiesNotArchived= Some entities were not archived -headingSomeEntitiesNotDearchived = Some entities were not dearchived -headingSomeEntitiesNotDeleted= Some entities were not deleted -headingSomeEntitiesNotEdited = Some entities were not edited -headingSomeEnvironmentSamplesNotRestored = Some environment samples were not restored -headingSomeEventParticipantsNotRestored = Some event participants were not restored -headingSomeEventsNotLinked = Some events were not linked -headingSomeEventsNotRestored = Some events were not restored -headingSomeImmunizationsNotRestored = Some immunizations were not restored -headingSomeSamplesNotRestored = Some samples were not restored -headingSomeTravelEntriesNotRestored = Some travel entries were not restored -headingSomeUsersNotDisabled = Some users were not disabled -headingSomeUsersNotEnabled= Some users were not enabled -headingSomeVisitsNotCancelled= Some follow-up visits were not cancelled -headingSomeVisitsNotSetToLost= Some follow-up visits were not set to lost -headingContactConfirmationRequired = Contact confirmation required -headingContactConversionFollowUpCommentLarge = Follow up comment will exceed the max characters allowed -headingSelectSourceCase = Select Source Case -headingRemoveCaseFromContact = Remove Case from Contact -headingStatusDetermination = Status Determination -headingDiscardUnsavedChanges = Discard Unsaved Changes -headingGenerateCases = Generate Cases -headingGenerateContacts = Generate Contacts -headingContactDataNotComplete = Contact data is not complete -headingSymptomJournalAccountCreation = PIA -headingSaveUser = Save User -headingCreateCampaignDataForm = New %s -headingExtendQuarantine = Extend quarantine -headingReduceQuarantine = Reduce quarantine -headingAdjustQuarantine = Adjust quarantine -headingExtendFollowUp = Extend follow-up period -headingExposureInvestigation = Exposure Investigation -headingEpiDataSourceCaseContacts = Contacts with Source Case -headingExposureDetails = Exposure Details -headingEpiConclusion = Conclusion -headingClusterType = Cluster Type -headingAnimalContactDetails = Animal Contact Details -headingBurialDetails = Burial Details -headingCampaignFormDataDuplicateNew = New Campaign Form Data -headingCampaignFormDataDuplicateExisting = Existing Campaign Form Data -headingCampaignFormDataAlreadyExisting = Campaign Form Data Already Existing -headingActivityAsCaseDetails = Activity as Case Details -headingUnlinkCaseFromEvent = Unlink case from event -headingUnlinkEventFromEnvironment = Unlink event from environment -headingUnlinkEnvironmentFromEvent = Unlink environment from event -headingUpdatePersonContactDetails = Update existing person contact details -headingEventGroupLinkEventIssue = Issue while linking events to event group -headingEventGroupUnlinkEventIssue = Issue while unlinking events to event group -headingExportUserRightsFailed = Export user rights failed -headingExternalMessageDownload = Download message -headingNoExternalMessagesSelected = No messages selected -headingExternalMessagesDeleted = Messages deleted -headingExternalMessagesNotDeleted = None of the external messages were deleted -headingExternalMessageCorrection = Correction message -headingExternalMessageProcessSample = Process sample and test reports -headingExternalMessageSampleInformation = Sample information -headingExternalMessageExistingPathogenTests = Existing pathogen tests -headingExternalMessageNewPathogenTests = New pathogen tests -headingFetchExternalMessages = Fetch new messages -headingCaution = Caution -headingUnavailableTaskEdition = Unavailable task edition -headingUsersNotDisabled = None of the users were disabled -headingUsersNotEnabled = None of the users were enabled -headingDeleteVaccinations = Remove immunization vaccinations -headingDocumentCreated = Document created +headingComparisonCase=Case %d: %s +headingCaseComparison=Case Comparison +headingConfirmChoice=Confirm Your Choice +headingHowToMergeCases=How to Merge Cases +headingHowToMergeContacts=How to Merge Contacts +headingExplanationOfTerms=Explanation of Terms +headingCompleteness=Completeness +headingDataImport=Data import +headingDisableLineListing=Disable Line Listing? +headingEditLineListing=Edit Line Listing +headingInvalidDateEntered=Invalid Date Entered +headingDearchivingNotPossible=De-archiving not possible +headingNoRowsSelected=No rows selected +headingUserSettings=User Settings +headingContactsPerCase=Contacts per Case +headingQuarantineForCases=Quarantine data for cases +headingCasesResultingFromContacts=Cases resulting from contacts +headingcasesWithReferenceDefinitionFulfilled=Cases with reference definition fulfilled +headingCasesInQuarantine=Cases in Quarantine +headingCasesPlacedInQuarantine=Cases placed in Quarantine +headingCasesRestored=Cases restored +headingContactsRestored=Contacts restored +headingEventsRestored=Events restored +headingEventParticipantsRestored=Event participants restored +headingImmunizationsDeleted=Immunizations deleted +headingImmunizationsNotDeleted=None of the immunizations were deleted +headingImmunizationsNotRestored=None of the immunizations were restored +headingImmunizationsRestored=Immunizations restored +headingSamplesRestored=Samples restored +headingTravelEntriesRestored=Travel entries restored +headingContactsInQuarantine=Contacts in Quarantine +headingContactsPlacedInQuarantine=Contacts placed in Quarantine +headingContactsCancelFollowUp=Confirm canceling follow-up for contacts +headingContactsLostToFollowUp=Confirm setting contacts to lost to follow-up +headingPickOrCreateContact=Pick or create contact +headingNewSourceCases=New Cases not Previously Known to Be Contacts +headingNoCaseFound=No case found +headingNoEventFound=No event found +headingEventNotDeleted=Event not deleted +headingSomeCasesNotRestored=Some cases were not restored +headingSomeContactsNotRestored=Some contacts were not restored +headingSomeEntitiesNotArchived=Some entities were not archived +headingSomeEntitiesNotDearchived=Some entities were not dearchived +headingSomeEntitiesNotDeleted=Some entities were not deleted +headingSomeEntitiesNotEdited=Some entities were not edited +headingSomeEnvironmentSamplesNotRestored=Some environment samples were not restored +headingSomeEventParticipantsNotRestored=Some event participants were not restored +headingSomeEventsNotLinked=Some events were not linked +headingSomeEventsNotRestored=Some events were not restored +headingSomeImmunizationsNotRestored=Some immunizations were not restored +headingSomeSamplesNotRestored=Some samples were not restored +headingSomeTravelEntriesNotRestored=Some travel entries were not restored +headingSomeUsersNotDisabled=Some users were not disabled +headingSomeUsersNotEnabled=Some users were not enabled +headingSomeVisitsNotCancelled=Some follow-up visits were not cancelled +headingSomeVisitsNotSetToLost=Some follow-up visits were not set to lost +headingContactConfirmationRequired=Contact confirmation required +headingContactConversionFollowUpCommentLarge=Follow up comment will exceed the max characters allowed +headingSelectSourceCase=Select Source Case +headingRemoveCaseFromContact=Remove Case from Contact +headingStatusDetermination=Status Determination +headingDiscardUnsavedChanges=Discard Unsaved Changes +headingGenerateCases=Generate Cases +headingGenerateContacts=Generate Contacts +headingContactDataNotComplete=Contact data is not complete +headingSymptomJournalAccountCreation=PIA +headingSaveUser=Save User +headingCreateCampaignDataForm=New %s +headingExtendQuarantine=Extend quarantine +headingReduceQuarantine=Reduce quarantine +headingAdjustQuarantine=Adjust quarantine +headingExtendFollowUp=Extend follow-up period +headingExposureInvestigation=Exposure Investigation +headingEpiDataSourceCaseContacts=Contacts with Source Case +headingExposureDetails=Exposure Details +headingEpiConclusion=Conclusion +headingClusterType=Cluster Type +headingAnimalContactDetails=Animal Contact Details +headingBurialDetails=Burial Details +headingCampaignFormDataDuplicateNew=New Campaign Form Data +headingCampaignFormDataDuplicateExisting=Existing Campaign Form Data +headingCampaignFormDataAlreadyExisting=Campaign Form Data Already Existing +headingActivityAsCaseDetails=Activity as Case Details +headingUnlinkCaseFromEvent=Unlink case from event +headingUnlinkEventFromEnvironment=Unlink event from environment +headingUnlinkEnvironmentFromEvent=Unlink environment from event +headingUpdatePersonContactDetails=Update existing person contact details +headingEventGroupLinkEventIssue=Issue while linking events to event group +headingEventGroupUnlinkEventIssue=Issue while unlinking events to event group +headingExportUserRightsFailed=Export user rights failed +headingExternalMessageDownload=Download message +headingNoExternalMessagesSelected=No messages selected +headingExternalMessagesDeleted=Messages deleted +headingExternalMessagesNotDeleted=None of the external messages were deleted +headingExternalMessageCorrection=Correction message +headingExternalMessageProcessSample=Process sample and test reports +headingExternalMessageSampleInformation=Sample information +headingExternalMessageExistingPathogenTests=Existing pathogen tests +headingExternalMessageNewPathogenTests=New pathogen tests +headingFetchExternalMessages=Fetch new messages +headingCaution=Caution +headingUnavailableTaskEdition=Unavailable task edition +headingUsersNotDisabled=None of the users were disabled +headingUsersNotEnabled=None of the users were enabled +headingDeleteVaccinations=Remove immunization vaccinations +headingDocumentCreated=Document created headingConfirmUnclearLabMessage=Confirm unclear headingConfirmManuallyForwardedLabMessage=Confirm forwarded headingUpdateCaseWithNewDiseaseVariant=Update case disease variant @@ -870,8 +868,8 @@ headingRejectSormasToSormasShareRequest=Reject share request headingRevokeSormasToSormasShareRequest=Revoke share request headingSormasToSormasCantShareContactWithoutCase=Can not share contact headingSormasToSormasCanAcceptContactsWithoutCase=Can not accept contact(s) -headingSormasToSormasDuplicateDetection = Potential duplicates detected -headingSormasToSormasShareRequestNotFound = Share request not found +headingSormasToSormasDuplicateDetection=Potential duplicates detected +headingSormasToSormasShareRequestNotFound=Share request not found headingShareRequestDetails=Share request details headingShareRequestCases=Cases headingShareRequestContacts=Contacts @@ -879,41 +877,41 @@ headingShareRequestEvents=Events headingShareRequestEventParticipants=Event participants headingCaseResponsibleJurisidction=Responsible jurisdiction headingSeeAllPersons=See persons for all association types -headingPlaceOfStayInHospital = Place of stay in hospital -headingCurrentHospitalization = Current hospitalization -headingCorrectPerson = Correct person data -headingPreviousPersonInformation = Previous person information -headingUpdatedPersonInformation = Updated person information -headingCorrectSample = Correct sample data -headingPreviousSampleInformation = Previous sample information -headingUpdatedSampleInformation = Updated sample information -headingCorrectPathogenTest = Correct pathogent test data -headingPreviousPathogenTestInformation = Previous pathogen test information -headingUpdatedPathogenTestInformation = Updated pathogen test information -headingLabMessageCorrectionThrough = No more changes found -headingDeleteContacts = Delete contacts -headingProcessPhysiciansReport = Process message -headingDeleteUserRoleNotPossible = Cannot delete user role -headingSaveUserNotPossible = Cannot save user -immunizationVaccinationHeading = Vaccination -immunizationRecoveryHeading = Recovery -headingAutomaticDeletionStarted = Automatic deletion started -headingBulkOperationProgress = Bulk operation progress -headingBulkEmailWrongFileType = Allowed file types in attachments -headingBulkEmailMaxAttachedFiles = Maximum allowed number of attached files -headingSomeContactsAlreadyInEvent = Some contacts are already linked -headingSomeCasesAlreadyInEvent = Some cases are already linked -headingEnvironmentJurisdictionUpdated = Environment location update -headingNoEnvironmentSamplesSelected = No environment samples selected -headingEnvironmentSamplesDeleted = Environment samples deleted -headingEnvironmentSamplesNotDeleted = None of the environment samples were deleted -headingEnvironmentSamplesNotRestored = None of the environment samples were restored -headingEnvironmentSamplesRestored = Environment samples restored -headingLaboratoryEnvironmentSample = Laboratory sample -headingEnvironmentSampleMeasurements = Sample measurements -headingEnvironmentSampleLocation = Location of sampling site -headingEnvironmentSampleManagement = Sample management -headingEnvironmentSampleRequestedPathogenTests = Requested pathogens to be tested +headingPlaceOfStayInHospital=Place of stay in hospital +headingCurrentHospitalization=Current hospitalization +headingCorrectPerson=Correct person data +headingPreviousPersonInformation=Previous person information +headingUpdatedPersonInformation=Updated person information +headingCorrectSample=Correct sample data +headingPreviousSampleInformation=Previous sample information +headingUpdatedSampleInformation=Updated sample information +headingCorrectPathogenTest=Correct pathogent test data +headingPreviousPathogenTestInformation=Previous pathogen test information +headingUpdatedPathogenTestInformation=Updated pathogen test information +headingLabMessageCorrectionThrough=No more changes found +headingDeleteContacts=Delete contacts +headingProcessPhysiciansReport=Process message +headingDeleteUserRoleNotPossible=Cannot delete user role +headingSaveUserNotPossible=Cannot save user +immunizationVaccinationHeading=Vaccination +immunizationRecoveryHeading=Recovery +headingAutomaticDeletionStarted=Automatic deletion started +headingBulkOperationProgress=Bulk operation progress +headingBulkEmailWrongFileType=Allowed file types in attachments +headingBulkEmailMaxAttachedFiles=Maximum allowed number of attached files +headingSomeContactsAlreadyInEvent=Some contacts are already linked +headingSomeCasesAlreadyInEvent=Some cases are already linked +headingEnvironmentJurisdictionUpdated=Environment location update +headingNoEnvironmentSamplesSelected=No environment samples selected +headingEnvironmentSamplesDeleted=Environment samples deleted +headingEnvironmentSamplesNotDeleted=None of the environment samples were deleted +headingEnvironmentSamplesNotRestored=None of the environment samples were restored +headingEnvironmentSamplesRestored=Environment samples restored +headingLaboratoryEnvironmentSample=Laboratory sample +headingEnvironmentSampleMeasurements=Sample measurements +headingEnvironmentSampleLocation=Location of sampling site +headingEnvironmentSampleManagement=Sample management +headingEnvironmentSampleRequestedPathogenTests=Requested pathogens to be tested headingLimitedDiseases=Disease restrictions headingExternalEmailSend=Send email headingExternalEmailDetails=Email details @@ -938,232 +936,231 @@ headingCaseSurveyDetails=Survey details headingSurveyGenerateDocument=Generate document headingSurveySendDocument=Send document headingErrorSendingExternalEmail=Error sending email -headingImportSurveyTokens = Import Survey Tokens -headingImportSurveyTokenResponses = Import Survey Token Responses -headingDrugSusceptibility = Drug Susceptibility -headingDiagnosisCriteria = Diagnosis Criteria -subheadingDiagnosisCriteria = Note: Diagnosis criteria information is gotten from pathogen testing details +headingImportSurveyTokens=Import Survey Tokens +headingImportSurveyTokenResponses=Import Survey Token Responses +headingDrugSusceptibility=Drug Susceptibility +headingDiagnosisCriteria=Diagnosis Criteria +subheadingDiagnosisCriteria=Note: Diagnosis criteria information is gotten from pathogen testing details headingGisDashboardMap=Combined status map headingLocalisation=Localisation - # Info texts -infoActivityAsCaseInvestigation = Please document ALL relevant activities after infection: -infoAddTestsToSample = To add a test result to this sample, it has to be marked as received first. -infoArchivedCases = Cases are automatically archived after %d days without changes to the data. -infoArchivedContacts = Contacts are automatically archived after %d days without changes to the data. -infoArchivedEvents = Events are automatically archived after %d days without changes to the data. -infoArchivedEventParticipants = Event participants are automatically archived after %d days without changes to the data. -infoArchivedTravelEntries = Travel entries are automatically archived after %d days without changes to the data. -infoAssigneeMissingEmail = The user assigned to this task does not have an e-mail address provided, and will therefore not be notified. -infoObserverMissingEmail = At least one of the observers of this task does not have an e-mail address provided, and will therefore not be notified. -infoAssigneeMissingEmailOrPhoneNumber = The user assigned to this task does not have an e-mail address nor a phone number provided, and will therefore not be notified. -infoAutomaticDeletion = Deletion scheduled for %s -infoAutomaticDeletionTooltip = Deletion scheduled for %s

%s: %s
Deletion period: %s -infoAutomaticDeletionTooltipDays = %s days -infoAutomaticDeletionTooltipMonths = %s months -infoAutomaticDeletionTooltipYears = %s years -infoObserverMissingEmailOrPhoneNumber = At least one of the observers of this task does not have an e-mail address nor a phone number provided, and will therefore not be notified. -infoBasicExport = Export the columns and rows that are shown in the table below. -infoCanceledBy = Canceled by %s using bulk action -infoCaseDate = By default, cases are filtered by the most relevant date available:
  • Symptom onset date
  • Case report date
This means that, when a case e.g. has a symptom onset date, only this date will be taken into account when searching the list for cases in the specified date range. You can specify a date type in the dropdown menu to instead specifically filter by this date.

Example: Case A has been created this week and therefore has a report date that lies in this week as well. However, Case A also has a symptom onset date that is set to last week (because it has been entered retrospectively). By default, when \"Most relevant date\" is selected and you have set the filter to only display cases of this week, Case A will not appear in the list because its symptom onset date lies in the previous week. For the case to appear in the list, you need to select \"Case report date\" which will result in only the report date being considered when filtering the list. -infoCaseIncidence = "Case incidence proportion" means the number of cases per 100,000 inhabitants. You can check the map key to see the thresholds that define how the districts are colorized. -infoCaseMap = If cases are shown by home address and there are no GPS coordinates available for it, the coordinates of the location where the case has been reported are used instead. -infoCheckProbableInfectionEnvironment = This checkbox should be checked if you are sure that this exposure was the most probable infection environment for this case. Only one exposure can be marked as the probable infection environment at the same time, and that exposure will be transmitted to SurvNet. -infoContactDashboard = All Dashboard elements that display general information about contacts use the follow-up period of the respective contact, starting with the contact report date. -infoConvertToCaseContacts = There are %s additional %s contacts of this person that do not have a resulting case set. Do you want to set the case you have just created as the resulting case of some or all of these contacts as well? -infoConvertToCaseContactsAndEventParticipants = There are %s additional %s contacts and %s additional %s event participants of this person that do not have a resulting case set. Do you want to set the case you have just created as the resulting case of some or all of these contacts and event participants as well? -infoConvertToCaseEventParticipants = There are %s additional %s event participants of this person that do not have a resulting case set. Do you want to set the case you have just created as the resulting case of some or all of these event participants as well? -infoConvertToCaseSelect = Please select the contacts and event participants for which you want to set the created case as the resulting case. -infoCreateEntry = The database contains no entry that seems to be similar to the details of the lab message.

Select one of the options and click on the Confirm button to create a new entry for the person.

If you are unsure, you can discard this window and cancel the process. -infoDashboardIncidence = Thresholds are calculated using quartiles. -infoDatabaseExportTables = Please select the database tables you want to export. -infoDefineOutbreaks = Click on a button to define which districts of the region currently have an outbreak of a specific disease. -infoDetailedExport = Export the rows that are shown in the table below with an extended set of columns. This may take a while. -infoDeterminedVaccinationStatusExplanation = The vaccination status is automatically determined from immunization records at the time of the case report. -infoDeterminedVaccinationStatusReadOnly = This field is read-only because the determined vaccination status feature is enabled. The vaccination status is automatically computed from immunization data. -infoCaseManagementExport = Export the rows that are shown in the table below with a customized set of columns that are relevant for the case management process. This may take a while. -infoDisplayNetworkDiagram = Please maximize to view the disease transmission chains -infoDocumentAlreadyExists = A Document with filename "%s" already exists. Are you sure you want to upload? -infoDocumentAlreadyExistsCannotUploadAnotherOne = A Document with filename "%s" already exists. You cannot upload a second one with the same name. -infoDocumentOverride = A Document with filename "%s" already exists. Overwrite? -infoDontShareCheckboxAlreadyShared = Case was already shared. It can not be set to don't share with external reporting tool. -infoDoseCountFromNumberOfDoses = Uses the number of doses if available -infoDoseCountFromVaccinationEntries = Otherwise counts the number of vaccination entries -infoDownloadDocumentTemplateImportGuide = If this is your first time uploading document templates to SORMAS, we strongly recommend to read the document template guide first. -infoDownloadEmailTemplateImportGuide = If this is your first time uploading email templates to SORMAS, we strongly recommend to read the email template guide first. -infoDownloadExport = The export is being prepared. This may take a while.
You can close this dialog after the download has completed. -infoDownloadCaseImportTemplate = You can use this template .csv file to bring your data into a format SORMAS can read. Please do this every time you import data, never use a file you have downloaded before. -infoDownloadImportTemplate = You can use this template .csv file to bring your data into a format SORMAS can read. Please do this every time you import data, never use a file you have downloaded before. -infoDownloadErrorReport = If there were any rows that could not be imported, you will be offered a .csv file containing all these rows as well as the error descriptions. -infoDownloadImportGuide = If this is your first time importing data into SORMAS, we strongly recommend to read the import guide first. -infoEventParticipantAlreadyExisting = For this person, an event participant already exists in this event. You can either continue with this event participant or go back to the event selection. -infoEventResponsibleUserFilter = The responsible user filter requires a region to be selected in the region filter. -infoExistingImmunizationPeriod = Immunization period of existing immunization -infoExpectedFollowUpUntilDateCase = The expected follow-up until date for this case is based on its %s (%s) -infoExpectedFollowUpUntilDateContact = The expected follow-up until date for this contact is based on its %s (%s) -infoExportNoFilters = Warning: No filters have been selected. Export may take a while. -infoFacilityCsvImport = Name of a configured facility (requires FacilityType), OTHER_FACILITY (requires FacilityType and FacilityDetails) or NO_FACILITY -infoFacilityNeedsDistrict = Please define a district in order to select a facility. -infoImmunizationPeriod = Immunization period of this immunization -infoImmunizationStatusAcquired = Only immunizations with acquired status are considered -infoImmunizationValidFromClosest = Selects the immunization with the valid from date closest to (but not after) the case report date -infoImmunizationValidUntilNotBefore = valid until date must not be before the case report date -infoImportAllCountries = This will import all countries which are currently WHO members. You will receive a notification when the import process has finished. -infoImportAllContinents = This will import all default continents. You will receive a notification when the import process has finished. -infoImportAllSubcontinents = This will import all default subcontinents. You will receive a notification when the import process has finished. -infoImportCsvFile = Depending on the amount of rows you want to import, this may take a while. You will receive a notification when the import process has finished. -infoImportInfrastructureAllowOverwrite = Select this option if existing data should be overwritten with data from the import file. If an existing entry (based on the name or ISO/UNO-Code if available ) is found, all data will be updated with the content of the import file (if available). If no existing entry is found, a new one will be created. -infoImportProcess = %d rows are being imported. The import process might take a while.
You will be able to review and solve any errors after the import process has been completed. -infoImportSimilarity = One of the cases you tried to import is similar to an already existing case in the SORMAS database. Please check whether the case to import is a duplicate of any of the cases in the list and, if so, select that case and confirm. -infoLostToFollowUpBy = Set to lost to follow-up by %s using bulk action -infoNoAdditionalTests = No additional tests have been created for this sample -infoNoCasesFoundStatistics = No cases have been found for the selected filters and visualization options. -infoNoDiseaseSelected = Please select a disease to display the immunization overview. -infoCaseIncidenceNotPossible = The following regions have missing population data:

%s.

As a result, case incidence cannot be calculated and case counts are displayed instead. -infoCaseIncidenceMissingPopulationData = The following regions and/or districts have missing population data:

%s.

Incidence proportion cannot be calculated for these regions and/or districts. -infoCaseIncidenceIncompatible = No population data is available for communities and facilities. Case incidence cannot be calculated and case counts are displayed instead. If you want to view case incidence, please remove any community and facilitiy filters and groupings. -infoNoPathogenTests = No pathogen tests have been created for this sample -infoPickOrCreateCase = There are existing cases in the database that seem very similar to the one you are about to create. Please have a look at the list of existing cases and verify that the case you want to create is not a duplicate of one of them. If you find a case that is most likely the same as yours, please click on it in the list and confirm. -infoPickOrCreateCaseNewCase = Newly added case information -infoPickOrCreateImmunization = The system already contains at least one immunization for %s for this person and means of immunization that overlaps with the specified immunziation period. Please compare the most recent existing immunization with the one you created and decide whether to discard the new immunization, use its information to update the existing one, or create it anyway. -infoPickOrCreateImmunizationExisting = Existing immunization information -infoPickOrCreateImmunizationNew = Newly added immunization information -infoPickOrCreatePathogenTest = The database already contains at least one pathogen test that belongs to the sample.

Please look through the lists of pathogen tests. If you feel certain that one matches the lab message details, select it and click on the Confirm button. Otherwise, click on Create new sample to create a new sample for the entry.

If you are unsure, you can discard this window and cancel the process. -infoPickOrCreateSample = Please choose one of the options below.

The list of matching samples contains samples in the database that seem to be similar to the details of the lab message (if any).
The list of different samples contains samples related to the entry you chose, but not similar to the details of the lab message (if any).
You can also create a new sample.

If you are unsure, you can discard this window and cancel the process. -infoSampleAdditionalTesting = Please tick every type of additional test you would like to be performed on this sample. -infoSampleExport = Export the samples of all cases displayed in the table rows with an extended set of columns. This may take a while. -infoSamplePathogenTesting = Please tick every type of pathogen test you would like to be performed on this sample. -infoSimilarImmunization = The system already contains at least one immunization for %s for this person and means of immunization that overlaps with the specified immunization period. Do you still want to update the start and end date or go back and adjust your changes? -infoStatisticsDisclaimer = All statistics on this page are aggregated data of the whole country. This includes cases you might not have read and write access to and therefore are not visible in the case directory. -infoStatisticsFilter = Add filters to restrict the aggregated data.
If you use multiple filters, only cases that pass all restrictions will be aggregated. -infoStatisticsResults = Click the "Generate" button to create a new table, map or chart. -infoSurveillanceDashboard = All Dashboard elements that display cases (the "New Cases" statistics, the Epidemiological Curve and the Case Status Map) use the onset date of the first symptom for the date/epi week filter. If this date is not available, the date of report is used instead. +infoActivityAsCaseInvestigation=Please document ALL relevant activities after infection: +infoAddTestsToSample=To add a test result to this sample, it has to be marked as received first. +infoArchivedCases=Cases are automatically archived after %d days without changes to the data. +infoArchivedContacts=Contacts are automatically archived after %d days without changes to the data. +infoArchivedEvents=Events are automatically archived after %d days without changes to the data. +infoArchivedEventParticipants=Event participants are automatically archived after %d days without changes to the data. +infoArchivedTravelEntries=Travel entries are automatically archived after %d days without changes to the data. +infoAssigneeMissingEmail=The user assigned to this task does not have an e-mail address provided, and will therefore not be notified. +infoObserverMissingEmail=At least one of the observers of this task does not have an e-mail address provided, and will therefore not be notified. +infoAssigneeMissingEmailOrPhoneNumber=The user assigned to this task does not have an e-mail address nor a phone number provided, and will therefore not be notified. +infoAutomaticDeletion=Deletion scheduled for %s +infoAutomaticDeletionTooltip=Deletion scheduled for %s
%s: %s
Deletion period: %s +infoAutomaticDeletionTooltipDays=%s days +infoAutomaticDeletionTooltipMonths=%s months +infoAutomaticDeletionTooltipYears=%s years +infoObserverMissingEmailOrPhoneNumber=At least one of the observers of this task does not have an e-mail address nor a phone number provided, and will therefore not be notified. +infoBasicExport=Export the columns and rows that are shown in the table below. +infoCanceledBy=Canceled by %s using bulk action +infoCaseDate=By default, cases are filtered by the most relevant date available:
  • Symptom onset date
  • Case report date
This means that, when a case e.g. has a symptom onset date, only this date will be taken into account when searching the list for cases in the specified date range. You can specify a date type in the dropdown menu to instead specifically filter by this date.

Example: Case A has been created this week and therefore has a report date that lies in this week as well. However, Case A also has a symptom onset date that is set to last week (because it has been entered retrospectively). By default, when \"Most relevant date\" is selected and you have set the filter to only display cases of this week, Case A will not appear in the list because its symptom onset date lies in the previous week. For the case to appear in the list, you need to select \"Case report date\" which will result in only the report date being considered when filtering the list. +infoCaseIncidence="Case incidence proportion" means the number of cases per 100,000 inhabitants. You can check the map key to see the thresholds that define how the districts are colorized. +infoCaseMap=If cases are shown by home address and there are no GPS coordinates available for it, the coordinates of the location where the case has been reported are used instead. +infoCheckProbableInfectionEnvironment=This checkbox should be checked if you are sure that this exposure was the most probable infection environment for this case. Only one exposure can be marked as the probable infection environment at the same time, and that exposure will be transmitted to SurvNet. +infoContactDashboard=All Dashboard elements that display general information about contacts use the follow-up period of the respective contact, starting with the contact report date. +infoConvertToCaseContacts=There are %s additional %s contacts of this person that do not have a resulting case set. Do you want to set the case you have just created as the resulting case of some or all of these contacts as well? +infoConvertToCaseContactsAndEventParticipants=There are %s additional %s contacts and %s additional %s event participants of this person that do not have a resulting case set. Do you want to set the case you have just created as the resulting case of some or all of these contacts and event participants as well? +infoConvertToCaseEventParticipants=There are %s additional %s event participants of this person that do not have a resulting case set. Do you want to set the case you have just created as the resulting case of some or all of these event participants as well? +infoConvertToCaseSelect=Please select the contacts and event participants for which you want to set the created case as the resulting case. +infoCreateEntry=The database contains no entry that seems to be similar to the details of the lab message.

Select one of the options and click on the Confirm button to create a new entry for the person.

If you are unsure, you can discard this window and cancel the process. +infoDashboardIncidence=Thresholds are calculated using quartiles. +infoDatabaseExportTables=Please select the database tables you want to export. +infoDefineOutbreaks=Click on a button to define which districts of the region currently have an outbreak of a specific disease. +infoDetailedExport=Export the rows that are shown in the table below with an extended set of columns. This may take a while. +infoDeterminedVaccinationStatusExplanation=The vaccination status is automatically determined from immunization records at the time of the case report. +infoDeterminedVaccinationStatusReadOnly=This field is read-only because the determined vaccination status feature is enabled. The vaccination status is automatically computed from immunization data. +infoCaseManagementExport=Export the rows that are shown in the table below with a customized set of columns that are relevant for the case management process. This may take a while. +infoDisplayNetworkDiagram=Please maximize to view the disease transmission chains +infoDocumentAlreadyExists=A Document with filename "%s" already exists. Are you sure you want to upload? +infoDocumentAlreadyExistsCannotUploadAnotherOne=A Document with filename "%s" already exists. You cannot upload a second one with the same name. +infoDocumentOverride=A Document with filename "%s" already exists. Overwrite? +infoDontShareCheckboxAlreadyShared=Case was already shared. It can not be set to don't share with external reporting tool. +infoDoseCountFromNumberOfDoses=Uses the number of doses if available +infoDoseCountFromVaccinationEntries=Otherwise counts the number of vaccination entries +infoDownloadDocumentTemplateImportGuide=If this is your first time uploading document templates to SORMAS, we strongly recommend to read the document template guide first. +infoDownloadEmailTemplateImportGuide=If this is your first time uploading email templates to SORMAS, we strongly recommend to read the email template guide first. +infoDownloadExport=The export is being prepared. This may take a while.
You can close this dialog after the download has completed. +infoDownloadCaseImportTemplate=You can use this template .csv file to bring your data into a format SORMAS can read. Please do this every time you import data, never use a file you have downloaded before. +infoDownloadImportTemplate=You can use this template .csv file to bring your data into a format SORMAS can read. Please do this every time you import data, never use a file you have downloaded before. +infoDownloadErrorReport=If there were any rows that could not be imported, you will be offered a .csv file containing all these rows as well as the error descriptions. +infoDownloadImportGuide=If this is your first time importing data into SORMAS, we strongly recommend to read the import guide first. +infoEventParticipantAlreadyExisting=For this person, an event participant already exists in this event. You can either continue with this event participant or go back to the event selection. +infoEventResponsibleUserFilter=The responsible user filter requires a region to be selected in the region filter. +infoExistingImmunizationPeriod=Immunization period of existing immunization +infoExpectedFollowUpUntilDateCase=The expected follow-up until date for this case is based on its %s (%s) +infoExpectedFollowUpUntilDateContact=The expected follow-up until date for this contact is based on its %s (%s) +infoExportNoFilters=Warning: No filters have been selected. Export may take a while. +infoFacilityCsvImport=Name of a configured facility (requires FacilityType), OTHER_FACILITY (requires FacilityType and FacilityDetails) or NO_FACILITY +infoFacilityNeedsDistrict=Please define a district in order to select a facility. +infoImmunizationPeriod=Immunization period of this immunization +infoImmunizationStatusAcquired=Only immunizations with acquired status are considered +infoImmunizationValidFromClosest=Selects the immunization with the valid from date closest to (but not after) the case report date +infoImmunizationValidUntilNotBefore=valid until date must not be before the case report date +infoImportAllCountries=This will import all countries which are currently WHO members. You will receive a notification when the import process has finished. +infoImportAllContinents=This will import all default continents. You will receive a notification when the import process has finished. +infoImportAllSubcontinents=This will import all default subcontinents. You will receive a notification when the import process has finished. +infoImportCsvFile=Depending on the amount of rows you want to import, this may take a while. You will receive a notification when the import process has finished. +infoImportInfrastructureAllowOverwrite=Select this option if existing data should be overwritten with data from the import file. If an existing entry (based on the name or ISO/UNO-Code if available ) is found, all data will be updated with the content of the import file (if available). If no existing entry is found, a new one will be created. +infoImportProcess=%d rows are being imported. The import process might take a while.
You will be able to review and solve any errors after the import process has been completed. +infoImportSimilarity=One of the cases you tried to import is similar to an already existing case in the SORMAS database. Please check whether the case to import is a duplicate of any of the cases in the list and, if so, select that case and confirm. +infoLostToFollowUpBy=Set to lost to follow-up by %s using bulk action +infoNoAdditionalTests=No additional tests have been created for this sample +infoNoCasesFoundStatistics=No cases have been found for the selected filters and visualization options. +infoNoDiseaseSelected=Please select a disease to display the immunization overview. +infoCaseIncidenceNotPossible=The following regions have missing population data:

%s.

As a result, case incidence cannot be calculated and case counts are displayed instead. +infoCaseIncidenceMissingPopulationData=The following regions and/or districts have missing population data:

%s.

Incidence proportion cannot be calculated for these regions and/or districts. +infoCaseIncidenceIncompatible=No population data is available for communities and facilities. Case incidence cannot be calculated and case counts are displayed instead. If you want to view case incidence, please remove any community and facilitiy filters and groupings. +infoNoPathogenTests=No pathogen tests have been created for this sample +infoPickOrCreateCase=There are existing cases in the database that seem very similar to the one you are about to create. Please have a look at the list of existing cases and verify that the case you want to create is not a duplicate of one of them. If you find a case that is most likely the same as yours, please click on it in the list and confirm. +infoPickOrCreateCaseNewCase=Newly added case information +infoPickOrCreateImmunization=The system already contains at least one immunization for %s for this person and means of immunization that overlaps with the specified immunziation period. Please compare the most recent existing immunization with the one you created and decide whether to discard the new immunization, use its information to update the existing one, or create it anyway. +infoPickOrCreateImmunizationExisting=Existing immunization information +infoPickOrCreateImmunizationNew=Newly added immunization information +infoPickOrCreatePathogenTest=The database already contains at least one pathogen test that belongs to the sample.

Please look through the lists of pathogen tests. If you feel certain that one matches the lab message details, select it and click on the Confirm button. Otherwise, click on Create new sample to create a new sample for the entry.

If you are unsure, you can discard this window and cancel the process. +infoPickOrCreateSample=Please choose one of the options below.

The list of matching samples contains samples in the database that seem to be similar to the details of the lab message (if any).
The list of different samples contains samples related to the entry you chose, but not similar to the details of the lab message (if any).
You can also create a new sample.

If you are unsure, you can discard this window and cancel the process. +infoSampleAdditionalTesting=Please tick every type of additional test you would like to be performed on this sample. +infoSampleExport=Export the samples of all cases displayed in the table rows with an extended set of columns. This may take a while. +infoSamplePathogenTesting=Please tick every type of pathogen test you would like to be performed on this sample. +infoSimilarImmunization=The system already contains at least one immunization for %s for this person and means of immunization that overlaps with the specified immunization period. Do you still want to update the start and end date or go back and adjust your changes? +infoStatisticsDisclaimer=All statistics on this page are aggregated data of the whole country. This includes cases you might not have read and write access to and therefore are not visible in the case directory. +infoStatisticsFilter=Add filters to restrict the aggregated data.
If you use multiple filters, only cases that pass all restrictions will be aggregated. +infoStatisticsResults=Click the "Generate" button to create a new table, map or chart. +infoSurveillanceDashboard=All Dashboard elements that display cases (the "New Cases" statistics, the Epidemiological Curve and the Case Status Map) use the onset date of the first symptom for the date/epi week filter. If this date is not available, the date of report is used instead. infoCampaignsDashboard=All Dashboard elements that display campaign diagrams. infoUploadDocumentTemplate=Select a "%s"-Document Template you would like to upload. -infoUserEmail = Used to send E-Mail notifications. -infoUserPhoneNumber = Used to send SMS notifications. Needs to contain country code. -infoVaccinationDoseCount = Determines dose count from immunization records (one dose or two doses) -infoWeeklyReportsView = Number of officer/informant reports is the total number of reports that were submitted by the officers/informants associated with the displayed region or officer this week.

Percentage is the percentage of officers/informants that submitted their report for the respective week.

Number of officers/informants zero reports is the amount of zero reports, i.e. submitted reports with no cases. These are included in the total number of reports.

Officer/Informant report submission is either the date the report has been submitted at or a hint that no report has been submitted for this week yet. -infoMergingExplanation = This view is designed to assist you in detecting and merging duplicate cases. Cases are always displayed as pairs, the case with the earlier creation date being on top.

You can use the creation date filter to only view potential duplicates that were created in a specific time period. The creation date is automatically generated when a case is entered into SORMAS and can not be changed by users. Therefore, once you have reviewed all duplicates from a specific time period in the past, you will never have to do it again as there will be no new cases created during this time frame.

Please note that most likely not all displayed cases are actual duplicates. There is the potential for false positives, so please thoroughly review the cases before merging them! In addition to the information provided in the table, you can also click on the IDs of the cases to open them in a new tab. Keep in mind that it is much worse to falsely merge unique cases together than to have some duplicates in the system. -infoContactMergingExplanation = This view is designed to assist you in detecting and merging duplicate contacts. Contacts are always displayed as pairs, the contact with the earlier creation date being on top.

You can use the creation date filter to only view potential duplicates that were created in a specific time period. The creation date is automatically generated when a contact is entered into SORMAS and can not be changed by users. Therefore, once you have reviewed all duplicates from a specific time period in the past, you will never have to do it again as there will be no new contacts created during this time frame.

Please note that most likely not all displayed contacts are actual duplicates. There is the potential for false positives, so please thoroughly review the contacts before merging them! In addition to the information provided in the table, you can also click on the IDs of the contacts to open them in a new tab. Keep in mind that it is much worse to falsely merge unique contacts together than to have some duplicates in the system. -infoMergingMergeDescription = Choose this option only if you are sure that the two cases are the same! You should click on this button next to the case with the most recent or more complete information. Click on the IDs of the cases to open them in new tabs in order to view all their data. When the case you chose is missing information that is present in the other case, it will be updated. Also, contacts, samples, tasks and case management information will be transfered. Afterwards, the case you did not choose will be deleted. -infoContactMergingMergeDescription = Choose this option only if you are sure that the two contacts are the same! You should click on this button next to the contact with the most recent or more complete information. Click on the IDs of the contacts to open them in new tabs in order to view all their data. When the contact you chose is missing information that is present in the other contact, it will be updated. Also, samples, tasks and contact management information will be transfered. Afterwards, the contact you did not choose will be deleted. -infoMergingPickDescription = Clicking on this button will simply delete the case that was not picked. However, no information will be copied to the case that remains active. All contacts, samples and tasks will be lost as well. Choose this option if you are sure that both cases are the same, but the other case has not been updated with any information that needs to be transfered to the one that remains active. -infoContactMergingPickDescription = Clicking on this button will simply delete the contact that was not picked. However, no information will be copied to the contact that remains active. All samples and tasks will be lost as well. Choose this option if you are sure that both contacts are the same, but the other contact has not been updated with any information that needs to be transfered to the one that remains active. -infoMergingHideDescription = Choose this option if you are not sure whether the two cases are the same or if you know that they are not. This will hide the case pair from the list. Please note that, when you refresh the view or come back to it later, it will re-appear as long as you don't choose a different time period in the creation date filter. -infoContactMergingHideDescription = Choose this option if you are not sure whether the two contacts are the same or if you know that they are not. This will hide the contact pair from the list. Please note that, when you refresh the view or come back to it later, it will re-appear as long as you don't choose a different time period in the creation date filter. -infoPersonMergeDescription = Please select one of the persons below as the leading person. You have the following options to continue.
Merge: Data of the discarded person will be linked and/or added to the remaining person but not overwritten. You will not be able to undo this action.
Pick: Data of the remaining person will not be changed and the data of the other person will be discarded. However, entities linked to the discarded person will be linked to the remaining person. You will not be able to undo this action. -infoPersonMergeConfirmation = Are you certain you want to do this? The action is not reversible. -infoPersonMergeConfirmationBothShared = The persons you want to merge both have shared entities via S2S. If you merge these persons, the synchronization will be broken for the person who is not the leading one and the associated entities. Please discuss with your administrator if you would like to do this and verify which of the two persons you would like to have as the leading person.
Are you certain you want to do this? The action is not reversible. -infoPersonMergeSharedMustLead = Please note, you cannot choose this person as a leading person because then the synchronization of S2S would break.\nPlease select the other person as leading person -infoPickEventParticipantsForPersonMerge = The selected persons both have one event participant in at least one event. Merging the persons would lead to duplicate event participants.
For each event, please select one of the event participants below as the leading event participant.
'Merge': The discarded event participant will be removed from the event. Its associated entities and information will be linked and/or added to the remaining event participant, but not overwritten. You will not be able to undo this action.
'Pick': The discarded event participant will be removed from the event. Its associated entities and information will not be linked and/or added to the remaining event participant. You will not be able to undo this action. -infoPickorMergeEventParticipantDuplicateEventParticipantByPersonByEvent = One of the selected persons has multiple active or archived event participants in the same event(s).
Please review the events with the UUIDs presented below and delete duplicate event participants or ask a supervisor to do so in order to be able to merge these persons. -infoPersonMergeConfirmationForNonSimilarPersons = The two selected persons do not match the similarity requirements used by SORMAS to detect duplicate persons. Please ensure that the selected persons are indeed identical and supposed to be merged before proceeding. -infoHowToMergeCases = You can choose between two options when reviewing potentially duplicate cases: -infoHowToMergeContacts = You can choose between two options when reviewing potentially duplicate contacts: -infoCalculateCompleteness = The Calculate Completeness button on top can be used to calculate the completeness values for all cases in the table. This is only necessary if there are cases in the list that do not yet have a completeness value. Normally, this value is automatically updated whenever the details of a case or one of its contacts or samples change. -infoContactCalculateCompleteness = The Calculate Completeness button on top can be used to calculate the completeness values for all contacts in the table. This is only necessary if there are contacts in the list that do not yet have a completeness value. Normally, this value is automatically updated whenever the details of a contact or one of its samples change. -infoCaseCompleteness = Completeness is a measurement of how much vital data has already been entered into the case. This is composed of the following, weighted by their importance:
  • Has the case been classified?
  • Has the case been investigated?
  • Has at least one sample been taken?
  • Has at least one symptom been documented?
  • Has at least one contact been created?
  • Is there an outcome for the case?
  • Does the case have a birth date or age?
  • Does the case have a sex?
  • Has an onset date been specified?
-infoContactCompleteness = Completeness is a measurement of how much vital data has already been entered into the contact. This is composed of the following, weighted by their importance:
  • Has the contact been classified?
  • Has the contact status been modified?
  • Has at least one sample been taken?
  • Does the contact has a last contact date specified?
  • Does the contact have a sex?
  • Does the contact have its relation specified?
  • Does the contact have a category specified?
  • Does the contact have its birthdate specified?
-infoCompletenessMerge = You can use this measurement to get an idea about which case you should use as the one that remains active when merging. However, please make sure that you still have a detailed look at both cases to avoid mistakes. -infoContactCompletenessMerge = You can use this measurement to get an idea about which contact you should use as the one that remains active when merging. However, please make sure that you still have a detailed look at both contacts to avoid mistakes. -infoMergeIgnoreRegion = Selecting this option excludes the region as a criteria for detecting duplicates. Merging and picking are deactivated here because the probability of a real duplicate beyond region boundaries is very low. If a real duplicate is detected, this case can be deleted manually via the case directory. -infoContactMergeIgnoreRegion = Selecting this option excludes the region as a criteria for detecting duplicates. Merging and picking are deactivated here because the probability of a real duplicate beyond region boundaries is very low. If a real duplicate is detected, this contact can be deleted manually via the contact directory. -infoCustomExport = In this view, you can create and save export configurations with customized sets of columns. Saving these configurations allows you to quickly export only the information that you're interested, without having to manually edit the resulting CSV file afterwards. Please click on the blue export button next to one of your configurations or create a new configuration by using the button to the right. -infoEditExportConfiguration = Each of the checkboxes below represents a column in the export file. Please select all the columns you want to appear in your customized export and deselect those that you don't require. -infoPopulationDataView = Use one of the buttons below to manage population data for regions and districts within SORMAS. If you want to edit the data, please use the export function, copy the data you want to change into the import template, edit it, and import the template file containing the changed data. -infoPopulationCollectionDate = Please indicate the date the population data you want to import was collected on. If you only know the year, please choose the 1st of January of that year. -infoPopulationReferenceYear = The case incidence proportions are calculated by either projecting the population data to %s, which is the maximum year that was selected in the filters, or by taking the original population data if the maximum selected year is before the year the population data was collected in. -infoLineListingConfigurationRegion = Line listing is enabled for all districts listed next to the disease. Click on the Edit line listing button below a disease name to configure line listing for all districts. -infoLineListingConfigurationNation = Click on a region to open a detailed view with line listing information for all its districts. Click on the Edit line listing button below a disease to configure line listing for all regions. +infoUserEmail=Used to send E-Mail notifications. +infoUserPhoneNumber=Used to send SMS notifications. Needs to contain country code. +infoVaccinationDoseCount=Determines dose count from immunization records (one dose or two doses) +infoWeeklyReportsView=Number of officer/informant reports is the total number of reports that were submitted by the officers/informants associated with the displayed region or officer this week.

Percentage is the percentage of officers/informants that submitted their report for the respective week.

Number of officers/informants zero reports is the amount of zero reports, i.e. submitted reports with no cases. These are included in the total number of reports.

Officer/Informant report submission is either the date the report has been submitted at or a hint that no report has been submitted for this week yet. +infoMergingExplanation=This view is designed to assist you in detecting and merging duplicate cases. Cases are always displayed as pairs, the case with the earlier creation date being on top.

You can use the creation date filter to only view potential duplicates that were created in a specific time period. The creation date is automatically generated when a case is entered into SORMAS and can not be changed by users. Therefore, once you have reviewed all duplicates from a specific time period in the past, you will never have to do it again as there will be no new cases created during this time frame.

Please note that most likely not all displayed cases are actual duplicates. There is the potential for false positives, so please thoroughly review the cases before merging them! In addition to the information provided in the table, you can also click on the IDs of the cases to open them in a new tab. Keep in mind that it is much worse to falsely merge unique cases together than to have some duplicates in the system. +infoContactMergingExplanation=This view is designed to assist you in detecting and merging duplicate contacts. Contacts are always displayed as pairs, the contact with the earlier creation date being on top.

You can use the creation date filter to only view potential duplicates that were created in a specific time period. The creation date is automatically generated when a contact is entered into SORMAS and can not be changed by users. Therefore, once you have reviewed all duplicates from a specific time period in the past, you will never have to do it again as there will be no new contacts created during this time frame.

Please note that most likely not all displayed contacts are actual duplicates. There is the potential for false positives, so please thoroughly review the contacts before merging them! In addition to the information provided in the table, you can also click on the IDs of the contacts to open them in a new tab. Keep in mind that it is much worse to falsely merge unique contacts together than to have some duplicates in the system. +infoMergingMergeDescription=Choose this option only if you are sure that the two cases are the same! You should click on this button next to the case with the most recent or more complete information. Click on the IDs of the cases to open them in new tabs in order to view all their data. When the case you chose is missing information that is present in the other case, it will be updated. Also, contacts, samples, tasks and case management information will be transfered. Afterwards, the case you did not choose will be deleted. +infoContactMergingMergeDescription=Choose this option only if you are sure that the two contacts are the same! You should click on this button next to the contact with the most recent or more complete information. Click on the IDs of the contacts to open them in new tabs in order to view all their data. When the contact you chose is missing information that is present in the other contact, it will be updated. Also, samples, tasks and contact management information will be transfered. Afterwards, the contact you did not choose will be deleted. +infoMergingPickDescription=Clicking on this button will simply delete the case that was not picked. However, no information will be copied to the case that remains active. All contacts, samples and tasks will be lost as well. Choose this option if you are sure that both cases are the same, but the other case has not been updated with any information that needs to be transfered to the one that remains active. +infoContactMergingPickDescription=Clicking on this button will simply delete the contact that was not picked. However, no information will be copied to the contact that remains active. All samples and tasks will be lost as well. Choose this option if you are sure that both contacts are the same, but the other contact has not been updated with any information that needs to be transfered to the one that remains active. +infoMergingHideDescription=Choose this option if you are not sure whether the two cases are the same or if you know that they are not. This will hide the case pair from the list. Please note that, when you refresh the view or come back to it later, it will re-appear as long as you don't choose a different time period in the creation date filter. +infoContactMergingHideDescription=Choose this option if you are not sure whether the two contacts are the same or if you know that they are not. This will hide the contact pair from the list. Please note that, when you refresh the view or come back to it later, it will re-appear as long as you don't choose a different time period in the creation date filter. +infoPersonMergeDescription=Please select one of the persons below as the leading person. You have the following options to continue.
Merge: Data of the discarded person will be linked and/or added to the remaining person but not overwritten. You will not be able to undo this action.
Pick: Data of the remaining person will not be changed and the data of the other person will be discarded. However, entities linked to the discarded person will be linked to the remaining person. You will not be able to undo this action. +infoPersonMergeConfirmation=Are you certain you want to do this? The action is not reversible. +infoPersonMergeConfirmationBothShared=The persons you want to merge both have shared entities via S2S. If you merge these persons, the synchronization will be broken for the person who is not the leading one and the associated entities. Please discuss with your administrator if you would like to do this and verify which of the two persons you would like to have as the leading person.
Are you certain you want to do this? The action is not reversible. +infoPersonMergeSharedMustLead=Please note, you cannot choose this person as a leading person because then the synchronization of S2S would break.\nPlease select the other person as leading person +infoPickEventParticipantsForPersonMerge=The selected persons both have one event participant in at least one event. Merging the persons would lead to duplicate event participants.
For each event, please select one of the event participants below as the leading event participant.
'Merge': The discarded event participant will be removed from the event. Its associated entities and information will be linked and/or added to the remaining event participant, but not overwritten. You will not be able to undo this action.
'Pick': The discarded event participant will be removed from the event. Its associated entities and information will not be linked and/or added to the remaining event participant. You will not be able to undo this action. +infoPickorMergeEventParticipantDuplicateEventParticipantByPersonByEvent=One of the selected persons has multiple active or archived event participants in the same event(s).
Please review the events with the UUIDs presented below and delete duplicate event participants or ask a supervisor to do so in order to be able to merge these persons. +infoPersonMergeConfirmationForNonSimilarPersons=The two selected persons do not match the similarity requirements used by SORMAS to detect duplicate persons. Please ensure that the selected persons are indeed identical and supposed to be merged before proceeding. +infoHowToMergeCases=You can choose between two options when reviewing potentially duplicate cases: +infoHowToMergeContacts=You can choose between two options when reviewing potentially duplicate contacts: +infoCalculateCompleteness=The Calculate Completeness button on top can be used to calculate the completeness values for all cases in the table. This is only necessary if there are cases in the list that do not yet have a completeness value. Normally, this value is automatically updated whenever the details of a case or one of its contacts or samples change. +infoContactCalculateCompleteness=The Calculate Completeness button on top can be used to calculate the completeness values for all contacts in the table. This is only necessary if there are contacts in the list that do not yet have a completeness value. Normally, this value is automatically updated whenever the details of a contact or one of its samples change. +infoCaseCompleteness=Completeness is a measurement of how much vital data has already been entered into the case. This is composed of the following, weighted by their importance:
  • Has the case been classified?
  • Has the case been investigated?
  • Has at least one sample been taken?
  • Has at least one symptom been documented?
  • Has at least one contact been created?
  • Is there an outcome for the case?
  • Does the case have a birth date or age?
  • Does the case have a sex?
  • Has an onset date been specified?
+infoContactCompleteness=Completeness is a measurement of how much vital data has already been entered into the contact. This is composed of the following, weighted by their importance:
  • Has the contact been classified?
  • Has the contact status been modified?
  • Has at least one sample been taken?
  • Does the contact has a last contact date specified?
  • Does the contact have a sex?
  • Does the contact have its relation specified?
  • Does the contact have a category specified?
  • Does the contact have its birthdate specified?
+infoCompletenessMerge=You can use this measurement to get an idea about which case you should use as the one that remains active when merging. However, please make sure that you still have a detailed look at both cases to avoid mistakes. +infoContactCompletenessMerge=You can use this measurement to get an idea about which contact you should use as the one that remains active when merging. However, please make sure that you still have a detailed look at both contacts to avoid mistakes. +infoMergeIgnoreRegion=Selecting this option excludes the region as a criteria for detecting duplicates. Merging and picking are deactivated here because the probability of a real duplicate beyond region boundaries is very low. If a real duplicate is detected, this case can be deleted manually via the case directory. +infoContactMergeIgnoreRegion=Selecting this option excludes the region as a criteria for detecting duplicates. Merging and picking are deactivated here because the probability of a real duplicate beyond region boundaries is very low. If a real duplicate is detected, this contact can be deleted manually via the contact directory. +infoCustomExport=In this view, you can create and save export configurations with customized sets of columns. Saving these configurations allows you to quickly export only the information that you're interested, without having to manually edit the resulting CSV file afterwards. Please click on the blue export button next to one of your configurations or create a new configuration by using the button to the right. +infoEditExportConfiguration=Each of the checkboxes below represents a column in the export file. Please select all the columns you want to appear in your customized export and deselect those that you don't require. +infoPopulationDataView=Use one of the buttons below to manage population data for regions and districts within SORMAS. If you want to edit the data, please use the export function, copy the data you want to change into the import template, edit it, and import the template file containing the changed data. +infoPopulationCollectionDate=Please indicate the date the population data you want to import was collected on. If you only know the year, please choose the 1st of January of that year. +infoPopulationReferenceYear=The case incidence proportions are calculated by either projecting the population data to %s, which is the maximum year that was selected in the filters, or by taking the original population data if the maximum selected year is before the year the population data was collected in. +infoLineListingConfigurationRegion=Line listing is enabled for all districts listed next to the disease. Click on the Edit line listing button below a disease name to configure line listing for all districts. +infoLineListingConfigurationNation=Click on a region to open a detailed view with line listing information for all its districts. Click on the Edit line listing button below a disease to configure line listing for all regions. # 1st %s: disease name; 2nd %s: region name -infoLineListingConfigurationRegionEdit = You're editing the regional line listing configuration for %s in %s. +infoLineListingConfigurationRegionEdit=You're editing the regional line listing configuration for %s in %s. # %s: disease name -infoLineListingConfigurationNationEdit = You're editing the country-wide line listing configuration for %s. -infoNoNetworkDiagram = Please select a disease above to view the disease transmission chains. -infoOtherImmunization = Other means of immunization (e.g., experimental treatments) -infoSyncUsers = Sync SORMAS users' data to the External Authentication Provider configured.
The sync is one way only SORMAS -> Authentication Provider.
Passwords are not updated for users which already exist in the External Authentication Provider -infoSpecificCaseSearch = Use the text field below to search for a specific case in the whole country. You can search by case ID, external ID or epid number. Click on "Search Case" when you're done to open the case if the search was successful. If more than one case is found, the case with the latest report date will be opened. -infoSpecificEventSearch = Use the text field below to search for a specific event in the whole country. You can search by case ID or person ID. Click on "Search Event" when you're done to open the event if the search was successful.

If more than one event is found, the event with the latest report date will be opened. -infoSearchCaseForContact = Use the text field below to search for any case in the system you have access to. You can search by name, case ID, external ID or epid number. When you're done, click on "Search Case" to see a list of all cases that match the text that you've entered. Select a case in this list and click on "Confirm" to use the selected case as the contact's source case. -infoNoSourceCaseSelected = Please select the source case for this contact, if known -infoNoSourceCaseSelectedLineListing = Please select the source case, if known -infoContactCreationSourceCase = Selected source case:
%s -infoSelectOrCreateContact = The database already contains at least one contact that seems to be very similar to the details of the created contact.

Please look through the list of contacts. If you feel certain that one matches your contact, select it and click on the Save button. Otherwise, click on Create new contact to create a new contact for the person.

If you are unsure, you can discard this window and cancel the contact creation process. -infoSelectOrCreateContactImport = The database already contains at least one contact that seems to be very similar to the details of the imported contact.

Please look through the list of contacts. If you feel certain that one matches your contact, select it and click on the Save button. Otherwise, click on Create new contact to create a new contact for the person.

If you are unsure, you can discard this window to remove the contact from the current import. -infoSelectOrCreateEntry = The database already contains at least one entry that seems to be very similar to the details of the external message.

Please look through the lists of entries. If you feel certain that one matches the external message details, select it and click on the Confirm button. Otherwise, select one of the other options to create a new entry for the person.

If you are unsure, you can discard this window and cancel the process. -infoSelectOrCreatePersonForContact = The database already contains at least one person that seems to be very similar to the personal details of the created contact.

Please look through the list of persons. If you feel certain that one of those persons matches your contact person, select it and click on the Save button. Otherwise, click on Create New Person to create a new person for your contact.

If you are unsure, you can discard this window and cancel the contact creation process. -infoSelectOrCreatePersonForImmunization = The database already contains at least one person that seems to be very similar to the personal details of the created immunization.

Please look through the list of persons. If you feel certain that one of those persons matches your immunization person, select it and click on the Save button. Otherwise, click on Create New Person to create a new person for your immunization.

If you are unsure, you can discard this window and cancel the immunization creation process. -infoSelectOrCreatePersonForImport = The database already contains at least one person that seems to be very similar to the personal details of the imported entry.

Please look through the list of persons. If you feel certain that one of those persons matches the person of the imported entry, select it and click on the Save button. Otherwise, click on Create New Person to create a new person.

If you are unsure, you can discard this window to remove the entry from the current import. -infoSelectOrCreatePersonForEventParticipant = The database already contains at least one person that seems to be very similar to the personal details of the created event participant.

Please look through the list of persons. If you feel certain that one of those persons matches your event person, select it and click on the Save button. Otherwise, click on Create New Person to create a new event person for your event.

If you are unsure, you can discard this window and cancel the event participant creation process. -infoSelectOrCreatePersonForLabMessage = The database already contains at least one person that seems to be very similar to the personal details of the external message.

Please look through the list of persons. If you feel certain that one of those persons matches the external message person, select it and click on the Confirm button. Otherwise, click on Create New Person to create a new person for the message.

If you are unsure, you can discard this window and cancel the process. -infoSelectOrCreatePersonForLabMessageWithoutMatches = A person closely matching the person details of the external message could not automatically be determined.

You can manually search for matches, or you can create a new person. Once you selected an option, continue via the Confirm button.

If you are unsure, you can discard this window and cancel the process. -infoSkipOrOverrideDuplicateCampaignFormDataImport = The database already contains a dataset for the form %s in the campaign %s for the specified community and date. Please have a look at the details for the existing dataset and choose Skip if you want to keep the existing data or Overwrite if you want to replace the existing data with the data you have imported. -pseudonymizedCasesSelectedWarning = For the bulked-edited cases you have only limited access to the sensitive data. For those cases the value you put into "Place Description" will be ignored. -pseudonymizedEntitiesSelectedWarning = You only have limited access to some of the selected entities. Please deselect pseudonymized entities to continue. -infoPickOrCreateEventForCase = The list below contains all existing events having the same disease as the current case. Please check whether the event this case belongs to is already on this list or create a new one if it isn't. -infoPickOrCreateEventForCases = The list below contains all existing events having the same disease as the selected cases. Please check whether the event these cases belongs to is already on this list or create a new one if it isn't. -infoPickOrCreateEventForContact = The list below contains all existing events having the same disease as the current contact. Please check whether the event this contact belongs to is already on this list or create a new one if it isn't. -infoPickOrCreateEventForContacts = The list below contains all existing events having the same disease as the selected contacts. Please check whether the event these contacts belongs to is already on this list or create a new one if it isn't. -infoPickOrCreateEventForLabMessage = The list below contains all existing events having the same disease as the lab message. Please check whether the event the new event participant belongs to is already on this list or create a new one if it isn't. -infoPickOrCreateSuperordinateEventForEvent = The list below contains all existing events with an event date and the same disease as the current event. Please check whether the superordinate event for this event is already on this list or create a new one if it isn't. -infoPickOrCreateEnvironmentForEvent = The list below contains all existing environments with reported date. Please check whether the environement for this event is already on this list or create a new one if it isn't. -infoPickOrCreateEventGroupForEvent = The list below contains all existing event groups. Please check whether the event group this event belongs to is already on this list or create a new one if it isn't. -infoSelectOrCreatePersonForCase = The database already contains at least one person that seems to be very similar to the personal details of the created case.

Please look through the list of persons. If you feel certain that one of those persons matches your case person, select them and click on the Save button. Otherwise, click on Create New Person to create a new person for your case.

If you are unsure, you can discard this window and cancel the case creation process. -infoSearchPerson = Use the filters below to search for any person in the system you have access to, based on: First Name, Last Name, Person UUID,External ID, External Token. When you're done click on "Search" to see a list of persons that match the text that you have entered. Select person in the list and click on "Confirm" to choose the selected person. -infoContactsViewRegionDistrictFilter = When you select a region and/or district filter, the contact directory is primarily filtered by the responsible region and district of the contacts. If these are not filled in, the region and district of the contact's source case are used instead. -infoDeveloperOptions = You can use the controls below to generate dummy cases and contacts based on the selected restraints. Please note that generating a lot of data at once might take some time.
Generated data is neither fully deterministic, nor fully random, and intended for testing and demonstration purposes only. -infoDeveloperOptionsContactGeneration = When generating contacts, the generator will pick random existing cases as source. Please make sure the case database is not empty before generating contacts. -infoDeveloperOptionsSeedUsage = Using the seed will create identical datasets, provided the starting conditions (configuration & database) are also identical -infoCreateNewSampleDiscardsChangesCase = Creating a new sample will discard all unsaved changes made to this case -infoCreateNewSampleDiscardsChangesContact = Creating a new sample will discard all unsaved changes made to this contact -infoCreateNewSampleDiscardsChangesEventParticipant = Creating a new sample will discard all unsaved changes made to this event participant -infoUsageOfEditableCampaignGrids = You can edit the campaign data and dashboard definitions by clicking inside one of the cells in the grid, and you can reorder the dashboard elements by dragging and dropping the grid rows -infoSaveOfTask = Saving this task will discard any unsaved changes made to the case. -populationDataByArea = Population data by Area -populationDataByRegion = Population data by Region -populationDataByCommunity = No population data available for communities -populationDataByDistrict = Population data by District -infoExposureInvestigation = Please document ALL relevant direct exposures (e.g. attended gatherings, travels, animal contacts, etc.) during the incubation period: -giardiaInfoExposureInvestigation = Please consider 25 days before the onset of the symptoms -infoExposureInvestigationContacts = Please document information about the exposure that led to this contact: -infoEpiDataFieldsHint = Please indicate if any of the following is relevant for the patient during the incubation period: -infoEpiDataSourceCaseContacts = Please indicate ALL contacts with potential source cases during the incubation period: -infoNoSourceCase = No source case -infoCreateNewContactDiscardsChanges = Creating a new contact will discard all unsaved changes made to this case -infoExposuresInfectionEnvironmentHint = This exposure is marked as the probable infection environment. -infoExposuresRiskAreaHint = This exposure took place in a risk area. -infoUserSyncProcess = %d users are being synced to the External Authentication Provider. The import process might take a while.
You will be able to review and solve any errors after the import process has been completed. +infoLineListingConfigurationNationEdit=You're editing the country-wide line listing configuration for %s. +infoNoNetworkDiagram=Please select a disease above to view the disease transmission chains. +infoOtherImmunization=Other means of immunization (e.g., experimental treatments) +infoSyncUsers=Sync SORMAS users' data to the External Authentication Provider configured.
The sync is one way only SORMAS -> Authentication Provider.
Passwords are not updated for users which already exist in the External Authentication Provider +infoSpecificCaseSearch=Use the text field below to search for a specific case in the whole country. You can search by case ID, external ID or epid number. Click on "Search Case" when you're done to open the case if the search was successful. If more than one case is found, the case with the latest report date will be opened. +infoSpecificEventSearch=Use the text field below to search for a specific event in the whole country. You can search by case ID or person ID. Click on "Search Event" when you're done to open the event if the search was successful.

If more than one event is found, the event with the latest report date will be opened. +infoSearchCaseForContact=Use the text field below to search for any case in the system you have access to. You can search by name, case ID, external ID or epid number. When you're done, click on "Search Case" to see a list of all cases that match the text that you've entered. Select a case in this list and click on "Confirm" to use the selected case as the contact's source case. +infoNoSourceCaseSelected=Please select the source case for this contact, if known +infoNoSourceCaseSelectedLineListing=Please select the source case, if known +infoContactCreationSourceCase=Selected source case:
%s +infoSelectOrCreateContact=The database already contains at least one contact that seems to be very similar to the details of the created contact.

Please look through the list of contacts. If you feel certain that one matches your contact, select it and click on the Save button. Otherwise, click on Create new contact to create a new contact for the person.

If you are unsure, you can discard this window and cancel the contact creation process. +infoSelectOrCreateContactImport=The database already contains at least one contact that seems to be very similar to the details of the imported contact.

Please look through the list of contacts. If you feel certain that one matches your contact, select it and click on the Save button. Otherwise, click on Create new contact to create a new contact for the person.

If you are unsure, you can discard this window to remove the contact from the current import. +infoSelectOrCreateEntry=The database already contains at least one entry that seems to be very similar to the details of the external message.

Please look through the lists of entries. If you feel certain that one matches the external message details, select it and click on the Confirm button. Otherwise, select one of the other options to create a new entry for the person.

If you are unsure, you can discard this window and cancel the process. +infoSelectOrCreatePersonForContact=The database already contains at least one person that seems to be very similar to the personal details of the created contact.

Please look through the list of persons. If you feel certain that one of those persons matches your contact person, select it and click on the Save button. Otherwise, click on Create New Person to create a new person for your contact.

If you are unsure, you can discard this window and cancel the contact creation process. +infoSelectOrCreatePersonForImmunization=The database already contains at least one person that seems to be very similar to the personal details of the created immunization.

Please look through the list of persons. If you feel certain that one of those persons matches your immunization person, select it and click on the Save button. Otherwise, click on Create New Person to create a new person for your immunization.

If you are unsure, you can discard this window and cancel the immunization creation process. +infoSelectOrCreatePersonForImport=The database already contains at least one person that seems to be very similar to the personal details of the imported entry.

Please look through the list of persons. If you feel certain that one of those persons matches the person of the imported entry, select it and click on the Save button. Otherwise, click on Create New Person to create a new person.

If you are unsure, you can discard this window to remove the entry from the current import. +infoSelectOrCreatePersonForEventParticipant=The database already contains at least one person that seems to be very similar to the personal details of the created event participant.

Please look through the list of persons. If you feel certain that one of those persons matches your event person, select it and click on the Save button. Otherwise, click on Create New Person to create a new event person for your event.

If you are unsure, you can discard this window and cancel the event participant creation process. +infoSelectOrCreatePersonForLabMessage=The database already contains at least one person that seems to be very similar to the personal details of the external message.

Please look through the list of persons. If you feel certain that one of those persons matches the external message person, select it and click on the Confirm button. Otherwise, click on Create New Person to create a new person for the message.

If you are unsure, you can discard this window and cancel the process. +infoSelectOrCreatePersonForLabMessageWithoutMatches=A person closely matching the person details of the external message could not automatically be determined.

You can manually search for matches, or you can create a new person. Once you selected an option, continue via the Confirm button.

If you are unsure, you can discard this window and cancel the process. +infoSkipOrOverrideDuplicateCampaignFormDataImport=The database already contains a dataset for the form %s in the campaign %s for the specified community and date. Please have a look at the details for the existing dataset and choose Skip if you want to keep the existing data or Overwrite if you want to replace the existing data with the data you have imported. +pseudonymizedCasesSelectedWarning=For the bulked-edited cases you have only limited access to the sensitive data. For those cases the value you put into "Place Description" will be ignored. +pseudonymizedEntitiesSelectedWarning=You only have limited access to some of the selected entities. Please deselect pseudonymized entities to continue. +infoPickOrCreateEventForCase=The list below contains all existing events having the same disease as the current case. Please check whether the event this case belongs to is already on this list or create a new one if it isn't. +infoPickOrCreateEventForCases=The list below contains all existing events having the same disease as the selected cases. Please check whether the event these cases belongs to is already on this list or create a new one if it isn't. +infoPickOrCreateEventForContact=The list below contains all existing events having the same disease as the current contact. Please check whether the event this contact belongs to is already on this list or create a new one if it isn't. +infoPickOrCreateEventForContacts=The list below contains all existing events having the same disease as the selected contacts. Please check whether the event these contacts belongs to is already on this list or create a new one if it isn't. +infoPickOrCreateEventForLabMessage=The list below contains all existing events having the same disease as the lab message. Please check whether the event the new event participant belongs to is already on this list or create a new one if it isn't. +infoPickOrCreateSuperordinateEventForEvent=The list below contains all existing events with an event date and the same disease as the current event. Please check whether the superordinate event for this event is already on this list or create a new one if it isn't. +infoPickOrCreateEnvironmentForEvent=The list below contains all existing environments with reported date. Please check whether the environement for this event is already on this list or create a new one if it isn't. +infoPickOrCreateEventGroupForEvent=The list below contains all existing event groups. Please check whether the event group this event belongs to is already on this list or create a new one if it isn't. +infoSelectOrCreatePersonForCase=The database already contains at least one person that seems to be very similar to the personal details of the created case.

Please look through the list of persons. If you feel certain that one of those persons matches your case person, select them and click on the Save button. Otherwise, click on Create New Person to create a new person for your case.

If you are unsure, you can discard this window and cancel the case creation process. +infoSearchPerson=Use the filters below to search for any person in the system you have access to, based on: First Name, Last Name, Person UUID,External ID, External Token. When you're done click on "Search" to see a list of persons that match the text that you have entered. Select person in the list and click on "Confirm" to choose the selected person. +infoContactsViewRegionDistrictFilter=When you select a region and/or district filter, the contact directory is primarily filtered by the responsible region and district of the contacts. If these are not filled in, the region and district of the contact's source case are used instead. +infoDeveloperOptions=You can use the controls below to generate dummy cases and contacts based on the selected restraints. Please note that generating a lot of data at once might take some time.
Generated data is neither fully deterministic, nor fully random, and intended for testing and demonstration purposes only. +infoDeveloperOptionsContactGeneration=When generating contacts, the generator will pick random existing cases as source. Please make sure the case database is not empty before generating contacts. +infoDeveloperOptionsSeedUsage=Using the seed will create identical datasets, provided the starting conditions (configuration & database) are also identical +infoCreateNewSampleDiscardsChangesCase=Creating a new sample will discard all unsaved changes made to this case +infoCreateNewSampleDiscardsChangesContact=Creating a new sample will discard all unsaved changes made to this contact +infoCreateNewSampleDiscardsChangesEventParticipant=Creating a new sample will discard all unsaved changes made to this event participant +infoUsageOfEditableCampaignGrids=You can edit the campaign data and dashboard definitions by clicking inside one of the cells in the grid, and you can reorder the dashboard elements by dragging and dropping the grid rows +infoSaveOfTask=Saving this task will discard any unsaved changes made to the case. +populationDataByArea=Population data by Area +populationDataByRegion=Population data by Region +populationDataByCommunity=No population data available for communities +populationDataByDistrict=Population data by District +infoExposureInvestigation=Please document ALL relevant direct exposures (e.g. attended gatherings, travels, animal contacts, etc.) during the incubation period: +giardiaInfoExposureInvestigation=Please consider 25 days before the onset of the symptoms +infoExposureInvestigationContacts=Please document information about the exposure that led to this contact: +infoEpiDataFieldsHint=Please indicate if any of the following is relevant for the patient during the incubation period: +infoEpiDataSourceCaseContacts=Please indicate ALL contacts with potential source cases during the incubation period: +infoNoSourceCase=No source case +infoCreateNewContactDiscardsChanges=Creating a new contact will discard all unsaved changes made to this case +infoExposuresInfectionEnvironmentHint=This exposure is marked as the probable infection environment. +infoExposuresRiskAreaHint=This exposure took place in a risk area. +infoUserSyncProcess=%d users are being synced to the External Authentication Provider. The import process might take a while.
You will be able to review and solve any errors after the import process has been completed. infoNoSubordinateEvents=No subordinate events infoNoSuperordinateEvent=No superordinate event infoNoEventGroups=No event groups -infoMergeFiltersHint = Calculating and displaying potential duplicates may take a lot of time under specific circumstances. It is recommended to use the filters on top of this view to reduce the number of rows that have to be compared at the same time, e.g. by choosing a narrow creation date interval and a low result count limit. If the potential duplicates are loading fast, extending these values should be safe.

In order to avoid performance issues when entering this view, potential duplicates are only loaded once you click on "Confirm Filters". -infoPlaceOfStayInHospital = Please select a hospital as the place of stay. If the case is not currently admitted to a hospital as an inpatient, please document hospitalizations under previous hospitalizations. -infoMoreDetailsAboutHospitalization = For adding more details about the hospitalization, go to the hospitalization tab. -infoCountryNotEditableEventParticipantsWithoutJurisdiction = Changing the country is not permitted because at least one event participant in this event does not have a responsible region and/or responsible district set. -infoContactAlreadyConvertedToCase = This contact has already been converted to a case. Please add new visits to the case instead. -infoSearchPersonOnDependentForm = Search for another person -infoTasksWithMultipleJurisdictionsSelected = You have selected tasks connected to different jurisdictions, or that are connected to data that does not have facility or point of entry information. Only users on %s level or above will be selectable as assignees. -infoNoAccessToPersonEntities = You don't have the necessary user rights to view any entries associated with persons. -infoDashboardFinalLaboratoryResult = When a case has multiple samples, only the final laboratory result of the sample with the latest sample collection date is considered. -infoBulkProcess = %d selected entries are currently being processed. This may take a while. The progress will be updated for each 20 entries that have been processed. -infoBulkProcessFinished = All selected entries have been processed!
You can now close this window. -infoBulkProcessFinishedWithIneligibleItems = Bulk process has been successfully completed!
However, some of the selected entries could not be processed, because they were not eligible. -infoBulkProcessFinishedWithoutSuccess = Bulk process finished without success!
None of the entries were successfully processed! -infoBulkProcessFinishedWithSkips = Bulk process has been successfully completed!
However, some of the selected entries could not be processed, most likely because they were outside your jurisdiction, already archived or not eligible. -infoBulkProcessFinishedWithSkipsOutsideJurisdictionOrNotEligible = Bulk process has been successfully completed!
However, some of the selected entries could not be processed, most likely because they were outside your jurisdiction or not eligible. -infoBulkProcessNoEligibleEntries = Bulk process has been cancelled because there are no eligible entries for this operation! -infoBulkProcessCancelled = Bulk process has been cancelled!
All selected entries up until this point have been processed. You can now close this window. All not yet processed entries will still be selected. -infoBulkUnresponsiveWindowHint = Hint: If the progress bar seems to be unresponsive and no progress is visible after a while, try to click this popup window or resize your browser window. -infoNoEnvironmentSamples = No samples have been created for this environment -infoRecoveryNaturalImmunity = Natural immunity from recovering from the disease +infoMergeFiltersHint=Calculating and displaying potential duplicates may take a lot of time under specific circumstances. It is recommended to use the filters on top of this view to reduce the number of rows that have to be compared at the same time, e.g. by choosing a narrow creation date interval and a low result count limit. If the potential duplicates are loading fast, extending these values should be safe.

In order to avoid performance issues when entering this view, potential duplicates are only loaded once you click on "Confirm Filters". +infoPlaceOfStayInHospital=Please select a hospital as the place of stay. If the case is not currently admitted to a hospital as an inpatient, please document hospitalizations under previous hospitalizations. +infoMoreDetailsAboutHospitalization=For adding more details about the hospitalization, go to the hospitalization tab. +infoCountryNotEditableEventParticipantsWithoutJurisdiction=Changing the country is not permitted because at least one event participant in this event does not have a responsible region and/or responsible district set. +infoContactAlreadyConvertedToCase=This contact has already been converted to a case. Please add new visits to the case instead. +infoSearchPersonOnDependentForm=Search for another person +infoTasksWithMultipleJurisdictionsSelected=You have selected tasks connected to different jurisdictions, or that are connected to data that does not have facility or point of entry information. Only users on %s level or above will be selectable as assignees. +infoNoAccessToPersonEntities=You don't have the necessary user rights to view any entries associated with persons. +infoDashboardFinalLaboratoryResult=When a case has multiple samples, only the final laboratory result of the sample with the latest sample collection date is considered. +infoBulkProcess=%d selected entries are currently being processed. This may take a while. The progress will be updated for each 20 entries that have been processed. +infoBulkProcessFinished=All selected entries have been processed!
You can now close this window. +infoBulkProcessFinishedWithIneligibleItems=Bulk process has been successfully completed!
However, some of the selected entries could not be processed, because they were not eligible. +infoBulkProcessFinishedWithoutSuccess=Bulk process finished without success!
None of the entries were successfully processed! +infoBulkProcessFinishedWithSkips=Bulk process has been successfully completed!
However, some of the selected entries could not be processed, most likely because they were outside your jurisdiction, already archived or not eligible. +infoBulkProcessFinishedWithSkipsOutsideJurisdictionOrNotEligible=Bulk process has been successfully completed!
However, some of the selected entries could not be processed, most likely because they were outside your jurisdiction or not eligible. +infoBulkProcessNoEligibleEntries=Bulk process has been cancelled because there are no eligible entries for this operation! +infoBulkProcessCancelled=Bulk process has been cancelled!
All selected entries up until this point have been processed. You can now close this window. All not yet processed entries will still be selected. +infoBulkUnresponsiveWindowHint=Hint: If the progress bar seems to be unresponsive and no progress is visible after a while, try to click this popup window or resize your browser window. +infoNoEnvironmentSamples=No samples have been created for this environment +infoRecoveryNaturalImmunity=Natural immunity from recovering from the disease infoRestrictDiseasesDescription=Mark all diseases that the user is supposed to have access to -infoNoCustomizableEnumTranslations = Click on the + button below to add translations to this customizable enum value. -infoCustomizableEnumConfigurationInfo = Customizable enums are value sets that can be customized in order to react to the individual needs of your country or a specific epidemiological situation. The table on this screen contains all customizable enum values in the database. Each value is associated with a data type, e.g. disease variants or occupation types. Some of these data types have default values that are automatically added to the database when SORMAS is set up or new data types are added to the system.

You can add new enum values or edit existing ones, add translations for languages supported by SORMAS, select the diseases that the value should be visible for (by default, customizable enum values are visible for all diseases), and configure additional properties.

Properties are used to further control the behaviour of customizable enum values. E.g. the "has details" property that is supported by most enum values toggles whether selecting this enum value would bring up an additional text field that users can add more information to. -infoNoImmunizationAdverseEvents = No adverse events have been created for this immunization -infoAefiSelectPrimarySuspectVaccine = The list below contains all vaccinations of the immunization. Please select the suspect vaccination related to this adverse event. -infoArchivedAefiEntries = Adverse event entries are automatically archived after %d days without changes to the data. -infoNoAefiInvestigations = No investigations have been created for this adverse event +infoNoCustomizableEnumTranslations=Click on the + button below to add translations to this customizable enum value. +infoCustomizableEnumConfigurationInfo=Customizable enums are value sets that can be customized in order to react to the individual needs of your country or a specific epidemiological situation. The table on this screen contains all customizable enum values in the database. Each value is associated with a data type, e.g. disease variants or occupation types. Some of these data types have default values that are automatically added to the database when SORMAS is set up or new data types are added to the system.

You can add new enum values or edit existing ones, add translations for languages supported by SORMAS, select the diseases that the value should be visible for (by default, customizable enum values are visible for all diseases), and configure additional properties.

Properties are used to further control the behaviour of customizable enum values. E.g. the "has details" property that is supported by most enum values toggles whether selecting this enum value would bring up an additional text field that users can add more information to. +infoNoImmunizationAdverseEvents=No adverse events have been created for this immunization +infoAefiSelectPrimarySuspectVaccine=The list below contains all vaccinations of the immunization. Please select the suspect vaccination related to this adverse event. +infoArchivedAefiEntries=Adverse event entries are automatically archived after %d days without changes to the data. +infoNoAefiInvestigations=No investigations have been created for this adverse event infoHeadingAefiDashboardMap=Adverse events are shown using the GPS coordinate of the facility or person's home address. infoNoSurveys=There are no surveys created or sent for this case infoSurveyResponseReceived=Response received @@ -1171,60 +1168,59 @@ infoSurveyResponseNotReceived=No response received yet infoNoDiseaseConfigurationAgeGroups=Click on the + button below to add age groups to this disease configuration. infoExternalMessageHospitalizationFacilityMissing=The external message contains a hospitalization entry without a hospital name.\nThe processing can continue but the hospital facility will not be set. infoExternalMessageHospitalizationMissingHospital=Hospital facility missing for hospital '%s'.\nPlease contact your system administrator to configure the hospital facility. - # Messages -messageActionOutsideJurisdictionDeletionDenied = The action outside user's jurisdiction cannot be deleted -messageActivateAccount = Account has to be activated -messageAdditionalTestDeleted = Additional test deleted -messageAdditionalTestSaved = Additional test saved -messageAggregateReportFound = Attention: Duplicate reports have been found for the above criteria. Diseases marked with red already have reports. -messageAggregateReportDelete = Do you want to delete the selected aggregate report? -messageAggregateReportExpiredAgeGroups = Age groups marked "Expired" are based on existing data for an age group that is no longer used. -messageAggregatedReportEpiWeekFilterNotFilled = The epiWeek filter is not filled correctly -messageAllCasesAlreadyInEvent = All cases are already linked to the selected event. -messageAllCasesLinkedToEvent = All cases have been linked to the selected event. -messageAllContactsAlreadyInEvent = All contacts are already linked to the selected event. -messageAllContactsLinkedToEvent = All contacts have been linked to the selected event. -messageAlreadyEventParticipant = The person you have selected is already defined as an event participant of this event. -messageAnimalContactsHint = Please indicate an answer regarding ALL animals (live or dead) the person had direct exposure to (e.g. hunt, touch, eat) during the incubation period. -messageArchiveUndoneReasonMandatory = Please add a reason for de-archiving -messageCampaignArchived = Campaign has been archived -messageCampaignCreated = New campaign created -messageCampaignDearchived = Campaign has been de-archived -messageCampaignDeleted = Campaign deleted -messageCampaignFormOutsideJurisdictionDeletionDenied = The campaign form outside user's jurisdiction cannot be deleted -messageCampaignSaved = Campaign saved -messageCampaignFormSaved = %s saved -messageCaseArchived = Case has been archived -messageCaseCreated = New case created -messageCaseDearchived = Case has been de-archived -messageCaseDuplicateDeleted = The duplicate case has been deleted. -messageCaseIncidenceUnsupportedAgeGroup = Case incidence proportion can only be generated for 5 year intervals. Please remove all other age stratification filters and visualization groupings. -messageCaseReferredFromPoe = Case has been referred to the specified facility +messageActionOutsideJurisdictionDeletionDenied=The action outside user's jurisdiction cannot be deleted +messageActivateAccount=Account has to be activated +messageAdditionalTestDeleted=Additional test deleted +messageAdditionalTestSaved=Additional test saved +messageAggregateReportFound=Attention: Duplicate reports have been found for the above criteria. Diseases marked with red already have reports. +messageAggregateReportDelete=Do you want to delete the selected aggregate report? +messageAggregateReportExpiredAgeGroups=Age groups marked "Expired" are based on existing data for an age group that is no longer used. +messageAggregatedReportEpiWeekFilterNotFilled=The epiWeek filter is not filled correctly +messageAllCasesAlreadyInEvent=All cases are already linked to the selected event. +messageAllCasesLinkedToEvent=All cases have been linked to the selected event. +messageAllContactsAlreadyInEvent=All contacts are already linked to the selected event. +messageAllContactsLinkedToEvent=All contacts have been linked to the selected event. +messageAlreadyEventParticipant=The person you have selected is already defined as an event participant of this event. +messageAnimalContactsHint=Please indicate an answer regarding ALL animals (live or dead) the person had direct exposure to (e.g. hunt, touch, eat) during the incubation period. +messageArchiveUndoneReasonMandatory=Please add a reason for de-archiving +messageCampaignArchived=Campaign has been archived +messageCampaignCreated=New campaign created +messageCampaignDearchived=Campaign has been de-archived +messageCampaignDeleted=Campaign deleted +messageCampaignFormOutsideJurisdictionDeletionDenied=The campaign form outside user's jurisdiction cannot be deleted +messageCampaignSaved=Campaign saved +messageCampaignFormSaved=%s saved +messageCaseArchived=Case has been archived +messageCaseCreated=New case created +messageCaseDearchived=Case has been de-archived +messageCaseDuplicateDeleted=The duplicate case has been deleted. +messageCaseIncidenceUnsupportedAgeGroup=Case incidence proportion can only be generated for 5 year intervals. Please remove all other age stratification filters and visualization groupings. +messageCaseReferredFromPoe=Case has been referred to the specified facility messageCaseRelationToEventWithoutDisease=It is not possible to link a case to an event if the disease of the event has not been set -messageCaseSaved = Case saved -messageCaseSavedClassificationChanged = Case saved. The classification was automatically changed to %s. -messageCaseTransfered = Case has been transfered to another facility -messageCaseOutsideJurisdictionDeletionDenied = The case outside user's jurisdiction cannot be deleted -messageCasesDeleted = All selected eligible cases have been deleted -messageCasesMerged = Cases merged and duplicate case deleted. -messageCasesRestored = All selected cases have been restored -messageContactsRestored = All selected contacts have been restored -messageEventsRestored = All selected events have been restored -messageEventParticipantsRestored = All selected event participants have been restored -messageImmunizationsDeleted = All selected eligible immunizations have been deleted -messageImmunizationsRestored = All selected immunizations have been restored -messageSamplesRestored = All selected samples have been restored -messageTravelEntriesRestored = All selected travel entries have been restored -messageChangePathogenTestResult = The result of this pathogen test differs from the current overall pathogen test result of the sample. Do you want to update its result to %s? -messageCheckInputData = Please check the input data -messageClinicalCourseSaved = Clinical course saved -messageClinicalVisitCreated = Clinical assessment created -messageClinicalVisitSaved = Clinical assessment saved -messageClinicalVisitsDeleted = All selected clinical assessments have been deleted -messageCloneCaseWithNewDisease = You have just created a positive pathogen test result for a different disease. Do you want SORMAS to automatically generate a new case with this new disease? All information from this case will be copied to the new case. -messageUpdateCaseWithNewDiseaseVariant = You have saved a positive pathogen test of a different disease variant than the variant specified in the case. Do you want to update the disease variant of the case? The case's current disease variant is %s, the pathogen test's disease variant is %s. -messageCompletenessValuesUpdated = Completeness values have been updated. +messageCaseSaved=Case saved +messageCaseSavedClassificationChanged=Case saved. The classification was automatically changed to %s. +messageCaseTransfered=Case has been transfered to another facility +messageCaseOutsideJurisdictionDeletionDenied=The case outside user's jurisdiction cannot be deleted +messageCasesDeleted=All selected eligible cases have been deleted +messageCasesMerged=Cases merged and duplicate case deleted. +messageCasesRestored=All selected cases have been restored +messageContactsRestored=All selected contacts have been restored +messageEventsRestored=All selected events have been restored +messageEventParticipantsRestored=All selected event participants have been restored +messageImmunizationsDeleted=All selected eligible immunizations have been deleted +messageImmunizationsRestored=All selected immunizations have been restored +messageSamplesRestored=All selected samples have been restored +messageTravelEntriesRestored=All selected travel entries have been restored +messageChangePathogenTestResult=The result of this pathogen test differs from the current overall pathogen test result of the sample. Do you want to update its result to %s? +messageCheckInputData=Please check the input data +messageClinicalCourseSaved=Clinical course saved +messageClinicalVisitCreated=Clinical assessment created +messageClinicalVisitSaved=Clinical assessment saved +messageClinicalVisitsDeleted=All selected clinical assessments have been deleted +messageCloneCaseWithNewDisease=You have just created a positive pathogen test result for a different disease. Do you want SORMAS to automatically generate a new case with this new disease? All information from this case will be copied to the new case. +messageUpdateCaseWithNewDiseaseVariant=You have saved a positive pathogen test of a different disease variant than the variant specified in the case. Do you want to update the disease variant of the case? The case's current disease variant is %s, the pathogen test's disease variant is %s. +messageCompletenessValuesUpdated=Completeness values have been updated. messageConfirmCaseAfterPathogenTest=The final laboratory result of the sample the saved pathogen test belongs to is positive. However, the case cannot be automatically classified as a confirmed case because it is missing some information. Do you want to set the case classification to confirmed anyway? messageConvertContactToCase=You have just saved a positive laboratory result for the contact disease. Do you want to create a case for the contact person? The case will be set as the resulting case of this contact, and the final laboratory result of the sample will automatically be set to positive. messageConvertContactToCaseDifferentDiseases=You have just saved a positive laboratory result for a different disease than the contact disease. Do you want to create a case with this disease for the contact person? The case will not be set as the resulting case of this contact. @@ -1232,398 +1228,397 @@ messageConvertEventParticipantToCase=You have just saved a positive laboratory r messageConvertEventParticipantToCaseDifferentDiseases=You have just saved a positive laboratory result for a different disease than the event disease. Do you want to create a case with this disease for the event participant person? The case will not be linked to the event participant. messageConvertEventParticipantToCaseNoDisease=You have just saved a positive laboratory result for an event with no disease. Do you want to create a case with this disease for the event participant person? The final laboratory result of the sample will automatically be set to positive but the case will not be linked to the event participant. messageContactCreated=New contact created -messageContactArchived = Contact has been archived -messageContactDearchived = Contact has been de-archived -messageContactSaved = Contact data saved -messageContactsDeleted = All selected eligible contacts have been deleted -messageContactOutsideJurisdictionDeletionDenied = The contact outside user's jurisdiction cannot be deleted -messageContactDuplicateDeleted = The duplicate contact has been deleted. -messageContactsMerged = Contacts merged and duplicate contact deleted. -messageCopyPassword = Please copy this password, it is shown only once. -messageCountCasesAlreadyInEvent = %s cases were already linked to the event, all others were linked. -messageCountContactsAlreadyInEvent = %s contacts were already linked to the event -messageCountEnvironmentSamplesNotRestored = %s environment samples not restored. UUIDs of samples not restored: %s -messageCreateCollectionTask = You have set the specimen condition to not adequate.
Do you want to create a new sample collection task? -messageDatabaseExportFailed = Please contact an admin and notify them about this problem -messageEntryCreated = Entry created -messageEpiDataHint = Please indicate if any of the following is relevant for the patient during the incubation period. -messageEpidNumberWarning = The entered epid number is already used by another case. Please assign a new epid number to this or the other case. -messageCaseExternalTokenWarning = The entered external token is already used by another case. Please assign a new external token to this or the other case. -messageCaseFound = A case that matches the entered search term has been found and linked to current immunization -messageCaseFoundNoValidPathogenTest = A case that matches the entered search term has been found however no valid pathogen tests on the case found -messageContactExternalTokenWarning = The entered external token is already used by another contact. Please assign a new external token to this or the other contact. -messageEventExternalTokenWarning = The entered external token is already used by another event. Please assign a new external token to this or the other event. -messagePersonExternalTokenWarning = The entered external token is already used by another person. Please assign a new external token to this or the other person. -messageErrorReportNotAvailable = The error report file is not available. Please contact an admin and tell them about this issue. -messageEventArchived = Event has been archived -messageEventGroupArchived = Event group has been archived -messageEventCreated = New event created -messageEventGroupCreated = New event group created -messageEventLinkedAsSuperordinate = The selected event was successfully linked to this event as its superordinate event -messageEventLinkedAsSubordinate = The selected event was successfully linked to this event as a subordinate event -messageEnvironmentLinkedToEvent = The selected environment was successfully linked to this event. -messageEnvironmentAlreadyLinkedToEvent = The selected environment was already linked to this event. -messageEventLinkedToGroup = The selected event was successfully linked to this event group -messageEventsLinkedToGroup = The selected events have been successfully linked to this event group -messageEventOutsideJurisdictionDeletionDenied = The event outside user's jurisdiction cannot be deleted -messageEventSuperordinateEventUnlinked = The link between this event and its superordinate event was successfully removed -messageEventSubordinateEventUnlinked = The link between this event and its subordinate event was successfully removed -messageEventParticipationUnlinked = The link between this case and the event was successfully removed -messageEventUnlinkedFromEventGroup = The link between this event and the event group was successfully removed -messageEventUnlinked = The link between this environment and the event was successfully removed -messageEventUnlinkedFromEnvironment = The link between this event and the environment was successfully removed -messageEventDearchived = Event has been de-archived -messageEventGroupDearchived = Event group has been de-archived -messageEventParticipantArchived = Event participant has been archived -messageEventParticipantDearchived = Event participant has been de-archived -messageEventParticipantCreated = New person created -messageEventParticipantSaved = Person data saved -messageEventParticipantOutsideJurisdictionDeletionDenied = The event participant outside user's jurisdiction cannot be deleted -messageEventParticipantsDeleted = All selected eligible event participants have been deleted -messageEventParticipantResponsibleJurisdictionUpdated = Changing or removing the responsible jurisdiction of this event participant could make you lose access to its personal details and/or disallow you to edit it in the future. Are you sure you want to proceed? +messageContactArchived=Contact has been archived +messageContactDearchived=Contact has been de-archived +messageContactSaved=Contact data saved +messageContactsDeleted=All selected eligible contacts have been deleted +messageContactOutsideJurisdictionDeletionDenied=The contact outside user's jurisdiction cannot be deleted +messageContactDuplicateDeleted=The duplicate contact has been deleted. +messageContactsMerged=Contacts merged and duplicate contact deleted. +messageCopyPassword=Please copy this password, it is shown only once. +messageCountCasesAlreadyInEvent=%s cases were already linked to the event, all others were linked. +messageCountContactsAlreadyInEvent=%s contacts were already linked to the event +messageCountEnvironmentSamplesNotRestored=%s environment samples not restored. UUIDs of samples not restored: %s +messageCreateCollectionTask=You have set the specimen condition to not adequate.
Do you want to create a new sample collection task? +messageDatabaseExportFailed=Please contact an admin and notify them about this problem +messageEntryCreated=Entry created +messageEpiDataHint=Please indicate if any of the following is relevant for the patient during the incubation period. +messageEpidNumberWarning=The entered epid number is already used by another case. Please assign a new epid number to this or the other case. +messageCaseExternalTokenWarning=The entered external token is already used by another case. Please assign a new external token to this or the other case. +messageCaseFound=A case that matches the entered search term has been found and linked to current immunization +messageCaseFoundNoValidPathogenTest=A case that matches the entered search term has been found however no valid pathogen tests on the case found +messageContactExternalTokenWarning=The entered external token is already used by another contact. Please assign a new external token to this or the other contact. +messageEventExternalTokenWarning=The entered external token is already used by another event. Please assign a new external token to this or the other event. +messagePersonExternalTokenWarning=The entered external token is already used by another person. Please assign a new external token to this or the other person. +messageErrorReportNotAvailable=The error report file is not available. Please contact an admin and tell them about this issue. +messageEventArchived=Event has been archived +messageEventGroupArchived=Event group has been archived +messageEventCreated=New event created +messageEventGroupCreated=New event group created +messageEventLinkedAsSuperordinate=The selected event was successfully linked to this event as its superordinate event +messageEventLinkedAsSubordinate=The selected event was successfully linked to this event as a subordinate event +messageEnvironmentLinkedToEvent=The selected environment was successfully linked to this event. +messageEnvironmentAlreadyLinkedToEvent=The selected environment was already linked to this event. +messageEventLinkedToGroup=The selected event was successfully linked to this event group +messageEventsLinkedToGroup=The selected events have been successfully linked to this event group +messageEventOutsideJurisdictionDeletionDenied=The event outside user's jurisdiction cannot be deleted +messageEventSuperordinateEventUnlinked=The link between this event and its superordinate event was successfully removed +messageEventSubordinateEventUnlinked=The link between this event and its subordinate event was successfully removed +messageEventParticipationUnlinked=The link between this case and the event was successfully removed +messageEventUnlinkedFromEventGroup=The link between this event and the event group was successfully removed +messageEventUnlinked=The link between this environment and the event was successfully removed +messageEventUnlinkedFromEnvironment=The link between this event and the environment was successfully removed +messageEventDearchived=Event has been de-archived +messageEventGroupDearchived=Event group has been de-archived +messageEventParticipantArchived=Event participant has been archived +messageEventParticipantDearchived=Event participant has been de-archived +messageEventParticipantCreated=New person created +messageEventParticipantSaved=Person data saved +messageEventParticipantOutsideJurisdictionDeletionDenied=The event participant outside user's jurisdiction cannot be deleted +messageEventParticipantsDeleted=All selected eligible event participants have been deleted +messageEventParticipantResponsibleJurisdictionUpdated=Changing or removing the responsible jurisdiction of this event participant could make you lose access to its personal details and/or disallow you to edit it in the future. Are you sure you want to proceed? messageEventParticipantToCaseWithoutEventDisease=It is not possible to create cases from an event participant if the disease of the event has not been set messageEventParticipantToContactWithoutEventDisease=It is not possible to create a contact from an event participant if the disease of the event has not been set messageSampleSearchWithDisease=It is not possible to search for environment samples by disease. -messageEventJurisdictionUpdated = Changing or removing the jurisdiction of this event could make you lose access to its personal details and/or disallow you to edit it in the future. Are you sure you want to proceed? -messageEventSaved = Event data saved -messageEventGroupSaved = Event group data saved -messageEventsDeleted = All selected eligible events have been deleted -messageEventsSentToSurvnet = All selected events have been sent to SurvNet -messageCountCasesNotArchivedExternalReason = %s cases not archived because the communication with the reporting tool failed: %s -messageCountCasesNotDearchivedExternalReason = %s cases not dearchived because the communication with the reporting tool failed: %s -messageCountCasesNotDeleted = %s cases not deleted: %s -messageCountCasesNotDeletedAccessDeniedReason = %s cases not deleted because they are not in jurisdiction or owned: %s -messageCountCasesNotDeletedExternalReason = %s cases not deleted because the communication with the reporting tool failed: %s -messageCountCasesNotDeletedSormasToSormasReason = %s cases not deleted because of failed attempt to revoke pending share request(s): %s -messageCountCasesNotLinkableAccessDeniedReason = %s cases not linked because the case is not editable anymore or the user is missing the rights: %s -messageCountCasesNotRestored = %s cases not restored. UUIDs of cases not restored: %s -messageCountContactsNotDeleted = %s contacts not deleted: %s -messageCountContactsNotDeletedAccessDeniedReason = %s contacts not deleted because they are not in jurisdiction or owned: %s -messageCountContactsNotDeletedSormasToSormasReason = %s contacts not deleted because of failed attempt to revoke pending share request(s): %s -messageCountContactsNotLinkableAccessDeniedReason = %s contacts not linked because the contact is not editable anymore or the user is missing the rights: %s -messageCountContactsNotRestored = %s contacts not restored. UUIDs of contact not restored: %s -messageCountEntitiesNotArchived = %s entities can not be archived: %s -messageCountEntitiesNotArchivedAccessDeniedReason = %s infrastructure entities can not be archived because the entities are used in other infrastructure data: %s -messageCountEntitiesNotDearchived = %s entities can not be dearchived: %s -messageCountEntitiesNotDearchivedAccessDeniedReason = %s infrastructure entities can not be dearchived because the entities have archived parent infrastructure: %s -messageCountEntitiesNotEdited = %s entities can not be edited because they are in a different jurisdiction or were already archived.: %s -messageCountEntitiesNotEditedAccessDeniedReason = %s entities not edited because the entity is not editable anymore: %s -messageCountEntitiesNotSent = %s entities can not be sent to the reporting tool: %s -messageCountEntitiesNotSentAccessDeniedReason = %s entities can not be sent to the reporting tool because the user does not have the proper rights: %s -messageCountEntitiesNotSentExternalReason = %s entities can not be sent to the reporting tool because the communication with the reporting tool failed: %s -messageCountEventsNotArchivedExternalReason = %s events not archived because the communication with the reporting tool failed: %s -messageCountEventsNotDearchivedExternalReason = %s events not dearchived because the communication with the reporting tool failed: %s -messageCountEventsNotLinked = %s events can not be linked or they are already linked to the event group: %s -messageCountEventsNotLinkedAccessDeniedReason = %s events can not be linked to the event group because it's not allowed to link events from another region to an event group.: %s -messageCountEventsNotRestored = %s events not restored. UUIDs of events not restored: %s -messageCountEventParticipantsNotDeleted = %s event participants not deleted: %s -messageCountEventParticipantsNotDeletedAccessDeniedReason = %s event participants not deleted because they are not in jurisdiction or owned: %s -messageCountEventParticipantsNotRestored = %s event participants not restored. UUIDs of event participants not restored: %s -messageCountExternalMessagesNotDeleted = %s external messages not deleted: %s -messageCountImmunizationsNotDeleted = %s immunizations not deleted: %s -messageCountImmunizationsNotDeletedAccessDeniedReason = %s immunizations not deleted because they are not in jurisdiction or owned: %s -messageCountImmunizationsNotRestored = %s immunizations not restored. UUIDs of immunizations not restored: %s -messageCountSamplesNotDeleted = %s samples not deleted: %s -messageCountSamplesNotRestored = %s samples not restored. UUIDs of samples not restored: %s -messageCountTasksNotDeleted = %s tasks not deleted: %s -messageCountTasksNotDeletedAccessDeniedReason = %s tasks not deleted because they are not in jurisdiction or owned: %s -messageCountTravelEntriesNotDeleted = %s travel entries not deleted: %s -messageCountTravelEntriesNotDeletedAccessDeniedReason = %s travel entries not deleted because they are not in jurisdiction or owned: %s -messageCountTravelEntriesNotRestored = %s travel entries not restored. UUIDs of travel entries not restored: %s -messageCountUsersNotDisabled = %s users not disabled: %s -messageCountUsersNotEnabled = %s users not enabled: %s -messageCountVisitsNotCancelled = %s follow-up visits not cancelled: %s -messageCountVisitsNotCancelledAccessDeniedReason = %s follow-up visits not cancelled because the contact is not editable anymore or is outside the user's jurisdiction: %s -messageCountVisitsNotDeleted = %s visits not deleted: %s -messageCountVisitsNotDeletedAccessDeniedReason = %s visits not deleted because they are not in jurisdiction or owned: %s -messageCountVisitsNotSetToLost = %s follow-up visits not set to lost: %s -messageCountVisitsNotSetToLostAccessDeniedReason = %s follow-up visits not set to lost because the contact is not editable anymore or is outside the user's jurisdiction: %s -messageCountEventsNotDeleted = %s events not deleted: %s -messageCountEventsNotDeletedAccessDeniedReason = %s events not deleted because they are not in jurisdiction or owned: %s -messageCountEventsNotDeletedExternalReason = %s events not deleted because the communication with the reporting tool failed: %s -messageEventsNotDeletedLinkedEntitiesReason = No events that contain event participants linked will be deleted. Please remove the event participants from the event in order to be able to delete it. -messageCountEventsNotDeletedSormasToSormasReason = %s events not deleted because of failed attempt to revoke pending share request(s): %s -messageExportFailed = There was an error preventing the data to be exported. Please contact an admin and inform them about this issue. -messageExportConfigurationDeleted = Export configuration deleted -messageExportConfigurationSaved = Export configuration saved -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, philosophical, political, religious data, union opinions, sexual life or orientation, ethnic origin, offenses, convictions, security measures, criminal record ... or any other data that is not related to public health surveillance. -messageGdprCheck = I have read this information, please don't show this window again -messageImmunizationArchived = Immunization has been archived -messageImmunizationDearchived = Immunization has been de-archived -messageImmunizationOutsideJurisdictionDeletionDenied = The immunization outside user's jurisdiction cannot be deleted -messageImmunizationSaved = Immunization data saved. -messageImmunizationSavedVaccinationStatusUpdated = Immunization data saved. The vaccination status of matching cases, contacts, and event participants of the immunization person has been updated to vaccinated. -messageAdverseEventArchived = Adverse event has been archived -messageAdverseEventDearchived = Adverse event has been de-archived -messageAdverseEventInvestigationArchived = Adverse event investigation has been archived -messageAdverseEventInvestigationDearchived = Adverse event investigation has been de-archived -messageImportCanceled = Import canceled!
The import has been canceled. All already processed rows have been successfully imported. You can now close this window. -messageImportCanceledErrors = Import canceled!
The import has been canceled. Some of the already processed rows could not be imported due to malformed data.
Please close this window and download the error report. -messageImportError = Could not import file. -messageImportExtensionDoesNotMatchContent = The file extension does not match the file content. Please check the file extension. -messageImportFileTypeNotAllowed = This file type is not allowed. -messageImportFailed = The import failed due to a critical error. Please contact your admin and inform them about this issue. -messageImportFailedFull = Import failed!
The import failed due to a critical error. Please contact your admin and inform them about this issue. -messageImportInvalidColumn = Invalid column!
The column "%s" is not part of the imported data type or one of its connected entities. Please remove it from the .csv file and upload it again. -messageImportPartiallySuccessful = Import partially successful!
The import has been partially successful, but some of the rows could not be imported due to malformed data.
Please close this window and download the error report. -messageImportPartiallySuccessfulWithSkips = Import partially successful!
The import has been partially successful, but some of the rows could not be imported due to malformed data, and some were skipped.
Please close this window and download the error report. -messageImportSuccessful = Import successful!
All rows have been imported. You can now close this window. -messageImportSuccessfulWithSkips = Import successful!
The import has been successful, but some of the rows were skipped. You can now close this window. -messageUploadSuccessful = Upload successful! You can now close this window. -messageIncompleteGpsCoordinates = GPS coordinates are incomplete -messageIncorrectDateRange = Date from is after date to -messageExternalMessagesAssigned = The assignee has been changed for all selected messages -messageLoginFailed = Please check your username and password and try again -messageMissingCases = Please generate some cases before generating contacts -messageMissingDateFilter = Please fill in both date filter fields -messageMissingEpiWeekFilter = Please fill in both epi week filter fields +messageEventJurisdictionUpdated=Changing or removing the jurisdiction of this event could make you lose access to its personal details and/or disallow you to edit it in the future. Are you sure you want to proceed? +messageEventSaved=Event data saved +messageEventGroupSaved=Event group data saved +messageEventsDeleted=All selected eligible events have been deleted +messageEventsSentToSurvnet=All selected events have been sent to SurvNet +messageCountCasesNotArchivedExternalReason=%s cases not archived because the communication with the reporting tool failed: %s +messageCountCasesNotDearchivedExternalReason=%s cases not dearchived because the communication with the reporting tool failed: %s +messageCountCasesNotDeleted=%s cases not deleted: %s +messageCountCasesNotDeletedAccessDeniedReason=%s cases not deleted because they are not in jurisdiction or owned: %s +messageCountCasesNotDeletedExternalReason=%s cases not deleted because the communication with the reporting tool failed: %s +messageCountCasesNotDeletedSormasToSormasReason=%s cases not deleted because of failed attempt to revoke pending share request(s): %s +messageCountCasesNotLinkableAccessDeniedReason=%s cases not linked because the case is not editable anymore or the user is missing the rights: %s +messageCountCasesNotRestored=%s cases not restored. UUIDs of cases not restored: %s +messageCountContactsNotDeleted=%s contacts not deleted: %s +messageCountContactsNotDeletedAccessDeniedReason=%s contacts not deleted because they are not in jurisdiction or owned: %s +messageCountContactsNotDeletedSormasToSormasReason=%s contacts not deleted because of failed attempt to revoke pending share request(s): %s +messageCountContactsNotLinkableAccessDeniedReason=%s contacts not linked because the contact is not editable anymore or the user is missing the rights: %s +messageCountContactsNotRestored=%s contacts not restored. UUIDs of contact not restored: %s +messageCountEntitiesNotArchived=%s entities can not be archived: %s +messageCountEntitiesNotArchivedAccessDeniedReason=%s infrastructure entities can not be archived because the entities are used in other infrastructure data: %s +messageCountEntitiesNotDearchived=%s entities can not be dearchived: %s +messageCountEntitiesNotDearchivedAccessDeniedReason=%s infrastructure entities can not be dearchived because the entities have archived parent infrastructure: %s +messageCountEntitiesNotEdited=%s entities can not be edited because they are in a different jurisdiction or were already archived.: %s +messageCountEntitiesNotEditedAccessDeniedReason=%s entities not edited because the entity is not editable anymore: %s +messageCountEntitiesNotSent=%s entities can not be sent to the reporting tool: %s +messageCountEntitiesNotSentAccessDeniedReason=%s entities can not be sent to the reporting tool because the user does not have the proper rights: %s +messageCountEntitiesNotSentExternalReason=%s entities can not be sent to the reporting tool because the communication with the reporting tool failed: %s +messageCountEventsNotArchivedExternalReason=%s events not archived because the communication with the reporting tool failed: %s +messageCountEventsNotDearchivedExternalReason=%s events not dearchived because the communication with the reporting tool failed: %s +messageCountEventsNotLinked=%s events can not be linked or they are already linked to the event group: %s +messageCountEventsNotLinkedAccessDeniedReason=%s events can not be linked to the event group because it's not allowed to link events from another region to an event group.: %s +messageCountEventsNotRestored=%s events not restored. UUIDs of events not restored: %s +messageCountEventParticipantsNotDeleted=%s event participants not deleted: %s +messageCountEventParticipantsNotDeletedAccessDeniedReason=%s event participants not deleted because they are not in jurisdiction or owned: %s +messageCountEventParticipantsNotRestored=%s event participants not restored. UUIDs of event participants not restored: %s +messageCountExternalMessagesNotDeleted=%s external messages not deleted: %s +messageCountImmunizationsNotDeleted=%s immunizations not deleted: %s +messageCountImmunizationsNotDeletedAccessDeniedReason=%s immunizations not deleted because they are not in jurisdiction or owned: %s +messageCountImmunizationsNotRestored=%s immunizations not restored. UUIDs of immunizations not restored: %s +messageCountSamplesNotDeleted=%s samples not deleted: %s +messageCountSamplesNotRestored=%s samples not restored. UUIDs of samples not restored: %s +messageCountTasksNotDeleted=%s tasks not deleted: %s +messageCountTasksNotDeletedAccessDeniedReason=%s tasks not deleted because they are not in jurisdiction or owned: %s +messageCountTravelEntriesNotDeleted=%s travel entries not deleted: %s +messageCountTravelEntriesNotDeletedAccessDeniedReason=%s travel entries not deleted because they are not in jurisdiction or owned: %s +messageCountTravelEntriesNotRestored=%s travel entries not restored. UUIDs of travel entries not restored: %s +messageCountUsersNotDisabled=%s users not disabled: %s +messageCountUsersNotEnabled=%s users not enabled: %s +messageCountVisitsNotCancelled=%s follow-up visits not cancelled: %s +messageCountVisitsNotCancelledAccessDeniedReason=%s follow-up visits not cancelled because the contact is not editable anymore or is outside the user's jurisdiction: %s +messageCountVisitsNotDeleted=%s visits not deleted: %s +messageCountVisitsNotDeletedAccessDeniedReason=%s visits not deleted because they are not in jurisdiction or owned: %s +messageCountVisitsNotSetToLost=%s follow-up visits not set to lost: %s +messageCountVisitsNotSetToLostAccessDeniedReason=%s follow-up visits not set to lost because the contact is not editable anymore or is outside the user's jurisdiction: %s +messageCountEventsNotDeleted=%s events not deleted: %s +messageCountEventsNotDeletedAccessDeniedReason=%s events not deleted because they are not in jurisdiction or owned: %s +messageCountEventsNotDeletedExternalReason=%s events not deleted because the communication with the reporting tool failed: %s +messageEventsNotDeletedLinkedEntitiesReason=No events that contain event participants linked will be deleted. Please remove the event participants from the event in order to be able to delete it. +messageCountEventsNotDeletedSormasToSormasReason=%s events not deleted because of failed attempt to revoke pending share request(s): %s +messageExportFailed=There was an error preventing the data to be exported. Please contact an admin and inform them about this issue. +messageExportConfigurationDeleted=Export configuration deleted +messageExportConfigurationSaved=Export configuration saved +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, philosophical, political, religious data, union opinions, sexual life or orientation, ethnic origin, offenses, convictions, security measures, criminal record ... or any other data that is not related to public health surveillance. +messageGdprCheck=I have read this information, please don't show this window again +messageImmunizationArchived=Immunization has been archived +messageImmunizationDearchived=Immunization has been de-archived +messageImmunizationOutsideJurisdictionDeletionDenied=The immunization outside user's jurisdiction cannot be deleted +messageImmunizationSaved=Immunization data saved. +messageImmunizationSavedVaccinationStatusUpdated=Immunization data saved. The vaccination status of matching cases, contacts, and event participants of the immunization person has been updated to vaccinated. +messageAdverseEventArchived=Adverse event has been archived +messageAdverseEventDearchived=Adverse event has been de-archived +messageAdverseEventInvestigationArchived=Adverse event investigation has been archived +messageAdverseEventInvestigationDearchived=Adverse event investigation has been de-archived +messageImportCanceled=Import canceled!
The import has been canceled. All already processed rows have been successfully imported. You can now close this window. +messageImportCanceledErrors=Import canceled!
The import has been canceled. Some of the already processed rows could not be imported due to malformed data.
Please close this window and download the error report. +messageImportError=Could not import file. +messageImportExtensionDoesNotMatchContent=The file extension does not match the file content. Please check the file extension. +messageImportFileTypeNotAllowed=This file type is not allowed. +messageImportFailed=The import failed due to a critical error. Please contact your admin and inform them about this issue. +messageImportFailedFull=Import failed!
The import failed due to a critical error. Please contact your admin and inform them about this issue. +messageImportInvalidColumn=Invalid column!
The column "%s" is not part of the imported data type or one of its connected entities. Please remove it from the .csv file and upload it again. +messageImportPartiallySuccessful=Import partially successful!
The import has been partially successful, but some of the rows could not be imported due to malformed data.
Please close this window and download the error report. +messageImportPartiallySuccessfulWithSkips=Import partially successful!
The import has been partially successful, but some of the rows could not be imported due to malformed data, and some were skipped.
Please close this window and download the error report. +messageImportSuccessful=Import successful!
All rows have been imported. You can now close this window. +messageImportSuccessfulWithSkips=Import successful!
The import has been successful, but some of the rows were skipped. You can now close this window. +messageUploadSuccessful=Upload successful! You can now close this window. +messageIncompleteGpsCoordinates=GPS coordinates are incomplete +messageIncorrectDateRange=Date from is after date to +messageExternalMessagesAssigned=The assignee has been changed for all selected messages +messageLoginFailed=Please check your username and password and try again +messageMissingCases=Please generate some cases before generating contacts +messageMissingDateFilter=Please fill in both date filter fields +messageMissingEpiWeekFilter=Please fill in both epi week filter fields messageMultipleSampleReports=This message references multiple samples. You will be guided through the creation of the number of referenced samples.
Note that potential sample duplicates can be prevented by selecting the existing or previously selected sample in the respective 'pick or create sample' windows. -messageNoCasesSelected = You have not selected any cases -messageNoClinicalVisitsSelected = You have not selected any clinical assessments -messageNoContactsSelected = You have not selected any contacts -messageNoCsvFile = You have not selected a file to upload. Please select a .csv file containing the data you want to import from your computer. -messageNoDocumentTemplateUploadFile = You have not selected a file to upload. Please select a .docx template file you want to import from your computer. -messageNoDocumentUploadFile = You have not selected a file to upload. Please select a file you want to import from your computer. -messageNoEligibleEntityForEditing = None of the selected entities are eligible for editing -messageNoEligibleEventForDeletionSelected = None of the selected events are eligible for deletion -messageNoEligibleVisitForCancellation = None of the follow-up visits were eligible for cancellation -messageNoEligibleVisitForSettingToLost = None of the follow-up visits were eligible for setting to lost -messageNoEnvironmentsSelected = You have not selected any environments -messageNoEventParticipantsSelected = You have not selected any event participants -messageNoEventsSelected = You have not selected any events -messageNoImmunizationsSelected = You have not selected any immunizations -messageNoTravelEntriesSelected = You have not selected any travel entries -messageNoPathogenTestsSelected = You have not selected any pathogen tests -messageNoPrescriptionsSelected = You have not selected any prescriptions -messageNoSamplesSelected = You have not selected any samples -messageNoTasksSelected = You have not selected any tasks -messageNoTreatmentsSelected = You have not selected any treatments -messageNoVisitsSelected = You have not selected any visits -messageNoUsersSelected = You have not selected any users -messageNoUserSelected = No user has been selected -messageOutbreakSaved = Outbreak information saved -messagePasswordReset = User's password was reset -messagePasswordResetEmailLink = A link to reset the password was sent to the user's email -messagePathogenTestSaved = Pathogen test saved. The classification of its associated case was automatically changed to %s. -messagePathogenTestSavedShort = Pathogen test saved -messagePathogenTestsSavedShort = Pathogen tests saved -messagePathogenTestsDeleted = All selected pathogen tests have been deleted -messagePersonSaved = Person data saved -messagePersonSavedClassificationChanged = Person data saved. The classification of at least one case associated with this person was automatically changed to %s. -messagePersonMergedAddressDescription = Adopted from discarded person during merge -messagePersonMergeNoEventParticipantRights = The merge process requires merging of event participants from the same event. You don't have user rights to process this type of merge. -messagePickEventParticipantsIncompleteSelection = Please select an event participant from each duplicate group -messagePlagueTypeChange = The symptoms selected match the clinical criteria for %s. The plague type is set to %s for this case. -messagePrescriptionCreated = Prescription created -messagePrescriptionSaved = Prescription saved -messagePrescriptionsDeleted = All selected prescriptions have been deleted -messageRelatedSampleFound = The sample referenced in this lab message seems to already exist.
Do you want to directly open that sample? There were no processed related lab messages found. -messageRelatedSampleAndLabMessagesFound = A lab message with the same report ID was already processed. It is related to a sample also referenced in this lab message.
Do you want to directly open that sample? -messageSampleErrors = There are errors in the sample form. Please fix them and save the sample before referring it to another laboratory. -messageSampleSaved = Sample data saved -messageSamplesDeleted = All selected eligible samples have been deleted -messageSpecifyColumnAttribute = Please specify the column attribute you have chosen for the visualization -messageSpecifyFilterAttributes = Please specify all selected filter attributes and sub attributes -messageSpecifyRowAttribute = Please specify the row attribute you have chosen for the visualization -messageSymptomsHint = Please tick an answer for ALL symptoms indicating if they occurred at any point in time during this illness: -messageSymptomsVisitHint = Please tick an answer for ALL symptoms indicating if they were present at the time of this visit: -messageTaskArchived = The task has been archived -messageTasksEdited = All tasks have been edited -messageTaskDearchived = The task has been de-archived -messageTasksDeleted = All selected eligible tasks have been deleted -messageTemplateNotAvailable = The template file is not available. Please contact an admin and tell them about this issue. -messageTravelEntryOutsideJurisdictionDeletionDenied = The travel entry outside user's jurisdiction cannot be deleted -messageTravelEntrySaved = Travel entry data saved -messageTravelEntryArchived = Travel entry has been archived -messageTravelEntryDearchived = Travel entry has been de-archived -messageTravelEntryPOEFilledBySystem = [System] Automatically filled point of entry -messageTravelEntriesDeleted = All selected eligible travel entries have been deleted -messageTreatmentCreated = Treatment created -messageTreatmentSaved = Treatment saved -messageTreatmentsDeleted = All selected treatments have been deleted -messageUnknownFilterAttributeForPopulationData = Displaying case incidence proportion for unknown sex or age group is not possible. Please remove the respective values from your filters. -messageDeletionUnsupportedByExternalJournalWarning = The external journal has not yet provided a function to unregister persons from within SORMAS. Please manually delete the person from the external journal. -messageExternalJournalDidNotProvideMessage = The external journal did not provide a message. -messageDiseaseNotSpecifiedInLabMessage = The disease of the external message could not automatically be determined. Please manually verify that this message is about a disease to be dealt with in SORMAS. -messageUserRoleCombination = cannot be combined with -messageUserRoleSaved = User role saved -messageVaccinationOutsideJurisdictionDeletionDenied = The vaccination outside user's jurisdiction cannot be deleted -messageVisitsDeleted = All selected eligible visits have been deleted -messageVisitsWithWrongStatusNotCancelled = Follow-up visits with CANCELLED or NO FOLLOW-UP status can not be cancelled -messageVisitsWithWrongStatusNotSetToLost = Follow-up visits with NO FOLLOW-UP status can not be set to lost -messageWrongFileType = Please provide a .csv file containing the data you want to import. It's recommended to use the import template file as a starting point. +messageNoCasesSelected=You have not selected any cases +messageNoClinicalVisitsSelected=You have not selected any clinical assessments +messageNoContactsSelected=You have not selected any contacts +messageNoCsvFile=You have not selected a file to upload. Please select a .csv file containing the data you want to import from your computer. +messageNoDocumentTemplateUploadFile=You have not selected a file to upload. Please select a .docx template file you want to import from your computer. +messageNoDocumentUploadFile=You have not selected a file to upload. Please select a file you want to import from your computer. +messageNoEligibleEntityForEditing=None of the selected entities are eligible for editing +messageNoEligibleEventForDeletionSelected=None of the selected events are eligible for deletion +messageNoEligibleVisitForCancellation=None of the follow-up visits were eligible for cancellation +messageNoEligibleVisitForSettingToLost=None of the follow-up visits were eligible for setting to lost +messageNoEnvironmentsSelected=You have not selected any environments +messageNoEventParticipantsSelected=You have not selected any event participants +messageNoEventsSelected=You have not selected any events +messageNoImmunizationsSelected=You have not selected any immunizations +messageNoTravelEntriesSelected=You have not selected any travel entries +messageNoPathogenTestsSelected=You have not selected any pathogen tests +messageNoPrescriptionsSelected=You have not selected any prescriptions +messageNoSamplesSelected=You have not selected any samples +messageNoTasksSelected=You have not selected any tasks +messageNoTreatmentsSelected=You have not selected any treatments +messageNoVisitsSelected=You have not selected any visits +messageNoUsersSelected=You have not selected any users +messageNoUserSelected=No user has been selected +messageOutbreakSaved=Outbreak information saved +messagePasswordReset=User's password was reset +messagePasswordResetEmailLink=A link to reset the password was sent to the user's email +messagePathogenTestSaved=Pathogen test saved. The classification of its associated case was automatically changed to %s. +messagePathogenTestSavedShort=Pathogen test saved +messagePathogenTestsSavedShort=Pathogen tests saved +messagePathogenTestsDeleted=All selected pathogen tests have been deleted +messagePersonSaved=Person data saved +messagePersonSavedClassificationChanged=Person data saved. The classification of at least one case associated with this person was automatically changed to %s. +messagePersonMergedAddressDescription=Adopted from discarded person during merge +messagePersonMergeNoEventParticipantRights=The merge process requires merging of event participants from the same event. You don't have user rights to process this type of merge. +messagePickEventParticipantsIncompleteSelection=Please select an event participant from each duplicate group +messagePlagueTypeChange=The symptoms selected match the clinical criteria for %s. The plague type is set to %s for this case. +messagePrescriptionCreated=Prescription created +messagePrescriptionSaved=Prescription saved +messagePrescriptionsDeleted=All selected prescriptions have been deleted +messageRelatedSampleFound=The sample referenced in this lab message seems to already exist.
Do you want to directly open that sample? There were no processed related lab messages found. +messageRelatedSampleAndLabMessagesFound=A lab message with the same report ID was already processed. It is related to a sample also referenced in this lab message.
Do you want to directly open that sample? +messageSampleErrors=There are errors in the sample form. Please fix them and save the sample before referring it to another laboratory. +messageSampleSaved=Sample data saved +messageSamplesDeleted=All selected eligible samples have been deleted +messageSpecifyColumnAttribute=Please specify the column attribute you have chosen for the visualization +messageSpecifyFilterAttributes=Please specify all selected filter attributes and sub attributes +messageSpecifyRowAttribute=Please specify the row attribute you have chosen for the visualization +messageSymptomsHint=Please tick an answer for ALL symptoms indicating if they occurred at any point in time during this illness: +messageSymptomsVisitHint=Please tick an answer for ALL symptoms indicating if they were present at the time of this visit: +messageTaskArchived=The task has been archived +messageTasksEdited=All tasks have been edited +messageTaskDearchived=The task has been de-archived +messageTasksDeleted=All selected eligible tasks have been deleted +messageTemplateNotAvailable=The template file is not available. Please contact an admin and tell them about this issue. +messageTravelEntryOutsideJurisdictionDeletionDenied=The travel entry outside user's jurisdiction cannot be deleted +messageTravelEntrySaved=Travel entry data saved +messageTravelEntryArchived=Travel entry has been archived +messageTravelEntryDearchived=Travel entry has been de-archived +messageTravelEntryPOEFilledBySystem=[System] Automatically filled point of entry +messageTravelEntriesDeleted=All selected eligible travel entries have been deleted +messageTreatmentCreated=Treatment created +messageTreatmentSaved=Treatment saved +messageTreatmentsDeleted=All selected treatments have been deleted +messageUnknownFilterAttributeForPopulationData=Displaying case incidence proportion for unknown sex or age group is not possible. Please remove the respective values from your filters. +messageDeletionUnsupportedByExternalJournalWarning=The external journal has not yet provided a function to unregister persons from within SORMAS. Please manually delete the person from the external journal. +messageExternalJournalDidNotProvideMessage=The external journal did not provide a message. +messageDiseaseNotSpecifiedInLabMessage=The disease of the external message could not automatically be determined. Please manually verify that this message is about a disease to be dealt with in SORMAS. +messageUserRoleCombination=cannot be combined with +messageUserRoleSaved=User role saved +messageVaccinationOutsideJurisdictionDeletionDenied=The vaccination outside user's jurisdiction cannot be deleted +messageVisitsDeleted=All selected eligible visits have been deleted +messageVisitsWithWrongStatusNotCancelled=Follow-up visits with CANCELLED or NO FOLLOW-UP status can not be cancelled +messageVisitsWithWrongStatusNotSetToLost=Follow-up visits with NO FOLLOW-UP status can not be set to lost +messageWrongFileType=Please provide a .csv file containing the data you want to import. It's recommended to use the import template file as a starting point. messageWrongTemplateFileType=For %s, please provide a .%s file. -messageLineListingDisabled = Line listing has been disabled -messageLineListingSaved = Line listing configuration saved -messageNoEndDate = no end date -messageInvalidDatesLineListing = There are invalid dates in at least one of the line listing configurations. Please make sure that all entered dates are in the present or future and try again. -messageAreaArchived = Area has been archived -messageAreaDearchived = Area has been de-archived -messageContinentArchived = Continent has been archived -messageContinentDearchived = Continent has been de-archived -messageSubcontinentArchived = Subcontinent has been archived -messageSubcontinentDearchived = Subcontinent has been de-archived -messageCountryArchived = Country has been archived -messageCountryDearchived = Country has been de-archived -messageRegionArchived = Region has been archived -messageRegionDearchived = Region has been de-archived -messageDistrictArchived = District has been archived -messageDistrictDearchived = District has been de-archived -messageCommunityArchived = Community has been archived -messageCommunityDearchived = Community has been de-archived -messageFacilityArchived = Facility has been archived -messageFacilityDearchived = Facility has been de-archived -messageLaboratoryArchived = Laboratory has been archived -messageLaboratoryDearchived = Laboratory has been de-archived -messagePointOfEntryArchived = Point of entry has been archived -messagePointOfEntryDearchived = Point of entry has been de-archived -messageAreaArchivingNotPossible = This area can not be archived because it is still used in other infrastructure data. Please archive any region in this area first. -messageContinentArchivingNotPossible = This continent can not be archived because it is still used in other infrastructure data. Please archive any subcontinent in this continent first. -messageSubcontinentArchivingNotPossible = This subcontinent can not be archived because it is still used in other infrastructure data. Please archive any country in this subcontinent first. -messageRegionArchivingNotPossible = This region can not be archived because it is still used in other infrastructure data. Please archive any district, facility, laboratory and point of entry in this region first. -messageDistrictArchivingNotPossible = This district can not be archived because it is still used in other infrastructure data. Please archive any community, facility, laboratory and point of entry in this district first. -messageCommunityArchivingNotPossible = This community can not be archived because it is still used in other infrastructure data. Please archive any facility and laboratory in this community first. -messageCountryDearchivingNotPossible = This country can not be de-archived because its subcontinent is still archived. Please de-archive its subcontinent first. -messageSubcontinentDearchivingNotPossible = This subcontinent can not be de-archived because its continent is still archived. Please de-archive its continent first. -messageDistrictDearchivingNotPossible = This district can not be de-archived because its region is still archived. Please de-archive its region first. -messageCommunityDearchivingNotPossible = This community can not be de-archived because its district or region are still archived. Please de-archive its district and region first. -messageFacilityDearchivingNotPossible = This facility can not be de-archived because its community, district or region are still archived. Please de-archive its community, district and region first. -messageLaboratoryDearchivingNotPossible = This laboratory can not be de-archived because its community, district or region are still archived. Please de-archive its community, district and region first. -messagePointOfEntryDearchivingNotPossible = This point of entry can not be de-archived because its district or region are still archived. Please de-archive its district and region first. -messageLaboratoriesDearchivingNotPossible = At least one of the selected laboratories can not be de-archived because its community, district or region are still archived. Please de-archive the communities, districts and regions of all selected laboratories first. -messageNoRowsSelected = You have not selected any rows -messageAreasArchived = All selected areas have been archived -messageAreasDearchived = All selected areas have been de-archived -messageContinentsArchived = All selected continents have been archived -messageContinentsDearchived = All selected continents have been de-archived -messageSubcontinentsArchived = All selected subcontinents have been archived -messageSubcontinentsDearchived = All selected subcontinents have been de-archived -messageSurveySaved = Survey saved -messageSurveyTokenSaved = Survey token saved -messageSurveyTokenDelete = Are you sure you want to delete this Survey token?

Along with the survey token you want to delete, the associated document will also be deleted -messageSurveyCreated = Survey created -messageSurveyNoDocumentTemplate = No document template has been set for this survey -messageSurveyNoEmailTemplate = No email template has been set for this survey -messageSurveyNoTokens = No unassigned tokens have been found for this survey -messageCountriesArchived = All selected countries have been archived -messageCountriesDearchived = All selected regions have been de-archived -messageRegionsArchived = All selected regions have been archived -messageRegionsDearchived = All selected regions have been de-archived -messageDistrictsArchived = All selected districts have been archived -messageDistrictsDearchived = All selected districts have been de-archived -messageCommunitiesArchived = All selected communities have been archived -messageCommunitiesDearchived = All selected communities have been de-archived -messageFacilitiesArchived = All selected facilities have been archived -messageFacilitiesDearchived = All selected facilities have been de-archived -messageLaboratoriesArchived = All selected laboratories have been archived -messageLaboratoriesDearchived = All selected laboratories have been de-archived -messagePointsOfEntryArchived = All selected points of entry have been archived -messagePointsOfEntryDearchived = All selected points of entry have been de-archived -messageForwardedExternalMessageFound = There exists at least one other message with the same report id that was forwarded. Do you want continue processing this message? -messageNoCaseFound = No case could be found that matches the entered search term. -messageNoCaseFoundToLinkImmunization = There is no case that matches the search criteria and link conditions. -messageNoEventFound = No event could be found that matches the entered search term. -messageContactToCaseConfirmationRequired = You can only convert contacts to cases that have been confirmed. Please confirm and save this contact before creating a case for its contact person. -messageContactConversionFollowUpCommentLarge = Performing this action will automatically cancel follow-up and append the following message to the follow-up comment:

%s

The maximum length of the follow-up comment field would be exceeded by appending this message. Please choose whether you want to cancel the action, reduce the length of the follow-up comment and try it again, or omit the message displayed above. -messageContactConversionFollowUpCommentLargeAdjustComment = Adjust comment -messageContactConversionFollowUpCommentLargeOmitMessage = Omit message -messageContactCaseRemoved = The source case has been removed from this contact -messageContactCaseChanged = The source case of the contact has been changed -messageSampleOpened = Opened sample found for search string -messageSystemConfigurationValueSaved = System configuration value saved -messageSystemFollowUpCanceled = [System] Follow-up automatically canceled because contact was converted to a case -messageSystemFollowUpCanceledByDropping = [System] Follow-up automatically canceled because contact was dropped -messageSetContactRegionAndDistrict = Please choose a responsible region and responsible district and save the contact before removing the source case. -messageAllCampaignFormsValid = All campaign forms have been successfully validated -messageEnterSms = Please enter your SMS message here: -messageSelectedPeriodTooLong = You have selected a time period that exceeds the maximum number of days. Please make sure that the selected time period does not exceed %d days. -messagePersonAlreadyEventParticipant = The case person already is an event participant in the selected event. This case has been linked to the selected event. -messageThisPersonAlreadyEventParticipant = This person already is an event participant in the selected event. -messageThisEventAlreadyLinkedToEnvironment = This event is already linked to the selected environment. -messagePersonAddedAsEventParticipant = The new event participant was created. -messagePersonListAddedAsEventPerticipants = New event participants were created from person list submitted -messagePersonAlreadyCaseInEvent = This case is already linked to the selected event. -messagePersonContactDetailsPrimaryDuplicate = There already are primary contact details of this type recorded for this person. Do you want to set these contact details as the primary contact details instead? -messageUserSyncCanceled = Sync canceled!
The sync has been canceled. All already processed users have been successfully synced. You can now close this window. -messageUserSyncCanceledErrors = Sync canceled!
The sync has been canceled. Some of the already processed users could not be synced due to malformed data.
Please close this window and download the error report. -messageUserSyncFailedFull = Sync failed!
The sync failed due to a critical error. Please contact your admin and inform them about this issue. -messageUserSyncPartiallySuccessful = Sync partially successful!
The sync has been successful, but some of the users could not be synced due to malformed data.
Please close this window and download the error report. -messageUserSyncSuccessful = Sync successful!
All users have been synced. You can now close this window. -messageUserRightsExportFailed = Please contact an admin and notify them about this problem -messageNoExternalMessagesSelected = You have not selected any messages -messageExternalLabResultsAdapterNotFound = The external lab results adapter could not be found. This probably means you system is not configured correctly. Please contact you system administrator. -messageExternalMessagesEligibleForDeletion = Only unprocessed messages can be deleted -messageExternalMessagesDeleted = All selected eligible messages have been deleted -messageQuarantineOrderDocumentCreated = Quarantine order document has been created -messageUnavailableTaskEditionDueToDifferentDistricts = Task edition is not available if they are related to different districts -messageUsersEnabled = All selected users have been enabled -messageUsersDisabled = All selected users have been disabled -messageDontShareWithReportingToolWarning = This case is actively prevented from being sent to the external reporting tool -messageBulkCasesWithDifferentDiseasesSelected = You have selected cases with different diseases. Some bulk edit options might be unavailable. -messageBulkContactsWithDifferentDiseasesSelected = You have selected contacts with different diseases. Some bulk edit options might be unavailable. -messageBulkDontShareWithReportingToolWarning = The cases will be prevented from being sent to the external reporting tool -messageBulkLinkEventHint = All selected cases will be linked to the selected event if they are not linked to it already -messageInfrastructureLocked = Infrastructure data is locked and cannot be added/edited/imported/de-archived -messageDeleteImmunizationVaccinations = Changing the means of immunization will delete all vaccinations that have been added to this immunization. Are you sure you want to proceed with the change? -messageDeleteReasonNotFilled = Please choose a reason for deletion -messageOtherDeleteReasonNotFilled = Please add a reason for deletion -messageVaccinationNotRelevantForCase = This vaccination is not relevant for this case because the vaccination date is set after the symptom onset date or case report date. -messageVaccinationNoDateNotRelevantForCase = This vaccination is not relevant for this case because it does not have a vaccination date. -messageVaccinationNotRelevantForContact = This vaccination is not relevant for this contact because the vaccination date is set after the last contact date or contact report date. -messageVaccinationNoDateNotRelevantForContact = This vaccination is not relevant for this contact because it does not have a vaccination date. -messageVaccinationNotRelevantForEventParticipant = This vaccination is not relevant for this event participant because the vaccination date is after the event date or event report date. -messageVaccinationNoDateNotRelevantForEventParticipant = This vaccination is not relevant for this event participant because it does not have a vaccination date. -messageAcceptRequestToNavigate = The request is not yet accepted. You have to accept it first to be able to navigate there. -messageEntityNotFound = The %s was not found in the system. -messageEntitiesNotEditable = There are no entities which are allowed to be edited -messageSormasToSormasSimilarCaseFound = There is at least one similar case in your system. If you accept the request the case maybe will be in your system as a duplicate.
If so, you should consolidate the cases after accepting.
Please make sure that you use the accepted case for this purpose. -messageSormasToSormasSimilarConvertedCaseFound = There is at least one similar case in your system. If you accept the request the case maybe will be in your system as a duplicate.
If so, you should consolidate the cases after accepting.
After consolidating the cases, it may be necessary to perform a manual conversion of some contacts to the accepted case.
Please make sure that you use the accepted case for this purpose. -messageSormasToSormasSimilarContactToCaseFound = There is at least one similar contact in your system.
After accepting the request, it may be necessary to perform a manual conversion of those contacts to the accepted case. -messageSormasToSormasSimilarContactFound = There is at least one similar contact in your system. If you accept the request the contact maybe will be in your system as a duplicate.
If so, you should consolidate the contacts after accepting.
Please make sure that you use the accepted contact for this purpose. -messageSormasToSormasSimilarConvertedContactFound = There is at least one similar contact in your system. If you accept the request the contact maybe will be in your system as a duplicate.
If so, you should consolidate the contacts after accepting.
After consolidating the contacts, it may be necessary to perform a manual conversion of the accepted contact.
Please make sure that you use the accepted contact for this purpose. -messageSormasToSormasSimilarCaseToContactFound = There is at least one similar case in your system.
After accepting the request, it may be necessary to perform a manual conversion of the accepted contacts. -messageSormasToSormasSimilarPersonFound = There is at least one similar person in your system. If you accept the request the case/contact maybe will create a person in your system as a duplicate.
Please check this after accepting. -messageDeleteWithPendingShareRequest = There is a pending share request. With a deletion, the share request will be revoked and deleted. -messageCannotMergeMoreThanTwoPersons = You need to select two persons for merge! -messageAutomaticDeletionStarted = Automatic deletion has been started and will be executed in the background. Please note that, depending on the amount of data that is deleted, this process can take some time. -messageUserRoleUnusableForLogin = Users with only this role will not be able to login because the role does not have Access Sormas UI nor Access Sormas REST right -messageUserRoleHasNoRights = This user role has no rights. Please select at least one right. -messageEntriesEdited = All entries have been edited -messageAllEntitiesArchived = All selected entries have been archived -messageAllEntitiesDearchived = All selected entries have been dearchived -messageAllEventsAlreadyLinkedToGroup = All the selected events were already linked to the event group. -messageEnvironmentCreated = Environment created -messageEnvironmentSaved = Environment saved -messageEnvironmentArchived = Environment has been archived -messageEnvironmentDearchived = Environment has been de-archived -messageEnvironmentSampleOutsideJurisdictionDeletionDenied = The environment sample outside user's jurisdiction cannot be deleted -messageEnvironmentJurisdictionUpdated = Changing the location of this environment could make you lose access to its details and/or disallow you to edit in the future. Are you sure you want to proceed? -messageNoEnvironmentSamplesSelected = You have not selected any environment samples -messageEnvironmentSamplesDeleted = All selected eligible environment samples have been deleted -messageCountEnvironmentSamplesNotDeleted = %s environment samples not deleted: %s -messageCountEnvironmentSamplesNotDeletedAccessDeniedReason = %s environment samples not deleted because they are not in jurisdiction or owned: %s -messageEnvironmentSamplesRestored = All selected environment samples have been restored -messageEnvironmentSampleSaved = Environment sample saved -messageRestoreNotPossibleAlreadyInEvent = Event participant can't be restored because the person already has another active event participant in this event -messageDuplicateEnvironmentFound = A similar environment already exists in the database (UUID: %s) -messageBulkEmailsSentToAllSelectedEntities = Emails sent to all selected entities -messageBulkEmailsNotSentToToEntites = Ineligible entities -headingBulkEmailsSomeNotSent = Some emails from the bulk selection were not sent -headingBulkEmailsNoProcessedEntities = No email has been sent -messageBulkEmailsNoEligible = Not eligible email addresses -messageBulkEmailsFinishedWithSkips = For some entities the email has not been sent -messageBulkEmailsFinishedWithoutSuccess = No email has been sent -messageBulkEmailsCountNotProcessed = %s of entities have not been processed: %s +messageLineListingDisabled=Line listing has been disabled +messageLineListingSaved=Line listing configuration saved +messageNoEndDate=no end date +messageInvalidDatesLineListing=There are invalid dates in at least one of the line listing configurations. Please make sure that all entered dates are in the present or future and try again. +messageAreaArchived=Area has been archived +messageAreaDearchived=Area has been de-archived +messageContinentArchived=Continent has been archived +messageContinentDearchived=Continent has been de-archived +messageSubcontinentArchived=Subcontinent has been archived +messageSubcontinentDearchived=Subcontinent has been de-archived +messageCountryArchived=Country has been archived +messageCountryDearchived=Country has been de-archived +messageRegionArchived=Region has been archived +messageRegionDearchived=Region has been de-archived +messageDistrictArchived=District has been archived +messageDistrictDearchived=District has been de-archived +messageCommunityArchived=Community has been archived +messageCommunityDearchived=Community has been de-archived +messageFacilityArchived=Facility has been archived +messageFacilityDearchived=Facility has been de-archived +messageLaboratoryArchived=Laboratory has been archived +messageLaboratoryDearchived=Laboratory has been de-archived +messagePointOfEntryArchived=Point of entry has been archived +messagePointOfEntryDearchived=Point of entry has been de-archived +messageAreaArchivingNotPossible=This area can not be archived because it is still used in other infrastructure data. Please archive any region in this area first. +messageContinentArchivingNotPossible=This continent can not be archived because it is still used in other infrastructure data. Please archive any subcontinent in this continent first. +messageSubcontinentArchivingNotPossible=This subcontinent can not be archived because it is still used in other infrastructure data. Please archive any country in this subcontinent first. +messageRegionArchivingNotPossible=This region can not be archived because it is still used in other infrastructure data. Please archive any district, facility, laboratory and point of entry in this region first. +messageDistrictArchivingNotPossible=This district can not be archived because it is still used in other infrastructure data. Please archive any community, facility, laboratory and point of entry in this district first. +messageCommunityArchivingNotPossible=This community can not be archived because it is still used in other infrastructure data. Please archive any facility and laboratory in this community first. +messageCountryDearchivingNotPossible=This country can not be de-archived because its subcontinent is still archived. Please de-archive its subcontinent first. +messageSubcontinentDearchivingNotPossible=This subcontinent can not be de-archived because its continent is still archived. Please de-archive its continent first. +messageDistrictDearchivingNotPossible=This district can not be de-archived because its region is still archived. Please de-archive its region first. +messageCommunityDearchivingNotPossible=This community can not be de-archived because its district or region are still archived. Please de-archive its district and region first. +messageFacilityDearchivingNotPossible=This facility can not be de-archived because its community, district or region are still archived. Please de-archive its community, district and region first. +messageLaboratoryDearchivingNotPossible=This laboratory can not be de-archived because its community, district or region are still archived. Please de-archive its community, district and region first. +messagePointOfEntryDearchivingNotPossible=This point of entry can not be de-archived because its district or region are still archived. Please de-archive its district and region first. +messageLaboratoriesDearchivingNotPossible=At least one of the selected laboratories can not be de-archived because its community, district or region are still archived. Please de-archive the communities, districts and regions of all selected laboratories first. +messageNoRowsSelected=You have not selected any rows +messageAreasArchived=All selected areas have been archived +messageAreasDearchived=All selected areas have been de-archived +messageContinentsArchived=All selected continents have been archived +messageContinentsDearchived=All selected continents have been de-archived +messageSubcontinentsArchived=All selected subcontinents have been archived +messageSubcontinentsDearchived=All selected subcontinents have been de-archived +messageSurveySaved=Survey saved +messageSurveyTokenSaved=Survey token saved +messageSurveyTokenDelete=Are you sure you want to delete this Survey token?

Along with the survey token you want to delete, the associated document will also be deleted +messageSurveyCreated=Survey created +messageSurveyNoDocumentTemplate=No document template has been set for this survey +messageSurveyNoEmailTemplate=No email template has been set for this survey +messageSurveyNoTokens=No unassigned tokens have been found for this survey +messageCountriesArchived=All selected countries have been archived +messageCountriesDearchived=All selected regions have been de-archived +messageRegionsArchived=All selected regions have been archived +messageRegionsDearchived=All selected regions have been de-archived +messageDistrictsArchived=All selected districts have been archived +messageDistrictsDearchived=All selected districts have been de-archived +messageCommunitiesArchived=All selected communities have been archived +messageCommunitiesDearchived=All selected communities have been de-archived +messageFacilitiesArchived=All selected facilities have been archived +messageFacilitiesDearchived=All selected facilities have been de-archived +messageLaboratoriesArchived=All selected laboratories have been archived +messageLaboratoriesDearchived=All selected laboratories have been de-archived +messagePointsOfEntryArchived=All selected points of entry have been archived +messagePointsOfEntryDearchived=All selected points of entry have been de-archived +messageForwardedExternalMessageFound=There exists at least one other message with the same report id that was forwarded. Do you want continue processing this message? +messageNoCaseFound=No case could be found that matches the entered search term. +messageNoCaseFoundToLinkImmunization=There is no case that matches the search criteria and link conditions. +messageNoEventFound=No event could be found that matches the entered search term. +messageContactToCaseConfirmationRequired=You can only convert contacts to cases that have been confirmed. Please confirm and save this contact before creating a case for its contact person. +messageContactConversionFollowUpCommentLarge=Performing this action will automatically cancel follow-up and append the following message to the follow-up comment:

%s

The maximum length of the follow-up comment field would be exceeded by appending this message. Please choose whether you want to cancel the action, reduce the length of the follow-up comment and try it again, or omit the message displayed above. +messageContactConversionFollowUpCommentLargeAdjustComment=Adjust comment +messageContactConversionFollowUpCommentLargeOmitMessage=Omit message +messageContactCaseRemoved=The source case has been removed from this contact +messageContactCaseChanged=The source case of the contact has been changed +messageSampleOpened=Opened sample found for search string +messageSystemConfigurationValueSaved=System configuration value saved +messageSystemFollowUpCanceled=[System] Follow-up automatically canceled because contact was converted to a case +messageSystemFollowUpCanceledByDropping=[System] Follow-up automatically canceled because contact was dropped +messageSetContactRegionAndDistrict=Please choose a responsible region and responsible district and save the contact before removing the source case. +messageAllCampaignFormsValid=All campaign forms have been successfully validated +messageEnterSms=Please enter your SMS message here: +messageSelectedPeriodTooLong=You have selected a time period that exceeds the maximum number of days. Please make sure that the selected time period does not exceed %d days. +messagePersonAlreadyEventParticipant=The case person already is an event participant in the selected event. This case has been linked to the selected event. +messageThisPersonAlreadyEventParticipant=This person already is an event participant in the selected event. +messageThisEventAlreadyLinkedToEnvironment=This event is already linked to the selected environment. +messagePersonAddedAsEventParticipant=The new event participant was created. +messagePersonListAddedAsEventPerticipants=New event participants were created from person list submitted +messagePersonAlreadyCaseInEvent=This case is already linked to the selected event. +messagePersonContactDetailsPrimaryDuplicate=There already are primary contact details of this type recorded for this person. Do you want to set these contact details as the primary contact details instead? +messageUserSyncCanceled=Sync canceled!
The sync has been canceled. All already processed users have been successfully synced. You can now close this window. +messageUserSyncCanceledErrors=Sync canceled!
The sync has been canceled. Some of the already processed users could not be synced due to malformed data.
Please close this window and download the error report. +messageUserSyncFailedFull=Sync failed!
The sync failed due to a critical error. Please contact your admin and inform them about this issue. +messageUserSyncPartiallySuccessful=Sync partially successful!
The sync has been successful, but some of the users could not be synced due to malformed data.
Please close this window and download the error report. +messageUserSyncSuccessful=Sync successful!
All users have been synced. You can now close this window. +messageUserRightsExportFailed=Please contact an admin and notify them about this problem +messageNoExternalMessagesSelected=You have not selected any messages +messageExternalLabResultsAdapterNotFound=The external lab results adapter could not be found. This probably means you system is not configured correctly. Please contact you system administrator. +messageExternalMessagesEligibleForDeletion=Only unprocessed messages can be deleted +messageExternalMessagesDeleted=All selected eligible messages have been deleted +messageQuarantineOrderDocumentCreated=Quarantine order document has been created +messageUnavailableTaskEditionDueToDifferentDistricts=Task edition is not available if they are related to different districts +messageUsersEnabled=All selected users have been enabled +messageUsersDisabled=All selected users have been disabled +messageDontShareWithReportingToolWarning=This case is actively prevented from being sent to the external reporting tool +messageBulkCasesWithDifferentDiseasesSelected=You have selected cases with different diseases. Some bulk edit options might be unavailable. +messageBulkContactsWithDifferentDiseasesSelected=You have selected contacts with different diseases. Some bulk edit options might be unavailable. +messageBulkDontShareWithReportingToolWarning=The cases will be prevented from being sent to the external reporting tool +messageBulkLinkEventHint=All selected cases will be linked to the selected event if they are not linked to it already +messageInfrastructureLocked=Infrastructure data is locked and cannot be added/edited/imported/de-archived +messageDeleteImmunizationVaccinations=Changing the means of immunization will delete all vaccinations that have been added to this immunization. Are you sure you want to proceed with the change? +messageDeleteReasonNotFilled=Please choose a reason for deletion +messageOtherDeleteReasonNotFilled=Please add a reason for deletion +messageVaccinationNotRelevantForCase=This vaccination is not relevant for this case because the vaccination date is set after the symptom onset date or case report date. +messageVaccinationNoDateNotRelevantForCase=This vaccination is not relevant for this case because it does not have a vaccination date. +messageVaccinationNotRelevantForContact=This vaccination is not relevant for this contact because the vaccination date is set after the last contact date or contact report date. +messageVaccinationNoDateNotRelevantForContact=This vaccination is not relevant for this contact because it does not have a vaccination date. +messageVaccinationNotRelevantForEventParticipant=This vaccination is not relevant for this event participant because the vaccination date is after the event date or event report date. +messageVaccinationNoDateNotRelevantForEventParticipant=This vaccination is not relevant for this event participant because it does not have a vaccination date. +messageAcceptRequestToNavigate=The request is not yet accepted. You have to accept it first to be able to navigate there. +messageEntityNotFound=The %s was not found in the system. +messageEntitiesNotEditable=There are no entities which are allowed to be edited +messageSormasToSormasSimilarCaseFound=There is at least one similar case in your system. If you accept the request the case maybe will be in your system as a duplicate.
If so, you should consolidate the cases after accepting.
Please make sure that you use the accepted case for this purpose. +messageSormasToSormasSimilarConvertedCaseFound=There is at least one similar case in your system. If you accept the request the case maybe will be in your system as a duplicate.
If so, you should consolidate the cases after accepting.
After consolidating the cases, it may be necessary to perform a manual conversion of some contacts to the accepted case.
Please make sure that you use the accepted case for this purpose. +messageSormasToSormasSimilarContactToCaseFound=There is at least one similar contact in your system.
After accepting the request, it may be necessary to perform a manual conversion of those contacts to the accepted case. +messageSormasToSormasSimilarContactFound=There is at least one similar contact in your system. If you accept the request the contact maybe will be in your system as a duplicate.
If so, you should consolidate the contacts after accepting.
Please make sure that you use the accepted contact for this purpose. +messageSormasToSormasSimilarConvertedContactFound=There is at least one similar contact in your system. If you accept the request the contact maybe will be in your system as a duplicate.
If so, you should consolidate the contacts after accepting.
After consolidating the contacts, it may be necessary to perform a manual conversion of the accepted contact.
Please make sure that you use the accepted contact for this purpose. +messageSormasToSormasSimilarCaseToContactFound=There is at least one similar case in your system.
After accepting the request, it may be necessary to perform a manual conversion of the accepted contacts. +messageSormasToSormasSimilarPersonFound=There is at least one similar person in your system. If you accept the request the case/contact maybe will create a person in your system as a duplicate.
Please check this after accepting. +messageDeleteWithPendingShareRequest=There is a pending share request. With a deletion, the share request will be revoked and deleted. +messageCannotMergeMoreThanTwoPersons=You need to select two persons for merge! +messageAutomaticDeletionStarted=Automatic deletion has been started and will be executed in the background. Please note that, depending on the amount of data that is deleted, this process can take some time. +messageUserRoleUnusableForLogin=Users with only this role will not be able to login because the role does not have Access Sormas UI nor Access Sormas REST right +messageUserRoleHasNoRights=This user role has no rights. Please select at least one right. +messageEntriesEdited=All entries have been edited +messageAllEntitiesArchived=All selected entries have been archived +messageAllEntitiesDearchived=All selected entries have been dearchived +messageAllEventsAlreadyLinkedToGroup=All the selected events were already linked to the event group. +messageEnvironmentCreated=Environment created +messageEnvironmentSaved=Environment saved +messageEnvironmentArchived=Environment has been archived +messageEnvironmentDearchived=Environment has been de-archived +messageEnvironmentSampleOutsideJurisdictionDeletionDenied=The environment sample outside user's jurisdiction cannot be deleted +messageEnvironmentJurisdictionUpdated=Changing the location of this environment could make you lose access to its details and/or disallow you to edit in the future. Are you sure you want to proceed? +messageNoEnvironmentSamplesSelected=You have not selected any environment samples +messageEnvironmentSamplesDeleted=All selected eligible environment samples have been deleted +messageCountEnvironmentSamplesNotDeleted=%s environment samples not deleted: %s +messageCountEnvironmentSamplesNotDeletedAccessDeniedReason=%s environment samples not deleted because they are not in jurisdiction or owned: %s +messageEnvironmentSamplesRestored=All selected environment samples have been restored +messageEnvironmentSampleSaved=Environment sample saved +messageRestoreNotPossibleAlreadyInEvent=Event participant can't be restored because the person already has another active event participant in this event +messageDuplicateEnvironmentFound=A similar environment already exists in the database (UUID: %s) +messageBulkEmailsSentToAllSelectedEntities=Emails sent to all selected entities +messageBulkEmailsNotSentToToEntites=Ineligible entities +headingBulkEmailsSomeNotSent=Some emails from the bulk selection were not sent +headingBulkEmailsNoProcessedEntities=No email has been sent +messageBulkEmailsNoEligible=Not eligible email addresses +messageBulkEmailsFinishedWithSkips=For some entities the email has not been sent +messageBulkEmailsFinishedWithoutSuccess=No email has been sent +messageBulkEmailsCountNotProcessed=%s of entities have not been processed: %s messageBulkEmailsCountNotProcessedExternalReason=%s entities could not be processed due to external reasons: %s messageBulkEmailsCountNotProcessedAccessDenied=%s entities could not be processed due to access denied: %s messageBulkEmailTooManySelectedAtachments=You can add max %s attachments. First %s files selected will be considered. The rest will be discarded. -messageBulkEmailWrongAttachmentExtension = The file %s you are trying to attach
does not have one of the accepted extensions: %s -messageBulkEmailMaxAttachedFiles = max %s files are allowed for attachment - +messageBulkEmailWrongAttachmentExtension=The file %s you are trying to attach
does not have one of the accepted extensions: %s +messageBulkEmailMaxAttachedFiles=max %s files are allowed for attachment messageCasePersonHasNoEmail=Case person has no email address specified messageContactPersonHasNoEmail=Contact person has no email address specified messageEventParticipantPersonHasNoEmail=Event participant person has no email address specified @@ -1633,7 +1628,7 @@ messageNoExternalEmailToContactSent=No email sent to contact person messageNoExternalEmailToEventParticipantSent=No email sent to event participant person messageNoExternalEmailToTravelEntrySent=No email sent to travel entry person messageExternalEmailNoAttachments=No attachments -messageCustomizableEnumValueSaved = Customizable enum value saved +messageCustomizableEnumValueSaved=Customizable enum value saved messageExternalEmailAttachmentPassword=Please use this password to open the documents sent to you via email from SORMAS: %s messageExternalEmailAttachmentNotAvailableInfo=Attaching documents is disabled because encryption would not be possible. To encrypt documents, the person needs to have either a national health ID specified, or a primary mobile phone number set with SMS sending set up on this system. messageAdverseEventSaved=Adverse event saved @@ -1643,171 +1638,166 @@ messageSyncUsersFromAuthProviderConfigurationError=Syncing users from authentica messageCountriesExcludedFromDataProtection=Countries excluded from data protection for this field: messageChangingCaseOutcome=Changing this information will also affect the associated person. messageReviewChangesAndConfirm=Please review the changes and confirm them: -messageChangingPersonPresentCondition = Changing this information will also affect the associated cases. -messageDiseaseConfigurationSaved = Disease configuration saved - +messageChangingPersonPresentCondition=Changing this information will also affect the associated cases. +messageDiseaseConfigurationSaved=Disease configuration saved # Notifications -notificationCaseClassificationChanged = The classification of case %s has changed to %s. -notificationCaseInvestigationDone = The investigation of case %s has been done. -notificationEventParticipantCaseClassificationConfirmed = A person that was an event participant in the event %s was identified as a confirmed %s case %s. Please check if an explicit link should be created between the event participant and the case. -notificationContactSymptomatic = The contact %s of case %s has become symptomatic. -notificationContactWithoutCaseSymptomatic = The contact %s has become symptomatic. -notificationDiseaseChanged = The disease of case %s has changed from %s to %s. Please review all related cases and see if their diseases need to be changed as well. -notificationLabResultArrived = %s pathogen test result has arrived for %s case %s. Test type: %s. Tested disease: %s. -notificationLabResultArrivedContact = %s pathogen test result has arrived for %s contact %s. Test type: %s. Tested disease: %s. -notificationLabResultArrivedEventParticipant = %s pathogen test result has arrived for %s event participant %s. Test type: %s. Tested disease: %s. -notificationLabResultArrivedEventParticipantNoDisease = %s pathogen test result has arrived for %s event participant %s. Test type: %s. -notificationLabSampleShipped = A new sample (sample code: %s) for case %s is being shipped to your laboratory. -notificationLabSampleShippedShort = A new sample for case %s is being shipped to your laboratory. -notificationLabSampleShippedShortForContact = A new sample for contact %s is being shipped to your laboratory. -notificationLabSampleShippedShortForEventParticipant = A new sample for event participant %s is being shipped to your laboratory. -notificationPersonsUpdated = Updated %d Person(s) -notificationTaskObserverInformation = You are assigned as an observer to this task. -notificationTaskDueGeneral = Your %s task is overdue. -notificationTaskDueSpecific = Your %s task for %s is overdue. -notificationTaskStartGeneral = Your %s task should be started today. -notificationTaskStartSpecific = Your %s task for %s should be started today. -notificationTaskAssociatedCaseLink = Link to the associated case: %s -notificationTaskAssociatedContactLink = Link to the associated contact: %s -notificationTaskAssociatedEventLink = Link to the associated event: %s -notificationTaskAssociatedTravelEntryLink = Link to the associated travel entry: %s -notificationTaskAssociatedEnvironmentLink = Link to the associated environment entry: %s -notificationTaskGeneralUpdatedAssigneeUserSource = Your %s task has been assigned to another user. You are no longer in charge of this task. -notificationTaskGeneralUpdatedAssigneeUserTarget = A(n) %s task has been assigned to you. -notificationTaskSpecificUpdatedAssigneeUserSource = Your %s task for %s has been assigned to another user. You are no longer in charge of this task. -notificationTaskSpecificUpdatedAssigneeUserTarget = A(n) %s task for %s has been assigned to you. -notificationVisitCompleted = A follow-up visit for contact %s assigned to user %s has been completed. -notificationEventParticipantRelatedToOtherEvents = The Person %s newly added as Participant %s to Event %s (responsible user: %s) by %s is also related to these Events :\n%s -notificationEventWithResponsibleUserLine = Event %s (responsible user: %s) -notificationSmsSent = Message sent -notificationEventGroupCreated = Event Group %s (%s) created by %s.\n\n%s -notificationEventAddedToEventGroup = %s added to Event Group %s (%s) by %s .\n\n%s -notificationEventRemovedFromEventGroup = %s removed from Event Group %s (%s) by %s .\n\n%s -notificationEventGroupSummary = Here is a summary of the Events now contained in the Event Group:\n%s -notificationEventGroupSummaryEmpty = This event group is empty. -notificationExternalEmailSent = Email message sent. - +notificationCaseClassificationChanged=The classification of case %s has changed to %s. +notificationCaseInvestigationDone=The investigation of case %s has been done. +notificationEventParticipantCaseClassificationConfirmed=A person that was an event participant in the event %s was identified as a confirmed %s case %s. Please check if an explicit link should be created between the event participant and the case. +notificationContactSymptomatic=The contact %s of case %s has become symptomatic. +notificationContactWithoutCaseSymptomatic=The contact %s has become symptomatic. +notificationDiseaseChanged=The disease of case %s has changed from %s to %s. Please review all related cases and see if their diseases need to be changed as well. +notificationLabResultArrived=%s pathogen test result has arrived for %s case %s. Test type: %s. Tested disease: %s. +notificationLabResultArrivedContact=%s pathogen test result has arrived for %s contact %s. Test type: %s. Tested disease: %s. +notificationLabResultArrivedEventParticipant=%s pathogen test result has arrived for %s event participant %s. Test type: %s. Tested disease: %s. +notificationLabResultArrivedEventParticipantNoDisease=%s pathogen test result has arrived for %s event participant %s. Test type: %s. +notificationLabSampleShipped=A new sample (sample code: %s) for case %s is being shipped to your laboratory. +notificationLabSampleShippedShort=A new sample for case %s is being shipped to your laboratory. +notificationLabSampleShippedShortForContact=A new sample for contact %s is being shipped to your laboratory. +notificationLabSampleShippedShortForEventParticipant=A new sample for event participant %s is being shipped to your laboratory. +notificationPersonsUpdated=Updated %d Person(s) +notificationTaskObserverInformation=You are assigned as an observer to this task. +notificationTaskDueGeneral=Your %s task is overdue. +notificationTaskDueSpecific=Your %s task for %s is overdue. +notificationTaskStartGeneral=Your %s task should be started today. +notificationTaskStartSpecific=Your %s task for %s should be started today. +notificationTaskAssociatedCaseLink=Link to the associated case: %s +notificationTaskAssociatedContactLink=Link to the associated contact: %s +notificationTaskAssociatedEventLink=Link to the associated event: %s +notificationTaskAssociatedTravelEntryLink=Link to the associated travel entry: %s +notificationTaskAssociatedEnvironmentLink=Link to the associated environment entry: %s +notificationTaskGeneralUpdatedAssigneeUserSource=Your %s task has been assigned to another user. You are no longer in charge of this task. +notificationTaskGeneralUpdatedAssigneeUserTarget=A(n) %s task has been assigned to you. +notificationTaskSpecificUpdatedAssigneeUserSource=Your %s task for %s has been assigned to another user. You are no longer in charge of this task. +notificationTaskSpecificUpdatedAssigneeUserTarget=A(n) %s task for %s has been assigned to you. +notificationVisitCompleted=A follow-up visit for contact %s assigned to user %s has been completed. +notificationEventParticipantRelatedToOtherEvents=The Person %s newly added as Participant %s to Event %s (responsible user: %s) by %s is also related to these Events :\n%s +notificationEventWithResponsibleUserLine=Event %s (responsible user: %s) +notificationSmsSent=Message sent +notificationEventGroupCreated=Event Group %s (%s) created by %s.\n\n%s +notificationEventAddedToEventGroup=%s added to Event Group %s (%s) by %s .\n\n%s +notificationEventRemovedFromEventGroup=%s removed from Event Group %s (%s) by %s .\n\n%s +notificationEventGroupSummary=Here is a summary of the Events now contained in the Event Group:\n%s +notificationEventGroupSummaryEmpty=This event group is empty. +notificationExternalEmailSent=Email message sent. #Labels -labelActualLongSeed = Actual Long seed -labelNumberOfUsers = No. of users -labelNumberOfContinents = No. of continents -labelNumberOfSubcontinents = No. of subcontinents -labelNumberOfCountries = No. of countries -labelNumberOfRegions = No. of regions -labelNumberOfDistricts = No. of districts -labelNumberOfCommunities = No. of communities -labelNumberOfPointofEntry = No. of points of entry -labelNumberOfFacilities = No. of facilities -labelNumberOfAreas = No. of areas -labelNumberOfTemplates = No. of Templates -labelNoVaccinationDate = No vaccination date -labelNoVaccineName = No vaccine name -labelNumberOfDiseaseConfigurations = No. of diseases - +labelActualLongSeed=Actual Long seed +labelNumberOfUsers=No. of users +labelNumberOfContinents=No. of continents +labelNumberOfSubcontinents=No. of subcontinents +labelNumberOfCountries=No. of countries +labelNumberOfRegions=No. of regions +labelNumberOfDistricts=No. of districts +labelNumberOfCommunities=No. of communities +labelNumberOfPointofEntry=No. of points of entry +labelNumberOfFacilities=No. of facilities +labelNumberOfAreas=No. of areas +labelNumberOfTemplates=No. of Templates +labelNoVaccinationDate=No vaccination date +labelNoVaccineName=No vaccine name +labelNumberOfDiseaseConfigurations=No. of diseases # Numbers -numberEight = eight -numberEleven = eleven -numberFive = five -numberFour = four -numberNine = nine -numberOne = one -numberSeven = seven -numberSix = six -numberTen = ten -numberThree = three -numberTwelve = twelve -numberTwo = two - +numberEight=eight +numberEleven=eleven +numberFive=five +numberFour=four +numberNine=nine +numberOne=one +numberSeven=seven +numberSix=six +numberTen=ten +numberThree=three +numberTwelve=twelve +numberTwo=two # Prompts -promptActionDateFrom = Date of action from... -promptActionDateTo = ... to -promptActionEpiWeekFrom = Date of action from epi week... -promptActionEpiWeekTo = ... to epi week -promptActionChangeDateFrom = Date of action change from... -promptActionChangeDateTo = ... to -promptActionChangeEpiWeekFrom = Date of action change from epi week... -promptActionChangeEpiWeekTo = ... to epi week -promptBirthdateFrom = Birthdate from -promptBirthdateTo = ... to -promptCampaignSearch = ID, name -promptCasesDateFrom = New cases from... -promptCasesEpiWeekFrom = New cases from epi week... -promptCasesEpiWeekTo = ... to epi week -promptCasesSearchField = ID, EPID number, external ID, facility -promptCaseOrContactEventSearchField = Event: ID, title, description -promptPersonsSearchField = ID, name, phone number, email, city, street, postal code -promptCreationDateFrom = Creation date from ... -promptDateTo = ... to -promptNamePhoneEmail = Name, phone number and email address -promptContactDateType = Contact reference date -promptContactDateFrom = New contacts from... -promptContactDateTo = ... to -promptContactEpiWeekFrom = New contacts from epi week... -promptContactEpiWeekTo = ... to epi week -promptContactsSearchField = ID, case ID, case name, external ID -promptDisease = Disease -promptDistrict = District -promptEventDateType = Event reference date -promptEventDateFrom =Date of event from epi week -promptEventDateTo = ... to -promptEventEpiWeekFrom = Date of event from epi week -promptEventEpiWeekTo = ... to epi week -promptEventEvolutionDateFrom = Date of last evolution from... -promptEventEvolutionDateTo = ... to -promptEventSignalEvolutionEpiWeekFrom = Date of last evolution from epi week... -promptEventSignalEvolutionEpiWeekTo = ... to epi week -promptEventParticipantsSearchField = name, phone number -promptEventsSearchField = ID, title, description, source details -promptEnvironmentSearchField = Environment ID, name, media -promptEventsSearchFieldEventParticipants = ID or personal details of event participants -promptEventsSearchFieldEventGroups = ID or name of event group -promptEventGroupSearchField = ID, name -promptEventGroupSearchFieldEvent = Event ID, title, description, source details, location -promptImmunizationDateType = Immunization reference date -promptImmunizationValidFrom = New immunizations valid from... -promptImmunizationDateFrom = New immunizations from... -promptImmunizationDateTo = ... to -promptImmunizationEpiWeekFrom = New immunizations from epi week... -promptImmunizationEpiWeekTo = ... to epi week -promptEmail = Email: -promptExternalMessagesSearchField = UUID, name, postal code, reporter name, reporter postal code -promptExternalMessagesContentSearchField = External message content -promptExternalMessagesDateFrom = Message date from... -promptExternalMessagesDateTo = ... to -promptExternalMessagesPersonBirthDateFrom = Birth date from... -promptExternalMessagesPersonBirthDateTo = ... to -promptNewCaseDateType = Case reference date -promptPrescriptionTextFilter = Prescription details or prescribing clinician -promptRegion = Region -promptRelatedPersonLikeField = Person ID/name/contact information/location -promptSamplesSearchField = Sample ID/name, case name/epid number/ID, contact name/ID, event participant name/ID -promptSampleDateFrom = Sample date from ... -promptSampleDateTo = ... to -promptSampleEpiWeekFrom = Sample date from epi week -promptSampleEpiWeekTo = ... to epi week -promtSampleDataType = Sample reference date -promptSearch = Search... -promptTaskSearchField = Case or contact ID/name, Event ID/title -promptTelephoneNumber = Phone number: -promptTaskDateType = Task reference date -promptTaskDateFrom = Tasks from... -promptTaskDateTo = ... to -promptTaskEpiWeekFrom = Tasks from epi week... -promptTaskEpiWeekTo = ... to epi week -promptTravelEntrySearchField = Person first and last name, person UUID, person external ID, travel entry UUID, travel entry external ID -promptTreatmentTextFilter = Treatment details or executing staff member -promptTypeToAdd = Type here to add... -promptUserSearch = Search user -promptFilterByPeriod = Filter by period -promptSelectPeriod = Select period -promptSelfReportDateFrom = Report date from... -promptSelfReportDateTo = ... to -promptSelfReportEpiWeekFrom = Report date from epi week... -promptSelfReportEpiWeekTo = Report date to epi week... -promptSelfReportFreeTextSearch = Case reference/ name/ contact information/ NationalHealthID - -promptCampaign = Campaign -promptArea = Area +promptActionDateFrom=Date of action from... +promptActionDateTo=... to +promptActionEpiWeekFrom=Date of action from epi week... +promptActionEpiWeekTo=... to epi week +promptActionChangeDateFrom=Date of action change from... +promptActionChangeDateTo=... to +promptActionChangeEpiWeekFrom=Date of action change from epi week... +promptActionChangeEpiWeekTo=... to epi week +promptBirthdateFrom=Birthdate from +promptBirthdateTo=... to +promptCampaignSearch=ID, name +promptCasesDateFrom=New cases from... +promptCasesEpiWeekFrom=New cases from epi week... +promptCasesEpiWeekTo=... to epi week +promptCasesSearchField=ID, EPID number, external ID, facility +promptCaseOrContactEventSearchField=Event: ID, title, description +promptPersonsSearchField=ID, name, phone number, email, city, street, postal code +promptCreationDateFrom=Creation date from ... +promptDateTo=... to +promptNamePhoneEmail=Name, phone number and email address +promptContactDateType=Contact reference date +promptContactDateFrom=New contacts from... +promptContactDateTo=... to +promptContactEpiWeekFrom=New contacts from epi week... +promptContactEpiWeekTo=... to epi week +promptContactsSearchField=ID, case ID, case name, external ID +promptDisease=Disease +promptDistrict=District +promptEventDateType=Event reference date +promptEventDateFrom=Date of event from epi week +promptEventDateTo=... to +promptEventEpiWeekFrom=Date of event from epi week +promptEventEpiWeekTo=... to epi week +promptEventEvolutionDateFrom=Date of last evolution from... +promptEventEvolutionDateTo=... to +promptEventSignalEvolutionEpiWeekFrom=Date of last evolution from epi week... +promptEventSignalEvolutionEpiWeekTo=... to epi week +promptEventParticipantsSearchField=name, phone number +promptEventsSearchField=ID, title, description, source details +promptEnvironmentSearchField=Environment ID, name, media +promptEventsSearchFieldEventParticipants=ID or personal details of event participants +promptEventsSearchFieldEventGroups=ID or name of event group +promptEventGroupSearchField=ID, name +promptEventGroupSearchFieldEvent=Event ID, title, description, source details, location +promptImmunizationDateType=Immunization reference date +promptImmunizationValidFrom=New immunizations valid from... +promptImmunizationDateFrom=New immunizations from... +promptImmunizationDateTo=... to +promptImmunizationEpiWeekFrom=New immunizations from epi week... +promptImmunizationEpiWeekTo=... to epi week +promptEmail=Email: +promptExternalMessagesSearchField=UUID, name, postal code, reporter name, reporter postal code +promptExternalMessagesContentSearchField=External message content +promptExternalMessagesDateFrom=Message date from... +promptExternalMessagesDateTo=... to +promptExternalMessagesPersonBirthDateFrom=Birth date from... +promptExternalMessagesPersonBirthDateTo=... to +promptNewCaseDateType=Case reference date +promptPrescriptionTextFilter=Prescription details or prescribing clinician +promptRegion=Region +promptRelatedPersonLikeField=Person ID/name/contact information/location +promptSamplesSearchField=Sample ID/name, case name/epid number/ID, contact name/ID, event participant name/ID +promptSampleDateFrom=Sample date from ... +promptSampleDateTo=... to +promptSampleEpiWeekFrom=Sample date from epi week +promptSampleEpiWeekTo=... to epi week +promtSampleDataType=Sample reference date +promptSearch=Search... +promptTaskSearchField=Case or contact ID/name, Event ID/title +promptTelephoneNumber=Phone number: +promptTaskDateType=Task reference date +promptTaskDateFrom=Tasks from... +promptTaskDateTo=... to +promptTaskEpiWeekFrom=Tasks from epi week... +promptTaskEpiWeekTo=... to epi week +promptTravelEntrySearchField=Person first and last name, person UUID, person external ID, travel entry UUID, travel entry external ID +promptTreatmentTextFilter=Treatment details or executing staff member +promptTypeToAdd=Type here to add... +promptUserSearch=Search user +promptFilterByPeriod=Filter by period +promptSelectPeriod=Select period +promptSelfReportDateFrom=Report date from... +promptSelfReportDateTo=... to +promptSelfReportEpiWeekFrom=Report date from epi week... +promptSelfReportEpiWeekTo=Report date to epi week... +promptSelfReportFreeTextSearch=Case reference/ name/ contact information/ NationalHealthID +promptCampaign=Campaign +promptArea=Area promptAllAreas=All areas promptAllRegions=All regions promptAllDistricts=All districts @@ -1816,107 +1806,94 @@ promptExternalIdExternalSurveillanceTool=Will adopt external reporting tool GUID promptExternalJournalForceDeletion=Do you want to force the cancellation in SORMAS? This would mark the person as deleted from the external journal in SORMAS, while there is a high probability of personal data still remaining in the external journal. promptPersonDuplicateSearchIdExternalId=First Name, Last Name, ID, External ID, External token promptAefiDashboardFilterDateType=AEFI reference date -promptAefiDateType = Aefi reference date -promptAefiValidFrom = New adverse events valid from... -promptAefiDateFrom = New adverse events from... -promptAefiDateTo = ... to -promptAefiEpiWeekFrom = New adverse events from epi week... -promptAefiEpiWeekTo = ... to epi week -promptAefiInvestigationDateType = Aefi investigation reference date -promptAefiInvestigationValidFrom = New Aefi investigations valid from... -promptAefiInvestigationDateFrom = New Aefi investigations from... -promptAefiInvestigationDateTo = ... to -promptAefiInvestigationEpiWeekFrom = New Aefi investigations from epi week... -promptAefiInvestigationEpiWeekTo = ... to epi week -promptRemarks = Remarks -promptDiseaseConfigurationAgeFrom = From age... -promptDiseaseConfigurationAgeTo = ... to -promptDiseaseConfigurationStartAge = Start age -promptDiseaseConfigurationStartAgeType = Start age unit -promptDiseaseConfigurationEndAge = End age -promptDiseaseConfigurationEndAgeType = End age unit +promptAefiDateType=Aefi reference date +promptAefiValidFrom=New adverse events valid from... +promptAefiDateFrom=New adverse events from... +promptAefiDateTo=... to +promptAefiEpiWeekFrom=New adverse events from epi week... +promptAefiEpiWeekTo=... to epi week +promptAefiInvestigationDateType=Aefi investigation reference date +promptAefiInvestigationValidFrom=New Aefi investigations valid from... +promptAefiInvestigationDateFrom=New Aefi investigations from... +promptAefiInvestigationDateTo=... to +promptAefiInvestigationEpiWeekFrom=New Aefi investigations from epi week... +promptAefiInvestigationEpiWeekTo=... to epi week +promptRemarks=Remarks +promptDiseaseConfigurationAgeFrom=From age... +promptDiseaseConfigurationAgeTo=... to +promptDiseaseConfigurationStartAge=Start age +promptDiseaseConfigurationStartAgeType=Start age unit +promptDiseaseConfigurationEndAge=End age +promptDiseaseConfigurationEndAgeType=End age unit promptCaseSex=Case sex - #DiseaseNetworkDiagram -DiseaseNetworkDiagram.Classification.HEALTHY = Healthy -DiseaseNetworkDiagram.heading = Disease network diagram -DiseaseNetworkDiagram.highRisk = High risk -DiseaseNetworkDiagram.legend = Legend -DiseaseNetworkDiagram.lowRisk = Low risk -DiseaseNetworkDiagram.selectByClassification = Select by Classification -DiseaseNetworkDiagram.subheading = The arrows indicate the direction of transmission - -promptImmunizationDateFrom = Immunization report date from... -promptImmunizationStartDateFrom = Immunization start date from... -promptImmunizationPositiveTestResultDateFrom = Immunization positive test result date from... -promptImmunizationRecoveryDateFrom = Immunization recovery date from... - -promptTravelEntryDateFrom = Travel entry report date from... -promptTravelEntryDateTo = ... to -promptTravelEntryEpiWeekFrom = Travel entry from epi week... -promptTravelEntryEpiWeekTo = ... to epi week - -promptEnvironmentFreeTextSearch = UUID, External ID, Name, Description -promptEnvironmentDateFrom = Report date from... -promptEnvironmentDateTo = ... to -promptEnvironmentEpiWeekFrom = Report date from epi week... -promptEnvironmentEpiWeekTo = ... to epi week -promptEnvironmentLatFrom= Latitude from... -promptEnvironmentLatTo= ... to -promptEnvironmentLonFrom= Longitude from... -promptEnvironmentLonTo= ... to -promptEnvironmentSampleFreetext = Sample ID, Lab sample ID, Environment ID, Environment name -promptEnvironmentSampleRegion = Region of Environment -promptEnvironmentSampleDistrict = District of Environment -promptEnvironmentSampleLab = Laboratory -promptEnvironmentSampleTestedPathogen = Tested pathogen -promptEnvironmentSampleDateFrom = Report date from... -promptEnvironmentSampleDateTo = ... to -promptEnvironmentSampleEpiWeekFrom = Report date from epi week... -promptEnvironmentSampleEpiWeekTo = ... to epi week -promptEnvironmentSampleLatFrom= Environment latitude from... -promptEnvironmentSampleLatTo= ... to -promptEnvironmentSampleLonFrom= Environment longitude from... -promptEnvironmentSampleLonTo= ... to - -promptCustomizableEnumTranslationLanguage = Language -promptCustomizableEnumTranslationCaption = Translated caption -promptCustomizableEnumSearchField = Search by value or caption... - -promptSurveyFreeTextSearch = Name -promptSurveyTokenFreeTextSearch = Token - +DiseaseNetworkDiagram.Classification.HEALTHY=Healthy +DiseaseNetworkDiagram.heading=Disease network diagram +DiseaseNetworkDiagram.highRisk=High risk +DiseaseNetworkDiagram.legend=Legend +DiseaseNetworkDiagram.lowRisk=Low risk +DiseaseNetworkDiagram.selectByClassification=Select by Classification +DiseaseNetworkDiagram.subheading=The arrows indicate the direction of transmission +promptImmunizationDateFrom=Immunization report date from... +promptImmunizationStartDateFrom=Immunization start date from... +promptImmunizationPositiveTestResultDateFrom=Immunization positive test result date from... +promptImmunizationRecoveryDateFrom=Immunization recovery date from... +promptTravelEntryDateFrom=Travel entry report date from... +promptTravelEntryDateTo=... to +promptTravelEntryEpiWeekFrom=Travel entry from epi week... +promptTravelEntryEpiWeekTo=... to epi week +promptEnvironmentFreeTextSearch=UUID, External ID, Name, Description +promptEnvironmentDateFrom=Report date from... +promptEnvironmentDateTo=... to +promptEnvironmentEpiWeekFrom=Report date from epi week... +promptEnvironmentEpiWeekTo=... to epi week +promptEnvironmentLatFrom=Latitude from... +promptEnvironmentLatTo=... to +promptEnvironmentLonFrom=Longitude from... +promptEnvironmentLonTo=... to +promptEnvironmentSampleFreetext=Sample ID, Lab sample ID, Environment ID, Environment name +promptEnvironmentSampleRegion=Region of Environment +promptEnvironmentSampleDistrict=District of Environment +promptEnvironmentSampleLab=Laboratory +promptEnvironmentSampleTestedPathogen=Tested pathogen +promptEnvironmentSampleDateFrom=Report date from... +promptEnvironmentSampleDateTo=... to +promptEnvironmentSampleEpiWeekFrom=Report date from epi week... +promptEnvironmentSampleEpiWeekTo=... to epi week +promptEnvironmentSampleLatFrom=Environment latitude from... +promptEnvironmentSampleLatTo=... to +promptEnvironmentSampleLonFrom=Environment longitude from... +promptEnvironmentSampleLonTo=... to +promptCustomizableEnumTranslationLanguage=Language +promptCustomizableEnumTranslationCaption=Translated caption +promptCustomizableEnumSearchField=Search by value or caption... +promptSurveyFreeTextSearch=Name +promptSurveyTokenFreeTextSearch=Token promptSurvey=Survey promptSurveyResponseStatus=Response status promptSurveyAssignedFrom=Assigned date from ... promptSurveyAssignedTo=... to - -promptMicValue = MIC value -promptResistanceResult = Resistance result - -promptSystemConfigurationSearchField = Search by key or value +promptMicValue=MIC value +promptResistanceResult=Resistance result +promptSystemConfigurationSearchField=Search by key or value # Unsaved changes -unsavedChanges.warningTitle = Unsaved changes -unsavedChanges.warningMessage = This form contains unsaved changes. Please decide whether you want to cancel the action you have just taken in order to review them, or save or discard the changes and continue. -unsavedChanges.discard = Discard changes -unsavedChanges.save = Save changes -unsavedChanges.cancel = Cancel action - -headingNetworkDiagramTooManyContacts = Too many contacts -warningNetworkDiagramTooManyContacts = There are %d contacts and it is possible that your browser will freeze while displaying the diagram.
Please choose a smaller time window. -confirmNetworkDiagramTooManyContacts = Do you really want to update the diagram? - -headingContactTracingFirstContact = First contact with Contact Tracing - +unsavedChanges.warningTitle=Unsaved changes +unsavedChanges.warningMessage=This form contains unsaved changes. Please decide whether you want to cancel the action you have just taken in order to review them, or save or discard the changes and continue. +unsavedChanges.discard=Discard changes +unsavedChanges.save=Save changes +unsavedChanges.cancel=Cancel action +headingNetworkDiagramTooManyContacts=Too many contacts +warningNetworkDiagramTooManyContacts=There are %d contacts and it is possible that your browser will freeze while displaying the diagram.
Please choose a smaller time window. +confirmNetworkDiagramTooManyContacts=Do you really want to update the diagram? +headingContactTracingFirstContact=First contact with Contact Tracing infoBAGExport=Full-Export to SEDEX - # Survnet Gateway -ExternalSurveillanceToolGateway.notificationEntrySent = Entry has been sent to the reporting tool -ExternalSurveillanceToolGateway.notificationEntriesSent = All selected entries have been sent to the reporting tool. -ExternalSurveillanceToolGateway.notificationEntriesDeleted = All selected entries have been successfully deleted in the reporting tool. -ExternalSurveillanceToolGateway.notificationEntryNotSent = Entry could not be sent -ExternalSurveillanceToolGateway.notificationErrorArchiving = The entity was not archived because the communication with the reporting tool failed -ExternalSurveillanceToolGateway.notificationErrorSending = Error when sending entry +ExternalSurveillanceToolGateway.notificationEntrySent=Entry has been sent to the reporting tool +ExternalSurveillanceToolGateway.notificationEntriesSent=All selected entries have been sent to the reporting tool. +ExternalSurveillanceToolGateway.notificationEntriesDeleted=All selected entries have been successfully deleted in the reporting tool. +ExternalSurveillanceToolGateway.notificationEntryNotSent=Entry could not be sent +ExternalSurveillanceToolGateway.notificationErrorArchiving=The entity was not archived because the communication with the reporting tool failed +ExternalSurveillanceToolGateway.notificationErrorSending=Error when sending entry ExternalSurveillanceToolGateway.unableToSend=Please save or discard any unsaved changes before sending the %s to the reporting tool. ExternalSurveillanceToolGateway.confirmSendCase=Are you sure you want to send the case to the reporting tool? ExternalSurveillanceToolGateway.confirmSendCases=Are you sure you want to send the cases to the reporting tool? @@ -1924,18 +1901,15 @@ ExternalSurveillanceToolGateway.confirmSendEvent=Are you sure you want to send t ExternalSurveillanceToolGateway.confirmSendEvents=Are you sure you want to send the events to the reporting tool? ExternalSurveillanceToolGateway.confirmDeleteCase=Are you sure you want to delete the case in the reporting tool? ExternalSurveillanceToolGateway.confirmDeleteEvent=Are you sure you want to delete the event in the reporting tool? -ExternalSurveillanceToolGateway.sharedAt = shared at -ExternalSurveillanceToolGateway.deletedAt = deleted at -ExternalSurveillanceToolGateway.notificationEntryNotDeleted = Entry could not be deleted in the reporting tool -warningDashboardMapTooManyMarkers = There are more than %d places to display and it is possible that your browser will freeze while displaying them. -ExternalSurveillanceToolGateway.notificationErrorDeleting = Error when deleting entry -ExternalSurveillanceToolGateway.versionRequestError = Error requesting version - +ExternalSurveillanceToolGateway.sharedAt=shared at +ExternalSurveillanceToolGateway.deletedAt=deleted at +ExternalSurveillanceToolGateway.notificationEntryNotDeleted=Entry could not be deleted in the reporting tool +warningDashboardMapTooManyMarkers=There are more than %d places to display and it is possible that your browser will freeze while displaying them. +ExternalSurveillanceToolGateway.notificationErrorDeleting=Error when deleting entry +ExternalSurveillanceToolGateway.versionRequestError=Error requesting version headingSurveillanceReports=Reports headingCreateSurveillanceReport=Create new report headingEditSurveillanceReport=Edit report - - # Default password DefaultPassword.ownUserIntroduction=You have just logged in using the default password for this user. This password is not secure, as it could be used by unauthorized third parties to gain access to your account. Please make sure to change your password as soon as possible. DefaultPassword.otherUsersIntroduction=Your installation of SORMAS has default logins enabled, which were automatically created during setup. These logins have insecure default passwords, which could be used by unauthorized third parties to gain access to these accounts. Please make sure to change the default passwords of all affected users as soon as possible, or to entirely remove the accounts, if they are no longer required. @@ -1946,39 +1920,33 @@ DefaultPassword.otherUsersNewPasswordSetHints=Your accounts have been successful DefaultPassword.newPassword=New Password DefaultPassword.newPasswordPlaceholder=New Password: %s DefaultPassword.unchanged=- unchanged - - -sormasToSormasLoadingShares = Loading shares... - -errorConstraintViolation = Invalid data - -reloadPageToSeeChanges = Please reload the page to see the latest changes. - -checkboxSetTickAnAnswerForAll = Please tick an answer for ALL - +sormasToSormasLoadingShares=Loading shares... +errorConstraintViolation=Invalid data +reloadPageToSeeChanges=Please reload the page to see the latest changes. +checkboxSetTickAnAnswerForAll=Please tick an answer for ALL promptSampleDashboardFilterDateType=Sample reference date headingSampleDashboardEpiCurve=Final Laboratory Results Chart headingSampleDashboardMap=Sample Status Map infoHeadingSampleDashboardMap=Samples are shown using the GPS coordinate of the person's home address. infoHeadingEnvironmentSampleDashboardMap=Environment samples are shown using the GPS coordinates of those samples or, if not available, their associated environment. - -headingSpecailCaseAccess = Grant special access -headingCreateSpecailCaseAccess = Create new special access -headingEditSpecailCaseAccess = Edit special access -headingConfirmBulkGrantSpecialAccess = Confirm saving special access -confirmationBulkGrantSpecialAccess = The selected user already has special access to at least one of the selected cases. Saving will overwrite the existing special access. Do you want to continue? -headingBulkSpecialCaseAccessSomeNotProcessed= Granted special access to some of the selected cases -headingBulkSpecialCaseAccessNoneProcessed = Not granted special access to any of the selected cases -messageBulkSpecialCaseAccessAllProcessed = Granted special access to all selected cases +headingSpecailCaseAccess=Grant special access +headingCreateSpecailCaseAccess=Create new special access +headingEditSpecailCaseAccess=Edit special access +headingConfirmBulkGrantSpecialAccess=Confirm saving special access +confirmationBulkGrantSpecialAccess=The selected user already has special access to at least one of the selected cases. Saving will overwrite the existing special access. Do you want to continue? +headingBulkSpecialCaseAccessSomeNotProcessed=Granted special access to some of the selected cases +headingBulkSpecialCaseAccessNoneProcessed=Not granted special access to any of the selected cases +messageBulkSpecialCaseAccessAllProcessed=Granted special access to all selected cases messageCountAccessesNotGrantedDueToError=%s cases have not been processed: %s messageSelfReportSaved=Self report saved -headingArchiveSelfReport = Archive self report -confirmationArchiveSelfReport = Are you sure you want to archive this self report? This will not remove it from the system or any statistics, but only hide it from the normal self report directory. -messageSelfReportArchived = Self report has been archived -headingDearchiveSelfReport = De-Archive self report -confirmationDearchiveSelfReport = Are you sure you want to de-archive this self report? This will make it appear in the normal self report directory again. -messageSelfReportDearchived = Self report has been de-archived -headingNoSelfReportsSelected = No self reports selected -messageNoSelfReportsSelected = You have not selected any self reports +headingArchiveSelfReport=Archive self report +confirmationArchiveSelfReport=Are you sure you want to archive this self report? This will not remove it from the system or any statistics, but only hide it from the normal self report directory. +messageSelfReportArchived=Self report has been archived +headingDearchiveSelfReport=De-Archive self report +confirmationDearchiveSelfReport=Are you sure you want to de-archive this self report? This will make it appear in the normal self report directory again. +messageSelfReportDearchived=Self report has been de-archived +headingNoSelfReportsSelected=No self reports selected +messageNoSelfReportsSelected=You have not selected any self reports messageSelfReportOutsideJurisdictionDeletionDenied=The self report outside user's jurisdiction cannot be deleted infoSelfReportSelectOrCreateEntry=The database already contains at least one entry that seems to be very similar to the details of the self report.

Please look through the list of entries. If you feel certain that one matches the self report, select it and click on the Confirm button. Otherwise, select the option to create a new entry for the person.

If you are unsure, you can discard this window and cancel the process. infoSelfReportCreateEntry=The database contains no entry that seems to be similar to the details of the self message.

Select the option to create one and click on the Confirm to continue the processing.

If you are unsure, you can discard this window and cancel the process. @@ -1988,21 +1956,18 @@ headingSelfReportCaseReportWithSameReferenceFound=Case self report with same cas confirmationSelfReportCaseReportWithSameReferenceFound=There is a case self report with the same case reference number as the processed self report.
It is recommended to process case reports first.

Do you want to continue processing this self report? headingSelfReportCaseWithSameReferenceNumberFound=Case with same reference number found confirmationSelfReportLinkContactToCaseWithSameReferenceNumber=There is a case with the same reference number as the contact found

Do you want to link this contact to that case? - infoSystemConfigurationValueDescriptionEmailSenderAddress=Email address that will be set as the sender of email notifications sent out by the system. infoSystemConfigurationValueDescriptionEmailSenderName=Name that will be set as the sender of email notifications sent out by the system. infoSystemConfigurationValueDescriptionSmsSenderName=Name that will be set as the sender of SMS notifications sent out by the system. infoSystemConfigurationValueDescriptionSmsAuthKey=SORMAS supports the delivery of SMS notifications via Vonage (https://www.vonage.com/communications-apis/). You need to specify a valid authentication key and secret in order to use this feature. SORMAS will not attempt to send out SMS if these properties are left empty. infoSystemConfigurationValueDescriptionSmsAuthSecret=Secret for SMS authentication. infoSystemConfigurationValueDescriptionUseDeterminedVaccinationStatus=Use automatic vaccination status. The status will be derived from vaccination data. - notificationCannotCreate=Cannot Create Or Edit Notification notificationCreationNotAllowedWithoutSurveillanceReport=Notifier creation or modification is not allowed when a surveillance report already exists for this case. notificationNotificationDateInformation=This date is automatically set based on when the notifier is created or modified. notificationDiagnosisDateInformation=Diagnostic date is only available when editing surveillance reports, not when editing notifiers. - -promptEpipulseExportDateFrom = Date from... -promptEpipulseExportDateTo = Date to... +promptEpipulseExportDateFrom=Date from... +promptEpipulseExportDateTo=Date to... epipulseDownloadLinkText=Download headingCreateNewEpipulseExport=Create new Epipulse export headingViewEpipulseExport=Epipulse export detail diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java index 739e67ee027..bee44aef4f6 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java @@ -170,6 +170,8 @@ public class ExternalMessageFacadeEjb implements ExternalMessageFacade { private FeatureConfigurationFacadeEjbLocal featureConfigurationFacade; @Inject private AutomaticSurveyResponseProcessor automaticSurveyResponseProcessor; + @Inject + private de.symeda.sormas.backend.patch.partial_retrieval.PartialRetrieverImpl partialRetriever; @EJB private SystemConfigurationValueFacade systemConfigurationValueFacade; @@ -940,6 +942,70 @@ public ExternalMessageDto getForSurveillanceReport(SurveillanceReportReferenceDt return toDto(externalMessageService.getForSurveillanceReport(surveillanceReport)); } + @Override + @RightsAllowed(UserRight._EXTERNAL_MESSAGE_SURVEY_RESPONSE_PROCESS) + public ExternalMessageDto reprocessSurveyResponse(String uuid, java.util.Map correctedDictionary) { + ExternalMessageDto externalMessage = getByUuid(uuid); + de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseRequest latestRequest = + externalMessage.getSurveyResponseData().getLatest().getRequest(); + + de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseRequest correctedRequest = + new de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseRequest().setToken(latestRequest.getToken()) + .setExternalSurveyId(latestRequest.getExternalSurveyId()) + .setExternalRespondentId(latestRequest.getExternalRespondentId()) + .setResponseReceivedDate(latestRequest.getResponseReceivedDate()) + .setReplacementStrategy(latestRequest.getReplacementStrategy()) + .setEmptyValueBehavior(latestRequest.getEmptyValueBehavior()) + .setOrigin(latestRequest.getOrigin()) + .setInputLanguages(latestRequest.getInputLanguages()) + .setAllowFallbackValues(latestRequest.isAllowFallbackValues()) + .setSkipIfAlreadyProcessed(false) + .setPatchedInCaseOfFailures(true) + .setPatchDictionary(correctedDictionary); + + de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseWrapper updatedWrapper = + new de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseWrapper().setRequest(correctedRequest); + externalMessage.getSurveyResponseData().setUpdated(updatedWrapper); + + try { + automaticSurveyResponseProcessor.processSurveyResponses(java.util.List.of(externalMessage)); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + throw new RuntimeException("Interrupted while reprocessing survey response", e); + } catch (java.util.concurrent.ExecutionException e) { + throw new RuntimeException("Error while reprocessing survey response", e); + } + + return save(externalMessage); + } + + @Override + @RightsAllowed(UserRight._EXTERNAL_MESSAGE_SURVEY_RESPONSE_PROCESS) + public de.symeda.sormas.api.patch.partial_retrieval.DisplayablePartialRetrievalResponse retrieveSurveyResponseFieldsForDisplay( + String externalMessageUuid) { + + ExternalMessageDto externalMessage = getByUuid(externalMessageUuid); + de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseWrapper latest = externalMessage.getSurveyResponseData().getLatest(); + de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseResult result = latest.getResult(); + + if (result == null || result.getCaseUuid() == null) { + return new de.symeda.sormas.api.patch.partial_retrieval.DisplayablePartialRetrievalResponse(); + } + + java.util.Map patchDictionary = latest.getRequest().getPatchDictionary(); + if (patchDictionary == null || patchDictionary.isEmpty()) { + return new de.symeda.sormas.api.patch.partial_retrieval.DisplayablePartialRetrievalResponse(); + } + + java.util.Set fieldPaths = patchDictionary.keySet(); + + de.symeda.sormas.api.patch.partial_retrieval.PartialRetrievalRequest request = + new de.symeda.sormas.api.patch.partial_retrieval.PartialRetrievalRequest().setCaseUuid(result.getCaseUuid()) + .setFieldsToRetrieve(fieldPaths); + + return partialRetriever.retrievePartialForDisplay(request); + } + public static ExternalMessageReferenceDto toReferenceDto(ExternalMessage entity) { if (entity == null) { diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/ExternalMessageController.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/ExternalMessageController.java index 192d2bc8416..16c869411ac 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/ExternalMessageController.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/ExternalMessageController.java @@ -84,6 +84,8 @@ import de.symeda.sormas.ui.externalmessage.labmessage.LabMessageSlider; import de.symeda.sormas.ui.externalmessage.labmessage.RelatedLabMessageHandler; import de.symeda.sormas.ui.externalmessage.physiciansreport.PhysiciansReportProcessingFlow; +import de.symeda.sormas.ui.externalmessage.surveyresponse.SurveyResponseDetailsWindow; +import de.symeda.sormas.ui.externalmessage.surveyresponse.SurveyResponseFailureEditor; import de.symeda.sormas.ui.utils.ButtonHelper; import de.symeda.sormas.ui.utils.CssStyles; import de.symeda.sormas.ui.utils.DeleteRestoreHandlers; @@ -129,6 +131,13 @@ public void showLabMessagesSlider(List labMessages) { public void showExternalMessage(String messageUuid, boolean withActions, Runnable onFormActionPerformed) { ExternalMessageDto newDto = FacadeProvider.getExternalMessageFacade().getByUuid(messageUuid); + + if (ExternalMessageType.SURVEY_RESPONSE.equals(newDto.getType())) { + // Side effect: window will be added to the current window. + new SurveyResponseDetailsWindow(newDto, onFormActionPerformed); + return; + } + VerticalLayout layout = new VerticalLayout(); layout.setMargin(true); @@ -152,33 +161,35 @@ public void showExternalMessage(String messageUuid, boolean withActions, Runnabl } public void processSurveyResponse(String surveyResponseMessageUuid) { - ExternalMessageDto labMessage = FacadeProvider.getExternalMessageFacade().getByUuid(surveyResponseMessageUuid); - ExternalMessageProcessingFacade processingFacade = getExternalMessageProcessingFacade(); - ExternalMessageMapper mapper = new ExternalMessageMapper(labMessage, processingFacade); - RelatedLabMessageHandler relatedLabMessageHandler = new RelatedLabMessageHandler(UiUtil.getUser(), processingFacade, mapper); - LabMessageProcessingFlow flow = new LabMessageProcessingFlow(labMessage, mapper, processingFacade, relatedLabMessageHandler); + ExternalMessageDto externalMessage = FacadeProvider.getExternalMessageFacade().getByUuid(surveyResponseMessageUuid); - flow.run().handle((BiFunction, Throwable, Void>) (result, exception) -> { - if (exception != null) { - logger.error("Unexpected exception while processing lab message", exception); + de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseResult result = + externalMessage.getSurveyResponseData() != null && externalMessage.getSurveyResponseData().getLatest() != null + ? externalMessage.getSurveyResponseData().getLatest().getResult() + : null; - Notification.show( - I18nProperties.getString(Strings.errorOccurred, I18nProperties.getString(Strings.errorOccurred)), - I18nProperties.getString(Strings.errorWasReported), - Notification.Type.ERROR_MESSAGE); + if (result == null) { + Notification.show(I18nProperties.getString(Strings.messageSurveyResponseNotYetProcessed), Notification.Type.HUMANIZED_MESSAGE); + return; + } - return null; + if (result.getPatchResponse() != null && result.getPatchResponse().hasFailures()) { + de.symeda.sormas.api.patch.partial_retrieval.DisplayablePartialRetrievalResponse displayData; + try { + displayData = FacadeProvider.getExternalMessageFacade().retrieveSurveyResponseFieldsForDisplay(surveyResponseMessageUuid); + } catch (Exception e) { + logger.error("Error retrieving survey response fields for display", e); + displayData = new de.symeda.sormas.api.patch.partial_retrieval.DisplayablePartialRetrievalResponse(); } - ProcessingResultStatus status = result.getStatus(); - if (status == ProcessingResultStatus.CANCELED_WITH_CORRECTIONS) { - showCorrectionsSavedPopup(); - } else if (status == ProcessingResultStatus.DONE) { + final de.symeda.sormas.api.patch.partial_retrieval.DisplayablePartialRetrievalResponse finalDisplayData = displayData; + SurveyResponseFailureEditor editor = new SurveyResponseFailureEditor(externalMessage, finalDisplayData, () -> { SormasUI.get().getNavigator().navigateTo(ExternalMessagesView.VIEW_NAME); - } - - return null; - }); + }); + UI.getCurrent().addWindow(editor); + } else { + Notification.show(I18nProperties.getString(Strings.messageSurveyResponseAllFieldsApplied), Notification.Type.HUMANIZED_MESSAGE); + } } public void processLabMessage(String labMessageUuid) { diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/ExternalMessageGrid.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/ExternalMessageGrid.java index 45beb95bdb6..8feb3221403 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/ExternalMessageGrid.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/ExternalMessageGrid.java @@ -224,6 +224,8 @@ private Component buildProcessComponent(ExternalMessageIndexDto indexDto) { ControllerProvider.getExternalMessageController().processLabMessage(indexDto.getUuid()); } else if (ExternalMessageType.PHYSICIANS_REPORT == indexDto.getType()) { ControllerProvider.getExternalMessageController().processDoctorDeclarationMessage(indexDto.getUuid()); + } else if (ExternalMessageType.SURVEY_RESPONSE == indexDto.getType()) { + ControllerProvider.getExternalMessageController().processSurveyResponse(indexDto.getUuid()); } }, ValoTheme.BUTTON_PRIMARY); } else { diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseDetailsWindow.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseDetailsWindow.java new file mode 100644 index 00000000000..1ffc3c2a603 --- /dev/null +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseDetailsWindow.java @@ -0,0 +1,207 @@ +/* + * SORMAS® - Surveillance Outbreak Response Management & Analysis System + * Copyright © 2016-2026 SORMAS Foundation gGmbH + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package de.symeda.sormas.ui.externalmessage.surveyresponse; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import com.vaadin.server.ExternalResource; +import com.vaadin.server.Sizeable; +import com.vaadin.ui.Button; +import com.vaadin.ui.Grid; +import com.vaadin.ui.Label; +import com.vaadin.ui.Link; +import com.vaadin.ui.UI; +import com.vaadin.ui.VerticalLayout; +import com.vaadin.ui.Window; +import com.vaadin.ui.themes.ValoTheme; + +import de.symeda.sormas.api.FacadeProvider; +import de.symeda.sormas.api.externalmessage.ExternalMessageDto; +import de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseRequest; +import de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseResult; +import de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseWrapper; +import de.symeda.sormas.api.i18n.Captions; +import de.symeda.sormas.api.i18n.I18nProperties; +import de.symeda.sormas.api.i18n.Strings; +import de.symeda.sormas.api.patch.DataPatchResponse; +import de.symeda.sormas.api.patch.partial_retrieval.DisplayableFieldInfo; +import de.symeda.sormas.api.patch.partial_retrieval.DisplayablePartialRetrievalResponse; +import de.symeda.sormas.api.user.UserRight; +import de.symeda.sormas.ui.UiUtil; +import de.symeda.sormas.ui.caze.CaseDataView; +import de.symeda.sormas.ui.utils.ButtonHelper; +import de.symeda.sormas.ui.utils.CssStyles; + +/** + * Popup window displaying full details of a SURVEY_RESPONSE external message. + */ +public class SurveyResponseDetailsWindow { + + public SurveyResponseDetailsWindow(ExternalMessageDto externalMessage, Runnable onFormActionPerformed) { + String uuid = externalMessage.getUuid(); + + DisplayablePartialRetrievalResponse displayData; + try { + displayData = FacadeProvider.getExternalMessageFacade().retrieveSurveyResponseFieldsForDisplay(uuid); + } catch (Exception e) { + displayData = new DisplayablePartialRetrievalResponse(); + } + + VerticalLayout layout = new VerticalLayout(); + layout.setMargin(true); + layout.setSpacing(true); + layout.setWidth(800, Sizeable.Unit.PIXELS); + + Window window = new Window(I18nProperties.getString(Strings.headingSurveyResponseDetails)); + window.setModal(true); + window.setResizable(true); + window.setWidth(850, Sizeable.Unit.PIXELS); + + ExternalMessageSurveyResponseWrapper latest = externalMessage.getSurveyResponseData().getLatest(); + ExternalMessageSurveyResponseRequest request = latest.getRequest(); + ExternalMessageSurveyResponseResult result = latest.getResult(); + + // --- Metadata section --- + Label metadataHeading = new Label(I18nProperties.getCaption(Captions.surveyResponseMetadata)); + CssStyles.style(metadataHeading, CssStyles.H3); + layout.addComponent(metadataHeading); + + addReadOnlyField(layout, "External Survey ID", request.getExternalSurveyId()); + addReadOnlyField(layout, "Token", request.getToken()); + addReadOnlyField(layout, "Respondent ID", request.getExternalRespondentId()); + addReadOnlyField(layout, "Response Received", request.getResponseReceivedDate() != null ? request.getResponseReceivedDate().toString() : ""); + addReadOnlyField(layout, "Replacement Strategy", request.getReplacementStrategy() != null ? request.getReplacementStrategy().name() : ""); + addReadOnlyField(layout, "Empty Value Behavior", request.getEmptyValueBehavior() != null ? request.getEmptyValueBehavior().name() : ""); + addReadOnlyField(layout, "Patched in Case of Failures", String.valueOf(request.isPatchedInCaseOfFailures())); + + // --- Patch Dictionary section --- + Label dictionaryHeading = new Label(I18nProperties.getCaption(Captions.surveyResponsePatchDictionary)); + CssStyles.style(dictionaryHeading, CssStyles.H3); + layout.addComponent(dictionaryHeading); + + Map patchDictionary = request.getPatchDictionary(); + if (patchDictionary != null && !patchDictionary.isEmpty()) { + List> entries = patchDictionary.entrySet().stream().collect(Collectors.toList()); + + final DisplayablePartialRetrievalResponse finalDisplayData = displayData; + + Grid> dictionaryGrid = new Grid<>(); + dictionaryGrid.setSizeFull(); + dictionaryGrid.setItems(entries); + dictionaryGrid.setHeightByRows(Math.max(entries.size(), 1)); + + dictionaryGrid.addColumn(entry -> resolveFieldName(entry.getKey(), finalDisplayData)) + .setCaption(I18nProperties.getCaption(Captions.surveyResponseField)) + .setExpandRatio(2); + + dictionaryGrid.addColumn(entry -> entry.getValue() != null ? entry.getValue().toString() : "") + .setCaption(I18nProperties.getCaption(Captions.surveyResponseSubmittedValue)) + .setExpandRatio(2); + + dictionaryGrid.addColumn(entry -> resolveCurrentValue(entry.getKey(), finalDisplayData)) + .setCaption(I18nProperties.getCaption(Captions.surveyResponseCurrentCaseValue)) + .setExpandRatio(2); + + layout.addComponent(dictionaryGrid); + } + + // --- Processing Result section --- + if (result != null) { + Label resultHeading = new Label(I18nProperties.getCaption(Captions.surveyResponseProcessingResult)); + CssStyles.style(resultHeading, CssStyles.H3); + layout.addComponent(resultHeading); + + if (result.getCaseUuid() != null) { + Link caseLink = new Link( + I18nProperties.getCaption(Captions.surveyResponseCaseLink) + ": " + result.getCaseUuid(), + new ExternalResource("#!" + CaseDataView.VIEW_NAME + "/" + result.getCaseUuid())); + layout.addComponent(caseLink); + } + + DataPatchResponse patchResponse = result.getPatchResponse(); + if (patchResponse != null) { + addReadOnlyField(layout, I18nProperties.getCaption(Captions.surveyResponseApplied), patchResponse.isApplied() ? "Yes" : "No"); + + if (patchResponse.hasFailures()) { + Label failuresHeading = new Label(I18nProperties.getString(Strings.headingSurveyResponseFailures)); + CssStyles.style(failuresHeading, CssStyles.H4); + layout.addComponent(failuresHeading); + + layout.addComponent(new SurveyResponseFailurePanel(patchResponse.getFailures(), displayData)); + } else { + Label successLabel = new Label(I18nProperties.getString(Strings.messageSurveyResponseAllFieldsApplied)); + CssStyles.style(successLabel, ValoTheme.LABEL_SUCCESS); + layout.addComponent(successLabel); + } + } + } else { + Label notProcessedLabel = new Label(I18nProperties.getString(Strings.messageSurveyResponseNotYetProcessed)); + layout.addComponent(notProcessedLabel); + } + + // --- Actions bar (if processable and has failures) --- + boolean canProcess = UiUtil.permitted(UserRight.EXTERNAL_MESSAGE_SURVEY_RESPONSE_PROCESS); + boolean hasFailures = result != null + && result.getPatchResponse() != null + && result.getPatchResponse().hasFailures() + && !result.getPatchResponse().getFailures().isEmpty(); + + if (canProcess && hasFailures) { + final DisplayablePartialRetrievalResponse finalDisplayDataForEditor = displayData; + Button correctButton = + ButtonHelper.createButton(Captions.actionCorrectAndReprocess, I18nProperties.getCaption(Captions.actionCorrectAndReprocess), e -> { + ExternalMessageDto refreshedDto = FacadeProvider.getExternalMessageFacade().getByUuid(uuid); + SurveyResponseFailureEditor editor = new SurveyResponseFailureEditor(refreshedDto, finalDisplayDataForEditor, () -> { + window.close(); + onFormActionPerformed.run(); + }); + UI.getCurrent().addWindow(editor); + }, ValoTheme.BUTTON_PRIMARY); + + layout.addComponent(correctButton); + } + + window.setContent(layout); + UI.getCurrent().addWindow(window); + } + + private void addReadOnlyField(VerticalLayout layout, String caption, String value) { + Label label = new Label(value != null ? value : ""); + label.setCaption(caption); + layout.addComponent(label); + } + + private String resolveFieldName(String fieldPath, DisplayablePartialRetrievalResponse displayData) { + if (displayData != null) { + DisplayableFieldInfo info = displayData.getFieldInfoDictionary().get(fieldPath); + if (info != null && info.getTranslatedFieldName() != null) { + return info.getTranslatedFieldName(); + } + } + return fieldPath; + } + + private String resolveCurrentValue(String fieldPath, DisplayablePartialRetrievalResponse displayData) { + if (displayData != null) { + DisplayableFieldInfo info = displayData.getFieldInfoDictionary().get(fieldPath); + if (info != null && info.getTranslatedFieldValue() != null) { + return info.getTranslatedFieldValue(); + } + } + return ""; + } +} diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailureEditor.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailureEditor.java new file mode 100644 index 00000000000..7bf18ccd022 --- /dev/null +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailureEditor.java @@ -0,0 +1,187 @@ +/* + * SORMAS® - Surveillance Outbreak Response Management & Analysis System + * Copyright © 2016-2026 SORMAS Foundation gGmbH + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package de.symeda.sormas.ui.externalmessage.surveyresponse; + +import java.util.HashMap; +import java.util.Map; + +import com.vaadin.ui.Button; +import com.vaadin.ui.FormLayout; +import com.vaadin.ui.HorizontalLayout; +import com.vaadin.ui.Label; +import com.vaadin.ui.Notification; +import com.vaadin.ui.Panel; +import com.vaadin.ui.TextField; +import com.vaadin.ui.VerticalLayout; +import com.vaadin.ui.Window; +import com.vaadin.ui.themes.ValoTheme; + +import de.symeda.sormas.api.FacadeProvider; +import de.symeda.sormas.api.externalmessage.ExternalMessageDto; +import de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseResult; +import de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseWrapper; +import de.symeda.sormas.api.i18n.Captions; +import de.symeda.sormas.api.i18n.I18nProperties; +import de.symeda.sormas.api.i18n.Strings; +import de.symeda.sormas.api.patch.DataPatchFailure; +import de.symeda.sormas.api.patch.partial_retrieval.DisplayableFieldInfo; +import de.symeda.sormas.api.patch.partial_retrieval.DisplayablePartialRetrievalResponse; +import de.symeda.sormas.ui.utils.ButtonHelper; +import de.symeda.sormas.ui.utils.CssStyles; + +/** + * Modal editor window allowing users to correct failed survey response fields and reprocess. + */ +public class SurveyResponseFailureEditor extends Window { + + private static final long serialVersionUID = 4912870523418167234L; + + public SurveyResponseFailureEditor(ExternalMessageDto externalMessage, DisplayablePartialRetrievalResponse displayData, Runnable onReprocessed) { + setCaption(I18nProperties.getString(Strings.headingSurveyResponseCorrectAndReprocess)); + setModal(true); + setResizable(true); + setWidth(700, Unit.PIXELS); + + ExternalMessageSurveyResponseWrapper latest = externalMessage.getSurveyResponseData().getLatest(); + Map patchDictionary = latest.getRequest().getPatchDictionary(); + + ExternalMessageSurveyResponseResult result = latest.getResult(); + Map failures = + result != null && result.getPatchResponse() != null ? result.getPatchResponse().getFailures() : new HashMap<>(); + Map validValues = + result != null && result.getPatchResponse() != null ? result.getPatchResponse().getValidPatchDictionary() : new HashMap<>(); + + VerticalLayout mainLayout = new VerticalLayout(); + mainLayout.setMargin(true); + mainLayout.setSpacing(true); + + // --- Failed fields (editable) --- + if (!failures.isEmpty()) { + Label failuresHeading = new Label(I18nProperties.getString(Strings.headingSurveyResponseFailures)); + CssStyles.style(failuresHeading, CssStyles.H3); + mainLayout.addComponent(failuresHeading); + + FormLayout failuresForm = new FormLayout(); + failuresForm.setMargin(false); + + Map fieldEditors = new HashMap<>(); + + for (Map.Entry entry : failures.entrySet()) { + String fieldPath = entry.getKey(); + DataPatchFailure failure = entry.getValue(); + + String fieldLabel = resolveFieldName(fieldPath, displayData); + String currentValue = resolveCurrentValue(fieldPath, displayData); + String causeName = failure.getDataPatchFailureCause() != null ? failure.getDataPatchFailureCause().name() : ""; + + VerticalLayout fieldContainer = new VerticalLayout(); + fieldContainer.setMargin(false); + fieldContainer.setSpacing(false); + + Label causeLabel = new Label(I18nProperties.getCaption(Captions.surveyResponseFailureCause) + ": " + causeName); + CssStyles.style(causeLabel, CssStyles.LABEL_SMALL, CssStyles.LABEL_SECONDARY); + fieldContainer.addComponent(causeLabel); + + Label currentValueLabel = + new Label(I18nProperties.getCaption(Captions.surveyResponseCurrentCaseValue) + ": " + (currentValue != null ? currentValue : "")); + CssStyles.style(currentValueLabel, CssStyles.LABEL_SMALL, CssStyles.LABEL_SECONDARY); + fieldContainer.addComponent(currentValueLabel); + + TextField valueField = new TextField(); + valueField.setCaption(fieldLabel); + valueField.setWidth(100, Unit.PERCENTAGE); + if (failure.getProvidedFieldValue() != null) { + valueField.setValue(failure.getProvidedFieldValue().toString()); + } + fieldContainer.addComponent(valueField); + fieldEditors.put(fieldPath, valueField); + + failuresForm.addComponent(fieldContainer); + } + + mainLayout.addComponent(failuresForm); + + // --- Valid fields (read-only context) --- + if (!validValues.isEmpty()) { + Label validHeading = new Label(I18nProperties.getCaption(Captions.surveyResponseValidFields)); + CssStyles.style(validHeading, CssStyles.H4); + mainLayout.addComponent(validHeading); + + Panel validPanel = new Panel(); + FormLayout validForm = new FormLayout(); + validForm.setMargin(true); + + for (Map.Entry entry : validValues.entrySet()) { + String fieldPath = entry.getKey(); + String fieldLabel = resolveFieldName(fieldPath, displayData); + Label label = new Label(entry.getValue() != null ? entry.getValue().toString() : ""); + label.setCaption(fieldLabel); + validForm.addComponent(label); + } + + validPanel.setContent(validForm); + validPanel.setHeight(120, Unit.PIXELS); + mainLayout.addComponent(validPanel); + } + + // --- Buttons --- + HorizontalLayout buttonsLayout = new HorizontalLayout(); + buttonsLayout.setSpacing(true); + + Button saveAndReprocessButton = + ButtonHelper.createButton(Captions.actionSaveAndReprocess, I18nProperties.getCaption(Captions.actionSaveAndReprocess), e -> { + Map correctedDictionary = new HashMap<>(validValues); + for (Map.Entry editorEntry : fieldEditors.entrySet()) { + String value = editorEntry.getValue().getValue(); + correctedDictionary.put(editorEntry.getKey(), value); + } + + FacadeProvider.getExternalMessageFacade().reprocessSurveyResponse(externalMessage.getUuid(), correctedDictionary); + + Notification.show(I18nProperties.getString(Strings.messageSurveyResponseReprocessed), Notification.Type.HUMANIZED_MESSAGE); + close(); + onReprocessed.run(); + }, ValoTheme.BUTTON_PRIMARY); + + Button cancelButton = ButtonHelper.createButton(Captions.actionCancel, I18nProperties.getCaption(Captions.actionCancel), e -> close()); + + buttonsLayout.addComponent(saveAndReprocessButton); + buttonsLayout.addComponent(cancelButton); + mainLayout.addComponent(buttonsLayout); + } + + setContent(mainLayout); + } + + private String resolveFieldName(String fieldPath, DisplayablePartialRetrievalResponse displayData) { + if (displayData != null) { + DisplayableFieldInfo info = displayData.getFieldInfoDictionary().get(fieldPath); + if (info != null && info.getTranslatedFieldName() != null) { + return info.getTranslatedFieldName(); + } + } + return fieldPath; + } + + private String resolveCurrentValue(String fieldPath, DisplayablePartialRetrievalResponse displayData) { + if (displayData != null) { + DisplayableFieldInfo info = displayData.getFieldInfoDictionary().get(fieldPath); + if (info != null) { + return info.getTranslatedFieldValue(); + } + } + return null; + } +} diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailurePanel.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailurePanel.java new file mode 100644 index 00000000000..ca486c3cdba --- /dev/null +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailurePanel.java @@ -0,0 +1,98 @@ +/* + * SORMAS® - Surveillance Outbreak Response Management & Analysis System + * Copyright © 2016-2026 SORMAS Foundation gGmbH + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package de.symeda.sormas.ui.externalmessage.surveyresponse; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import com.vaadin.ui.Grid; +import com.vaadin.ui.VerticalLayout; + +import de.symeda.sormas.api.i18n.Captions; +import de.symeda.sormas.api.i18n.I18nProperties; +import de.symeda.sormas.api.patch.DataPatchFailure; +import de.symeda.sormas.api.patch.partial_retrieval.DisplayableFieldInfo; +import de.symeda.sormas.api.patch.partial_retrieval.DisplayablePartialRetrievalResponse; + +/** + * Read-only panel displaying patch failures for a survey response. + * Shows all failures including non-correctable ones so the user can understand what happened. + */ +public class SurveyResponseFailurePanel extends VerticalLayout { + + private static final long serialVersionUID = -2309124756823178543L; + + public SurveyResponseFailurePanel(Map failures, DisplayablePartialRetrievalResponse displayData) { + setMargin(false); + setSpacing(true); + setSizeFull(); + + List> failureEntries = failures.entrySet().stream().collect(Collectors.toList()); + + Grid> grid = new Grid<>(); + grid.setSizeFull(); + grid.setItems(failureEntries); + + grid.addColumn(entry -> resolveFieldName(entry.getKey(), displayData)) + .setCaption(I18nProperties.getCaption(Captions.surveyResponseField)) + .setId("field") + .setExpandRatio(2); + + grid.addColumn(entry -> entry.getValue().getDataPatchFailureCause() != null ? entry.getValue().getDataPatchFailureCause().name() : "") + .setCaption(I18nProperties.getCaption(Captions.surveyResponseFailureCause)) + .setId("cause") + .setExpandRatio(2); + + grid.addColumn(entry -> resolveCurrentValue(entry.getKey(), displayData)) + .setCaption(I18nProperties.getCaption(Captions.surveyResponseCurrentCaseValue)) + .setId("currentValue") + .setExpandRatio(2); + + grid.addColumn(entry -> entry.getValue().getProvidedFieldValue() != null ? entry.getValue().getProvidedFieldValue().toString() : "") + .setCaption(I18nProperties.getCaption(Captions.surveyResponseSubmittedValue)) + .setId("submittedValue") + .setExpandRatio(2); + + grid.addColumn(entry -> entry.getValue().getDescription() != null ? entry.getValue().getDescription() : "") + .setCaption(I18nProperties.getCaption(Captions.surveyResponseDescription)) + .setId("description") + .setExpandRatio(3); + + grid.setHeightByRows(Math.max(failureEntries.size(), 1)); + + addComponent(grid); + } + + private String resolveFieldName(String fieldPath, DisplayablePartialRetrievalResponse displayData) { + if (displayData != null) { + DisplayableFieldInfo info = displayData.getFieldInfoDictionary().get(fieldPath); + if (info != null && info.getTranslatedFieldName() != null) { + return info.getTranslatedFieldName(); + } + } + return fieldPath; + } + + private String resolveCurrentValue(String fieldPath, DisplayablePartialRetrievalResponse displayData) { + if (displayData != null) { + DisplayableFieldInfo info = displayData.getFieldInfoDictionary().get(fieldPath); + if (info != null && info.getTranslatedFieldValue() != null) { + return info.getTranslatedFieldValue(); + } + } + return ""; + } +} From cb57f538890abed4cd11d42aa4f5cb0f2873b35c Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Tue, 17 Mar 2026 08:06:30 +0100 Subject: [PATCH 058/134] =?UTF-8?q?=F0=9F=93=9D=20missing=20javadoc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/patch/partial_retrieval/DisplayableFieldInfo.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/DisplayableFieldInfo.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/DisplayableFieldInfo.java index c7ea2373a88..2338ddafcb0 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/DisplayableFieldInfo.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/DisplayableFieldInfo.java @@ -2,6 +2,9 @@ import java.util.Objects; +/** + * Type to display a specific value to the user with its field name and its value. + */ public class DisplayableFieldInfo { private String translatedFieldName; From dd1a72594dfe0ab54bf364d857fa5f8dc28d72ba Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Tue, 17 Mar 2026 08:17:41 +0100 Subject: [PATCH 059/134] =?UTF-8?q?=F0=9F=92=AC=20translated=20failure=20c?= =?UTF-8?q?auses?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/patch/CaseDataPatchRequest.java | 7 + .../sormas/api/patch/DataPatchFailure.java | 3 + .../sormas/api/patch/DataPatchResponse.java | 2 +- .../PartialRetrievalRequest.java | 9 + sormas-api/src/main/resources/enum.properties | 3916 ++++++++--------- .../SurveyResponseFailureEditor.java | 3 +- .../SurveyResponseFailurePanel.java | 5 +- 7 files changed, 1862 insertions(+), 2083 deletions(-) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/CaseDataPatchRequest.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/CaseDataPatchRequest.java index 764b64153e5..e704c9c585e 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/CaseDataPatchRequest.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/CaseDataPatchRequest.java @@ -152,4 +152,11 @@ public int hashCode() { inputLanguages, allowFallbackValues); } + + @Override + public String toString() { + return "CaseDataPatchRequest{" + "caseUuid='" + caseUuid + '\'' + ", patchedInCaseOfFailures=" + patchedInCaseOfFailures + + ", replacementStrategy=" + replacementStrategy + ", emptyValueBehavior=" + emptyValueBehavior + ", patchDictionary=" + patchDictionary + + ", origin='" + origin + '\'' + ", inputLanguages=" + inputLanguages + ", allowFallbackValues=" + allowFallbackValues + '}'; + } } diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailure.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailure.java index c70b70b7f07..82e94bdb070 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailure.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailure.java @@ -5,6 +5,9 @@ import javax.annotation.Nullable; import javax.validation.constraints.NotNull; +/** + * Resulting object that is built in case some field couldn't be mapped during data patching. + */ public class DataPatchFailure { @NotNull diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchResponse.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchResponse.java index 5ef88ed3594..f12040631b2 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchResponse.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchResponse.java @@ -26,7 +26,7 @@ public class DataPatchResponse { private Map validPatchDictionary = new HashMap<>(); /** - * Provides the reason for the failure. + * Provides the reason for the failure for the impacted fields. */ private Map failures = new HashMap<>(); diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetrievalRequest.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetrievalRequest.java index 7084ee78b00..c4fb2b1a639 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetrievalRequest.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetrievalRequest.java @@ -6,11 +6,20 @@ import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; +/** + * Allows to retrieve field values and their respective field names. + */ public class PartialRetrievalRequest { + /** + * Root object for retrieval is the case. + */ @NotNull private String caseUuid; + /** + * Example: CaseData.hospitalization. Must be the physical path of the DTO. + */ @NotNull @NotEmpty private Set fieldsToRetrieve; diff --git a/sormas-api/src/main/resources/enum.properties b/sormas-api/src/main/resources/enum.properties index 9d84305dd1a..23914f0da75 100644 --- a/sormas-api/src/main/resources/enum.properties +++ b/sormas-api/src/main/resources/enum.properties @@ -15,33 +15,27 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . ############################################################################### - # Enum captions and descriptions - # ActionContext -ActionContext.EVENT = Event - -ActionMeasure.PROHIBITION_OF_ENTRY_AND_WORK_CASES = Prohibition of entry and work for case persons -ActionMeasure.SAMPLE_COLLECTION = Sample collection -ActionMeasure.FORWARDING_TO_NATIONAL_REFERENCE_CENTER = Forwarding to the national reference center -ActionMeasure.CONTACT_FOLLOW_UP = Active follow-up of contact persons -ActionMeasure.VERIFICATION_OF_VACCINATION_IMMUNIZATION = Verification of vaccination or immunization status -ActionMeasure.POST_EXPOSURE_PROPHYLAXIS_VACCINATION = Conduct post-exposure prophylaxis vaccination -ActionMeasure.CLOSURE_OF_FACILITY = Closure of facility -ActionMeasure.PROHIBITION_OF_ENTRY_AND_WORK_CONTACTS = Prohibition of entry and work for contact persons -ActionMeasure.POPULATION_INFORMATION = Population information about outbreak -ActionMeasure.OTHER = Other - +ActionContext.EVENT=Event +ActionMeasure.PROHIBITION_OF_ENTRY_AND_WORK_CASES=Prohibition of entry and work for case persons +ActionMeasure.SAMPLE_COLLECTION=Sample collection +ActionMeasure.FORWARDING_TO_NATIONAL_REFERENCE_CENTER=Forwarding to the national reference center +ActionMeasure.CONTACT_FOLLOW_UP=Active follow-up of contact persons +ActionMeasure.VERIFICATION_OF_VACCINATION_IMMUNIZATION=Verification of vaccination or immunization status +ActionMeasure.POST_EXPOSURE_PROPHYLAXIS_VACCINATION=Conduct post-exposure prophylaxis vaccination +ActionMeasure.CLOSURE_OF_FACILITY=Closure of facility +ActionMeasure.PROHIBITION_OF_ENTRY_AND_WORK_CONTACTS=Prohibition of entry and work for contact persons +ActionMeasure.POPULATION_INFORMATION=Population information about outbreak +ActionMeasure.OTHER=Other # ActionPriority -ActionPriority.HIGH = High -ActionPriority.LOW = Low -ActionPriority.NORMAL = Normal - +ActionPriority.HIGH=High +ActionPriority.LOW=Low +ActionPriority.NORMAL=Normal # ActionStatus -ActionStatus.DONE = Done -ActionStatus.PENDING = Pending -ActionStatus.IN_PROGRESS = In progress - +ActionStatus.DONE=Done +ActionStatus.PENDING=Pending +ActionStatus.IN_PROGRESS=In progress # ActivityAsCaseType ActivityAsCaseType.WORK=Work ActivityAsCaseType.TRAVEL=Travel @@ -53,666 +47,604 @@ ActivityAsCaseType.PERSONAL_SERVICES=Personal Services ActivityAsCaseType.CARED_FOR=Cared for ActivityAsCaseType.OTHER=Other ActivityAsCaseType.UNKNOWN=Unknown - # AdditionalTestingStatus -AdditionalTestingStatus.NOT_REQUESTED = Not requested -AdditionalTestingStatus.REQUESTED = Requested -AdditionalTestingStatus.PERFORMED = Performed - +AdditionalTestingStatus.NOT_REQUESTED=Not requested +AdditionalTestingStatus.REQUESTED=Requested +AdditionalTestingStatus.PERFORMED=Performed # AdditionalTestType -AdditionalTestType.HAEMOGLOBINURIA = Haemoglobin in urine -AdditionalTestType.PROTEINURIA = Protein in urine -AdditionalTestType.HEMATURIA = Red blood cells in urine -AdditionalTestType.ARTERIAL_VENOUS_BLOOD_GAS = Arterial/venous blood gas -AdditionalTestType.ALT_SGPT = ALT/SGPT -AdditionalTestType.AST_SGOT = AST/SGOT -AdditionalTestType.CREATININE = Creatinine -AdditionalTestType.POTASSIUM = Potassium -AdditionalTestType.UREA = Urea -AdditionalTestType.HAEMOGLOBIN = Haemoglobin -AdditionalTestType.TOTAL_BILIRUBIN = Total bilirubin -AdditionalTestType.CONJ_BILIRUBIN = Conj. bilirubin -AdditionalTestType.WBC_COUNT = WBC count -AdditionalTestType.PLATELETS = Platelets -AdditionalTestType.PROTHROMBIN_TIME = Prothrombin time - -AgeGroup.AGE_0_4 = 0--4 -AgeGroup.AGE_5_9 = 5--9 -AgeGroup.AGE_10_14 = 10--14 -AgeGroup.AGE_15_19 = 15--19 -AgeGroup.AGE_20_24 = 20--24 -AgeGroup.AGE_25_29 = 25--29 -AgeGroup.AGE_30_34 = 30--34 -AgeGroup.AGE_35_39 = 35--59 -AgeGroup.AGE_40_44 = 40--44 -AgeGroup.AGE_45_49 = 45--49 -AgeGroup.AGE_50_54 = 50--54 -AgeGroup.AGE_55_59 = 55--59 -AgeGroup.AGE_60_64 = 60--64 -AgeGroup.AGE_65_69 = 65--69 -AgeGroup.AGE_70_74 = 70--74 -AgeGroup.AGE_75_79 = 75--79 -AgeGroup.AGE_80_84 = 80--84 -AgeGroup.AGE_80_PLUS = 80+ - +AdditionalTestType.HAEMOGLOBINURIA=Haemoglobin in urine +AdditionalTestType.PROTEINURIA=Protein in urine +AdditionalTestType.HEMATURIA=Red blood cells in urine +AdditionalTestType.ARTERIAL_VENOUS_BLOOD_GAS=Arterial/venous blood gas +AdditionalTestType.ALT_SGPT=ALT/SGPT +AdditionalTestType.AST_SGOT=AST/SGOT +AdditionalTestType.CREATININE=Creatinine +AdditionalTestType.POTASSIUM=Potassium +AdditionalTestType.UREA=Urea +AdditionalTestType.HAEMOGLOBIN=Haemoglobin +AdditionalTestType.TOTAL_BILIRUBIN=Total bilirubin +AdditionalTestType.CONJ_BILIRUBIN=Conj. bilirubin +AdditionalTestType.WBC_COUNT=WBC count +AdditionalTestType.PLATELETS=Platelets +AdditionalTestType.PROTHROMBIN_TIME=Prothrombin time +AgeGroup.AGE_0_4=0--4 +AgeGroup.AGE_5_9=5--9 +AgeGroup.AGE_10_14=10--14 +AgeGroup.AGE_15_19=15--19 +AgeGroup.AGE_20_24=20--24 +AgeGroup.AGE_25_29=25--29 +AgeGroup.AGE_30_34=30--34 +AgeGroup.AGE_35_39=35--59 +AgeGroup.AGE_40_44=40--44 +AgeGroup.AGE_45_49=45--49 +AgeGroup.AGE_50_54=50--54 +AgeGroup.AGE_55_59=55--59 +AgeGroup.AGE_60_64=60--64 +AgeGroup.AGE_65_69=65--69 +AgeGroup.AGE_70_74=70--74 +AgeGroup.AGE_75_79=75--79 +AgeGroup.AGE_80_84=80--84 +AgeGroup.AGE_80_PLUS=80+ #AggregatedReportGroupingLevel -AggregateReportGroupingLevel.REGION = Region -AggregateReportGroupingLevel.DISTRICT = District -AggregateReportGroupingLevel.HEALTH_FACILITY = Facility -AggregateReportGroupingLevel.POINT_OF_ENTRY = Point of entry - +AggregateReportGroupingLevel.REGION=Region +AggregateReportGroupingLevel.DISTRICT=District +AggregateReportGroupingLevel.HEALTH_FACILITY=Facility +AggregateReportGroupingLevel.POINT_OF_ENTRY=Point of entry # AnimalCondition -AnimalCondition.ALIVE = Alive -AnimalCondition.DEAD = Dead -AnimalCondition.PROCESSED = Processed -AnimalCondition.UNKNOWN = Unknown - +AnimalCondition.ALIVE=Alive +AnimalCondition.DEAD=Dead +AnimalCondition.PROCESSED=Processed +AnimalCondition.UNKNOWN=Unknown AnimalContactType.BITE=Bite AnimalContactType.TOUCH=Touch AnimalContactType.SCRATCH=Scratch AnimalContactType.LICK=Lick AnimalContactType.OTHER=Other - # AnimalLocation -AnimalLocation.ZOO = Zoo -AnimalLocation.FARM = Farm -AnimalLocation.PARK = Park -AnimalLocation.FOREST = Forest -AnimalLocation.OTHER = Other - +AnimalLocation.ZOO=Zoo +AnimalLocation.FARM=Farm +AnimalLocation.PARK=Park +AnimalLocation.FOREST=Forest +AnimalLocation.OTHER=Other # ApproximateAgeType -ApproximateAgeType.DAYS = Days -ApproximateAgeType.MONTHS = Months -ApproximateAgeType.YEARS = Years - -AreaType.URBAN = Urban -AreaType.RURAL = Rural -AreaType.UNKNOWN = Unknown - -ArmedForcesRelationType.UNKNOWN = Unknown -ArmedForcesRelationType.NO_RELATION = No relation to armed forces -ArmedForcesRelationType.CIVIL = Civil person working for/accomodated in facility of armed forces -ArmedForcesRelationType.SOLDIER_OR_RELATIVE = Soldier, Relative - -ArrivalOrDeparture.ARRIVAL = Arrival -ArrivalOrDeparture.DEPARTURE = Departure -ArrivalOrDeparture.UNKNOWN = Unknown - +ApproximateAgeType.DAYS=Days +ApproximateAgeType.MONTHS=Months +ApproximateAgeType.YEARS=Years +AreaType.URBAN=Urban +AreaType.RURAL=Rural +AreaType.UNKNOWN=Unknown +ArmedForcesRelationType.UNKNOWN=Unknown +ArmedForcesRelationType.NO_RELATION=No relation to armed forces +ArmedForcesRelationType.CIVIL=Civil person working for/accomodated in facility of armed forces +ArmedForcesRelationType.SOLDIER_OR_RELATIVE=Soldier, Relative +ArrivalOrDeparture.ARRIVAL=Arrival +ArrivalOrDeparture.DEPARTURE=Departure +ArrivalOrDeparture.UNKNOWN=Unknown # BurialConductor -BurialConductor.FAMILY_COMMUNITY = Family/Community -BurialConductor.OUTBREAK_TEAM = Outbreak burial team - +BurialConductor.FAMILY_COMMUNITY=Family/Community +BurialConductor.OUTBREAK_TEAM=Outbreak burial team # CampaignPhase -CampaignPhase.PRE = Pre-Campaign -CampaignPhase.INTRA = Intra-Campaign -CampaignPhase.POST = Post-Campaign - +CampaignPhase.PRE=Pre-Campaign +CampaignPhase.INTRA=Intra-Campaign +CampaignPhase.POST=Post-Campaign # CampaignJurisdictionLevel -CampaignJurisdictionLevel.AREA = Area -CampaignJurisdictionLevel.REGION = Region -CampaignJurisdictionLevel.DISTRICT = District -CampaignJurisdictionLevel.COMMUNITY = Community - +CampaignJurisdictionLevel.AREA=Area +CampaignJurisdictionLevel.REGION=Region +CampaignJurisdictionLevel.DISTRICT=District +CampaignJurisdictionLevel.COMMUNITY=Community # CaseClassification -CaseClassification.CONFIRMED = Confirmed case -CaseClassification.CONFIRMED_NO_SYMPTOMS = Confirmed case with no symptoms -CaseClassification.CONFIRMED_UNKNOWN_SYMPTOMS = Confirmed case with unknown symptoms -CaseClassification.NO_CASE = Not a case -CaseClassification.NOT_CLASSIFIED = Not yet classified -CaseClassification.PROBABLE = Probable case -CaseClassification.SUSPECT = Possible case -CaseClassification.Short.CONFIRMED = Confirmed -CaseClassification.Short.CONFIRMED_NO_SYMPTOMS = Confirmed with symptoms -CaseClassification.Short.CONFIRMED_UNKNOWN_SYMPTOMS = Confirmed unknown symptoms -CaseClassification.Short.NO_CASE = No case -CaseClassification.Short.NOT_CLASSIFIED = Not classified -CaseClassification.Short.PROBABLE = Probable -CaseClassification.Short.SUSPECT = Suspect - +CaseClassification.CONFIRMED=Confirmed case +CaseClassification.CONFIRMED_NO_SYMPTOMS=Confirmed case with no symptoms +CaseClassification.CONFIRMED_UNKNOWN_SYMPTOMS=Confirmed case with unknown symptoms +CaseClassification.NO_CASE=Not a case +CaseClassification.NOT_CLASSIFIED=Not yet classified +CaseClassification.PROBABLE=Probable case +CaseClassification.SUSPECT=Possible case +CaseClassification.Short.CONFIRMED=Confirmed +CaseClassification.Short.CONFIRMED_NO_SYMPTOMS=Confirmed with symptoms +CaseClassification.Short.CONFIRMED_UNKNOWN_SYMPTOMS=Confirmed unknown symptoms +CaseClassification.Short.NO_CASE=No case +CaseClassification.Short.NOT_CLASSIFIED=Not classified +CaseClassification.Short.PROBABLE=Probable +CaseClassification.Short.SUSPECT=Suspect # CaseIdentificationSource -CaseIdentificationSource.UNKNOWN = Unknown -CaseIdentificationSource.OUTBREAK_INVESTIGATION = Outbreak investigation -CaseIdentificationSource.CONTACT_TRACKING_APP = Contact tracking app -CaseIdentificationSource.SUSPICION_REPORT = Suspicion report -CaseIdentificationSource.CONTACT_TRACING = Contact tracing -CaseIdentificationSource.SCREENING = Screening -CaseIdentificationSource.OTHER = Other - -ScreeningType.ON_HOSPITAL_ADMISSION = On admission in a hospital -ScreeningType.ON_CARE_HOME_ADMISSION = On admission in care home -ScreeningType.ON_ASYLUM_ADMISSION = On admission in an asylum seeking centre -ScreeningType.ON_ENTRY_FROM_RISK_AREA = On entry from risk area -ScreeningType.HEALTH_SECTOR_EMPLOYEE = Employee in health sector -ScreeningType.EDUCATIONAL_INSTITUTIONS = Educational institutions -ScreeningType.SELF_ARRANGED_TEST = Self arranged test -ScreeningType.SELF_CONDUCTED_TEST = Self conducted test -ScreeningType.OTHER = Other - -CaseCountOrIncidence.CASE_COUNT = Case count -CaseCountOrIncidence.CASE_INCIDENCE = Case incidence - -CaseJurisdictionType.RESPONSIBLE = Responsible jurisdiction -CaseJurisdictionType.PLACE_OF_STAY = Place of stay -CaseJurisdictionType.ALL = All - +CaseIdentificationSource.UNKNOWN=Unknown +CaseIdentificationSource.OUTBREAK_INVESTIGATION=Outbreak investigation +CaseIdentificationSource.CONTACT_TRACKING_APP=Contact tracking app +CaseIdentificationSource.SUSPICION_REPORT=Suspicion report +CaseIdentificationSource.CONTACT_TRACING=Contact tracing +CaseIdentificationSource.SCREENING=Screening +CaseIdentificationSource.OTHER=Other +ScreeningType.ON_HOSPITAL_ADMISSION=On admission in a hospital +ScreeningType.ON_CARE_HOME_ADMISSION=On admission in care home +ScreeningType.ON_ASYLUM_ADMISSION=On admission in an asylum seeking centre +ScreeningType.ON_ENTRY_FROM_RISK_AREA=On entry from risk area +ScreeningType.HEALTH_SECTOR_EMPLOYEE=Employee in health sector +ScreeningType.EDUCATIONAL_INSTITUTIONS=Educational institutions +ScreeningType.SELF_ARRANGED_TEST=Self arranged test +ScreeningType.SELF_CONDUCTED_TEST=Self conducted test +ScreeningType.OTHER=Other +CaseCountOrIncidence.CASE_COUNT=Case count +CaseCountOrIncidence.CASE_INCIDENCE=Case incidence +CaseJurisdictionType.RESPONSIBLE=Responsible jurisdiction +CaseJurisdictionType.PLACE_OF_STAY=Place of stay +CaseJurisdictionType.ALL=All # CaseMeasure -CaseMeasure.CASE_COUNT = Case count -CaseMeasure.CASE_INCIDENCE = Case incidence proportion - -CaseOrigin.IN_COUNTRY = In-Country -CaseOrigin.POINT_OF_ENTRY = Point of Entry - +CaseMeasure.CASE_COUNT=Case count +CaseMeasure.CASE_INCIDENCE=Case incidence proportion +CaseOrigin.IN_COUNTRY=In-Country +CaseOrigin.POINT_OF_ENTRY=Point of Entry # CaseOutcome -CaseOutcome.DECEASED = Deceased -CaseOutcome.NO_OUTCOME = No Outcome Yet -CaseOutcome.RECOVERED = Recovered -CaseOutcome.UNKNOWN = Unknown +CaseOutcome.DECEASED=Deceased +CaseOutcome.NO_OUTCOME=No Outcome Yet +CaseOutcome.RECOVERED=Recovered +CaseOutcome.UNKNOWN=Unknown #CaseImportedStatus CaseImportedStatus.IMPORTED_CASE=Imported case CaseImportedStatus.IMPORT_RELATED_CASE=Import related case CaseImportedStatus.UNKNOWN_IMPORTATION_STATUS=Unknown importation status CaseImportedStatus.NOT_IMPORTED_CASE=Not imported (locally acquired) case - - # CaseReferenceDefinition -CaseReferenceDefinition.FULFILLED = Fulfilled -CaseReferenceDefinition.NOT_FULFILLED = Not fulfilled - +CaseReferenceDefinition.FULFILLED=Fulfilled +CaseReferenceDefinition.NOT_FULFILLED=Not fulfilled # CauseOfDeath -CauseOfDeath.EPIDEMIC_DISEASE = Epidemic disease -CauseOfDeath.OTHER_CAUSE = Other cause - +CauseOfDeath.EPIDEMIC_DISEASE=Epidemic disease +CauseOfDeath.OTHER_CAUSE=Other cause ## Confirmed case classification -CaseConfirmationBasis.CLINICAL_CONFIRMATION = Clinical confirmation -CaseConfirmationBasis.EPIDEMIOLOGICAL_CONFIRMATION = Epidemiological confirmation -CaseConfirmationBasis.LABORATORY_DIAGNOSTIC_CONFIRMATION = Laboratory diagnostic confirmation - +CaseConfirmationBasis.CLINICAL_CONFIRMATION=Clinical confirmation +CaseConfirmationBasis.EPIDEMIOLOGICAL_CONFIRMATION=Epidemiological confirmation +CaseConfirmationBasis.LABORATORY_DIAGNOSTIC_CONFIRMATION=Laboratory diagnostic confirmation # ClusterType -ClusterType.KINDERGARTEN_OR_CHILDCARE = Kindergarten or childcare -ClusterType.FAMILY = Family -ClusterType.MILITARY = Military -ClusterType.NOSOCOMIAL = Nosocomial (hospital) -ClusterType.SCHOOL = School -ClusterType.SPORTS_TEAM = Sports team -ClusterType.UNIVERSITY = University -ClusterType.OTHER = Other - - -CongenitalHeartDiseaseType.PDA = Patent ductus arteriosus (PDA) -CongenitalHeartDiseaseType.PPS = Peripheral pulmonary stenosis (PPS) -CongenitalHeartDiseaseType.VSD = Ventricular septal defect (VSD) -CongenitalHeartDiseaseType.OTHER = Other heart defect - +ClusterType.KINDERGARTEN_OR_CHILDCARE=Kindergarten or childcare +ClusterType.FAMILY=Family +ClusterType.MILITARY=Military +ClusterType.NOSOCOMIAL=Nosocomial (hospital) +ClusterType.SCHOOL=School +ClusterType.SPORTS_TEAM=Sports team +ClusterType.UNIVERSITY=University +ClusterType.OTHER=Other +CongenitalHeartDiseaseType.PDA=Patent ductus arteriosus (PDA) +CongenitalHeartDiseaseType.PPS=Peripheral pulmonary stenosis (PPS) +CongenitalHeartDiseaseType.VSD=Ventricular septal defect (VSD) +CongenitalHeartDiseaseType.OTHER=Other heart defect # ContactCategory -ContactCategory.HIGH_RISK = High risk contact -ContactCategory.HIGH_RISK_MED = High risk medical contact -ContactCategory.MEDIUM_RISK_MED = Medium risk medical contact -ContactCategory.LOW_RISK = Low risk contact -ContactCategory.NO_RISK = No risk contact - +ContactCategory.HIGH_RISK=High risk contact +ContactCategory.HIGH_RISK_MED=High risk medical contact +ContactCategory.MEDIUM_RISK_MED=Medium risk medical contact +ContactCategory.LOW_RISK=Low risk contact +ContactCategory.NO_RISK=No risk contact # ContactClassification -ContactClassification.CONFIRMED = Confirmed contact -ContactClassification.NO_CONTACT = Not a contact -ContactClassification.UNCONFIRMED = Unconfirmed contact -ContactClassification.Short.CONFIRMED = Confirmed -ContactClassification.Short.NO_CONTACT = No contact -ContactClassification.Short.UNCONFIRMED = Unconfirmed - +ContactClassification.CONFIRMED=Confirmed contact +ContactClassification.NO_CONTACT=Not a contact +ContactClassification.UNCONFIRMED=Unconfirmed contact +ContactClassification.Short.CONFIRMED=Confirmed +ContactClassification.Short.NO_CONTACT=No contact +ContactClassification.Short.UNCONFIRMED=Unconfirmed # ContactDateType -ContactDateType.REPORT_DATE = Report date -ContactDateType.LAST_CONTACT_DATE = Last contact date - -ContactsEpiCurveMode.FOLLOW_UP_STATUS = Follow-up status -ContactsEpiCurveMode.CONTACT_CLASSIFICATION = Contact classification -ContactsEpiCurveMode.FOLLOW_UP_UNTIL = Follow-up until - +ContactDateType.REPORT_DATE=Report date +ContactDateType.LAST_CONTACT_DATE=Last contact date +ContactsEpiCurveMode.FOLLOW_UP_STATUS=Follow-up status +ContactsEpiCurveMode.CONTACT_CLASSIFICATION=Contact classification +ContactsEpiCurveMode.FOLLOW_UP_UNTIL=Follow-up until # ContactIdentificationSource -ContactIdentificationSource.CASE_PERSON = Case person -ContactIdentificationSource.CONTACT_PERSON = Contact person -ContactIdentificationSource.TRACING_APP = Proximity tracing app -ContactIdentificationSource.OTHER = Other -ContactIdentificationSource.UNKNOWN = Unknown - +ContactIdentificationSource.CASE_PERSON=Case person +ContactIdentificationSource.CONTACT_PERSON=Contact person +ContactIdentificationSource.TRACING_APP=Proximity tracing app +ContactIdentificationSource.OTHER=Other +ContactIdentificationSource.UNKNOWN=Unknown # ContactProximity -ContactProximity.AEROSOL = Persons exposed to aerosol producing activities -ContactProximity.AIRPLANE = Airplane, sitting up to two rows in front or behind the source case -ContactProximity.CLOSE_CONTACT = Was in close proximity (1 meter) with source case -ContactProximity.CLOTHES_OR_OTHER = Manipulation of clothes or other objects of source case -ContactProximity.FACE_TO_FACE_LONG = Face-to-face contact of at least 15 minutes -ContactProximity.FACE_TO_FACE_SHORT = Face-to-face contact of less than 15 minutes -ContactProximity.MEDICAL_DISTANT = Medical personnel at safe proximity (> 2 meter), without direct contact with secretions or excretions of the patient and without aerosol exposure -ContactProximity.MEDICAL_SAME_ROOM = Medical personnel that was in same room or house with source case -ContactProximity.MEDICAL_SAFE = Medical personnel at safe proximity (> 2 meter) or with protective equipment -ContactProximity.MEDICAL_UNSAFE = Medical personnel with a high risk of exposure, e.g. unprotected relevant exposure to secretions, exposure to aerosols from COVID-19 cases -ContactProximity.MEDICAL_LIMITED = Medical personnel with limited exposure, e.g. with contact < 2m to COVID-19 cases without protective equipment, ≥ 15min face-to-face contact (without exposure as described under Ia) -ContactProximity.PHYSICAL_CONTACT = Direct physical contact with source case -ContactProximity.SAME_ROOM = Was in same room or house with source case -ContactProximity.TOUCHED_FLUID = Touched fluid of source case - +ContactProximity.AEROSOL=Persons exposed to aerosol producing activities +ContactProximity.AIRPLANE=Airplane, sitting up to two rows in front or behind the source case +ContactProximity.CLOSE_CONTACT=Was in close proximity (1 meter) with source case +ContactProximity.CLOTHES_OR_OTHER=Manipulation of clothes or other objects of source case +ContactProximity.FACE_TO_FACE_LONG=Face-to-face contact of at least 15 minutes +ContactProximity.FACE_TO_FACE_SHORT=Face-to-face contact of less than 15 minutes +ContactProximity.MEDICAL_DISTANT=Medical personnel at safe proximity (> 2 meter), without direct contact with secretions or excretions of the patient and without aerosol exposure +ContactProximity.MEDICAL_SAME_ROOM=Medical personnel that was in same room or house with source case +ContactProximity.MEDICAL_SAFE=Medical personnel at safe proximity (> 2 meter) or with protective equipment +ContactProximity.MEDICAL_UNSAFE=Medical personnel with a high risk of exposure, e.g. unprotected relevant exposure to secretions, exposure to aerosols from COVID-19 cases +ContactProximity.MEDICAL_LIMITED=Medical personnel with limited exposure, e.g. with contact < 2m to COVID-19 cases without protective equipment, ≥ 15min face-to-face contact (without exposure as described under Ia) +ContactProximity.PHYSICAL_CONTACT=Direct physical contact with source case +ContactProximity.SAME_ROOM=Was in same room or house with source case +ContactProximity.TOUCHED_FLUID=Touched fluid of source case # ContactRelation -ContactRelation.FAMILY_MEMBER_OR_FRIEND = Other family member or friend -ContactRelation.SAME_ENVIRONMENT = Work in the same environment -ContactRelation.SAME_HOUSEHOLD = Live in the same household -ContactRelation.MEDICAL_CARE = Provided medical care for the case -ContactRelation.OTHER = Other - +ContactRelation.FAMILY_MEMBER_OR_FRIEND=Other family member or friend +ContactRelation.SAME_ENVIRONMENT=Work in the same environment +ContactRelation.SAME_HOUSEHOLD=Live in the same household +ContactRelation.MEDICAL_CARE=Provided medical care for the case +ContactRelation.OTHER=Other # ContactStatus -ContactStatus.ACTIVE = Active contact -ContactStatus.CONVERTED = Converted to case -ContactStatus.DROPPED = Dropped - -ConveyanceType.CAR = Car -ConveyanceType.BUS = Bus -ConveyanceType.MOTORBIKE = Motorbike -ConveyanceType.OTHER = Other - -CustomizableEnumType.DISEASE_VARIANT = Disease variant -CustomizableEnumType.SPECIFIC_EVENT_RISK = Specific event risk -CustomizableEnumType.OCCUPATION_TYPE = Occupation type -CustomizableEnumType.PATHOGEN = Pathogen - +ContactStatus.ACTIVE=Active contact +ContactStatus.CONVERTED=Converted to case +ContactStatus.DROPPED=Dropped +ConveyanceType.CAR=Car +ConveyanceType.BUS=Bus +ConveyanceType.MOTORBIKE=Motorbike +ConveyanceType.OTHER=Other +CustomizableEnumType.DISEASE_VARIANT=Disease variant +CustomizableEnumType.SPECIFIC_EVENT_RISK=Specific event risk +CustomizableEnumType.OCCUPATION_TYPE=Occupation type +CustomizableEnumType.PATHOGEN=Pathogen #ComplianceWithTreatment -ComplianceWithTreatment.NO_COMPLIANCE = No compliance -ComplianceWithTreatment.TREATMENT_COMPLETED = Treatment completed -ComplianceWithTreatment.TREATMENT_FAILED = Treatment failed -ComplianceWithTreatment.TREATMENT_NOT_COMPLETED = Treatment not completed -ComplianceWithTreatment.UNKNOWN = Unknown -ComplianceWithTreatment.NOT_APPLICABLE = Not applicable - +ComplianceWithTreatment.NO_COMPLIANCE=No compliance +ComplianceWithTreatment.TREATMENT_COMPLETED=Treatment completed +ComplianceWithTreatment.TREATMENT_FAILED=Treatment failed +ComplianceWithTreatment.TREATMENT_NOT_COMPLETED=Treatment not completed +ComplianceWithTreatment.UNKNOWN=Unknown +ComplianceWithTreatment.NOT_APPLICABLE=Not applicable # DashboardType -DashboardType.CONTACTS = Contacts -DashboardType.SURVEILLANCE = Surveillance -DashboardType.CAMPAIGNS = Campaigns -DashboardType.ADVERSE_EVENTS = Adverse Events -DashboardType.GIS = Geographical Analysis - +DashboardType.CONTACTS=Contacts +DashboardType.SURVEILLANCE=Surveillance +DashboardType.CAMPAIGNS=Campaigns +DashboardType.ADVERSE_EVENTS=Adverse Events +DashboardType.GIS=Geographical Analysis # DatabaseTable -DatabaseTable.ACTIONS = Actions -DatabaseTable.CASES = Cases -DatabaseTable.SYMPTOMS = Symptoms -DatabaseTable.CLINICAL_COURSES = Clinical courses -DatabaseTable.CLINICAL_VISITS = Clinical visits -DatabaseTable.COMMUNITIES = Communities -DatabaseTable.CONTACTS = Contacts -DatabaseTable.CONTACTS_VISITS = Contacts → Visits -DatabaseTable.CONTINENTS = Continents -DatabaseTable.SUBCONTINENTS = Subcontinents -DatabaseTable.AREAS = Areas -DatabaseTable.COUNTRIES = Countries -DatabaseTable.CUSTOMIZABLE_ENUM_VALUES = Customizable enum values -DatabaseTable.DISTRICTS = Districts -DatabaseTable.EPIDATA = Epidemiological data -DatabaseTable.EVENTS = Events -DatabaseTable.EVENTS_EVENTGROUPS = Events → Event groups -DatabaseTable.EVENTGROUPS = Event groups -DatabaseTable.EVENTPARTICIPANTS = Event participants -DatabaseTable.EXPOSURES = Exposures -DatabaseTable.ACTIVITIES_AS_CASE = Activities as case -DatabaseTable.FACILITIES = Facilities -DatabaseTable.POINTS_OF_ENTRY = Points of entry -DatabaseTable.HEALTH_CONDITIONS = Health conditions -DatabaseTable.HOSPITALIZATIONS = Hospitalizations -DatabaseTable.IMMUNIZATIONS = Immunizations -DatabaseTable.LOCATIONS = Locations -DatabaseTable.OUTBREAKS = Outbreaks -DatabaseTable.PERSONS = Persons -DatabaseTable.PERSON_CONTACT_DETAILS = Person contact details -DatabaseTable.PERSON_LOCATIONS = Person locations -DatabaseTable.PRESCRIPTIONS = Prescriptions -DatabaseTable.PREVIOUSHOSPITALIZATIONS = Previous hospitalizations -DatabaseTable.REGIONS = Regions -DatabaseTable.SAMPLES = Samples -DatabaseTable.PATHOGEN_TESTS = Pathogen tests -DatabaseTable.ADDITIONAL_TESTS = Additional tests -DatabaseTable.TASKS = Tasks -DatabaseTable.TASK_OBSERVER = Task observer -DatabaseTable.THERAPIES = Therapies -DatabaseTable.TRAVEL_ENTRIES = Travel entries -DatabaseTable.TREATMENTS = Treatments -DatabaseTable.USERS = Users -DatabaseTable.USER_ROLES = User roles -DatabaseTable.USERS_USERROLES = Users → User roles -DatabaseTable.USERROLES_USERRIGHTS = User roles → User rights -DatabaseTable.USERROLES_EMAILNOTIFICATIONTYPES = User roles → Email notification types -DatabaseTable.USERROLES_SMSNOTIFICATIONTYPES = User roles → SMS notification types -DatabaseTable.VACCINATIONS = Vaccinations -DatabaseTable.VISITS = Visits -DatabaseTable.WEEKLYREPORTS = Weekly reports -DatabaseTable.WEEKLYREPORTENTRIES = Weekly report entries -DatabaseTable.PORT_HEALTH_INFO = Port health information -DatabaseTable.MATERNAL_HISTORIES = Maternal histories -DatabaseTable.EXTERNAL_MESSAGES = Messages -DatabaseTable.SAMPLE_REPORTS = Sample reports -DatabaseTable.TEST_REPORTS = Test reports -DatabaseTable.SORMAS_TO_SORMAS_ORIGIN_INFO = SORMAS 2 SORMAS origin information -DatabaseTable.SORMAS_TO_SORMAS_SHARE_INFO = SORMAS 2 SORMAS share information -DatabaseTable.SORMAS_TO_SORMAS_SHARE_REQUESTS = SORMAS 2 SORMAS share requests -DatabaseTable.SHARE_REQUEST_INFO = SORMAS 2 SORMAS share request information -DatabaseTable.SHARE_REQUEST_INFO_SHARE_INFO = SORMAS 2 SORMAS share request information → Share Info -DatabaseTable.EXTERNAL_SHARE_INFO = External share information -DatabaseTable.CAMPAIGNS = Campaigns -DatabaseTable.CAMPAIGN_CAMPAIGNFORMMETA = Campaigns → Campaign Form Meta -DatabaseTable.CAMPAIGN_FORM_META = Campaign form meta -DatabaseTable.CAMPAIGN_FORM_DATA = Campaign form data -DatabaseTable.CAMPAIGN_DIAGRAM_DEFINITIONS = Campaign diagram definitions -DatabaseTable.POPULATION_DATA = Population data -DatabaseTable.SURVEILLANCE_REPORTS = Surveillance reports -DatabaseTable.AGGREGATE_REPORTS = Aggregate reports -DatabaseTable.WEEKLY_REPORTS = Weekly reports -DatabaseTable.WEEKLY_REPORT_ENTRIES = Weekly report entries -DatabaseTable.DOCUMENTS = Documents -DatabaseTable.EXPORT_CONFIGURATIONS = Export configurations -DatabaseTable.FEATURE_CONFIGURATIONS = Feature configurations -DatabaseTable.DISEASE_CONFIGURATIONS = Disease configurations -DatabaseTable.DELETION_CONFIGURATIONS = Deletion configurations -DatabaseTable.SYSTEM_CONFIGURATION_VALUES = System configuration values -DatabaseTable.SYSTEM_CONFIGURATION_CATEGORIES = System configuration categories -DatabaseTable.NOTIFIER = Notifier -DatabaseTable.DRUG_SUSCEPTIBILITY = Drug susceptibility -DatabaseTable.SPECIAL_CASE_ACCESSES = Special case accesses -DatabaseTable.ENVIRONMENTS = Environments -DatabaseTable.EVENT_ENVIRONMENTS = Events → Environments -DatabaseTable.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATIONS = Adverse events following immunizations -DatabaseTable.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_INVESTIGATIONS = Adverse events following immunization investigations -DatabaseTable.ADVERSE_EVENTS = Adverse events -DatabaseTable.DOCUMENT_RELATED_ENTITIES = Document related entities - +DatabaseTable.ACTIONS=Actions +DatabaseTable.CASES=Cases +DatabaseTable.SYMPTOMS=Symptoms +DatabaseTable.CLINICAL_COURSES=Clinical courses +DatabaseTable.CLINICAL_VISITS=Clinical visits +DatabaseTable.COMMUNITIES=Communities +DatabaseTable.CONTACTS=Contacts +DatabaseTable.CONTACTS_VISITS=Contacts → Visits +DatabaseTable.CONTINENTS=Continents +DatabaseTable.SUBCONTINENTS=Subcontinents +DatabaseTable.AREAS=Areas +DatabaseTable.COUNTRIES=Countries +DatabaseTable.CUSTOMIZABLE_ENUM_VALUES=Customizable enum values +DatabaseTable.DISTRICTS=Districts +DatabaseTable.EPIDATA=Epidemiological data +DatabaseTable.EVENTS=Events +DatabaseTable.EVENTS_EVENTGROUPS=Events → Event groups +DatabaseTable.EVENTGROUPS=Event groups +DatabaseTable.EVENTPARTICIPANTS=Event participants +DatabaseTable.EXPOSURES=Exposures +DatabaseTable.ACTIVITIES_AS_CASE=Activities as case +DatabaseTable.FACILITIES=Facilities +DatabaseTable.POINTS_OF_ENTRY=Points of entry +DatabaseTable.HEALTH_CONDITIONS=Health conditions +DatabaseTable.HOSPITALIZATIONS=Hospitalizations +DatabaseTable.IMMUNIZATIONS=Immunizations +DatabaseTable.LOCATIONS=Locations +DatabaseTable.OUTBREAKS=Outbreaks +DatabaseTable.PERSONS=Persons +DatabaseTable.PERSON_CONTACT_DETAILS=Person contact details +DatabaseTable.PERSON_LOCATIONS=Person locations +DatabaseTable.PRESCRIPTIONS=Prescriptions +DatabaseTable.PREVIOUSHOSPITALIZATIONS=Previous hospitalizations +DatabaseTable.REGIONS=Regions +DatabaseTable.SAMPLES=Samples +DatabaseTable.PATHOGEN_TESTS=Pathogen tests +DatabaseTable.ADDITIONAL_TESTS=Additional tests +DatabaseTable.TASKS=Tasks +DatabaseTable.TASK_OBSERVER=Task observer +DatabaseTable.THERAPIES=Therapies +DatabaseTable.TRAVEL_ENTRIES=Travel entries +DatabaseTable.TREATMENTS=Treatments +DatabaseTable.USERS=Users +DatabaseTable.USER_ROLES=User roles +DatabaseTable.USERS_USERROLES=Users → User roles +DatabaseTable.USERROLES_USERRIGHTS=User roles → User rights +DatabaseTable.USERROLES_EMAILNOTIFICATIONTYPES=User roles → Email notification types +DatabaseTable.USERROLES_SMSNOTIFICATIONTYPES=User roles → SMS notification types +DatabaseTable.VACCINATIONS=Vaccinations +DatabaseTable.VISITS=Visits +DatabaseTable.WEEKLYREPORTS=Weekly reports +DatabaseTable.WEEKLYREPORTENTRIES=Weekly report entries +DatabaseTable.PORT_HEALTH_INFO=Port health information +DatabaseTable.MATERNAL_HISTORIES=Maternal histories +DatabaseTable.EXTERNAL_MESSAGES=Messages +DatabaseTable.SAMPLE_REPORTS=Sample reports +DatabaseTable.TEST_REPORTS=Test reports +DatabaseTable.SORMAS_TO_SORMAS_ORIGIN_INFO=SORMAS 2 SORMAS origin information +DatabaseTable.SORMAS_TO_SORMAS_SHARE_INFO=SORMAS 2 SORMAS share information +DatabaseTable.SORMAS_TO_SORMAS_SHARE_REQUESTS=SORMAS 2 SORMAS share requests +DatabaseTable.SHARE_REQUEST_INFO=SORMAS 2 SORMAS share request information +DatabaseTable.SHARE_REQUEST_INFO_SHARE_INFO=SORMAS 2 SORMAS share request information → Share Info +DatabaseTable.EXTERNAL_SHARE_INFO=External share information +DatabaseTable.CAMPAIGNS=Campaigns +DatabaseTable.CAMPAIGN_CAMPAIGNFORMMETA=Campaigns → Campaign Form Meta +DatabaseTable.CAMPAIGN_FORM_META=Campaign form meta +DatabaseTable.CAMPAIGN_FORM_DATA=Campaign form data +DatabaseTable.CAMPAIGN_DIAGRAM_DEFINITIONS=Campaign diagram definitions +DatabaseTable.POPULATION_DATA=Population data +DatabaseTable.SURVEILLANCE_REPORTS=Surveillance reports +DatabaseTable.AGGREGATE_REPORTS=Aggregate reports +DatabaseTable.WEEKLY_REPORTS=Weekly reports +DatabaseTable.WEEKLY_REPORT_ENTRIES=Weekly report entries +DatabaseTable.DOCUMENTS=Documents +DatabaseTable.EXPORT_CONFIGURATIONS=Export configurations +DatabaseTable.FEATURE_CONFIGURATIONS=Feature configurations +DatabaseTable.DISEASE_CONFIGURATIONS=Disease configurations +DatabaseTable.DELETION_CONFIGURATIONS=Deletion configurations +DatabaseTable.SYSTEM_CONFIGURATION_VALUES=System configuration values +DatabaseTable.SYSTEM_CONFIGURATION_CATEGORIES=System configuration categories +DatabaseTable.NOTIFIER=Notifier +DatabaseTable.DRUG_SUSCEPTIBILITY=Drug susceptibility +DatabaseTable.SPECIAL_CASE_ACCESSES=Special case accesses +DatabaseTable.ENVIRONMENTS=Environments +DatabaseTable.EVENT_ENVIRONMENTS=Events → Environments +DatabaseTable.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATIONS=Adverse events following immunizations +DatabaseTable.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_INVESTIGATIONS=Adverse events following immunization investigations +DatabaseTable.ADVERSE_EVENTS=Adverse events +DatabaseTable.DOCUMENT_RELATED_ENTITIES=Document related entities # DateFilterOption -DateFilterOption.DATE = By Date -DateFilterOption.EPI_WEEK = By Epi Week - +DateFilterOption.DATE=By Date +DateFilterOption.EPI_WEEK=By Epi Week # DeathPlaceType -DeathPlaceType.COMMUNITY = Community -DeathPlaceType.HOSPITAL = Hospital -DeathPlaceType.OTHER = Other - +DeathPlaceType.COMMUNITY=Community +DeathPlaceType.HOSPITAL=Hospital +DeathPlaceType.OTHER=Other # DefaultUserRole -DefaultUserRole.ADMIN = Admin -DefaultUserRole.CASE_OFFICER = Case Officer -DefaultUserRole.CASE_SUPERVISOR = Clinician -DefaultUserRole.COMMUNITY_INFORMANT = Community Informant -DefaultUserRole.COMMUNITY_OFFICER = Community Officer -DefaultUserRole.CONTACT_OFFICER = Contact Officer -DefaultUserRole.CONTACT_SUPERVISOR = Contact Supervisor -DefaultUserRole.DISTRICT_OBSERVER = District Observer -DefaultUserRole.EVENT_OFFICER = Event Officer -DefaultUserRole.EXTERNAL_LAB_USER = External Lab Officer -DefaultUserRole.HOSPITAL_INFORMANT = Hospital Informant -DefaultUserRole.IMPORT_USER = Import User -DefaultUserRole.LAB_USER = Lab Officer -DefaultUserRole.NATIONAL_CLINICIAN = National Clinician -DefaultUserRole.NATIONAL_OBSERVER = National Observer -DefaultUserRole.NATIONAL_USER = National User -DefaultUserRole.POE_INFORMANT = POE Informant -DefaultUserRole.POE_NATIONAL_USER = POE National User -DefaultUserRole.POE_SUPERVISOR = POE Supervisor -DefaultUserRole.STATE_OBSERVER = Region Observer -DefaultUserRole.SURVEILLANCE_OFFICER = Surveillance Officer -DefaultUserRole.SURVEILLANCE_SUPERVISOR = Surveillance Supervisor -DefaultUserRole.REST_EXTERNAL_VISITS_USER = External Visits User -DefaultUserRole.SORMAS_TO_SORMAS_CLIENT = Sormas to Sormas Client -DefaultUserRole.ADMIN_SUPERVISOR = Admin Surveillance Supervisor -DefaultUserRole.BAG_USER = BAG User -DefaultUserRole.ENVIRONMENTAL_SURVEILLANCE_USER = Environmental Surveillance User -DefaultUserRole.Short.ADMIN = Admin -DefaultUserRole.Short.CASE_OFFICER = CaseOff -DefaultUserRole.Short.CASE_SUPERVISOR = Clinician -DefaultUserRole.Short.CONTACT_OFFICER = ContOff -DefaultUserRole.Short.CONTACT_SUPERVISOR = ContSup -DefaultUserRole.Short.COMMUNITY_INFORMANT = CommInf -DefaultUserRole.Short.DISTRICT_OBSERVER = DistObs -DefaultUserRole.Short.EVENT_OFFICER = EventOff -DefaultUserRole.Short.EXTERNAL_LAB_USER = ExtLabOff -DefaultUserRole.Short.HOSPITAL_INFORMANT = HospInf -DefaultUserRole.Short.IMPORT_USER = ImpUser -DefaultUserRole.Short.LAB_USER = LabOff -DefaultUserRole.Short.NATIONAL_CLINICIAN = NatClin -DefaultUserRole.Short.NATIONAL_OBSERVER = NatObs -DefaultUserRole.Short.NATIONAL_USER = NatUser -DefaultUserRole.Short.POE_INFORMANT = POEInf -DefaultUserRole.Short.POE_NATIONAL_USER = POENat -DefaultUserRole.Short.POE_SUPERVISOR = POESup -DefaultUserRole.Short.STATE_OBSERVER = RegObs -DefaultUserRole.Short.SURVEILLANCE_SUPERVISOR = SurvSup -DefaultUserRole.Short.ADMIN_SUPERVISOR = AdminSup -DefaultUserRole.Short.SURVEILLANCE_OFFICER = SurvOff -DefaultUserRole.Short.REST_EXTERNAL_VISITS_USER = ExtVis -DefaultUserRole.Short.SORMAS_TO_SORMAS_CLIENT = SormasToSormas -DefaultUserRole.Short.BAG_USER = BAG -DefaultUserRole.Short.ENVIRONMENTAL_SURVEILLANCE_USER = EnvSurv - +DefaultUserRole.ADMIN=Admin +DefaultUserRole.CASE_OFFICER=Case Officer +DefaultUserRole.CASE_SUPERVISOR=Clinician +DefaultUserRole.COMMUNITY_INFORMANT=Community Informant +DefaultUserRole.COMMUNITY_OFFICER=Community Officer +DefaultUserRole.CONTACT_OFFICER=Contact Officer +DefaultUserRole.CONTACT_SUPERVISOR=Contact Supervisor +DefaultUserRole.DISTRICT_OBSERVER=District Observer +DefaultUserRole.EVENT_OFFICER=Event Officer +DefaultUserRole.EXTERNAL_LAB_USER=External Lab Officer +DefaultUserRole.HOSPITAL_INFORMANT=Hospital Informant +DefaultUserRole.IMPORT_USER=Import User +DefaultUserRole.LAB_USER=Lab Officer +DefaultUserRole.NATIONAL_CLINICIAN=National Clinician +DefaultUserRole.NATIONAL_OBSERVER=National Observer +DefaultUserRole.NATIONAL_USER=National User +DefaultUserRole.POE_INFORMANT=POE Informant +DefaultUserRole.POE_NATIONAL_USER=POE National User +DefaultUserRole.POE_SUPERVISOR=POE Supervisor +DefaultUserRole.STATE_OBSERVER=Region Observer +DefaultUserRole.SURVEILLANCE_OFFICER=Surveillance Officer +DefaultUserRole.SURVEILLANCE_SUPERVISOR=Surveillance Supervisor +DefaultUserRole.REST_EXTERNAL_VISITS_USER=External Visits User +DefaultUserRole.SORMAS_TO_SORMAS_CLIENT=Sormas to Sormas Client +DefaultUserRole.ADMIN_SUPERVISOR=Admin Surveillance Supervisor +DefaultUserRole.BAG_USER=BAG User +DefaultUserRole.ENVIRONMENTAL_SURVEILLANCE_USER=Environmental Surveillance User +DefaultUserRole.Short.ADMIN=Admin +DefaultUserRole.Short.CASE_OFFICER=CaseOff +DefaultUserRole.Short.CASE_SUPERVISOR=Clinician +DefaultUserRole.Short.CONTACT_OFFICER=ContOff +DefaultUserRole.Short.CONTACT_SUPERVISOR=ContSup +DefaultUserRole.Short.COMMUNITY_INFORMANT=CommInf +DefaultUserRole.Short.DISTRICT_OBSERVER=DistObs +DefaultUserRole.Short.EVENT_OFFICER=EventOff +DefaultUserRole.Short.EXTERNAL_LAB_USER=ExtLabOff +DefaultUserRole.Short.HOSPITAL_INFORMANT=HospInf +DefaultUserRole.Short.IMPORT_USER=ImpUser +DefaultUserRole.Short.LAB_USER=LabOff +DefaultUserRole.Short.NATIONAL_CLINICIAN=NatClin +DefaultUserRole.Short.NATIONAL_OBSERVER=NatObs +DefaultUserRole.Short.NATIONAL_USER=NatUser +DefaultUserRole.Short.POE_INFORMANT=POEInf +DefaultUserRole.Short.POE_NATIONAL_USER=POENat +DefaultUserRole.Short.POE_SUPERVISOR=POESup +DefaultUserRole.Short.STATE_OBSERVER=RegObs +DefaultUserRole.Short.SURVEILLANCE_SUPERVISOR=SurvSup +DefaultUserRole.Short.ADMIN_SUPERVISOR=AdminSup +DefaultUserRole.Short.SURVEILLANCE_OFFICER=SurvOff +DefaultUserRole.Short.REST_EXTERNAL_VISITS_USER=ExtVis +DefaultUserRole.Short.SORMAS_TO_SORMAS_CLIENT=SormasToSormas +DefaultUserRole.Short.BAG_USER=BAG +DefaultUserRole.Short.ENVIRONMENTAL_SURVEILLANCE_USER=EnvSurv #DeleteReason -DeletionReason.GDPR = Deletion request by affected person according to GDPR -DeletionReason.DELETION_REQUEST = Deletion request by another authority -DeletionReason.CREATED_WITH_NO_LEGAL_REASON = Entity created without legal reason -DeletionReason.TRANSFERRED_RESPONSIBILITY = Responsibility transferred to another authority -DeletionReason.DUPLICATE_ENTRIES = Deletion of duplicate entries -DeletionReason.OTHER_REASON = Other reason - +DeletionReason.GDPR=Deletion request by affected person according to GDPR +DeletionReason.DELETION_REQUEST=Deletion request by another authority +DeletionReason.CREATED_WITH_NO_LEGAL_REASON=Entity created without legal reason +DeletionReason.TRANSFERRED_RESPONSIBILITY=Responsibility transferred to another authority +DeletionReason.DUPLICATE_ENTRIES=Deletion of duplicate entries +DeletionReason.OTHER_REASON=Other reason # DengueFeverType -DengueFeverType.DENGUE_FEVER = Dengue Fever -DengueFeverType.DENGUE_HEMORRHAGIC_FEVER = Dengue Hemorrhagic Fever -DengueFeverType.DENUGE_SHOCK_SYNDROME = Denuge Shock Syndrome - +DengueFeverType.DENGUE_FEVER=Dengue Fever +DengueFeverType.DENGUE_HEMORRHAGIC_FEVER=Dengue Hemorrhagic Fever +DengueFeverType.DENUGE_SHOCK_SYNDROME=Denuge Shock Syndrome # HumanRabiesType -RabiesType.FURIOUS_RABIES = Furious Rabies -RabiesType.PARALYTIC_RABIES = Paralytic Rabies - +RabiesType.FURIOUS_RABIES=Furious Rabies +RabiesType.PARALYTIC_RABIES=Paralytic Rabies # Disease -Disease.AFP = Acute Flaccid Paralysis -Disease.CHOLERA = Cholera -Disease.CONGENITAL_RUBELLA = Congenital Rubella -Disease.CSM = Meningitis (CSM) -Disease.DENGUE = Dengue Fever -Disease.EVD = Ebola Virus Disease -Disease.GUINEA_WORM = Guinea Worm -Disease.LASSA = Lassa -Disease.MEASLES = Measles -Disease.MONKEYPOX = Mpox -Disease.NEW_INFLUENZA = Influenza (New subtype) -Disease.UNDEFINED = Not Yet Defined -Disease.OTHER = Other Epidemic Disease -Disease.PLAGUE = Plague -Disease.POLIO = Poliomyelitis -Disease.UNSPECIFIED_VHF = Unspecified VHF -Disease.WEST_NILE_FEVER = West Nile Fever -Disease.YELLOW_FEVER = Yellow Fever -Disease.RABIES = Human Rabies -Disease.ANTHRAX = Anthrax -Disease.PNEUMONIA = Pneumonia -Disease.MALARIA = Malaria -Disease.TYPHOID_FEVER = Typhoid Fever -Disease.ACUTE_VIRAL_HEPATITIS = Acute Viral Hepatitis -Disease.NON_NEONATAL_TETANUS = Non-Neonatal Tetanus -Disease.HIV = HIV -Disease.SCHISTOSOMIASIS = Schistosomiasis -Disease.SOIL_TRANSMITTED_HELMINTHS = Soil-Transmitted Helminths -Disease.TRYPANOSOMIASIS = Trypanosomiasis -Disease.DIARRHEA_DEHYDRATION = Diarrhea w/ Dehydration (< 5) -Disease.DIARRHEA_BLOOD = Diarrhea w/ Blood (Shigella) -Disease.SNAKE_BITE = Snake Bite -Disease.RUBELLA = Rubella -Disease.TUBERCULOSIS = Tuberculosis -Disease.LATENT_TUBERCULOSIS = Latent Tuberculosis -Disease.LEPROSY = Leprosy -Disease.LYMPHATIC_FILARIASIS = Lymphatic Filariasis -Disease.BURULI_ULCER = Buruli Ulcer -Disease.PERTUSSIS = Pertussis -Disease.NEONATAL_TETANUS = Neonatal Tetanus -Disease.ONCHOCERCIASIS = Onchocerciasis -Disease.DIPHTERIA = Diphteria -Disease.TRACHOMA = Trachoma -Disease.YAWS_ENDEMIC_SYPHILIS = Yaws and Endemic Syphilis -Disease.MATERNAL_DEATHS = Maternal Deaths -Disease.PERINATAL_DEATHS = Perinatal Deaths -Disease.CORONAVIRUS = COVID-19 +Disease.AFP=Acute Flaccid Paralysis +Disease.CHOLERA=Cholera +Disease.CONGENITAL_RUBELLA=Congenital Rubella +Disease.CSM=Meningitis (CSM) +Disease.DENGUE=Dengue Fever +Disease.EVD=Ebola Virus Disease +Disease.GUINEA_WORM=Guinea Worm +Disease.LASSA=Lassa +Disease.MEASLES=Measles +Disease.MONKEYPOX=Mpox +Disease.NEW_INFLUENZA=Influenza (New subtype) +Disease.UNDEFINED=Not Yet Defined +Disease.OTHER=Other Epidemic Disease +Disease.PLAGUE=Plague +Disease.POLIO=Poliomyelitis +Disease.UNSPECIFIED_VHF=Unspecified VHF +Disease.WEST_NILE_FEVER=West Nile Fever +Disease.YELLOW_FEVER=Yellow Fever +Disease.RABIES=Human Rabies +Disease.ANTHRAX=Anthrax +Disease.PNEUMONIA=Pneumonia +Disease.MALARIA=Malaria +Disease.TYPHOID_FEVER=Typhoid Fever +Disease.ACUTE_VIRAL_HEPATITIS=Acute Viral Hepatitis +Disease.NON_NEONATAL_TETANUS=Non-Neonatal Tetanus +Disease.HIV=HIV +Disease.SCHISTOSOMIASIS=Schistosomiasis +Disease.SOIL_TRANSMITTED_HELMINTHS=Soil-Transmitted Helminths +Disease.TRYPANOSOMIASIS=Trypanosomiasis +Disease.DIARRHEA_DEHYDRATION=Diarrhea w/ Dehydration (< 5) +Disease.DIARRHEA_BLOOD=Diarrhea w/ Blood (Shigella) +Disease.SNAKE_BITE=Snake Bite +Disease.RUBELLA=Rubella +Disease.TUBERCULOSIS=Tuberculosis +Disease.LATENT_TUBERCULOSIS=Latent Tuberculosis +Disease.LEPROSY=Leprosy +Disease.LYMPHATIC_FILARIASIS=Lymphatic Filariasis +Disease.BURULI_ULCER=Buruli Ulcer +Disease.PERTUSSIS=Pertussis +Disease.NEONATAL_TETANUS=Neonatal Tetanus +Disease.ONCHOCERCIASIS=Onchocerciasis +Disease.DIPHTERIA=Diphteria +Disease.TRACHOMA=Trachoma +Disease.YAWS_ENDEMIC_SYPHILIS=Yaws and Endemic Syphilis +Disease.MATERNAL_DEATHS=Maternal Deaths +Disease.PERINATAL_DEATHS=Perinatal Deaths +Disease.CORONAVIRUS=COVID-19 Disease.INFLUENZA=Influenza -Disease.INFLUENZA_A = Influenza A -Disease.INFLUENZA_B = Influenza B -Disease.H_METAPNEUMOVIRUS = H.metapneumovirus -Disease.RESPIRATORY_SYNCYTIAL_VIRUS = Respiratory syncytial virus (RSV) -Disease.PARAINFLUENZA_1_4 = Parainfluenza (1-4) -Disease.ADENOVIRUS = Adenovirus -Disease.RHINOVIRUS = Rhinovirus -Disease.ENTEROVIRUS = Enterovirus -Disease.M_PNEUMONIAE = M.pneumoniae -Disease.C_PNEUMONIAE = C.pneumoniae -Disease.ARI = ARI (Acute Respiratory Infections) -Disease.CHIKUNGUNYA = Chikungunya -Disease.INVASIVE_PNEUMOCOCCAL_INFECTION = Invasive Pneumococcal Infection -Disease.INVASIVE_MENINGOCOCCAL_INFECTION = Invasive Meningococcal Infection -Disease.POST_IMMUNIZATION_ADVERSE_EVENTS_MILD = Post-immunization adverse events mild -Disease.POST_IMMUNIZATION_ADVERSE_EVENTS_SEVERE = Post-immunization adverse events severe -Disease.FHA = FHA (Functional Hypothalamic Amenorrhea) +Disease.INFLUENZA_A=Influenza A +Disease.INFLUENZA_B=Influenza B +Disease.H_METAPNEUMOVIRUS=H.metapneumovirus +Disease.RESPIRATORY_SYNCYTIAL_VIRUS=Respiratory syncytial virus (RSV) +Disease.PARAINFLUENZA_1_4=Parainfluenza (1-4) +Disease.ADENOVIRUS=Adenovirus +Disease.RHINOVIRUS=Rhinovirus +Disease.ENTEROVIRUS=Enterovirus +Disease.M_PNEUMONIAE=M.pneumoniae +Disease.C_PNEUMONIAE=C.pneumoniae +Disease.ARI=ARI (Acute Respiratory Infections) +Disease.CHIKUNGUNYA=Chikungunya +Disease.INVASIVE_PNEUMOCOCCAL_INFECTION=Invasive Pneumococcal Infection +Disease.INVASIVE_MENINGOCOCCAL_INFECTION=Invasive Meningococcal Infection +Disease.POST_IMMUNIZATION_ADVERSE_EVENTS_MILD=Post-immunization adverse events mild +Disease.POST_IMMUNIZATION_ADVERSE_EVENTS_SEVERE=Post-immunization adverse events severe +Disease.FHA=FHA (Functional Hypothalamic Amenorrhea) Disease.GIARDIASIS=Giardiasis Disease.CRYPTOSPORIDIOSIS=Cryptosporidiosis -Disease.Short.AFP = AFP -Disease.Short.CHOLERA = Cholera -Disease.Short.CONGENITAL_RUBELLA = CRS -Disease.Short.CSM = Meningitis -Disease.Short.DENGUE = Dengue -Disease.Short.EVD = EVD -Disease.Short.GUINEA_WORM = Guinea Worm -Disease.Short.LASSA = Lassa -Disease.Short.MEASLES = Measles -Disease.Short.MONKEYPOX = Mpox -Disease.Short.NEW_INFLUENZA = New Flu -Disease.Short.UNDEFINED = Undefined -Disease.Short.OTHER = Other -Disease.Short.PLAGUE = Plague -Disease.Short.POLIO = Polio -Disease.Short.UNSPECIFIED_VHF = VHF -Disease.Short.WEST_NILE_FEVER = West Nile Fever -Disease.Short.YELLOW_FEVER = Yellow Fever -Disease.Short.RABIES = Rabies -Disease.Short.ANTHRAX = Anthrax -Disease.Short.PNEUMONIA = Pneumonia -Disease.Short.MALARIA = Malaria -Disease.Short.TYPHOID_FEVER = Typhoid Fever -Disease.Short.ACUTE_VIRAL_HEPATITIS = Acute Viral Hepatitis -Disease.Short.NON_NEONATAL_TETANUS = Non-Neonatal Tetanus -Disease.Short.HIV = HIV -Disease.Short.SCHISTOSOMIASIS = Schistosomiasis -Disease.Short.SOIL_TRANSMITTED_HELMINTHS = Soil-Transmitted Helminths -Disease.Short.TRYPANOSOMIASIS = Trypanosomiasis -Disease.Short.DIARRHEA_DEHYDRATION = Diarrhea w/ Dehydration (< 5) -Disease.Short.DIARRHEA_BLOOD = Diarrhea w/ Blood (Shigella) -Disease.Short.SNAKE_BITE = Snake Bite -Disease.Short.RUBELLA = Rubella -Disease.Short.TUBERCULOSIS = TB -Disease.Short.LATENT_TUBERCULOSIS = Latent Tuberculosis -Disease.Short.LEPROSY = Leprosy -Disease.Short.LYMPHATIC_FILARIASIS = Lymphatic Filariasis -Disease.Short.BURULI_ULCER = Buruli Ulcer -Disease.Short.PERTUSSIS = Pertussis -Disease.Short.NEONATAL_TETANUS = Neonatal Tetanus -Disease.Short.ONCHOCERCIASIS = Onchocerciasis -Disease.Short.DIPHTERIA = Diphteria -Disease.Short.TRACHOMA = Trachoma -Disease.Short.YAWS_ENDEMIC_SYPHILIS = Yaws and Endemic Syphilis -Disease.Short.MATERNAL_DEATHS = Maternal Deaths -Disease.Short.PERINATAL_DEATHS = Perinatal Deaths -Disease.Short.CORONAVIRUS = COVID-19 -Disease.Short.INFLUENZA_A = Influenza A -Disease.Short.INFLUENZA_B = Influenza B -Disease.Short.H_METAPNEUMOVIRUS = H.metapneumovirus -Disease.Short.RESPIRATORY_SYNCYTIAL_VIRUS = RSV -Disease.Short.PARAINFLUENZA_1_4 = Parainfluenza -Disease.Short.ADENOVIRUS = Adenovirus -Disease.Short.RHINOVIRUS = Rhinovirus -Disease.Short.ENTEROVIRUS = Enterovirus -Disease.Short.M_PNEUMONIAE = M.pneumoniae -Disease.Short.C_PNEUMONIAE = C.pneumoniae -Disease.Short.ARI = ARI -Disease.Short.CHIKUNGUNYA = Chikungunya -Disease.Short.POST_IMMUNIZATION_ADVERSE_EVENTS_MILD = Post-immunization adverse events mild -Disease.Short.POST_IMMUNIZATION_ADVERSE_EVENTS_SEVERE = Post-immunization adverse events severe -Disease.Short.FHA = FHA -Disease.Short.INVASIVE_PNEUMOCOCCAL_INFECTION = IPI -Disease.Short.INVASIVE_MENINGOCOCCAL_INFECTION = IMI +Disease.Short.AFP=AFP +Disease.Short.CHOLERA=Cholera +Disease.Short.CONGENITAL_RUBELLA=CRS +Disease.Short.CSM=Meningitis +Disease.Short.DENGUE=Dengue +Disease.Short.EVD=EVD +Disease.Short.GUINEA_WORM=Guinea Worm +Disease.Short.LASSA=Lassa +Disease.Short.MEASLES=Measles +Disease.Short.MONKEYPOX=Mpox +Disease.Short.NEW_INFLUENZA=New Flu +Disease.Short.UNDEFINED=Undefined +Disease.Short.OTHER=Other +Disease.Short.PLAGUE=Plague +Disease.Short.POLIO=Polio +Disease.Short.UNSPECIFIED_VHF=VHF +Disease.Short.WEST_NILE_FEVER=West Nile Fever +Disease.Short.YELLOW_FEVER=Yellow Fever +Disease.Short.RABIES=Rabies +Disease.Short.ANTHRAX=Anthrax +Disease.Short.PNEUMONIA=Pneumonia +Disease.Short.MALARIA=Malaria +Disease.Short.TYPHOID_FEVER=Typhoid Fever +Disease.Short.ACUTE_VIRAL_HEPATITIS=Acute Viral Hepatitis +Disease.Short.NON_NEONATAL_TETANUS=Non-Neonatal Tetanus +Disease.Short.HIV=HIV +Disease.Short.SCHISTOSOMIASIS=Schistosomiasis +Disease.Short.SOIL_TRANSMITTED_HELMINTHS=Soil-Transmitted Helminths +Disease.Short.TRYPANOSOMIASIS=Trypanosomiasis +Disease.Short.DIARRHEA_DEHYDRATION=Diarrhea w/ Dehydration (< 5) +Disease.Short.DIARRHEA_BLOOD=Diarrhea w/ Blood (Shigella) +Disease.Short.SNAKE_BITE=Snake Bite +Disease.Short.RUBELLA=Rubella +Disease.Short.TUBERCULOSIS=TB +Disease.Short.LATENT_TUBERCULOSIS=Latent Tuberculosis +Disease.Short.LEPROSY=Leprosy +Disease.Short.LYMPHATIC_FILARIASIS=Lymphatic Filariasis +Disease.Short.BURULI_ULCER=Buruli Ulcer +Disease.Short.PERTUSSIS=Pertussis +Disease.Short.NEONATAL_TETANUS=Neonatal Tetanus +Disease.Short.ONCHOCERCIASIS=Onchocerciasis +Disease.Short.DIPHTERIA=Diphteria +Disease.Short.TRACHOMA=Trachoma +Disease.Short.YAWS_ENDEMIC_SYPHILIS=Yaws and Endemic Syphilis +Disease.Short.MATERNAL_DEATHS=Maternal Deaths +Disease.Short.PERINATAL_DEATHS=Perinatal Deaths +Disease.Short.CORONAVIRUS=COVID-19 +Disease.Short.INFLUENZA_A=Influenza A +Disease.Short.INFLUENZA_B=Influenza B +Disease.Short.H_METAPNEUMOVIRUS=H.metapneumovirus +Disease.Short.RESPIRATORY_SYNCYTIAL_VIRUS=RSV +Disease.Short.PARAINFLUENZA_1_4=Parainfluenza +Disease.Short.ADENOVIRUS=Adenovirus +Disease.Short.RHINOVIRUS=Rhinovirus +Disease.Short.ENTEROVIRUS=Enterovirus +Disease.Short.M_PNEUMONIAE=M.pneumoniae +Disease.Short.C_PNEUMONIAE=C.pneumoniae +Disease.Short.ARI=ARI +Disease.Short.CHIKUNGUNYA=Chikungunya +Disease.Short.POST_IMMUNIZATION_ADVERSE_EVENTS_MILD=Post-immunization adverse events mild +Disease.Short.POST_IMMUNIZATION_ADVERSE_EVENTS_SEVERE=Post-immunization adverse events severe +Disease.Short.FHA=FHA +Disease.Short.INVASIVE_PNEUMOCOCCAL_INFECTION=IPI +Disease.Short.INVASIVE_MENINGOCOCCAL_INFECTION=IMI Disease.Short.GIARDIASIS=Giardia Disease.Short.CRYPTOSPORIDIOSIS=Cryptosporidiosis - -DiseaseTransmissionMode.HUMAN_TO_HUMAN = Primarily via human to human -DiseaseTransmissionMode.ANIMAL = Primarily via animal -DiseaseTransmissionMode.ENVIRONMENT = Primarily via environment -DiseaseTransmissionMode.FOOD = Primarily via food -DiseaseTransmissionMode.VECTOR_BORNE = Primarily vector-borne -DiseaseTransmissionMode.UNKNOWN = Unknown - +DiseaseTransmissionMode.HUMAN_TO_HUMAN=Primarily via human to human +DiseaseTransmissionMode.ANIMAL=Primarily via animal +DiseaseTransmissionMode.ENVIRONMENT=Primarily via environment +DiseaseTransmissionMode.FOOD=Primarily via food +DiseaseTransmissionMode.VECTOR_BORNE=Primarily vector-borne +DiseaseTransmissionMode.UNKNOWN=Unknown # DocumentRelatedEntityType -DocumentRelatedEntityType.ACTION = Action -DocumentRelatedEntityType.CASE = Case -DocumentRelatedEntityType.CONTACT = Contact -DocumentRelatedEntityType.EVENT = Event -DocumentRelatedEntityType.TRAVEL_ENTRY = Travel Entry - +DocumentRelatedEntityType.ACTION=Action +DocumentRelatedEntityType.CASE=Case +DocumentRelatedEntityType.CONTACT=Contact +DocumentRelatedEntityType.EVENT=Event +DocumentRelatedEntityType.TRAVEL_ENTRY=Travel Entry # DocumentWorkflow -DocumentWorkflow.QUARANTINE_ORDER_CASE = Document Templates Case -DocumentWorkflow.QUARANTINE_ORDER_CONTACT = Document Templates Contact -DocumentWorkflow.QUARANTINE_ORDER_EVENT_PARTICIPANT = Document Templates Event Participant -DocumentWorkflow.QUARANTINE_ORDER_TRAVEL_ENTRY = Document Templates Travel Entry -DocumentWorkflow.EVENT_HANDOUT = Templates Event Handout -DocumentWorkflow.CASE_EMAIL = Case email templates -DocumentWorkflow.CONTACT_EMAIL = Contact email templates -DocumentWorkflow.EVENT_PARTICIPANT_EMAIL = Event participant email templates -DocumentWorkflow.TRAVEL_ENTRY_EMAIL = Travel entry email templates -DocumentWorkflow.SURVEY_DOCUMENT = Survey request document template -DocumentWorkflow.SURVEY_EMAIL = Survey request email template - -EducationType.NONE = No education -EducationType.NURSERY = Nursery -EducationType.PRIMARY = Primary -EducationType.SECONDARY = Secondary -EducationType.TERTIARY = Tertiary -EducationType.OTHER = Other - -EntityRelevanceStatus.ACTIVE = Active -EntityRelevanceStatus.ARCHIVED = Archived -EntityRelevanceStatus.ALL = All - +DocumentWorkflow.QUARANTINE_ORDER_CASE=Document Templates Case +DocumentWorkflow.QUARANTINE_ORDER_CONTACT=Document Templates Contact +DocumentWorkflow.QUARANTINE_ORDER_EVENT_PARTICIPANT=Document Templates Event Participant +DocumentWorkflow.QUARANTINE_ORDER_TRAVEL_ENTRY=Document Templates Travel Entry +DocumentWorkflow.EVENT_HANDOUT=Templates Event Handout +DocumentWorkflow.CASE_EMAIL=Case email templates +DocumentWorkflow.CONTACT_EMAIL=Contact email templates +DocumentWorkflow.EVENT_PARTICIPANT_EMAIL=Event participant email templates +DocumentWorkflow.TRAVEL_ENTRY_EMAIL=Travel entry email templates +DocumentWorkflow.SURVEY_DOCUMENT=Survey request document template +DocumentWorkflow.SURVEY_EMAIL=Survey request email template +EducationType.NONE=No education +EducationType.NURSERY=Nursery +EducationType.PRIMARY=Primary +EducationType.SECONDARY=Secondary +EducationType.TERTIARY=Tertiary +EducationType.OTHER=Other +EntityRelevanceStatus.ACTIVE=Active +EntityRelevanceStatus.ARCHIVED=Archived +EntityRelevanceStatus.ALL=All # EnvironmentInfrastructureDetails -EnvironmentInfrastructureDetails.SEPTIC_TANK = Septic tank -EnvironmentInfrastructureDetails.LATRIN = Latrin -EnvironmentInfrastructureDetails.TOILET = Toilet -EnvironmentInfrastructureDetails.MANHOLE = Manhole -EnvironmentInfrastructureDetails.WELLS = Wells -EnvironmentInfrastructureDetails.SURFACE_WATER = Surface water -EnvironmentInfrastructureDetails.OPEN_DRAIN = Open drain -EnvironmentInfrastructureDetails.OTHER = Other -EnvironmentInfrastructureDetails.UNKNOWN = Unknown - +EnvironmentInfrastructureDetails.SEPTIC_TANK=Septic tank +EnvironmentInfrastructureDetails.LATRIN=Latrin +EnvironmentInfrastructureDetails.TOILET=Toilet +EnvironmentInfrastructureDetails.MANHOLE=Manhole +EnvironmentInfrastructureDetails.WELLS=Wells +EnvironmentInfrastructureDetails.SURFACE_WATER=Surface water +EnvironmentInfrastructureDetails.OPEN_DRAIN=Open drain +EnvironmentInfrastructureDetails.OTHER=Other +EnvironmentInfrastructureDetails.UNKNOWN=Unknown # EnvironmentMedia -EnvironmentMedia.WATER = Water -EnvironmentMedia.SOIL_ROCK = Soil or rock -EnvironmentMedia.AIR = Air -EnvironmentMedia.BIOTA = Biota -EnvironmentMedia.VECTORS = Vectors - +EnvironmentMedia.WATER=Water +EnvironmentMedia.SOIL_ROCK=Soil or rock +EnvironmentMedia.AIR=Air +EnvironmentMedia.BIOTA=Biota +EnvironmentMedia.VECTORS=Vectors # EpiCurveGrouping -EpiCurveGrouping.DAY = Day -EpiCurveGrouping.MONTH = Month -EpiCurveGrouping.WEEK = Epi Week - +EpiCurveGrouping.DAY=Day +EpiCurveGrouping.MONTH=Month +EpiCurveGrouping.WEEK=Epi Week # EpiCurveContactsMode -EpiCurveContactsMode.CONTACT_CLASSIFICATION = Contact Classification -EpiCurveContactsMode.FOLLOW_UP_STATUS = Follow-Up Status -EpiCurveContactsMode.FOLLOW_UP_UNTIL = Follow-Up Until - +EpiCurveContactsMode.CONTACT_CLASSIFICATION=Contact Classification +EpiCurveContactsMode.FOLLOW_UP_STATUS=Follow-Up Status +EpiCurveContactsMode.FOLLOW_UP_UNTIL=Follow-Up Until # EpiCurveSurveillanceMode -EpiCurveSurveillanceMode.ALIVE_OR_DEAD = Alive or dead -EpiCurveSurveillanceMode.CASE_STATUS = Case status - +EpiCurveSurveillanceMode.ALIVE_OR_DEAD=Alive or dead +EpiCurveSurveillanceMode.CASE_STATUS=Case status # EpiWeekFilterOption -EpiWeekFilterOption.LAST_WEEK = Last Week -EpiWeekFilterOption.SPECIFY_WEEK = Specify -EpiWeekFilterOption.THIS_WEEK = This Week - +EpiWeekFilterOption.LAST_WEEK=Last Week +EpiWeekFilterOption.SPECIFY_WEEK=Specify +EpiWeekFilterOption.THIS_WEEK=This Week # EventContactCountMethod -EventContactCountMethod.ALL = Count all contacts -EventContactCountMethod.SOURCE_CASE_IN_EVENT = Only count contacts with source case in event -EventContactCountMethod.BOTH_METHODS = Show both methods - +EventContactCountMethod.ALL=Count all contacts +EventContactCountMethod.SOURCE_CASE_IN_EVENT=Only count contacts with source case in event +EventContactCountMethod.BOTH_METHODS=Show both methods # EventInvestigationStatus EventInvestigationStatus.DISCARDED=Investigation discarded EventInvestigationStatus.DONE=Investigation done @@ -722,58 +654,51 @@ EventInvestigationStatus.Short.DISCARDED=Discarded EventInvestigationStatus.Short.DONE=Done EventInvestigationStatus.Short.ONGOING=Ongoing EventInvestigationStatus.Short.PENDING=Pending - # EventStatus -EventStatus.EVENT = Event -EventStatus.DROPPED = Dropped -EventStatus.SIGNAL = Signal -EventStatus.SCREENING = Screening -EventStatus.CLUSTER = Cluster -EventStatus.Short.EVENT = Event -EventStatus.Short.DROPPED = Dropped -EventStatus.Short.SIGNAL = Signal -EventStatus.Short.SCREENING = Screening -EventStatus.Short.CLUSTER = Cluster - +EventStatus.EVENT=Event +EventStatus.DROPPED=Dropped +EventStatus.SIGNAL=Signal +EventStatus.SCREENING=Screening +EventStatus.CLUSTER=Cluster +EventStatus.Short.EVENT=Event +EventStatus.Short.DROPPED=Dropped +EventStatus.Short.SIGNAL=Signal +EventStatus.Short.SCREENING=Screening +EventStatus.Short.CLUSTER=Cluster # EventManagementStatus -EventManagementStatus.PENDING = Pending -EventManagementStatus.ONGOING = Ongoing -EventManagementStatus.DONE = Done -EventManagementStatus.CLOSED = Closed - +EventManagementStatus.PENDING=Pending +EventManagementStatus.ONGOING=Ongoing +EventManagementStatus.DONE=Done +EventManagementStatus.CLOSED=Closed # EventIndentificationSource -EventIdentificationSource.UNKNOWN = Unknown -EventIdentificationSource.BACKWARD_TRACING = Backward-tracing -EventIdentificationSource.FORWARD_TRACING = Forward-tracing - -ExportGroupType.CORE = Core Data -ExportGroupType.SENSITIVE = Sensitive Person Data -ExportGroupType.PERSON = General Person Data -ExportGroupType.HOSPITALIZATION = Hospitalization Data -ExportGroupType.EPIDEMIOLOGICAL = Epidemiological Data -ExportGroupType.VACCINATION = Vaccination Data -ExportGroupType.FOLLOW_UP = Follow-up Data -ExportGroupType.ADDITIONAL = Additional Data -ExportGroupType.LOCATION = Location Data -ExportGroupType.EVENT = Event Data -ExportGroupType.EVENT_GROUP = Event Group Data -ExportGroupType.EVENT_SOURCE = Event Source Data -ExportGroupType.CLINICAL_COURSE = Clinical Course Data -ExportGroupType.THERAPY = Therapy Data - -EventSourceType.NOT_APPLICABLE = Not applicable -EventSourceType.MEDIA_NEWS = Media/News -EventSourceType.HOTLINE_PERSON = Hotline/Person -EventSourceType.MATHEMATICAL_MODEL = Mathematical model -EventSourceType.INSTITUTIONAL_PARTNER = Institutional partner - -InstitutionalPartnerType.HEALTH_INSURANCE = Health insurance -InstitutionalPartnerType.TERRITORIAL_COMMUNITIES = Territorial communities -InstitutionalPartnerType.NATIONAL_EDUCATION = National education -InstitutionalPartnerType.HEALTH_ESTABLISHMENTS = Health establishments -InstitutionalPartnerType.MEDICO_SOCIAL_ESTABLISHMENTS = Medico-social establishments -InstitutionalPartnerType.OTHER = Other - +EventIdentificationSource.UNKNOWN=Unknown +EventIdentificationSource.BACKWARD_TRACING=Backward-tracing +EventIdentificationSource.FORWARD_TRACING=Forward-tracing +ExportGroupType.CORE=Core Data +ExportGroupType.SENSITIVE=Sensitive Person Data +ExportGroupType.PERSON=General Person Data +ExportGroupType.HOSPITALIZATION=Hospitalization Data +ExportGroupType.EPIDEMIOLOGICAL=Epidemiological Data +ExportGroupType.VACCINATION=Vaccination Data +ExportGroupType.FOLLOW_UP=Follow-up Data +ExportGroupType.ADDITIONAL=Additional Data +ExportGroupType.LOCATION=Location Data +ExportGroupType.EVENT=Event Data +ExportGroupType.EVENT_GROUP=Event Group Data +ExportGroupType.EVENT_SOURCE=Event Source Data +ExportGroupType.CLINICAL_COURSE=Clinical Course Data +ExportGroupType.THERAPY=Therapy Data +EventSourceType.NOT_APPLICABLE=Not applicable +EventSourceType.MEDIA_NEWS=Media/News +EventSourceType.HOTLINE_PERSON=Hotline/Person +EventSourceType.MATHEMATICAL_MODEL=Mathematical model +EventSourceType.INSTITUTIONAL_PARTNER=Institutional partner +InstitutionalPartnerType.HEALTH_INSURANCE=Health insurance +InstitutionalPartnerType.TERRITORIAL_COMMUNITIES=Territorial communities +InstitutionalPartnerType.NATIONAL_EDUCATION=National education +InstitutionalPartnerType.HEALTH_ESTABLISHMENTS=Health establishments +InstitutionalPartnerType.MEDICO_SOCIAL_ESTABLISHMENTS=Medico-social establishments +InstitutionalPartnerType.OTHER=Other ExposureType.WORK=Work ExposureType.TRAVEL=Travel ExposureType.SPORT=Sport @@ -791,7 +716,6 @@ ExposureType.FOOD=Food ExposureType.SEXUAL_CONTACT=Sexual contact ExposureType.SYMPTOMATIC_CONTACT=Contact with symptomatic individuals ExposureType.FLOOD_EXPOSURE=Flooded area - # FacilityType FacilityType.ASSOCIATION=Association, club FacilityType.BAR=Bar @@ -837,23 +761,22 @@ FacilityType.SWIMMING_POOL=Swimming pool FacilityType.THEATER=Theater/cinema FacilityType.UNIVERSITY=University FacilityType.ZOO=Zoological garden, animal park -FacilityType.RETAIL = Retail -FacilityType.WHOLESALE = Wholesale -FacilityType.AMBULATORY_SURGERY_FACILITY = Ambulatory surgery facility -FacilityType.DIALYSIS_FACILITY = Dialysis facility -FacilityType.DAY_HOSPITAL = Day hospital -FacilityType.MATERNITY_FACILITY = Maternity facility -FacilityType.MEDICAL_PRACTICE = Medical practice -FacilityType.DENTAL_PRACTICE = Dental practice -FacilityType.OTHER_MEDICAL_PRACTICE = Other medical practice -FacilityType.DIAGNOSTIC_PREVENTATIVE_THERAPEUTIC_FACILITY = Diagnostic, preventative, therapeutic facility -FacilityType.EMERGENCY_MEDICAL_SERVICES = Emergency medical services -FacilityType.ELDERLY_CARE_FACILITY = Elderly care facility -FacilityType.DISABLED_PERSON_HABITATION = Disabled person habitation -FacilityType.CARE_RECIPIENT_HABITATION = Care recipient habitation -FacilityType.VISITING_AMBULATORY_AID = Visiting ambulatory aid -FacilityType.AFTER_SCHOOL = After school facility - +FacilityType.RETAIL=Retail +FacilityType.WHOLESALE=Wholesale +FacilityType.AMBULATORY_SURGERY_FACILITY=Ambulatory surgery facility +FacilityType.DIALYSIS_FACILITY=Dialysis facility +FacilityType.DAY_HOSPITAL=Day hospital +FacilityType.MATERNITY_FACILITY=Maternity facility +FacilityType.MEDICAL_PRACTICE=Medical practice +FacilityType.DENTAL_PRACTICE=Dental practice +FacilityType.OTHER_MEDICAL_PRACTICE=Other medical practice +FacilityType.DIAGNOSTIC_PREVENTATIVE_THERAPEUTIC_FACILITY=Diagnostic, preventative, therapeutic facility +FacilityType.EMERGENCY_MEDICAL_SERVICES=Emergency medical services +FacilityType.ELDERLY_CARE_FACILITY=Elderly care facility +FacilityType.DISABLED_PERSON_HABITATION=Disabled person habitation +FacilityType.CARE_RECIPIENT_HABITATION=Care recipient habitation +FacilityType.VISITING_AMBULATORY_AID=Visiting ambulatory aid +FacilityType.AFTER_SCHOOL=After school facility #FacilityTypeGroup FacilityTypeGroup.ACCOMMODATION=Accommodation FacilityTypeGroup.CARE_FACILITY=Care facility @@ -864,13 +787,11 @@ FacilityTypeGroup.MEDICAL_FACILITY=Medical facility FacilityTypeGroup.RESIDENCE=Residence FacilityTypeGroup.WORKING_PLACE=Working place/company FacilityTypeGroup.COMMERCE=Commerce - # FollowUpStartDateType FollowUpStartDateType.SYMPTOM_ONSET_DATE=symptom onset date FollowUpStartDateType.LAST_CONTACT_DATE=last contact date FollowUpStartDateType.EARLIEST_SAMPLE_COLLECTION_DATE=earliest sample collection date FollowUpStartDateType.REPORT_DATE=report date - # FollowUpStatus FollowUpStatus.CANCELED=Canceled follow-up FollowUpStatus.COMPLETED=Completed follow-up @@ -887,7 +808,6 @@ FollowUpStatus.Desc.COMPLETED=The follow-up process has been completed FollowUpStatus.Desc.FOLLOW_UP=The follow-up process is running FollowUpStatus.Desc.LOST=The follow-up process could not be continued because the person was not available FollowUpStatus.Desc.NO_FOLLOW_UP=No contact follow-up is being done - GatheringType.PARTY=Party GatheringType.RELIGIOUS=Religious Gathering GatheringType.MUSICAL=Choir/Singing Club/Orchestra @@ -897,61 +817,55 @@ GatheringType.CARNIVAL=Carnival GatheringType.FAIR=Fair GatheringType.SPORTING_EVENT=Sporting event GatheringType.OTHER=Other - # GestationalAgeCategory GestationalAgeCategory.AT_TERM=At term (between 38 and 42 weeks of pregnancy) GestationalAgeCategory.PREMATURE_BEFORE_32=Prematurely before 32 weeks of pregnancy GestationalAgeCategory.PREMATURE_32_TO_38=Prematurely between 32 and 38 weeks of pregnancy - #GenoTypeResult -GenoTypeResult.GENOTYPE_A = Genotype A -GenoTypeResult.GENOTYPE_B = Genotype B -GenoTypeResult.GENOTYPE_B2 = Genotype B2 -GenoTypeResult.GENOTYPE_B3 = Genotype B3 -GenoTypeResult.GENOTYPE_C1 = Genotype C1 -GenoTypeResult.GENOTYPE_C2 = Genotype C2 -GenoTypeResult.GENOTYPE_D1 = Genotype D1 -GenoTypeResult.GENOTYPE_D10 = Genotype D10 -GenoTypeResult.GENOTYPE_D11 = Genotype D11 -GenoTypeResult.GENOTYPE_D2 = Genotype D2 -GenoTypeResult.GENOTYPE_D3 = Genotype D3 -GenoTypeResult.GENOTYPE_D4 = Genotype D4 -GenoTypeResult.GENOTYPE_D5 = Genotype D5 -GenoTypeResult.GENOTYPE_D6 = Genotype D6 -GenoTypeResult.GENOTYPE_D7 = Genotype D7 -GenoTypeResult.GENOTYPE_D8 = Genotype D8 -GenoTypeResult.GENOTYPE_D9 = Genotype D9 -GenoTypeResult.GENOTYPE_E = Genotype E -GenoTypeResult.GENOTYPE_F = Genotype F -GenoTypeResult.GENOTYPE_G1 = Genotype G1 -GenoTypeResult.GENOTYPE_G2 = Genotype G2 -GenoTypeResult.GENOTYPE_G3 = Genotype G3 -GenoTypeResult.GENOTYPE_H1 = Genotype H1 -GenoTypeResult.GENOTYPE_H2 = Genotype H2 -GenoTypeResult.CRYPTOSPORIDIUM_HOMINIS = Cryptosporidium hominis -GenoTypeResult.CRYPTOSPORIDIUM_PARVUM = Cryptosporidium parvum -GenoTypeResult.CRYPTOSPORIDIUM_SPECIES = Cryptosporidium species -GenoTypeResult.OTHER = Other -GenoTypeResult.UNKNOWN = Unknown - +GenoTypeResult.GENOTYPE_A=Genotype A +GenoTypeResult.GENOTYPE_B=Genotype B +GenoTypeResult.GENOTYPE_B2=Genotype B2 +GenoTypeResult.GENOTYPE_B3=Genotype B3 +GenoTypeResult.GENOTYPE_C1=Genotype C1 +GenoTypeResult.GENOTYPE_C2=Genotype C2 +GenoTypeResult.GENOTYPE_D1=Genotype D1 +GenoTypeResult.GENOTYPE_D10=Genotype D10 +GenoTypeResult.GENOTYPE_D11=Genotype D11 +GenoTypeResult.GENOTYPE_D2=Genotype D2 +GenoTypeResult.GENOTYPE_D3=Genotype D3 +GenoTypeResult.GENOTYPE_D4=Genotype D4 +GenoTypeResult.GENOTYPE_D5=Genotype D5 +GenoTypeResult.GENOTYPE_D6=Genotype D6 +GenoTypeResult.GENOTYPE_D7=Genotype D7 +GenoTypeResult.GENOTYPE_D8=Genotype D8 +GenoTypeResult.GENOTYPE_D9=Genotype D9 +GenoTypeResult.GENOTYPE_E=Genotype E +GenoTypeResult.GENOTYPE_F=Genotype F +GenoTypeResult.GENOTYPE_G1=Genotype G1 +GenoTypeResult.GENOTYPE_G2=Genotype G2 +GenoTypeResult.GENOTYPE_G3=Genotype G3 +GenoTypeResult.GENOTYPE_H1=Genotype H1 +GenoTypeResult.GENOTYPE_H2=Genotype H2 +GenoTypeResult.CRYPTOSPORIDIUM_HOMINIS=Cryptosporidium hominis +GenoTypeResult.CRYPTOSPORIDIUM_PARVUM=Cryptosporidium parvum +GenoTypeResult.CRYPTOSPORIDIUM_SPECIES=Cryptosporidium species +GenoTypeResult.OTHER=Other +GenoTypeResult.UNKNOWN=Unknown HabitationType.MEDICAL=Stay in a Medical Institution HabitationType.OTHER=Other - HospitalizationReasonType.REPORTED_DISEASE=Reported disease HospitalizationReasonType.ISOLATION=Isolation HospitalizationReasonType.OTHER=Other reason HospitalizationReasonType.UNKNOWN=Unknown - -HospitalWardType.PEDIATRIC_INPATIENT = Pediatric-Inpatient -HospitalWardType.NURSERY = Nursery -HospitalWardType.EPU = EPU -HospitalWardType.CHER = CHER -HospitalWardType.OPD = OPD -HospitalWardType.EYE = Eye -HospitalWardType.ENT = ENT -HospitalWardType.CARDIOLOGY = Cardiology -HospitalWardType.OTHER = Other - +HospitalWardType.PEDIATRIC_INPATIENT=Pediatric-Inpatient +HospitalWardType.NURSERY=Nursery +HospitalWardType.EPU=EPU +HospitalWardType.CHER=CHER +HospitalWardType.OPD=OPD +HospitalWardType.EYE=Eye +HospitalWardType.ENT=ENT +HospitalWardType.CARDIOLOGY=Cardiology +HospitalWardType.OTHER=Other # ImmunizationDateType ImmunizationDateType.FIRST_VACCINATION_DATE=Date of first vaccination ImmunizationDateType.IMMUNIZATION_END=End of immunization @@ -959,13 +873,11 @@ ImmunizationDateType.LAST_VACCINATION_DATE=Date of last vaccination ImmunizationDateType.RECOVERY_DATE=Date of recovery ImmunizationDateType.REPORT_DATE=Date of report ImmunizationDateType.VALID_UNTIL=Valid until - # InfectionSource InfectionSource.ANIMAL=Animal InfectionSource.NOT_APPLICABLE=Not applicable InfectionSource.FOOD=Food InfectionSource.OTHER=Other - # InvestigationStatus InvestigationStatus.DISCARDED=Investigation discarded InvestigationStatus.DONE=Investigation done @@ -973,338 +885,303 @@ InvestigationStatus.PENDING=Investigation pending InvestigationStatus.Short.DISCARDED=Discarded InvestigationStatus.Short.DONE=Done InvestigationStatus.Short.PENDING=Pending - # KindOfInvolvement -KindOfInvolvement.OTHER = Other -KindOfInvolvement.POTENTIALLY_EXPOSED = Potentially exposed -KindOfInvolvement.POTENTIAL_INDEX_CASE = Potential index case - -Language.EN = English -Language.EN_GM = English (The Gambia) -Language.EN_LR = English (Liberia) -Language.EN_AF = English (Afghanistan) -Language.EN_NG = English (Nigeria) -Language.EN_GH = English (Ghana) -Language.EN_KE = English (Kenya) -Language.FR = Français -Language.DE = Deutsch -Language.ES_BO = Español (Bolivia) -Language.ES_EC = Español (Ecuador) -Language.ES_CU = Español (Cuba) -Language.FI = Suomi -Language.IT = Italiano -Language.DE_CH = Deutsch (Schweiz) -Language.PT_CV = Português (Cabo Verde) -Language.IT_CH = Italiano (Svizzera) -Language.FR_CH = Français (Suisse) -Language.PS = Pashto -Language.FA = Dari -Language.CZ = Čeština -Language.UR_PK = Urdu -Language.FR_TN = Français (Tunisie) - +KindOfInvolvement.OTHER=Other +KindOfInvolvement.POTENTIALLY_EXPOSED=Potentially exposed +KindOfInvolvement.POTENTIAL_INDEX_CASE=Potential index case +Language.EN=English +Language.EN_GM=English (The Gambia) +Language.EN_LR=English (Liberia) +Language.EN_AF=English (Afghanistan) +Language.EN_NG=English (Nigeria) +Language.EN_GH=English (Ghana) +Language.EN_KE=English (Kenya) +Language.FR=Français +Language.DE=Deutsch +Language.ES_BO=Español (Bolivia) +Language.ES_EC=Español (Ecuador) +Language.ES_CU=Español (Cuba) +Language.FI=Suomi +Language.IT=Italiano +Language.DE_CH=Deutsch (Schweiz) +Language.PT_CV=Português (Cabo Verde) +Language.IT_CH=Italiano (Svizzera) +Language.FR_CH=Français (Suisse) +Language.PS=Pashto +Language.FA=Dari +Language.CZ=Čeština +Language.UR_PK=Urdu +Language.FR_TN=Français (Tunisie) #LivingStatus -LivingStatus.MIGRANT = Migrant -LivingStatus.FOREIGNER = Foreigner -LivingStatus.HOMELESS = Homeless -LivingStatus.REGISTERED_AT_A_RESIDENCE = Registered as living at a residence in LU - +LivingStatus.MIGRANT=Migrant +LivingStatus.FOREIGNER=Foreigner +LivingStatus.HOMELESS=Homeless +LivingStatus.REGISTERED_AT_A_RESIDENCE=Registered as living at a residence in LU # MapCaseDisplayMode -MapCaseDisplayMode.CASE_ADDRESS = ... by home address -MapCaseDisplayMode.FACILITY = ... by facility -MapCaseDisplayMode.FACILITY_OR_CASE_ADDRESS = ... by facility or home address - -MapCaseClassificationOption.ALL_CASES = Show all cases -MapCaseClassificationOption.CONFIRMED_CASES_ONLY = Show confirmed cases only - -MapPeriodType.DAILY = Daily -MapPeriodType.WEEKLY = Weekly -MapPeriodType.MONTHLY = Monthly -MapPeriodType.YEARLY = Yearly - - +MapCaseDisplayMode.CASE_ADDRESS=... by home address +MapCaseDisplayMode.FACILITY=... by facility +MapCaseDisplayMode.FACILITY_OR_CASE_ADDRESS=... by facility or home address +MapCaseClassificationOption.ALL_CASES=Show all cases +MapCaseClassificationOption.CONFIRMED_CASES_ONLY=Show confirmed cases only +MapPeriodType.DAILY=Daily +MapPeriodType.WEEKLY=Weekly +MapPeriodType.MONTHLY=Monthly +MapPeriodType.YEARLY=Yearly MeansOfTransport.LOCAL_PUBLIC_TRANSPORT=Local public transport MeansOfTransport.BUS=Bus MeansOfTransport.FERRY=Ship/Ferry MeansOfTransport.PLANE=Plane MeansOfTransport.TRAIN=Train MeansOfTransport.OTHER=Other - # MessageSubject -MessageSubject.CASE_CLASSIFICATION_CHANGED = Case classification changed -MessageSubject.CASE_INVESTIGATION_DONE = Case investigation done -MessageSubject.EVENT_PARTICIPANT_CASE_CLASSIFICATION_CONFIRMED = Event participant identified as a confirmed %s case -MessageSubject.EVENT_PARTICIPANT_RELATED_TO_OTHER_EVENTS = Event Participant related to other Events -MessageSubject.LAB_RESULT_ARRIVED = Lab result arrived -MessageSubject.LAB_SAMPLE_SHIPPED = Lab sample shipped -MessageSubject.CONTACT_SYMPTOMATIC = Contact has become symptomatic -MessageSubject.TASK_START = Task to be started -MessageSubject.TASK_DUE = Task overdue -MessageSubject.TASK_UPDATED_ASSIGNEE = Updated task assignee -MessageSubject.VISIT_COMPLETED = Follow-up visit completed -MessageSubject.DISEASE_CHANGED = Case disease changed -MessageSubject.EVENT_GROUP_CREATED = Event Group created -MessageSubject.EVENT_ADDED_TO_EVENT_GROUP = Event added to Event Group -MessageSubject.EVENT_REMOVED_FROM_EVENT_GROUP = Event removed from Event Group - +MessageSubject.CASE_CLASSIFICATION_CHANGED=Case classification changed +MessageSubject.CASE_INVESTIGATION_DONE=Case investigation done +MessageSubject.EVENT_PARTICIPANT_CASE_CLASSIFICATION_CONFIRMED=Event participant identified as a confirmed %s case +MessageSubject.EVENT_PARTICIPANT_RELATED_TO_OTHER_EVENTS=Event Participant related to other Events +MessageSubject.LAB_RESULT_ARRIVED=Lab result arrived +MessageSubject.LAB_SAMPLE_SHIPPED=Lab sample shipped +MessageSubject.CONTACT_SYMPTOMATIC=Contact has become symptomatic +MessageSubject.TASK_START=Task to be started +MessageSubject.TASK_DUE=Task overdue +MessageSubject.TASK_UPDATED_ASSIGNEE=Updated task assignee +MessageSubject.VISIT_COMPLETED=Follow-up visit completed +MessageSubject.DISEASE_CHANGED=Case disease changed +MessageSubject.EVENT_GROUP_CREATED=Event Group created +MessageSubject.EVENT_ADDED_TO_EVENT_GROUP=Event added to Event Group +MessageSubject.EVENT_REMOVED_FROM_EVENT_GROUP=Event removed from Event Group # ModeOfTransmission -ModeOfTransmission.ANIMAL_TO_HUMAN = Animal to human -ModeOfTransmission.FOOD_OR_WATER = Food including drinking water -ModeOfTransmission.PERSON_TO_PERSON = Person-to-person (faecal-oral, excluding mother-to-child and sexual transmission) -ModeOfTransmission.RECREATIONAL_WATER = Recreational water -ModeOfTransmission.HEALTHCARE_ASSOCIATED = Healthcare associated -ModeOfTransmission.INJECTING_DRUG_USERS = Injecting drug users -ModeOfTransmission.LAB_OCCUPATIONAL_EXPOSURE = Transmission in a laboratory due to occupational exposure -ModeOfTransmission.MOTHER_TO_CHILD = Transmission from mother to child during pregnancy or at birth -ModeOfTransmission.SEXUAL = Sexual transmission -ModeOfTransmission.TRANSFUSION_RECIPIENT = Transfusion recipient -ModeOfTransmission.ORGAN_RECIPIENT = Organ recipient -ModeOfTransmission.UNKNOWN = Unknown -ModeOfTransmission.OTHER = Other - - +ModeOfTransmission.ANIMAL_TO_HUMAN=Animal to human +ModeOfTransmission.FOOD_OR_WATER=Food including drinking water +ModeOfTransmission.PERSON_TO_PERSON=Person-to-person (faecal-oral, excluding mother-to-child and sexual transmission) +ModeOfTransmission.RECREATIONAL_WATER=Recreational water +ModeOfTransmission.HEALTHCARE_ASSOCIATED=Healthcare associated +ModeOfTransmission.INJECTING_DRUG_USERS=Injecting drug users +ModeOfTransmission.LAB_OCCUPATIONAL_EXPOSURE=Transmission in a laboratory due to occupational exposure +ModeOfTransmission.MOTHER_TO_CHILD=Transmission from mother to child during pregnancy or at birth +ModeOfTransmission.SEXUAL=Sexual transmission +ModeOfTransmission.TRANSFUSION_RECIPIENT=Transfusion recipient +ModeOfTransmission.ORGAN_RECIPIENT=Organ recipient +ModeOfTransmission.UNKNOWN=Unknown +ModeOfTransmission.OTHER=Other # Month -Month.JANUARY = January -Month.FEBRUARY = February -Month.MARCH = March -Month.APRIL = April -Month.MAY = May -Month.JUNE = June -Month.JULY = July -Month.AUGUST = August -Month.SEPTEMBER = September -Month.OCTOBER = October -Month.NOVEMBER = November -Month.DECEMBER = December - +Month.JANUARY=January +Month.FEBRUARY=February +Month.MARCH=March +Month.APRIL=April +Month.MAY=May +Month.JUNE=June +Month.JULY=July +Month.AUGUST=August +Month.SEPTEMBER=September +Month.OCTOBER=October +Month.NOVEMBER=November +Month.DECEMBER=December # NewCaseDateType -NewCaseDateType.MOST_RELEVANT = Most relevant date -NewCaseDateType.ONSET = Symptom onset date -NewCaseDateType.REPORT = Case report date - +NewCaseDateType.MOST_RELEVANT=Most relevant date +NewCaseDateType.ONSET=Symptom onset date +NewCaseDateType.REPORT=Case report date # OccupationType # Temporarily necessary for data migration of older systems; can be removed at a later point in time -OccupationType.BUSINESSMAN_WOMAN = Businessman / woman -OccupationType.BUTCHER = Butcher -OccupationType.CHILD = Child -OccupationType.FARMER = Farmer -OccupationType.HEALTHCARE_WORKER = Healthcare worker -OccupationType.HOUSEWIFE = Housewife -OccupationType.HUNTER_MEAT_TRADER = Hunter / trader of game meat -OccupationType.MINER = Miner -OccupationType.OTHER = Other -OccupationType.PUPIL_STUDENT = Pupil / student -OccupationType.RELIGIOUS_LEADER = Religious leader -OccupationType.TRADITIONAL_SPIRITUAL_HEALER = Traditional / spiritual healer -OccupationType.TRANSPORTER = Transporter -OccupationType.WORKING_WITH_ANIMALS = Working with animals -OccupationType.LABORATORY_STAFF = Laboratory staff -OccupationType.UNKNOWN = Unknown - -OccupationType.AGRICULTURE = A. Agriculture & forestry, fisheries -OccupationType.MINING = B. Mining & quarrying -OccupationType.MANUFACTURING = C. Manufacturing industry /manufacture of goods -OccupationType.ENERGY_SUPPLY = D. Energy supply -OccupationType.WATER_SUPPLY_AND_WASTE = E. Water supply; sewerage and waste management -OccupationType.CONSTRUCTION = F. Construction industry /building -OccupationType.RETAIL_AND_REPAIR_SERVICE = G. Wholesale and retail trade; repair services -OccupationType.TRANSPORT_AND_STORAGE = H. Transport and storage -OccupationType.ACCOMMODATION_AND_FOOD_SERVICES = I. Hotels and restaurants /accommodation & gastronomy -OccupationType.INFORMATION_AND_COMMUNICATION = J. Information & communication -OccupationType.FINANCE_AND_INSURANCE = K. Finance & insurance -OccupationType.REAL_ESTATE = L. Real estate and housing -OccupationType.PROFESSIONAL_SCIENTIFIC_AND_TECHNICAL = M. Service: freelance, scientific, technical -OccupationType.ADMINISTRATIVE_AND_SUPPORT = N. Service: other economic activities -OccupationType.PUBLIC_ADMINISTRATION_AND_DEFENCE = O. Public administration and defence; social services/security -OccupationType.EDUCATION = P. Education & teaching -OccupationType.HEALTH_AND_SOCIAL = Q. Health & social services -OccupationType.ARTS_ENTERTAINMENT_AND_RECREATION = R. Arts, entertainment & recreation -OccupationType.SERVICE_OTHER = S. Service: other -OccupationType.PRIVATE_HOUSEHOLD = T. Private households with domestic staff -OccupationType.EXTRATERRITORIAL_ORGANIZATIONS = U. Exterritorial organisations & bodies - +OccupationType.BUSINESSMAN_WOMAN=Businessman / woman +OccupationType.BUTCHER=Butcher +OccupationType.CHILD=Child +OccupationType.FARMER=Farmer +OccupationType.HEALTHCARE_WORKER=Healthcare worker +OccupationType.HOUSEWIFE=Housewife +OccupationType.HUNTER_MEAT_TRADER=Hunter / trader of game meat +OccupationType.MINER=Miner +OccupationType.OTHER=Other +OccupationType.PUPIL_STUDENT=Pupil / student +OccupationType.RELIGIOUS_LEADER=Religious leader +OccupationType.TRADITIONAL_SPIRITUAL_HEALER=Traditional / spiritual healer +OccupationType.TRANSPORTER=Transporter +OccupationType.WORKING_WITH_ANIMALS=Working with animals +OccupationType.LABORATORY_STAFF=Laboratory staff +OccupationType.UNKNOWN=Unknown +OccupationType.AGRICULTURE=A. Agriculture & forestry, fisheries +OccupationType.MINING=B. Mining & quarrying +OccupationType.MANUFACTURING=C. Manufacturing industry /manufacture of goods +OccupationType.ENERGY_SUPPLY=D. Energy supply +OccupationType.WATER_SUPPLY_AND_WASTE=E. Water supply; sewerage and waste management +OccupationType.CONSTRUCTION=F. Construction industry /building +OccupationType.RETAIL_AND_REPAIR_SERVICE=G. Wholesale and retail trade; repair services +OccupationType.TRANSPORT_AND_STORAGE=H. Transport and storage +OccupationType.ACCOMMODATION_AND_FOOD_SERVICES=I. Hotels and restaurants /accommodation & gastronomy +OccupationType.INFORMATION_AND_COMMUNICATION=J. Information & communication +OccupationType.FINANCE_AND_INSURANCE=K. Finance & insurance +OccupationType.REAL_ESTATE=L. Real estate and housing +OccupationType.PROFESSIONAL_SCIENTIFIC_AND_TECHNICAL=M. Service: freelance, scientific, technical +OccupationType.ADMINISTRATIVE_AND_SUPPORT=N. Service: other economic activities +OccupationType.PUBLIC_ADMINISTRATION_AND_DEFENCE=O. Public administration and defence; social services/security +OccupationType.EDUCATION=P. Education & teaching +OccupationType.HEALTH_AND_SOCIAL=Q. Health & social services +OccupationType.ARTS_ENTERTAINMENT_AND_RECREATION=R. Arts, entertainment & recreation +OccupationType.SERVICE_OTHER=S. Service: other +OccupationType.PRIVATE_HOUSEHOLD=T. Private households with domestic staff +OccupationType.EXTRATERRITORIAL_ORGANIZATIONS=U. Exterritorial organisations & bodies # PathogenTestResultType -PathogenTestResultType.INDETERMINATE = Indeterminate -PathogenTestResultType.NEGATIVE = Negative -PathogenTestResultType.PENDING = Pending -PathogenTestResultType.POSITIVE = Positive -PathogenTestResultType.NOT_DONE = Not done -PathogenTestResultType.NOT_APPLICABLE = Not applicable - +PathogenTestResultType.INDETERMINATE=Indeterminate +PathogenTestResultType.NEGATIVE=Negative +PathogenTestResultType.PENDING=Pending +PathogenTestResultType.POSITIVE=Positive +PathogenTestResultType.NOT_DONE=Not done +PathogenTestResultType.NOT_APPLICABLE=Not applicable # PathogenTestType -PathogenTestType.ANTIGEN_DETECTION = Antigen detection test -PathogenTestType.CULTURE = Culture -PathogenTestType.DENGUE_FEVER_ANTIBODIES = Dengue fever neutralizing antibodies -PathogenTestType.DENGUE_FEVER_IGM = Dengue fever IgM serum antibody -PathogenTestType.DNA_MICROARRAY = DNA Microarray -PathogenTestType.HISTOPATHOLOGY = Histopathology -PathogenTestType.IGG_SERUM_ANTIBODY = IgG serum antibody -PathogenTestType.IGM_SERUM_ANTIBODY = IgM serum antibody -PathogenTestType.IGA_SERUM_ANTIBODY = IgA serum antibody -PathogenTestType.ISOLATION = Isolation -PathogenTestType.MICROSCOPY = Microscopy -PathogenTestType.NEUTRALIZING_ANTIBODIES = Neutralizing antibodies -PathogenTestType.OTHER = Other -PathogenTestType.PCR_RT_PCR = PCR / RT-PCR -PathogenTestType.RAPID_TEST = Antigen detection test (rapid test) -PathogenTestType.WEST_NILE_FEVER_ANTIBODIES = West nile fever neutralizing antibodies -PathogenTestType.WEST_NILE_FEVER_IGM = West nile fever IgM serum antibody -PathogenTestType.YELLOW_FEVER_ANTIBODIES = Yellow fever neutralizing antibodies -PathogenTestType.YELLOW_FEVER_IGM = Yellow fever IgM serum antibody -PathogenTestType.YERSINIA_PESTIS_ANTIGEN = Yersinia pestis antigen test -PathogenTestType.ANTIBODY_DETECTION = Antibody detection -PathogenTestType.INCUBATION_TIME = Incubation time -PathogenTestType.INDIRECT_FLUORESCENT_ANTIBODY = Indirect Fluorescent Antibody (IFA) -PathogenTestType.DIRECT_FLUORESCENT_ANTIBODY = Direct Fluorescent Antibody (FA) -PathogenTestType.GRAM_STAIN = Gram Stain -PathogenTestType.LATEX_AGGLUTINATION = Latex Agglutination -PathogenTestType.CQ_VALUE_DETECTION = CQ Value Detection -PathogenTestType.SEQUENCING = Sequencing -PathogenTestType.TMA = Transcription-mediated amplification (TMA) -PathogenTestType.IGRA = Interferon-Gamma Release Assays -PathogenTestType.TST = Tuberculine Skin Test -PathogenTestType.BEIJINGGENOTYPING = Beijing Genotyping -PathogenTestType.SPOLIGOTYPING = Spoligotyping -PathogenTestType.MIRU_PATTERN_CODE = MIRU Pattern Code -PathogenTestType.ANTIBIOTIC_SUSCEPTIBILITY = Antibiotic susceptibility -PathogenTestType.MULTILOCUS_SEQUENCE_TYPING = Multilocus Sequence Typing (MLST) -PathogenTestType.SLIDE_AGGLUTINATION = Slide Agglutination -PathogenTestType.WHOLE_GENOME_SEQUENCING = Whole-Genome Sequencing (WGS) -PathogenTestType.SEROGROUPING = Serogrouping -PathogenTestType.GENOTYPING = Genotyping -PathogenTestType.RAPID_ANTIGEN_DETECTION = Rapid antigen detection test -PathogenTestType.ENZYME_LINKED_IMMUNOSORBENT_ASSAY = Enzyme-linked immunosorbent assay (ELISA) - -PCRTestSpecification.VARIANT_SPECIFIC = Variant specific -PCRTestSpecification.N501Y_MUTATION_DETECTION = N501Y mutation detection - +PathogenTestType.ANTIGEN_DETECTION=Antigen detection test +PathogenTestType.CULTURE=Culture +PathogenTestType.DENGUE_FEVER_ANTIBODIES=Dengue fever neutralizing antibodies +PathogenTestType.DENGUE_FEVER_IGM=Dengue fever IgM serum antibody +PathogenTestType.DNA_MICROARRAY=DNA Microarray +PathogenTestType.HISTOPATHOLOGY=Histopathology +PathogenTestType.IGG_SERUM_ANTIBODY=IgG serum antibody +PathogenTestType.IGM_SERUM_ANTIBODY=IgM serum antibody +PathogenTestType.IGA_SERUM_ANTIBODY=IgA serum antibody +PathogenTestType.ISOLATION=Isolation +PathogenTestType.MICROSCOPY=Microscopy +PathogenTestType.NEUTRALIZING_ANTIBODIES=Neutralizing antibodies +PathogenTestType.OTHER=Other +PathogenTestType.PCR_RT_PCR=PCR / RT-PCR +PathogenTestType.RAPID_TEST=Antigen detection test (rapid test) +PathogenTestType.WEST_NILE_FEVER_ANTIBODIES=West nile fever neutralizing antibodies +PathogenTestType.WEST_NILE_FEVER_IGM=West nile fever IgM serum antibody +PathogenTestType.YELLOW_FEVER_ANTIBODIES=Yellow fever neutralizing antibodies +PathogenTestType.YELLOW_FEVER_IGM=Yellow fever IgM serum antibody +PathogenTestType.YERSINIA_PESTIS_ANTIGEN=Yersinia pestis antigen test +PathogenTestType.ANTIBODY_DETECTION=Antibody detection +PathogenTestType.INCUBATION_TIME=Incubation time +PathogenTestType.INDIRECT_FLUORESCENT_ANTIBODY=Indirect Fluorescent Antibody (IFA) +PathogenTestType.DIRECT_FLUORESCENT_ANTIBODY=Direct Fluorescent Antibody (FA) +PathogenTestType.GRAM_STAIN=Gram Stain +PathogenTestType.LATEX_AGGLUTINATION=Latex Agglutination +PathogenTestType.CQ_VALUE_DETECTION=CQ Value Detection +PathogenTestType.SEQUENCING=Sequencing +PathogenTestType.TMA=Transcription-mediated amplification (TMA) +PathogenTestType.IGRA=Interferon-Gamma Release Assays +PathogenTestType.TST=Tuberculine Skin Test +PathogenTestType.BEIJINGGENOTYPING=Beijing Genotyping +PathogenTestType.SPOLIGOTYPING=Spoligotyping +PathogenTestType.MIRU_PATTERN_CODE=MIRU Pattern Code +PathogenTestType.ANTIBIOTIC_SUSCEPTIBILITY=Antibiotic susceptibility +PathogenTestType.MULTILOCUS_SEQUENCE_TYPING=Multilocus Sequence Typing (MLST) +PathogenTestType.SLIDE_AGGLUTINATION=Slide Agglutination +PathogenTestType.WHOLE_GENOME_SEQUENCING=Whole-Genome Sequencing (WGS) +PathogenTestType.SEROGROUPING=Serogrouping +PathogenTestType.GENOTYPING=Genotyping +PathogenTestType.RAPID_ANTIGEN_DETECTION=Rapid antigen detection test +PathogenTestType.ENZYME_LINKED_IMMUNOSORBENT_ASSAY=Enzyme-linked immunosorbent assay (ELISA) +PCRTestSpecification.VARIANT_SPECIFIC=Variant specific +PCRTestSpecification.N501Y_MUTATION_DETECTION=N501Y mutation detection # SpoligotypeSpecie -PathogenSpecie.MYCOBATERIUM_AFRICANUM = Mycobaterium Africanum -PathogenSpecie.MYCOBATERIUM_BOVIS = Mycobaterium bovis -PathogenSpecie.MYCOBATERIUM_TUBERCULOSIS = Mycobaterium tuberculosis -PathogenSpecie.OTHER_MTBC_MEMBER = Other member of the MTBC -PathogenSpecie.UNKNOWN = Unknown -PathogenSpecie.NOT_APPLICABLE = Not Applicable - +PathogenSpecie.MYCOBATERIUM_AFRICANUM=Mycobaterium Africanum +PathogenSpecie.MYCOBATERIUM_BOVIS=Mycobaterium bovis +PathogenSpecie.MYCOBATERIUM_TUBERCULOSIS=Mycobaterium tuberculosis +PathogenSpecie.OTHER_MTBC_MEMBER=Other member of the MTBC +PathogenSpecie.UNKNOWN=Unknown +PathogenSpecie.NOT_APPLICABLE=Not Applicable # PathogenTestScale -PathogenTestScale.ONE_PLUS = + -PathogenTestScale.TWO_PLUS = ++ -PathogenTestScale.THREE_PLUS = +++ - +PathogenTestScale.ONE_PLUS=+ +PathogenTestScale.TWO_PLUS=++ +PathogenTestScale.THREE_PLUS=+++ # PathogenStrainCallStatus -PathogenStrainCallStatus.BEIJING = Beijing -PathogenStrainCallStatus.NOBEIJING = Not Beijing -PathogenStrainCallStatus.POSSBEIJING = Possible Beijing -PathogenStrainCallStatus.UNKNOWN = Unknown - -PersonContactDetailType.PHONE = Phone -PersonContactDetailType.EMAIL = Email -PersonContactDetailType.OTHER = Other - -PhoneNumberType.LANDLINE = Landline -PhoneNumberType.MOBILE = Mobile -PhoneNumberType.WORK = Work -PhoneNumberType.OTHER = Other - -ExposureRole.PASSENGER = Passenger -ExposureRole.STAFF = Staff -ExposureRole.NURSING_STAFF = Nursing staff -ExposureRole.MEDICAL_STAFF = Medical staff -ExposureRole.VISITOR = Visitor -ExposureRole.GUEST = Guest -ExposureRole.CUSTOMER = Customer -ExposureRole.CONSERVATEE = Conservatee -ExposureRole.PATIENT = Patient -ExposureRole.EDUCATOR = Educator -ExposureRole.TRAINEE_TEACHER = Trainee teacher -ExposureRole.PUPIL = Pupil -ExposureRole.STUDENT = Student -ExposureRole.PARENT = Parent -ExposureRole.TEACHER = Teacher -ExposureRole.UNKNOWN = Unknown -ExposureRole.OTHER = Other - +PathogenStrainCallStatus.BEIJING=Beijing +PathogenStrainCallStatus.NOBEIJING=Not Beijing +PathogenStrainCallStatus.POSSBEIJING=Possible Beijing +PathogenStrainCallStatus.UNKNOWN=Unknown +PersonContactDetailType.PHONE=Phone +PersonContactDetailType.EMAIL=Email +PersonContactDetailType.OTHER=Other +PhoneNumberType.LANDLINE=Landline +PhoneNumberType.MOBILE=Mobile +PhoneNumberType.WORK=Work +PhoneNumberType.OTHER=Other +ExposureRole.PASSENGER=Passenger +ExposureRole.STAFF=Staff +ExposureRole.NURSING_STAFF=Nursing staff +ExposureRole.MEDICAL_STAFF=Medical staff +ExposureRole.VISITOR=Visitor +ExposureRole.GUEST=Guest +ExposureRole.CUSTOMER=Customer +ExposureRole.CONSERVATEE=Conservatee +ExposureRole.PATIENT=Patient +ExposureRole.EDUCATOR=Educator +ExposureRole.TRAINEE_TEACHER=Trainee teacher +ExposureRole.PUPIL=Pupil +ExposureRole.STUDENT=Student +ExposureRole.PARENT=Parent +ExposureRole.TEACHER=Teacher +ExposureRole.UNKNOWN=Unknown +ExposureRole.OTHER=Other #SymptomJournalStatus -SymptomJournalStatus.UNREGISTERED = Unregistered -SymptomJournalStatus.REGISTERED = Registered -SymptomJournalStatus.ACCEPTED = Accepted -SymptomJournalStatus.REJECTED = Rejected -SymptomJournalStatus.DELETED = Deleted - +SymptomJournalStatus.UNREGISTERED=Unregistered +SymptomJournalStatus.REGISTERED=Registered +SymptomJournalStatus.ACCEPTED=Accepted +SymptomJournalStatus.REJECTED=Rejected +SymptomJournalStatus.DELETED=Deleted # PlagueType -PlagueType.BUBONIC = Bubonic plague -PlagueType.PNEUMONIC = Pneumonic plague -PlagueType.SEPTICAEMIC = Septicaemic plague - +PlagueType.BUBONIC=Bubonic plague +PlagueType.PNEUMONIC=Pneumonic plague +PlagueType.SEPTICAEMIC=Septicaemic plague # PersonAddressType -PersonAddressType.HOME = Home -PersonAddressType.PLACE_OF_RESIDENCE = Place of residence -PersonAddressType.PLACE_OF_EXPOSURE = Place of exposure -PersonAddressType.PLACE_OF_WORK = Place of work -PersonAddressType.PLACE_OF_ISOLATION = Place of isolation -PersonAddressType.EVENT_LOCATION = Event location -PersonAddressType.OTHER_ADDRESS = Other address - +PersonAddressType.HOME=Home +PersonAddressType.PLACE_OF_RESIDENCE=Place of residence +PersonAddressType.PLACE_OF_EXPOSURE=Place of exposure +PersonAddressType.PLACE_OF_WORK=Place of work +PersonAddressType.PLACE_OF_ISOLATION=Place of isolation +PersonAddressType.EVENT_LOCATION=Event location +PersonAddressType.OTHER_ADDRESS=Other address # PointOfEntryType -PointOfEntryType.AIRPORT = Airport -PointOfEntryType.SEAPORT = Seaport -PointOfEntryType.GROUND_CROSSING = Ground crossing -PointOfEntryType.OTHER = Other - +PointOfEntryType.AIRPORT=Airport +PointOfEntryType.SEAPORT=Seaport +PointOfEntryType.GROUND_CROSSING=Ground crossing +PointOfEntryType.OTHER=Other # PresentCondition PresentCondition.ALIVE=Alive PresentCondition.BURIED=Buried PresentCondition.DEAD=Dead PresentCondition.UNKNOWN=Unknown - # QuarantineType -QuarantineType.HOME = Home -QuarantineType.INSTITUTIONELL = Institutional -QuarantineType.NONE = None -QuarantineType.UNKNOWN = Unknown -QuarantineType.OTHER = Other - -QuarantineType.HOSPITAL = Hospital -QuarantineType.HOTEL = Hotel -QuarantineType.ASYLUM_ACCOMMODATION = Asylum Accommodation - +QuarantineType.HOME=Home +QuarantineType.INSTITUTIONELL=Institutional +QuarantineType.NONE=None +QuarantineType.UNKNOWN=Unknown +QuarantineType.OTHER=Other +QuarantineType.HOSPITAL=Hospital +QuarantineType.HOTEL=Hotel +QuarantineType.ASYLUM_ACCOMMODATION=Asylum Accommodation # ReportingType -ReportingType.NOT_RAISED = Not raised -ReportingType.OTHER = Other -ReportingType.DOCTOR = Doctor -ReportingType.LABORATORY = Laboratory -ReportingType.OWN_DETERMINATION = Own Determination -ReportingType.HOSPITAL_OR_STATIONARY_CARE = Hospital or stationary care -ReportingType.NOT_DETERMINABLE = Not determinable -ReportingType.FORWARDING = Forwarding -ReportingType.COMMUNITY_FACILITY = Community facility -ReportingType.COMMUNITY_FACILITY_IFSG_ARTICLE_34 = Community facility (§ 34 IfSG) - +ReportingType.NOT_RAISED=Not raised +ReportingType.OTHER=Other +ReportingType.DOCTOR=Doctor +ReportingType.LABORATORY=Laboratory +ReportingType.OWN_DETERMINATION=Own Determination +ReportingType.HOSPITAL_OR_STATIONARY_CARE=Hospital or stationary care +ReportingType.NOT_DETERMINABLE=Not determinable +ReportingType.FORWARDING=Forwarding +ReportingType.COMMUNITY_FACILITY=Community facility +ReportingType.COMMUNITY_FACILITY_IFSG_ARTICLE_34=Community facility (§ 34 IfSG) # RiskLevel -RiskLevel.LOW = Low risk -RiskLevel.MODERATE = Moderate risk -RiskLevel.HIGH = High risk -RiskLevel.UNKNOWN = Unknown - +RiskLevel.LOW=Low risk +RiskLevel.MODERATE=Moderate risk +RiskLevel.HIGH=High risk +RiskLevel.UNKNOWN=Unknown # RsvSubtype -RsvSubtype.RSV_A = RSV A -RsvSubtype.RSV_B = RSV B -RsvSubtype.RSV_A_AND_B = RSV A+B -RsvSubtype.INDETERMINATE = Indeterminate - +RsvSubtype.RSV_A=RSV A +RsvSubtype.RSV_B=RSV B +RsvSubtype.RSV_A_AND_B=RSV A+B +RsvSubtype.INDETERMINATE=Indeterminate # SampleMaterial -SampleMaterial.BLOOD = Blood -SampleMaterial.CEREBROSPINAL_FLUID = Cerebrospinal fluid -SampleMaterial.CRUST = Crust -SampleMaterial.NASAL_SWAB = Nasal swab -SampleMaterial.NP_SWAB = Nasopharyngeal swab -SampleMaterial.OTHER = Other -SampleMaterial.RECTAL_SWAB = Rectal swab -SampleMaterial.SERA = Sera -SampleMaterial.STOOL = Stool -SampleMaterial.THROAT_SWAB = Throat swab -SampleMaterial.TISSUE = Tissue -SampleMaterial.URINE = Urine +SampleMaterial.BLOOD=Blood +SampleMaterial.CEREBROSPINAL_FLUID=Cerebrospinal fluid +SampleMaterial.CRUST=Crust +SampleMaterial.NASAL_SWAB=Nasal swab +SampleMaterial.NP_SWAB=Nasopharyngeal swab +SampleMaterial.OTHER=Other +SampleMaterial.RECTAL_SWAB=Rectal swab +SampleMaterial.SERA=Sera +SampleMaterial.STOOL=Stool +SampleMaterial.THROAT_SWAB=Throat swab +SampleMaterial.TISSUE=Tissue +SampleMaterial.URINE=Urine SampleMaterial.CORNEA_PM=Cornea p.m SampleMaterial.SALIVA=Saliva SampleMaterial.URINE_PM=Urine p.m @@ -1320,15 +1197,15 @@ SampleMaterial.NP_ASPIRATE=Nasopharyngeal aspirate SampleMaterial.NASOPHARYNGEAL_LAVAGE=Nasopharyngeal lavage SampleMaterial.PLEURAL_FLUID=Pleural fluid specimen SampleMaterial.CLINICAL_SAMPLE=Clinical sample -SampleMaterial.PERITONEAL_FLUID = Peritoneal Fluid -SampleMaterial.SYNOVIAL_FLUID = Synovial Fluid -SampleMaterial.DRY_BLOOD = Dried blood spot -SampleMaterial.AMNIOTIC_FLUID = Amniotic fluid -SampleMaterial.THROAT_ASPIRATE = Throat aspirate -SampleMaterial.EDTA_WHOLE_BLOOD = EDTA Whole Blood -SampleMaterial.INTESTINAL_FLUID = Intestinal Fluid -SampleMaterial.DUODENUM_FLUID = Duodenum fluid -SampleMaterial.BIOPSY = Biopsy +SampleMaterial.PERITONEAL_FLUID=Peritoneal Fluid +SampleMaterial.SYNOVIAL_FLUID=Synovial Fluid +SampleMaterial.DRY_BLOOD=Dried blood spot +SampleMaterial.AMNIOTIC_FLUID=Amniotic fluid +SampleMaterial.THROAT_ASPIRATE=Throat aspirate +SampleMaterial.EDTA_WHOLE_BLOOD=EDTA Whole Blood +SampleMaterial.INTESTINAL_FLUID=Intestinal Fluid +SampleMaterial.DUODENUM_FLUID=Duodenum fluid +SampleMaterial.BIOPSY=Biopsy # SampleSource SampleSource.ANIMAL=Animal SampleSource.ENVIRONMENT=Environment @@ -1344,30 +1221,27 @@ Sex.FEMALE=Female Sex.MALE=Male Sex.OTHER=Other Sex.UNKNOWN=Unknown - # SeroGroupSpecification -SeroGroupSpecification.SEROGROUP_A = Serogroup A -SeroGroupSpecification.SEROGROUP_B = Serogroup B -SeroGroupSpecification.SEROGROUP_C = Serogroup C -SeroGroupSpecification.SEROGROUP_W = Serogroup W -SeroGroupSpecification.SEROGROUP_X = Serogroup X -SeroGroupSpecification.SEROGROUP_Y = Serogroup Y -SeroGroupSpecification.SEROGROUP_Z = Serogroup Z -SeroGroupSpecification.SEROGROUP_29E = Serogroup 29E -SeroGroupSpecification.NOT_GROUPABLE = Not Groupable -SeroGroupSpecification.NOT_UNDER_SURVEILLANCE = Not Under Surveillance -SeroGroupSpecification.OTHER = Other -SeroGroupSpecification.UNKNOWN = Unknown - +SeroGroupSpecification.SEROGROUP_A=Serogroup A +SeroGroupSpecification.SEROGROUP_B=Serogroup B +SeroGroupSpecification.SEROGROUP_C=Serogroup C +SeroGroupSpecification.SEROGROUP_W=Serogroup W +SeroGroupSpecification.SEROGROUP_X=Serogroup X +SeroGroupSpecification.SEROGROUP_Y=Serogroup Y +SeroGroupSpecification.SEROGROUP_Z=Serogroup Z +SeroGroupSpecification.SEROGROUP_29E=Serogroup 29E +SeroGroupSpecification.NOT_GROUPABLE=Not Groupable +SeroGroupSpecification.NOT_UNDER_SURVEILLANCE=Not Under Surveillance +SeroGroupSpecification.OTHER=Other +SeroGroupSpecification.UNKNOWN=Unknown # SerotypingMethod -SerotypingMethod.MULTIPLEX_PCR = Multiplex PCR -SerotypingMethod.QUELLUNG_REACTION = Quellung Reaction -SerotypingMethod.COAGGLUTINATION = Coagglutination -SerotypingMethod.GEL_DIFFUSION = Gel Diffusion -SerotypingMethod.PNEUMOTEST = Pneumotest -SerotypingMethod.SLIDE_AGGLUTINATION = Slide Agglutination -SerotypingMethod.OTHER = Other - +SerotypingMethod.MULTIPLEX_PCR=Multiplex PCR +SerotypingMethod.QUELLUNG_REACTION=Quellung Reaction +SerotypingMethod.COAGGLUTINATION=Coagglutination +SerotypingMethod.GEL_DIFFUSION=Gel Diffusion +SerotypingMethod.PNEUMOTEST=Pneumotest +SerotypingMethod.SLIDE_AGGLUTINATION=Slide Agglutination +SerotypingMethod.OTHER=Other # ShipmentStatus ShipmentStatus.NOT_SHIPPED=Not shipped ShipmentStatus.RECEIVED=Received @@ -1381,200 +1255,172 @@ ShipmentStatus.Short.SHIPPED=Shipped SimpleTestResultType.POSITIVE=Positive SimpleTestResultType.NEGATIVE=Negative SimpleTestResultType.INDETERMINATE=Indeterminate - # SpecimenCondition -SpecimenCondition.ADEQUATE = Adequate -SpecimenCondition.NOT_ADEQUATE = Not adequate - +SpecimenCondition.ADEQUATE=Adequate +SpecimenCondition.NOT_ADEQUATE=Not adequate # StatisticsCaseAttribute -StatisticsCaseAttribute.AGE_INTERVAL_1_YEAR= Age stratification: 1 year intervals -StatisticsCaseAttribute.AGE_INTERVAL_5_YEARS= Age stratification: 5 year intervals -StatisticsCaseAttribute.AGE_INTERVAL_BASIC= Age stratification: basic -StatisticsCaseAttribute.AGE_INTERVAL_CHILDREN_COARSE= Age stratification: children coarse -StatisticsCaseAttribute.AGE_INTERVAL_CHILDREN_FINE= Age stratification: children fine -StatisticsCaseAttribute.AGE_INTERVAL_CHILDREN_MEDIUM= Age stratification: children medium -StatisticsCaseAttribute.CLASSIFICATION = Classification -StatisticsCaseAttribute.DISEASE = Disease -StatisticsCaseAttribute.ONSET_TIME = Onset time -StatisticsCaseAttribute.OUTCOME = Outcome -StatisticsCaseAttribute.OUTCOME_TIME = Outcome time -StatisticsCaseAttribute.JURISDICTION = Region / District / Community / Facility -StatisticsCaseAttribute.REPORT_TIME = Report time -StatisticsCaseAttribute.REPORTING_USER_ROLE = Reporting user role -StatisticsCaseAttribute.SEX = Sex -StatisticsCaseAttribute.PLACE_OF_RESIDENCE = Place of residence - +StatisticsCaseAttribute.AGE_INTERVAL_1_YEAR=Age stratification: 1 year intervals +StatisticsCaseAttribute.AGE_INTERVAL_5_YEARS=Age stratification: 5 year intervals +StatisticsCaseAttribute.AGE_INTERVAL_BASIC=Age stratification: basic +StatisticsCaseAttribute.AGE_INTERVAL_CHILDREN_COARSE=Age stratification: children coarse +StatisticsCaseAttribute.AGE_INTERVAL_CHILDREN_FINE=Age stratification: children fine +StatisticsCaseAttribute.AGE_INTERVAL_CHILDREN_MEDIUM=Age stratification: children medium +StatisticsCaseAttribute.CLASSIFICATION=Classification +StatisticsCaseAttribute.DISEASE=Disease +StatisticsCaseAttribute.ONSET_TIME=Onset time +StatisticsCaseAttribute.OUTCOME=Outcome +StatisticsCaseAttribute.OUTCOME_TIME=Outcome time +StatisticsCaseAttribute.JURISDICTION=Region / District / Community / Facility +StatisticsCaseAttribute.REPORT_TIME=Report time +StatisticsCaseAttribute.REPORTING_USER_ROLE=Reporting user role +StatisticsCaseAttribute.SEX=Sex +StatisticsCaseAttribute.PLACE_OF_RESIDENCE=Place of residence # StatisticsCaseAttributeGroup -StatisticsCaseAttributeGroup.CASE = Case -StatisticsCaseAttributeGroup.PERSON = Person -StatisticsCaseAttributeGroup.PLACE = Place -StatisticsCaseAttributeGroup.TIME = Time - +StatisticsCaseAttributeGroup.CASE=Case +StatisticsCaseAttributeGroup.PERSON=Person +StatisticsCaseAttributeGroup.PLACE=Place +StatisticsCaseAttributeGroup.TIME=Time # StatisticsCaseSubAttribute -StatisticsCaseSubAttribute.DATE_RANGE = Date range -StatisticsCaseSubAttribute.DISTRICT = District -StatisticsCaseSubAttribute.EPI_WEEK = Epi week -StatisticsCaseSubAttribute.EPI_WEEK_OF_YEAR = Epi week of year -StatisticsCaseSubAttribute.MONTH = Month -StatisticsCaseSubAttribute.MONTH_OF_YEAR = Month of year -StatisticsCaseSubAttribute.QUARTER = Quarter -StatisticsCaseSubAttribute.QUARTER_OF_YEAR = Quarter of year -StatisticsCaseSubAttribute.REGION = Region -StatisticsCaseSubAttribute.YEAR = Year -StatisticsCaseSubAttribute.COMMUNITY = Community -StatisticsCaseSubAttribute.FACILITY = Facility -StatisticsCaseSubAttribute.PERSON_REGION = Person's region -StatisticsCaseSubAttribute.PERSON_DISTRICT = Person's district -StatisticsCaseSubAttribute.PERSON_COMMUNITY = Person's community -StatisticsCaseSubAttribute.PERSON_CITY = Person's city -StatisticsCaseSubAttribute.PERSON_POSTCODE = Person's postcode -StatisticsCaseSubAttribute.PERSON_ADDRESS = Person's address - +StatisticsCaseSubAttribute.DATE_RANGE=Date range +StatisticsCaseSubAttribute.DISTRICT=District +StatisticsCaseSubAttribute.EPI_WEEK=Epi week +StatisticsCaseSubAttribute.EPI_WEEK_OF_YEAR=Epi week of year +StatisticsCaseSubAttribute.MONTH=Month +StatisticsCaseSubAttribute.MONTH_OF_YEAR=Month of year +StatisticsCaseSubAttribute.QUARTER=Quarter +StatisticsCaseSubAttribute.QUARTER_OF_YEAR=Quarter of year +StatisticsCaseSubAttribute.REGION=Region +StatisticsCaseSubAttribute.YEAR=Year +StatisticsCaseSubAttribute.COMMUNITY=Community +StatisticsCaseSubAttribute.FACILITY=Facility +StatisticsCaseSubAttribute.PERSON_REGION=Person's region +StatisticsCaseSubAttribute.PERSON_DISTRICT=Person's district +StatisticsCaseSubAttribute.PERSON_COMMUNITY=Person's community +StatisticsCaseSubAttribute.PERSON_CITY=Person's city +StatisticsCaseSubAttribute.PERSON_POSTCODE=Person's postcode +StatisticsCaseSubAttribute.PERSON_ADDRESS=Person's address # StatisticsVisualizationChartType -StatisticsVisualizationChartType.COLUMN = Column -StatisticsVisualizationChartType.LINE = Line -StatisticsVisualizationChartType.PIE = Pie -StatisticsVisualizationChartType.STACKED_COLUMN = Stacked column - +StatisticsVisualizationChartType.COLUMN=Column +StatisticsVisualizationChartType.LINE=Line +StatisticsVisualizationChartType.PIE=Pie +StatisticsVisualizationChartType.STACKED_COLUMN=Stacked column # StatisticsVisualizationElementType -StatisticsVisualizationElementType.COLUMNS = Columns -StatisticsVisualizationElementType.Chart.COLUMNS = X-axis -StatisticsVisualizationElementType.Chart.ROWS = Series -StatisticsVisualizationElementType.ROWS = Rows - +StatisticsVisualizationElementType.COLUMNS=Columns +StatisticsVisualizationElementType.Chart.COLUMNS=X-axis +StatisticsVisualizationElementType.Chart.ROWS=Series +StatisticsVisualizationElementType.ROWS=Rows # StatisticsVisualizationType -StatisticsVisualizationType.CHART = Chart -StatisticsVisualizationMapType.DISTRICTS = Districts -StatisticsVisualizationType.MAP = Map -StatisticsVisualizationMapType.REGIONS = Regions -StatisticsVisualizationType.TABLE = Table - -SurveillanceEpiCurveMode.CASE_STATUS = Case status -SurveillanceEpiCurveMode.ALIVE_OR_DEAD = Alive or dead - +StatisticsVisualizationType.CHART=Chart +StatisticsVisualizationMapType.DISTRICTS=Districts +StatisticsVisualizationType.MAP=Map +StatisticsVisualizationMapType.REGIONS=Regions +StatisticsVisualizationType.TABLE=Table +SurveillanceEpiCurveMode.CASE_STATUS=Case status +SurveillanceEpiCurveMode.ALIVE_OR_DEAD=Alive or dead # SwimmingLocation -SwimmingLocation.PUBLIC = Public pool -SwimmingLocation.PRIVATE = Private pool -SwimmingLocation.LAKE = Lake -SwimmingLocation.RIVER = River -SwimmingLocation.OCEAN = Ocean -SwimmingLocation.WATER_PARK = Water Park -SwimmingLocation.OTHER = Other - - +SwimmingLocation.PUBLIC=Public pool +SwimmingLocation.PRIVATE=Private pool +SwimmingLocation.LAKE=Lake +SwimmingLocation.RIVER=River +SwimmingLocation.OCEAN=Ocean +SwimmingLocation.WATER_PARK=Water Park +SwimmingLocation.OTHER=Other # SymptomState -SymptomState.NO = No -SymptomState.UNKNOWN = Unknown -SymptomState.YES = Yes - - - - +SymptomState.NO=No +SymptomState.UNKNOWN=Unknown +SymptomState.YES=Yes # TaskAssignee -TaskAssignee.ALL = All tasks -TaskAssignee.CURRENT_USER = Tasks assigned to me -TaskAssignee.OTHER_USERS = Tasks created by me - +TaskAssignee.ALL=All tasks +TaskAssignee.CURRENT_USER=Tasks assigned to me +TaskAssignee.OTHER_USERS=Tasks created by me # TaskContext -TaskContext.CASE = Case -TaskContext.CONTACT = Contact -TaskContext.EVENT = Event -TaskContext.GENERAL = General -TaskContext.TRAVEL_ENTRY = Travel entry -TaskContext.ENVIRONMENT = Environment - +TaskContext.CASE=Case +TaskContext.CONTACT=Contact +TaskContext.EVENT=Event +TaskContext.GENERAL=General +TaskContext.TRAVEL_ENTRY=Travel entry +TaskContext.ENVIRONMENT=Environment # TaskDateType -TaskDateType.SUGGESTED_START_DATE = Suggested start date -TaskDateType.DUE_DATE = Due date - +TaskDateType.SUGGESTED_START_DATE=Suggested start date +TaskDateType.DUE_DATE=Due date # TaskPriority -TaskPriority.HIGH = High -TaskPriority.LOW = Low -TaskPriority.NORMAL = Normal - +TaskPriority.HIGH=High +TaskPriority.LOW=Low +TaskPriority.NORMAL=Normal # TaskStatus -TaskStatus.DONE = done -TaskStatus.NOT_EXECUTABLE = not executable -TaskStatus.PENDING = pending -TaskStatus.IN_PROGRESS = in progress -TaskStatus.REMOVED = removed - +TaskStatus.DONE=done +TaskStatus.NOT_EXECUTABLE=not executable +TaskStatus.PENDING=pending +TaskStatus.IN_PROGRESS=in progress +TaskStatus.REMOVED=removed # TaskType -TaskType.ACTIVE_SEARCH_FOR_OTHER_CASES = active search for other cases e.g. in household or workplace -TaskType.ANIMAL_DEPOPULATION = depopulation of animals -TaskType.ANIMAL_TESTING = testing of animals -TaskType.CASE_BURIAL = safe burial / cremation -TaskType.CASE_INVESTIGATION = case investigation -TaskType.CASE_ISOLATION = case isolation -TaskType.CASE_MANAGEMENT = case management -TaskType.CONTACT_FOLLOW_UP = contact follow up -TaskType.CONTACT_INVESTIGATION = contact investigation -TaskType.CONTACT_MANAGEMENT = contact management -TaskType.CONTACT_TRACING = contact tracing -TaskType.DAILY_REPORT_GENERATION = generate daily report -TaskType.DECONTAMINATION_DISINFECTION_ACTIVITIES = decontamination / disinfection activities -TaskType.ENVIRONMENTAL_HEALTH_ACTIVITIES = environmental health activities -TaskType.EVENT_INVESTIGATION = investigate the event -TaskType.EVENT_CONTINUE_INVESTIGATION = continue the investigation following a change in the event -TaskType.EVENT_REQUEST_ADDITIONAL_INFORMATION = request for an investigation report / a summary / additional information to be collected -TaskType.OTHER = other task as described in comments -TaskType.QUARANTINE_MANAGEMENT = quarantine management -TaskType.QUARANTINE_ORDER_SEND = send quarantine order -TaskType.QUARANTINE_PLACE = quarantine place -TaskType.SAMPLE_COLLECTION = sample collection -TaskType.SOURCECASE_TRACING = source case tracing -TaskType.SURVEILLANCE_REPORT_GENERATION = generate surveillance report -TaskType.TREATMENT_CENTER_ESTABLISHMENT = establishment of local treatment center -TaskType.VACCINATION_ACTIVITIES = vaccination activities -TaskType.WEEKLY_REPORT_GENERATION = generate weekly report -TaskType.ENVIRONMENT_INVESTIGATION = environment investigation - +TaskType.ACTIVE_SEARCH_FOR_OTHER_CASES=active search for other cases e.g. in household or workplace +TaskType.ANIMAL_DEPOPULATION=depopulation of animals +TaskType.ANIMAL_TESTING=testing of animals +TaskType.CASE_BURIAL=safe burial / cremation +TaskType.CASE_INVESTIGATION=case investigation +TaskType.CASE_ISOLATION=case isolation +TaskType.CASE_MANAGEMENT=case management +TaskType.CONTACT_FOLLOW_UP=contact follow up +TaskType.CONTACT_INVESTIGATION=contact investigation +TaskType.CONTACT_MANAGEMENT=contact management +TaskType.CONTACT_TRACING=contact tracing +TaskType.DAILY_REPORT_GENERATION=generate daily report +TaskType.DECONTAMINATION_DISINFECTION_ACTIVITIES=decontamination / disinfection activities +TaskType.ENVIRONMENTAL_HEALTH_ACTIVITIES=environmental health activities +TaskType.EVENT_INVESTIGATION=investigate the event +TaskType.EVENT_CONTINUE_INVESTIGATION=continue the investigation following a change in the event +TaskType.EVENT_REQUEST_ADDITIONAL_INFORMATION=request for an investigation report / a summary / additional information to be collected +TaskType.OTHER=other task as described in comments +TaskType.QUARANTINE_MANAGEMENT=quarantine management +TaskType.QUARANTINE_ORDER_SEND=send quarantine order +TaskType.QUARANTINE_PLACE=quarantine place +TaskType.SAMPLE_COLLECTION=sample collection +TaskType.SOURCECASE_TRACING=source case tracing +TaskType.SURVEILLANCE_REPORT_GENERATION=generate surveillance report +TaskType.TREATMENT_CENTER_ESTABLISHMENT=establishment of local treatment center +TaskType.VACCINATION_ACTIVITIES=vaccination activities +TaskType.WEEKLY_REPORT_GENERATION=generate weekly report +TaskType.ENVIRONMENT_INVESTIGATION=environment investigation # TemperatureSource TemperatureSource.AXILLARY=axillary -TemperatureSource.NON_CONTACT = Non-contact (infrared) +TemperatureSource.NON_CONTACT=Non-contact (infrared) TemperatureSource.ORAL=oral TemperatureSource.RECTAL=rectal - #TracingApp -TracingApp.CORONA_WARN_APP = Corona warn app -TracingApp.OTHER = Other -TracingApp.UNKNOWN = Unknown - +TracingApp.CORONA_WARN_APP=Corona warn app +TracingApp.OTHER=Other +TracingApp.UNKNOWN=Unknown # TravelType -TravelType.ABROAD = Abroad -TravelType.WITHIN_COUNTRY = Within the country - +TravelType.ABROAD=Abroad +TravelType.WITHIN_COUNTRY=Within the country # TravelAccommodation -TravelAccommodation.HOTEL = Hotel -TravelAccommodation.CAMPING = Camping site -TravelAccommodation.RENTED_APARTMENT_OR_HOUSE = Rented apartment/ house -TravelAccommodation.FRIENDS_OR_FAMILY = Friends/Family -TravelAccommodation.OTHER = Other - +TravelAccommodation.HOTEL=Hotel +TravelAccommodation.CAMPING=Camping site +TravelAccommodation.RENTED_APARTMENT_OR_HOUSE=Rented apartment/ house +TravelAccommodation.FRIENDS_OR_FAMILY=Friends/Family +TravelAccommodation.OTHER=Other # TreatmentRoute -TreatmentRoute.ORAL = Oral -TreatmentRoute.IV = IV -TreatmentRoute.RECTAL = Rectal -TreatmentRoute.TOPICAL = Topical -TreatmentRoute.OTHER = Other - +TreatmentRoute.ORAL=Oral +TreatmentRoute.IV=IV +TreatmentRoute.RECTAL=Rectal +TreatmentRoute.TOPICAL=Topical +TreatmentRoute.OTHER=Other # TreatmentType -TreatmentType.DRUG_INTAKE = Drug intake -TreatmentType.ORAL_REHYDRATION_SALTS = Oral rehydration salts -TreatmentType.BLOOD_TRANSFUSION = Blood transfusion -TreatmentType.RENAL_REPLACEMENT_THERAPY = Renal replacement therapy -TreatmentType.IV_FLUID_THERAPY = IV fluid therapy -TreatmentType.OXYGEN_THERAPY = Oxygen therapy -TreatmentType.INVASIVE_MECHANICAL_VENTILATION = Invasive mechanical ventilation -TreatmentType.VASOPRESSORS_INOTROPES = Vasopressors/Inotropes -TreatmentType.OTHER = Other - +TreatmentType.DRUG_INTAKE=Drug intake +TreatmentType.ORAL_REHYDRATION_SALTS=Oral rehydration salts +TreatmentType.BLOOD_TRANSFUSION=Blood transfusion +TreatmentType.RENAL_REPLACEMENT_THERAPY=Renal replacement therapy +TreatmentType.IV_FLUID_THERAPY=IV fluid therapy +TreatmentType.OXYGEN_THERAPY=Oxygen therapy +TreatmentType.INVASIVE_MECHANICAL_VENTILATION=Invasive mechanical ventilation +TreatmentType.VASOPRESSORS_INOTROPES=Vasopressors/Inotropes +TreatmentType.OTHER=Other # Trimester -Trimester.FIRST = First -Trimester.SECOND = Second -Trimester.THIRD = Third -Trimester.UNKNOWN = Unknown - +Trimester.FIRST=First +Trimester.SECOND=Second +Trimester.THIRD=Third +Trimester.UNKNOWN=Unknown TypeOfAnimal.BAT=Bat or its excreta TypeOfAnimal.POULTRY=Poultry or wild bird TypeOfAnimal.CAMEL=Camel @@ -1594,288 +1440,282 @@ TypeOfAnimal.GOAT=Goat TypeOfAnimal.HORSE=Horse TypeOfAnimal.SHEEP=Sheep TypeOfAnimal.OTHER=Other - TypeOfChildcareFacility.NURSERY_CRECHE=Nursery/Creche TypeOfChildcareFacility.NURSERY_SCHOOL=Nursery School TypeOfChildcareFacility.CHILDMINDER_CENTER=Childminder Centre TypeOfChildcareFacility.CHILDCARE_CENTER=Childcare Centre TypeOfChildcareFacility.SCHOOL=School TypeOfChildcareFacility.OTHER=Other - # TypeOfDrug -TypeOfDrug.ANTIMICROBIAL = Antimicrobial -TypeOfDrug.ANTIVIRAL = Antiviral -TypeOfDrug.ANTIBIOTIC = Antibiotic -TypeOfDrug.OTHER = Other - +TypeOfDrug.ANTIMICROBIAL=Antimicrobial +TypeOfDrug.ANTIVIRAL=Antiviral +TypeOfDrug.ANTIBIOTIC=Antibiotic +TypeOfDrug.OTHER=Other # Drug -Drug.AMIKACIN = Amikacin -Drug.BEDAQUILINE = Bedaquiline -Drug.CAPREOMYCIN = Capreomycin -Drug.CIPROFLOXACIN = Ciprofloxacin -Drug.DELAMANID = Delamanid -Drug.ETHAMBUTOL = Ethambutol -Drug.GATIFLOXACIN = Gatifloxacin -Drug.ISONIAZID = Isoniazid -Drug.KANAMYCIN = Kanamycin -Drug.LEVOFLOXACIN = Levofloxacin -Drug.MOXIFLOXACIN = Moxifloxacin -Drug.OFLOXACIN = Ofloxacin -Drug.RIFAMPICIN = Rifampicin -Drug.STREPTOMYCIN =Streptomycin -Drug.CEFTRIAXONE = Ceftriaxone -Drug.PENICILLIN = Penicillin -Drug.ERYTHROMYCIN = Erythromycin -Drug.OTHER = Other - -DrugSusceptibilityType.NOT_APPLICABLE = Not applicable -DrugSusceptibilityType.RESISTANT = Resistant -DrugSusceptibilityType.SUSCEPTIBLE = Susceptible -DrugSusceptibilityType.UNKNOWN = Unknown -DrugSusceptibilityType.INTERMEDIATE = Intermediate - +Drug.AMIKACIN=Amikacin +Drug.BEDAQUILINE=Bedaquiline +Drug.CAPREOMYCIN=Capreomycin +Drug.CIPROFLOXACIN=Ciprofloxacin +Drug.DELAMANID=Delamanid +Drug.ETHAMBUTOL=Ethambutol +Drug.GATIFLOXACIN=Gatifloxacin +Drug.ISONIAZID=Isoniazid +Drug.KANAMYCIN=Kanamycin +Drug.LEVOFLOXACIN=Levofloxacin +Drug.MOXIFLOXACIN=Moxifloxacin +Drug.OFLOXACIN=Ofloxacin +Drug.RIFAMPICIN=Rifampicin +Drug.STREPTOMYCIN=Streptomycin +Drug.CEFTRIAXONE=Ceftriaxone +Drug.PENICILLIN=Penicillin +Drug.ERYTHROMYCIN=Erythromycin +Drug.OTHER=Other +DrugSusceptibilityType.NOT_APPLICABLE=Not applicable +DrugSusceptibilityType.RESISTANT=Resistant +DrugSusceptibilityType.SUSCEPTIBLE=Susceptible +DrugSusceptibilityType.UNKNOWN=Unknown +DrugSusceptibilityType.INTERMEDIATE=Intermediate # TypeOfPlace -TypeOfPlace.FACILITY = Facility -TypeOfPlace.FACILITY_23_IFSG = Facility (§ 23 IfSG) -TypeOfPlace.COMMUNITY_FACILITY = Community facility (§ 33 IfSG) -TypeOfPlace.FACILITY_36_IFSG = Facility (§ 36 IfSG) -TypeOfPlace.FESTIVITIES = Festivities -TypeOfPlace.HOME = Home -TypeOfPlace.HOSPITAL = Hospital -TypeOfPlace.MEANS_OF_TRANSPORT = Means of transport -TypeOfPlace.OTHER = Other -TypeOfPlace.PUBLIC_PLACE = Public place -TypeOfPlace.UNKNOWN = Unknown -TypeOfPlace.SCATTERED = Scattered -TypeOfPlace.SCHOOL = School -TypeOfPlace.EDUCATION_AND_CHILDCARE = Education and childcare -TypeOfPlace.NURSING_HOME = Nursing home -TypeOfPlace.ASYLUM_SEEKERS_SHELTER = Asylum seekers' shelter - +TypeOfPlace.FACILITY=Facility +TypeOfPlace.FACILITY_23_IFSG=Facility (§ 23 IfSG) +TypeOfPlace.COMMUNITY_FACILITY=Community facility (§ 33 IfSG) +TypeOfPlace.FACILITY_36_IFSG=Facility (§ 36 IfSG) +TypeOfPlace.FESTIVITIES=Festivities +TypeOfPlace.HOME=Home +TypeOfPlace.HOSPITAL=Hospital +TypeOfPlace.MEANS_OF_TRANSPORT=Means of transport +TypeOfPlace.OTHER=Other +TypeOfPlace.PUBLIC_PLACE=Public place +TypeOfPlace.UNKNOWN=Unknown +TypeOfPlace.SCATTERED=Scattered +TypeOfPlace.SCHOOL=School +TypeOfPlace.EDUCATION_AND_CHILDCARE=Education and childcare +TypeOfPlace.NURSING_HOME=Nursing home +TypeOfPlace.ASYLUM_SEEKERS_SHELTER=Asylum seekers' shelter # UserRight -UserRight.CASE_ARCHIVE = Archive cases -UserRight.CASE_CHANGE_DISEASE = Edit case disease -UserRight.CASE_CHANGE_EPID_NUMBER = Edit case epid number -UserRight.CASE_CLASSIFY = Edit case classification and outcome -UserRight.CASE_CREATE = Create new cases -UserRight.CASE_DELETE = Delete cases from the system -UserRight.CASE_EDIT = Edit existing cases -UserRight.CASE_EXPORT = Export cases from SORMAS -UserRight.CASE_IMPORT = Import cases into SORMAS -UserRight.CASE_INVESTIGATE = Edit case investigation status -UserRight.CASE_TRANSFER = Transfer cases to another region/district/facility -UserRight.CASE_REFER_FROM_POE = Refer case from point of entry -UserRight.CASE_RESPONSIBLE = Can be responsible for a case -UserRight.CASE_VIEW = View existing cases -UserRight.CASE_VIEW_ARCHIVED = View archived cases -UserRight.CONTACT_ASSIGN = Assign contacts to officers -UserRight.CONTACT_CLASSIFY = Edit contact classification -UserRight.CONTACT_CONVERT = Create resulting cases from contacts -UserRight.CONTACT_CREATE = Create new contacts -UserRight.CONTACT_IMPORT = Import contacts -UserRight.CONTACT_DELETE = Delete contacts from the system -UserRight.CONTACT_EDIT = Edit existing contacts -UserRight.CONTACT_EXPORT = Export contacts from SORMAS -UserRight.CONTACT_RESPONSIBLE = Can be responsible for a contact -UserRight.CONTACT_VIEW = View existing contacts -UserRight.CONTACT_VIEW_ARCHIVED = View archived contacts -UserRight.CONTACT_ARCHIVE = Archive contacts -UserRight.DASHBOARD_CONTACT_VIEW = Access the contact supervisor dashboard -UserRight.DASHBOARD_SURVEILLANCE_VIEW = Access the surveillance supervisor dashboard -UserRight.DASHBOARD_SAMPLES_VIEW = Access the samples dashboard -UserRight.DASHBOARD_ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_VIEW = Access the adverse events dashboard -UserRight.DATABASE_EXPORT_ACCESS = Export the whole database -UserRight.EVENT_ARCHIVE = Archive events -UserRight.EVENT_CREATE = Create new events -UserRight.EVENT_EDIT = Edit existing events -UserRight.EVENT_EXPORT = Export events from SORMAS -UserRight.EVENT_RESPONSIBLE = Can be responsible for an event -UserRight.EVENT_VIEW = View existing events -UserRight.EVENT_VIEW_ARCHIVED = View archived events -UserRight.EVENTPARTICIPANT_CREATE = Create new event participants -UserRight.EVENTPARTICIPANT_EDIT = Edit existing event participants -UserRight.EVENTPARTICIPANT_ARCHIVE = Event participant archive -UserRight.EVENTPARTICIPANT_VIEW = View existing event participants -UserRight.EVENTPARTICIPANT_VIEW_ARCHIVED = View archived event participants -UserRight.INFRASTRUCTURE_CREATE = Create new regions/districts/communities/facilities -UserRight.INFRASTRUCTURE_EDIT = Edit regions/districts/communities/facilities -UserRight.INFRASTRUCTURE_VIEW = View regions/districts/communities/facilities in the system -UserRight.INFRASTRUCTURE_VIEW_ARCHIVED = View archived infrastructure data -UserRight.PERFORM_BULK_OPERATIONS = Perform bulk operations in lists -UserRight.SAMPLE_CREATE = Create new samples -UserRight.SAMPLE_EDIT = Edit existing samples -UserRight.SAMPLE_EXPORT = Export samples from SORMAS -UserRight.SAMPLE_DELETE = Delete samples from the system -UserRight.SAMPLE_SEE_ARCHIVED = View archived samples -UserRight.SAMPLE_TRANSFER = Transfer samples to another lab -UserRight.SAMPLE_VIEW = View existing samples -UserRight.SAMPLETEST_CREATE = Create new sample tests -UserRight.SAMPLETEST_EDIT = Edit existing sample tests -UserRight.STATISTICS_EXPORT = Export detailed statistics from SORMAS -UserRight.TASK_ASSIGN = Assign tasks to users -UserRight.TASK_CREATE = Create new tasks -UserRight.TASK_EDIT = Edit existing tasks -UserRight.TASK_SEE_ARCHIVED = View archived tasks -UserRight.TASK_VIEW = View existing tasks -UserRight.TASK_VIEW_ARCHIVED = View archived tasks -UserRight.USER_CREATE = Create new users -UserRight.USER_EDIT = Edit existing users -UserRight.USER_VIEW = View existing users -UserRight.USER_ROLE_EDIT = Edit existing user roles -UserRight.USER_ROLE_DELETE = Delete user roles from the system -UserRight.USER_ROLE_VIEW = View existing user roles -UserRight.VISIT_CREATE = Create new visits -UserRight.VISIT_EDIT = Edit existing visits -UserRight.WEEKLYREPORT_CREATE = Create weekly reports -UserRight.WEEKLYREPORT_VIEW = View weekly reports -UserRight.CASE_MERGE = Merge cases -UserRight.PERSON_VIEW = View existing persons -UserRight.PERSON_EDIT = Edit existing persons -UserRight.PERSON_DELETE = Delete persons from the system -UserRight.PERSON_CONTACT_DETAILS_DELETE = Delete person contact details -UserRight.SAMPLE_EDIT_NOT_OWNED = Edit samples reported by other users -UserRight.PATHOGEN_TEST_CREATE = Create new pathogen tests -UserRight.PATHOGEN_TEST_EDIT = Edit existing pathogen tests -UserRight.PATHOGEN_TEST_DELETE = Delete pathogen tests from the system -UserRight.ADDITIONAL_TEST_VIEW = View existing additional tests -UserRight.ADDITIONAL_TEST_CREATE = Create new additional tests -UserRight.ADDITIONAL_TEST_EDIT = Edit existing additional tests -UserRight.ADDITIONAL_TEST_DELETE = Delete additional tests from the system -UserRight.CONTACT_REASSIGN_CASE = Reassign the source case of contacts -UserRight.MANAGE_EXTERNAL_SYMPTOM_JOURNAL = Manage external symptom journal -UserRight.VISIT_DELETE = Delete visits from the system -UserRight.VISIT_EXPORT = Export visits from SORMAS -UserRight.TASK_DELETE = Delete tasks from the system -UserRight.TASK_EXPORT = Export tasks from SORMAS -UserRight.TASK_ARCHIVE = Archive tasks -UserRight.ACTION_CREATE = Create new actions -UserRight.ACTION_DELETE = Delete actions from the system -UserRight.ACTION_EDIT = Edit existing actions -UserRight.EVENT_IMPORT = Import events -UserRight.EVENT_DELETE = Delete events from the system -UserRight.EVENTPARTICIPANT_DELETE = Delete event participants from the system -UserRight.EVENTPARTICIPANT_IMPORT = Import event participants -UserRight.SEND_MANUAL_EXTERNAL_MESSAGES = Send manual external messages -UserRight.STATISTICS_ACCESS = Access statistics -UserRight.MANAGE_PUBLIC_EXPORT_CONFIGURATION = Manage public export configurations -UserRight.INFRASTRUCTURE_EXPORT = Export infrastructure data from SORMAS -UserRight.INFRASTRUCTURE_IMPORT = Import infrastructure data -UserRight.INFRASTRUCTURE_ARCHIVE = Archive infrastructure data -UserRight.DASHBOARD_CONTACT_VIEW_TRANSMISSION_CHAINS = View contact transmission chains on the dashboard -UserRight.DASHBOARD_CAMPAIGNS_VIEW = Access campaigns dashboard -UserRight.CASE_CLINICIAN_VIEW = Access case sections concerned with clinician -UserRight.THERAPY_VIEW = View existing therapies -UserRight.PRESCRIPTION_CREATE = Create new prescriptions -UserRight.PRESCRIPTION_EDIT = Edit existing prescriptions -UserRight.PRESCRIPTION_DELETE = Delete prescriptions from the system -UserRight.TREATMENT_CREATE = Create new treatments -UserRight.TREATMENT_EDIT = Edit existing treatments -UserRight.TREATMENT_DELETE = Delete treatments from the system -UserRight.CLINICAL_COURSE_VIEW = View the clinical course of cases -UserRight.CLINICAL_COURSE_EDIT = Edit the clinical course of cases -UserRight.CLINICAL_VISIT_CREATE = Create new clinical visits -UserRight.CLINICAL_VISIT_EDIT = Edit existing clinical visits -UserRight.CLINICAL_VISIT_DELETE = Delete clinical visits from the system -UserRight.PORT_HEALTH_INFO_VIEW = View port health info -UserRight.PORT_HEALTH_INFO_EDIT = Edit existing port health info -UserRight.POPULATION_MANAGE = Manage population data -UserRight.DOCUMENT_TEMPLATE_MANAGEMENT = Manage document templates -UserRight.QUARANTINE_ORDER_CREATE = Create new quarantine orders -UserRight.LINE_LISTING_CONFIGURE = Configure line listing -UserRight.AGGREGATE_REPORT_VIEW = Create new aggregate reports -UserRight.AGGREGATE_REPORT_EXPORT = Export aggregate reports from SORMAS -UserRight.AGGREGATE_REPORT_EDIT = Edit existing aggregate reports -UserRight.SEE_PERSONAL_DATA_IN_JURISDICTION = See personal data in jurisdiction -UserRight.SEE_PERSONAL_DATA_OUTSIDE_JURISDICTION = See personal data outside jurisdiction -UserRight.SEE_SENSITIVE_DATA_IN_JURISDICTION = See sensitive data in jurisdiction -UserRight.SEE_SENSITIVE_DATA_OUTSIDE_JURISDICTION = See sensitive data outside jurisdiction -UserRight.CAMPAIGN_VIEW = View existing campaigns -UserRight.CAMPAIGN_VIEW_ARCHIVED = View archived campaigns -UserRight.CAMPAIGN_EDIT = Edit existing campaigns -UserRight.CAMPAIGN_ARCHIVE = Archive campaigns -UserRight.CAMPAIGN_DELETE = Delete campaigns from the system -UserRight.CAMPAIGN_FORM_DATA_VIEW = View existing campaign form data -UserRight.CAMPAIGN_FORM_DATA_VIEW_ARCHIVED = View archived campaign form data -UserRight.CAMPAIGN_FORM_DATA_EDIT = Edit existing campaign form data -UserRight.CAMPAIGN_FORM_DATA_ARCHIVE = Archive campaign form data -UserRight.CAMPAIGN_FORM_DATA_DELETE = Delete campaign form data from the system -UserRight.CAMPAIGN_FORM_DATA_EXPORT = Export campaign form data from SORMAS -UserRight.BAG_EXPORT = Perform BAG export -UserRight.SORMAS_TO_SORMAS_SHARE = Share data from one SORMAS instance to another -UserRight.SORMAS_TO_SORMAS_PROCESS = Process shares -UserRight.EXTERNAL_SURVEILLANCE_SHARE = Send data to external surveillance tool -UserRight.EXTERNAL_SURVEILLANCE_DELETE = Delete data in external surveillance tool -UserRight.EXTERNAL_MESSAGE_PUSH = Push external messages to the system -UserRight.EXTERNAL_MESSAGE_ACCESS = Access external messages -UserRight.EXTERNAL_MESSAGE_LABORATORY_VIEW = View laboratory messages -UserRight.EXTERNAL_MESSAGE_DOCTOR_DECLARATION_VIEW = View doctor declaration messages -UserRight.EXTERNAL_MESSAGE_LABORATORY_PROCESS = Work with laboratory messages -UserRight.EXTERNAL_MESSAGE_DOCTOR_DECLARATION_PROCESS = Work with doctor declaration messages -UserRight.EXTERNAL_MESSAGE_LABORATORY_DELETE = Delete laboratory messages from the system -UserRight.EXTERNAL_MESSAGE_DOCTOR_DECLARATION_DELETE = Delete doctor declaration messages from the system -UserRight.CASE_SHARE = Share cases with the whole country -UserRight.IMMUNIZATION_VIEW = View existing immunizations and vaccinations -UserRight.IMMUNIZATION_VIEW_ARCHIVED = View archived immunizations and vaccinations -UserRight.IMMUNIZATION_CREATE = Create new immunizations and vaccinations -UserRight.IMMUNIZATION_EDIT = Edit existing immunizations and vaccinations -UserRight.IMMUNIZATION_DELETE = Delete immunizations and vaccinations from the system -UserRight.IMMUNIZATION_ARCHIVE = Archive immunizations -UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_VIEW = View existing adverse events following immunization -UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_CREATE = Create new adverse event following immunization -UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_EDIT = Edit existing adverse event following immunization -UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_DELETE = Delete adverse events following immunization from the system -UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_ARCHIVE = Archive adverse events following immunization -UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_EXPORT = Export adverse events following immunization -UserRight.PERSON_EXPORT = Export persons -UserRight.CONTACT_MERGE = Merge contacts -UserRight.EVENTGROUP_CREATE = Create new event groups -UserRight.EVENTGROUP_EDIT = Edit existing event groups -UserRight.EVENTGROUP_LINK = Link events to event groups -UserRight.EVENTGROUP_ARCHIVE = Archive event groups -UserRight.EVENTGROUP_DELETE = Delete event groups from the system -UserRight.EVENTGROUP_VIEW_ARCHIVED = View archived event groups from the system -UserRight.TRAVEL_ENTRY_MANAGEMENT_ACCESS = Access the travel entry directory -UserRight.TRAVEL_ENTRY_VIEW = View existing travel entries -UserRight.TRAVEL_ENTRY_VIEW_ARCHIVED = View archived travel entries -UserRight.TRAVEL_ENTRY_CREATE = Create new travel entries -UserRight.TRAVEL_ENTRY_EDIT = Edit existing travel entries -UserRight.TRAVEL_ENTRY_DELETE = Delete travel entries from the system -UserRight.TRAVEL_ENTRY_ARCHIVE = Archive travel entries -UserRight.EXPORT_DATA_PROTECTION_DATA = Export data protection data -UserRight.OUTBREAK_VIEW = View outbreaks -UserRight.OUTBREAK_EDIT = Edit outbreaks -UserRight.PERFORM_BULK_OPERATIONS_PSEUDONYM = Perform bulk pseudonomization -UserRight.SORMAS_TO_SORMAS_CLIENT = Sormas to Sormas Client -UserRight.SORMAS_REST = Access Sormas REST -UserRight.EXTERNAL_VISITS = External visits -UserRight.SORMAS_UI = Access Sormas UI -UserRight.DEV_MODE = Access developer options -UserRight.CUSTOMIZABLE_ENUM_MANAGEMENT = Manage customizable enums -UserRight.DISEASE_MANAGEMENT = Disease management -UserRight.DOCUMENT_VIEW = View existing documents -UserRight.DOCUMENT_UPLOAD = Upload documents -UserRight.DOCUMENT_DELETE = Delete documents from the system -UserRight.PERSON_MERGE = Merge persons -UserRight.ENVIRONMENT_VIEW = View existing environments -UserRight.ENVIRONMENT_CREATE = Create new environments -UserRight.ENVIRONMENT_EDIT = Edit existing environments -UserRight.ENVIRONMENT_ARCHIVE = Archive environments -UserRight.ENVIRONMENT_VIEW_ARCHIVED = View archived environments -UserRight.ENVIRONMENT_DELETE = Delete environments from the system -UserRight.ENVIRONMENT_IMPORT = Import environments -UserRight.ENVIRONMENT_EXPORT = Export environments -UserRight.ENVIRONMENT_LINK = Linking the environments -UserRight.ENVIRONMENT_SAMPLE_VIEW = View existing environment samples -UserRight.ENVIRONMENT_SAMPLE_CREATE = Create new environment samples -UserRight.ENVIRONMENT_SAMPLE_EDIT = Edit existing environment samples -UserRight.ENVIRONMENT_SAMPLE_EDIT_DISPATCH = Edit environment samples dispatch information -UserRight.ENVIRONMENT_SAMPLE_EDIT_RECEIVAL = Edit environment samples receival information -UserRight.ENVIRONMENT_SAMPLE_DELETE = Delete environment samples from the system -UserRight.ENVIRONMENT_SAMPLE_IMPORT = Import environment samples -UserRight.ENVIRONMENT_SAMPLE_EXPORT = Export environment samples -UserRight.ENVIRONMENT_PATHOGEN_TEST_CREATE = Create environment sample pathogen tests -UserRight.ENVIRONMENT_PATHOGEN_TEST_EDIT = Edit environment sample pathogen tests -UserRight.ENVIRONMENT_PATHOGEN_TEST_DELETE = Delete environment sample pathogen tests +UserRight.CASE_ARCHIVE=Archive cases +UserRight.CASE_CHANGE_DISEASE=Edit case disease +UserRight.CASE_CHANGE_EPID_NUMBER=Edit case epid number +UserRight.CASE_CLASSIFY=Edit case classification and outcome +UserRight.CASE_CREATE=Create new cases +UserRight.CASE_DELETE=Delete cases from the system +UserRight.CASE_EDIT=Edit existing cases +UserRight.CASE_EXPORT=Export cases from SORMAS +UserRight.CASE_IMPORT=Import cases into SORMAS +UserRight.CASE_INVESTIGATE=Edit case investigation status +UserRight.CASE_TRANSFER=Transfer cases to another region/district/facility +UserRight.CASE_REFER_FROM_POE=Refer case from point of entry +UserRight.CASE_RESPONSIBLE=Can be responsible for a case +UserRight.CASE_VIEW=View existing cases +UserRight.CASE_VIEW_ARCHIVED=View archived cases +UserRight.CONTACT_ASSIGN=Assign contacts to officers +UserRight.CONTACT_CLASSIFY=Edit contact classification +UserRight.CONTACT_CONVERT=Create resulting cases from contacts +UserRight.CONTACT_CREATE=Create new contacts +UserRight.CONTACT_IMPORT=Import contacts +UserRight.CONTACT_DELETE=Delete contacts from the system +UserRight.CONTACT_EDIT=Edit existing contacts +UserRight.CONTACT_EXPORT=Export contacts from SORMAS +UserRight.CONTACT_RESPONSIBLE=Can be responsible for a contact +UserRight.CONTACT_VIEW=View existing contacts +UserRight.CONTACT_VIEW_ARCHIVED=View archived contacts +UserRight.CONTACT_ARCHIVE=Archive contacts +UserRight.DASHBOARD_CONTACT_VIEW=Access the contact supervisor dashboard +UserRight.DASHBOARD_SURVEILLANCE_VIEW=Access the surveillance supervisor dashboard +UserRight.DASHBOARD_SAMPLES_VIEW=Access the samples dashboard +UserRight.DASHBOARD_ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_VIEW=Access the adverse events dashboard +UserRight.DATABASE_EXPORT_ACCESS=Export the whole database +UserRight.EVENT_ARCHIVE=Archive events +UserRight.EVENT_CREATE=Create new events +UserRight.EVENT_EDIT=Edit existing events +UserRight.EVENT_EXPORT=Export events from SORMAS +UserRight.EVENT_RESPONSIBLE=Can be responsible for an event +UserRight.EVENT_VIEW=View existing events +UserRight.EVENT_VIEW_ARCHIVED=View archived events +UserRight.EVENTPARTICIPANT_CREATE=Create new event participants +UserRight.EVENTPARTICIPANT_EDIT=Edit existing event participants +UserRight.EVENTPARTICIPANT_ARCHIVE=Event participant archive +UserRight.EVENTPARTICIPANT_VIEW=View existing event participants +UserRight.EVENTPARTICIPANT_VIEW_ARCHIVED=View archived event participants +UserRight.INFRASTRUCTURE_CREATE=Create new regions/districts/communities/facilities +UserRight.INFRASTRUCTURE_EDIT=Edit regions/districts/communities/facilities +UserRight.INFRASTRUCTURE_VIEW=View regions/districts/communities/facilities in the system +UserRight.INFRASTRUCTURE_VIEW_ARCHIVED=View archived infrastructure data +UserRight.PERFORM_BULK_OPERATIONS=Perform bulk operations in lists +UserRight.SAMPLE_CREATE=Create new samples +UserRight.SAMPLE_EDIT=Edit existing samples +UserRight.SAMPLE_EXPORT=Export samples from SORMAS +UserRight.SAMPLE_DELETE=Delete samples from the system +UserRight.SAMPLE_SEE_ARCHIVED=View archived samples +UserRight.SAMPLE_TRANSFER=Transfer samples to another lab +UserRight.SAMPLE_VIEW=View existing samples +UserRight.SAMPLETEST_CREATE=Create new sample tests +UserRight.SAMPLETEST_EDIT=Edit existing sample tests +UserRight.STATISTICS_EXPORT=Export detailed statistics from SORMAS +UserRight.TASK_ASSIGN=Assign tasks to users +UserRight.TASK_CREATE=Create new tasks +UserRight.TASK_EDIT=Edit existing tasks +UserRight.TASK_SEE_ARCHIVED=View archived tasks +UserRight.TASK_VIEW=View existing tasks +UserRight.TASK_VIEW_ARCHIVED=View archived tasks +UserRight.USER_CREATE=Create new users +UserRight.USER_EDIT=Edit existing users +UserRight.USER_VIEW=View existing users +UserRight.USER_ROLE_EDIT=Edit existing user roles +UserRight.USER_ROLE_DELETE=Delete user roles from the system +UserRight.USER_ROLE_VIEW=View existing user roles +UserRight.VISIT_CREATE=Create new visits +UserRight.VISIT_EDIT=Edit existing visits +UserRight.WEEKLYREPORT_CREATE=Create weekly reports +UserRight.WEEKLYREPORT_VIEW=View weekly reports +UserRight.CASE_MERGE=Merge cases +UserRight.PERSON_VIEW=View existing persons +UserRight.PERSON_EDIT=Edit existing persons +UserRight.PERSON_DELETE=Delete persons from the system +UserRight.PERSON_CONTACT_DETAILS_DELETE=Delete person contact details +UserRight.SAMPLE_EDIT_NOT_OWNED=Edit samples reported by other users +UserRight.PATHOGEN_TEST_CREATE=Create new pathogen tests +UserRight.PATHOGEN_TEST_EDIT=Edit existing pathogen tests +UserRight.PATHOGEN_TEST_DELETE=Delete pathogen tests from the system +UserRight.ADDITIONAL_TEST_VIEW=View existing additional tests +UserRight.ADDITIONAL_TEST_CREATE=Create new additional tests +UserRight.ADDITIONAL_TEST_EDIT=Edit existing additional tests +UserRight.ADDITIONAL_TEST_DELETE=Delete additional tests from the system +UserRight.CONTACT_REASSIGN_CASE=Reassign the source case of contacts +UserRight.MANAGE_EXTERNAL_SYMPTOM_JOURNAL=Manage external symptom journal +UserRight.VISIT_DELETE=Delete visits from the system +UserRight.VISIT_EXPORT=Export visits from SORMAS +UserRight.TASK_DELETE=Delete tasks from the system +UserRight.TASK_EXPORT=Export tasks from SORMAS +UserRight.TASK_ARCHIVE=Archive tasks +UserRight.ACTION_CREATE=Create new actions +UserRight.ACTION_DELETE=Delete actions from the system +UserRight.ACTION_EDIT=Edit existing actions +UserRight.EVENT_IMPORT=Import events +UserRight.EVENT_DELETE=Delete events from the system +UserRight.EVENTPARTICIPANT_DELETE=Delete event participants from the system +UserRight.EVENTPARTICIPANT_IMPORT=Import event participants +UserRight.SEND_MANUAL_EXTERNAL_MESSAGES=Send manual external messages +UserRight.STATISTICS_ACCESS=Access statistics +UserRight.MANAGE_PUBLIC_EXPORT_CONFIGURATION=Manage public export configurations +UserRight.INFRASTRUCTURE_EXPORT=Export infrastructure data from SORMAS +UserRight.INFRASTRUCTURE_IMPORT=Import infrastructure data +UserRight.INFRASTRUCTURE_ARCHIVE=Archive infrastructure data +UserRight.DASHBOARD_CONTACT_VIEW_TRANSMISSION_CHAINS=View contact transmission chains on the dashboard +UserRight.DASHBOARD_CAMPAIGNS_VIEW=Access campaigns dashboard +UserRight.CASE_CLINICIAN_VIEW=Access case sections concerned with clinician +UserRight.THERAPY_VIEW=View existing therapies +UserRight.PRESCRIPTION_CREATE=Create new prescriptions +UserRight.PRESCRIPTION_EDIT=Edit existing prescriptions +UserRight.PRESCRIPTION_DELETE=Delete prescriptions from the system +UserRight.TREATMENT_CREATE=Create new treatments +UserRight.TREATMENT_EDIT=Edit existing treatments +UserRight.TREATMENT_DELETE=Delete treatments from the system +UserRight.CLINICAL_COURSE_VIEW=View the clinical course of cases +UserRight.CLINICAL_COURSE_EDIT=Edit the clinical course of cases +UserRight.CLINICAL_VISIT_CREATE=Create new clinical visits +UserRight.CLINICAL_VISIT_EDIT=Edit existing clinical visits +UserRight.CLINICAL_VISIT_DELETE=Delete clinical visits from the system +UserRight.PORT_HEALTH_INFO_VIEW=View port health info +UserRight.PORT_HEALTH_INFO_EDIT=Edit existing port health info +UserRight.POPULATION_MANAGE=Manage population data +UserRight.DOCUMENT_TEMPLATE_MANAGEMENT=Manage document templates +UserRight.QUARANTINE_ORDER_CREATE=Create new quarantine orders +UserRight.LINE_LISTING_CONFIGURE=Configure line listing +UserRight.AGGREGATE_REPORT_VIEW=Create new aggregate reports +UserRight.AGGREGATE_REPORT_EXPORT=Export aggregate reports from SORMAS +UserRight.AGGREGATE_REPORT_EDIT=Edit existing aggregate reports +UserRight.SEE_PERSONAL_DATA_IN_JURISDICTION=See personal data in jurisdiction +UserRight.SEE_PERSONAL_DATA_OUTSIDE_JURISDICTION=See personal data outside jurisdiction +UserRight.SEE_SENSITIVE_DATA_IN_JURISDICTION=See sensitive data in jurisdiction +UserRight.SEE_SENSITIVE_DATA_OUTSIDE_JURISDICTION=See sensitive data outside jurisdiction +UserRight.CAMPAIGN_VIEW=View existing campaigns +UserRight.CAMPAIGN_VIEW_ARCHIVED=View archived campaigns +UserRight.CAMPAIGN_EDIT=Edit existing campaigns +UserRight.CAMPAIGN_ARCHIVE=Archive campaigns +UserRight.CAMPAIGN_DELETE=Delete campaigns from the system +UserRight.CAMPAIGN_FORM_DATA_VIEW=View existing campaign form data +UserRight.CAMPAIGN_FORM_DATA_VIEW_ARCHIVED=View archived campaign form data +UserRight.CAMPAIGN_FORM_DATA_EDIT=Edit existing campaign form data +UserRight.CAMPAIGN_FORM_DATA_ARCHIVE=Archive campaign form data +UserRight.CAMPAIGN_FORM_DATA_DELETE=Delete campaign form data from the system +UserRight.CAMPAIGN_FORM_DATA_EXPORT=Export campaign form data from SORMAS +UserRight.BAG_EXPORT=Perform BAG export +UserRight.SORMAS_TO_SORMAS_SHARE=Share data from one SORMAS instance to another +UserRight.SORMAS_TO_SORMAS_PROCESS=Process shares +UserRight.EXTERNAL_SURVEILLANCE_SHARE=Send data to external surveillance tool +UserRight.EXTERNAL_SURVEILLANCE_DELETE=Delete data in external surveillance tool +UserRight.EXTERNAL_MESSAGE_PUSH=Push external messages to the system +UserRight.EXTERNAL_MESSAGE_ACCESS=Access external messages +UserRight.EXTERNAL_MESSAGE_LABORATORY_VIEW=View laboratory messages +UserRight.EXTERNAL_MESSAGE_DOCTOR_DECLARATION_VIEW=View doctor declaration messages +UserRight.EXTERNAL_MESSAGE_LABORATORY_PROCESS=Work with laboratory messages +UserRight.EXTERNAL_MESSAGE_DOCTOR_DECLARATION_PROCESS=Work with doctor declaration messages +UserRight.EXTERNAL_MESSAGE_LABORATORY_DELETE=Delete laboratory messages from the system +UserRight.EXTERNAL_MESSAGE_DOCTOR_DECLARATION_DELETE=Delete doctor declaration messages from the system +UserRight.CASE_SHARE=Share cases with the whole country +UserRight.IMMUNIZATION_VIEW=View existing immunizations and vaccinations +UserRight.IMMUNIZATION_VIEW_ARCHIVED=View archived immunizations and vaccinations +UserRight.IMMUNIZATION_CREATE=Create new immunizations and vaccinations +UserRight.IMMUNIZATION_EDIT=Edit existing immunizations and vaccinations +UserRight.IMMUNIZATION_DELETE=Delete immunizations and vaccinations from the system +UserRight.IMMUNIZATION_ARCHIVE=Archive immunizations +UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_VIEW=View existing adverse events following immunization +UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_CREATE=Create new adverse event following immunization +UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_EDIT=Edit existing adverse event following immunization +UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_DELETE=Delete adverse events following immunization from the system +UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_ARCHIVE=Archive adverse events following immunization +UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_EXPORT=Export adverse events following immunization +UserRight.PERSON_EXPORT=Export persons +UserRight.CONTACT_MERGE=Merge contacts +UserRight.EVENTGROUP_CREATE=Create new event groups +UserRight.EVENTGROUP_EDIT=Edit existing event groups +UserRight.EVENTGROUP_LINK=Link events to event groups +UserRight.EVENTGROUP_ARCHIVE=Archive event groups +UserRight.EVENTGROUP_DELETE=Delete event groups from the system +UserRight.EVENTGROUP_VIEW_ARCHIVED=View archived event groups from the system +UserRight.TRAVEL_ENTRY_MANAGEMENT_ACCESS=Access the travel entry directory +UserRight.TRAVEL_ENTRY_VIEW=View existing travel entries +UserRight.TRAVEL_ENTRY_VIEW_ARCHIVED=View archived travel entries +UserRight.TRAVEL_ENTRY_CREATE=Create new travel entries +UserRight.TRAVEL_ENTRY_EDIT=Edit existing travel entries +UserRight.TRAVEL_ENTRY_DELETE=Delete travel entries from the system +UserRight.TRAVEL_ENTRY_ARCHIVE=Archive travel entries +UserRight.EXPORT_DATA_PROTECTION_DATA=Export data protection data +UserRight.OUTBREAK_VIEW=View outbreaks +UserRight.OUTBREAK_EDIT=Edit outbreaks +UserRight.PERFORM_BULK_OPERATIONS_PSEUDONYM=Perform bulk pseudonomization +UserRight.SORMAS_TO_SORMAS_CLIENT=Sormas to Sormas Client +UserRight.SORMAS_REST=Access Sormas REST +UserRight.EXTERNAL_VISITS=External visits +UserRight.SORMAS_UI=Access Sormas UI +UserRight.DEV_MODE=Access developer options +UserRight.CUSTOMIZABLE_ENUM_MANAGEMENT=Manage customizable enums +UserRight.DISEASE_MANAGEMENT=Disease management +UserRight.DOCUMENT_VIEW=View existing documents +UserRight.DOCUMENT_UPLOAD=Upload documents +UserRight.DOCUMENT_DELETE=Delete documents from the system +UserRight.PERSON_MERGE=Merge persons +UserRight.ENVIRONMENT_VIEW=View existing environments +UserRight.ENVIRONMENT_CREATE=Create new environments +UserRight.ENVIRONMENT_EDIT=Edit existing environments +UserRight.ENVIRONMENT_ARCHIVE=Archive environments +UserRight.ENVIRONMENT_VIEW_ARCHIVED=View archived environments +UserRight.ENVIRONMENT_DELETE=Delete environments from the system +UserRight.ENVIRONMENT_IMPORT=Import environments +UserRight.ENVIRONMENT_EXPORT=Export environments +UserRight.ENVIRONMENT_LINK=Linking the environments +UserRight.ENVIRONMENT_SAMPLE_VIEW=View existing environment samples +UserRight.ENVIRONMENT_SAMPLE_CREATE=Create new environment samples +UserRight.ENVIRONMENT_SAMPLE_EDIT=Edit existing environment samples +UserRight.ENVIRONMENT_SAMPLE_EDIT_DISPATCH=Edit environment samples dispatch information +UserRight.ENVIRONMENT_SAMPLE_EDIT_RECEIVAL=Edit environment samples receival information +UserRight.ENVIRONMENT_SAMPLE_DELETE=Delete environment samples from the system +UserRight.ENVIRONMENT_SAMPLE_IMPORT=Import environment samples +UserRight.ENVIRONMENT_SAMPLE_EXPORT=Export environment samples +UserRight.ENVIRONMENT_PATHOGEN_TEST_CREATE=Create environment sample pathogen tests +UserRight.ENVIRONMENT_PATHOGEN_TEST_EDIT=Edit environment sample pathogen tests +UserRight.ENVIRONMENT_PATHOGEN_TEST_DELETE=Delete environment sample pathogen tests UserRight.EMAIL_TEMPLATE_MANAGEMENT=Manage email templates UserRight.EXTERNAL_EMAIL_SEND=Send external emails UserRight.EXTERNAL_EMAIL_ATTACH_DOCUMENTS=Attach documents to external emails @@ -1902,222 +1742,221 @@ UserRight.EPIPULSE_EXPORT_VIEW=View Epipulse export UserRight.EPIPULSE_EXPORT_CREATE=Create Epipulse export UserRight.EPIPULSE_EXPORT_DOWNLOAD=Download Epipulse export UserRight.EPIPULSE_EXPORT_DELETE=Delete Epipulse export - # UserRight descriptions -UserRight.Desc.CASE_ARCHIVE = Able to archive cases -UserRight.Desc.CASE_CHANGE_DISEASE = Able to edit case disease -UserRight.Desc.CASE_CHANGE_EPID_NUMBER = Able to edit case epid number -UserRight.Desc.CASE_CLASSIFY = Able to edit case classification and outcome -UserRight.Desc.CASE_CREATE = Able to create new cases -UserRight.Desc.CASE_DELETE = Able to delete cases from the system -UserRight.Desc.CASE_EDIT = Able to edit existing cases -UserRight.Desc.CASE_EXPORT = Able to export cases from SORMAS -UserRight.Desc.CASE_IMPORT = Able to import cases into SORMAS -UserRight.Desc.CASE_INVESTIGATE = Able to edit case investigation status -UserRight.Desc.CASE_TRANSFER = Able to transfer cases to another region/district/facility -UserRight.Desc.CASE_REFER_FROM_POE = Able to refer case from point of entry -UserRight.Desc.CASE_RESPONSIBLE = Can be responsible for a case -UserRight.Desc.CASE_VIEW = Able to view existing cases -UserRight.Desc.CASE_VIEW_ARCHIVED = Able to view archived cases -UserRight.Desc.CONTACT_ASSIGN = Able to assign contacts to officers -UserRight.Desc.CONTACT_CLASSIFY = Able to edit contact classification -UserRight.Desc.CONTACT_CONVERT = Able to create resulting cases from contacts -UserRight.Desc.CONTACT_CREATE = Able to create new contacts -UserRight.Desc.CONTACT_IMPORT = Able to import contacts -UserRight.Desc.CONTACT_DELETE = Able to delete contacts from the system -UserRight.Desc.CONTACT_EDIT = Able to edit existing contacts -UserRight.Desc.CONTACT_EXPORT = Able to export contacts from SORMAS -UserRight.Desc.CONTACT_RESPONSIBLE = Can be responsible for a contact -UserRight.Desc.CONTACT_VIEW = Able to view existing contacts -UserRight.Desc.CONTACT_VIEW_ARCHIVED = Able to view archived contacts -UserRight.Desc.CONTACT_ARCHIVE = Able to archive contacts -UserRight.Desc.DASHBOARD_CONTACT_VIEW = Able to access the contact supervisor dashboard -UserRight.Desc.DASHBOARD_SURVEILLANCE_VIEW = Able to access the surveillance supervisor dashboard -UserRight.Desc.DATABASE_EXPORT_ACCESS = Able to export the whole database -UserRight.Desc.EVENT_ARCHIVE = Able to archive events -UserRight.Desc.EVENT_CREATE = Able to create new events -UserRight.Desc.EVENT_EDIT = Able to edit existing events -UserRight.Desc.EVENT_EXPORT = Able to export events from SORMAS -UserRight.Desc.EVENT_RESPONSIBLE = Can be responsible for an event -UserRight.Desc.EVENT_VIEW = Able to view existing events -UserRight.Desc.EVENT_VIEW_ARCHIVED = Able to view archived events -UserRight.Desc.EVENTPARTICIPANT_CREATE = Able to create new event participants -UserRight.Desc.EVENTPARTICIPANT_EDIT = Able to edit existing event participants -UserRight.Desc.EVENTPARTICIPANT_ARCHIVE = Able to archive event participants -UserRight.Desc.EVENTPARTICIPANT_VIEW = Able to view existing event participants -UserRight.Desc.EVENTPARTICIPANT_VIEW_ARCHIVED = Able to view archived event participants -UserRight.Desc.INFRASTRUCTURE_CREATE = Able to create new regions/districts/communities/facilities -UserRight.Desc.INFRASTRUCTURE_EDIT = Able to edit regions/districts/communities/facilities -UserRight.Desc.INFRASTRUCTURE_VIEW = Able to view regions/districts/communities/facilities in the system -UserRight.Desc.INFRASTRUCTURE_VIEW_ARCHIVED = Able to view archived infrastructure data -UserRight.Desc.PERFORM_BULK_OPERATIONS = Able to perform bulk operations in lists -UserRight.Desc.SAMPLE_CREATE = Able to create new samples -UserRight.Desc.SAMPLE_EDIT = Able to edit existing samples -UserRight.Desc.SAMPLE_EXPORT = Able to export samples from SORMAS -UserRight.Desc.SAMPLE_DELETE = Able to delete samples from the system -UserRight.Desc.SAMPLE_TRANSFER = Able to transfer samples to another lab -UserRight.Desc.SAMPLE_VIEW = Able to view existing samples -UserRight.Desc.SAMPLETEST_CREATE = Able to create new sample tests -UserRight.Desc.SAMPLETEST_EDIT = Able to edit existing sample tests -UserRight.Desc.STATISTICS_EXPORT = Able to export detailed statistics from SORMAS -UserRight.Desc.TASK_ASSIGN = Able to assign tasks to users -UserRight.Desc.TASK_CREATE = Able to create new tasks -UserRight.Desc.TASK_EDIT = Able to edit existing tasks -UserRight.Desc.TASK_VIEW = Able to view existing tasks -UserRight.Desc.TASK_VIEW_ARCHIVED = Able to view archived tasks -UserRight.Desc.TASK_ARCHIVE = Able to archive tasks -UserRight.Desc.USER_CREATE = Able to create new users -UserRight.Desc.USER_EDIT = Able to edit existing users -UserRight.Desc.USER_VIEW = Able to view existing users -UserRight.Desc.VISIT_CREATE = Able to create new visits -UserRight.Desc.VISIT_EDIT = Able to edit existing visits -UserRight.Desc.WEEKLYREPORT_CREATE = Able to create weekly reports -UserRight.Desc.WEEKLYREPORT_VIEW = Able to view weekly reports -UserRight.Desc.CASE_MERGE = Able to merge cases -UserRight.Desc.PERSON_VIEW = Able to view existing persons -UserRight.Desc.PERSON_EDIT = Able to edit existing persons -UserRight.Desc.PERSON_DELETE = Able to delete persons from the system -UserRight.Desc.PERSON_CONTACT_DETAILS_DELETE = Able to delete person contact details -UserRight.Desc.SAMPLE_EDIT_NOT_OWNED = Able to edit samples reported by other users -UserRight.Desc.PATHOGEN_TEST_CREATE = Able to create new pathogen tests -UserRight.Desc.PATHOGEN_TEST_EDIT = Able to edit existing pathogen tests -UserRight.Desc.PATHOGEN_TEST_DELETE = Able to delete pathogen tests from the system -UserRight.Desc.ADDITIONAL_TEST_VIEW = Able to view existing additional tests -UserRight.Desc.ADDITIONAL_TEST_CREATE = Able to create new additional tests -UserRight.Desc.ADDITIONAL_TEST_EDIT = Able to edit existing additional tests -UserRight.Desc.ADDITIONAL_TEST_DELETE = Able to delete additional tests from the system -UserRight.Desc.CONTACT_REASSIGN_CASE = Able to reassign the source case of contacts -UserRight.Desc.MANAGE_EXTERNAL_SYMPTOM_JOURNAL = Able to manage external symptom journal -UserRight.Desc.VISIT_DELETE = Able to delete visits from the system -UserRight.Desc.VISIT_EXPORT = Able to export visits from SORMAS -UserRight.Desc.TASK_DELETE = Able to delete tasks from the system -UserRight.Desc.TASK_EXPORT = Able to export tasks from SORMAS -UserRight.Desc.ACTION_CREATE = Able to create new actions -UserRight.Desc.ACTION_DELETE = Able to delete actions from the system -UserRight.Desc.ACTION_EDIT = Able to edit existing actions -UserRight.Desc.EVENT_IMPORT = Able to import events -UserRight.Desc.EVENT_DELETE = Able to delete events from the system -UserRight.Desc.EVENTPARTICIPANT_DELETE = Able to delete event participants from the system -UserRight.Desc.EVENTPARTICIPANT_IMPORT = Able to import event participants -UserRight.Desc.SEND_MANUAL_EXTERNAL_MESSAGES = Able to send manual external messages -UserRight.Desc.STATISTICS_ACCESS = Able to access statistics -UserRight.Desc.MANAGE_PUBLIC_EXPORT_CONFIGURATION = Able to manage public export configurations -UserRight.Desc.INFRASTRUCTURE_EXPORT = Able to export infrastructure data from SORMAS -UserRight.Desc.INFRASTRUCTURE_IMPORT = Able to import infrastructure data -UserRight.Desc.INFRASTRUCTURE_ARCHIVE = Able to archive infrastructure data -UserRight.Desc.DASHBOARD_CONTACT_VIEW_TRANSMISSION_CHAINS = Able to view contact transmission chains on the dashboard -UserRight.Desc.DASHBOARD_CAMPAIGNS_VIEW = Able to access campaigns dashboard -UserRight.Desc.CASE_CLINICIAN_VIEW = Able to access case sections concerned with clinician -UserRight.Desc.THERAPY_VIEW = Able to view existing therapies -UserRight.Desc.PRESCRIPTION_CREATE = Able to create new prescriptions -UserRight.Desc.PRESCRIPTION_EDIT = Able to edit existing prescriptions -UserRight.Desc.PRESCRIPTION_DELETE = Able to delete prescriptions from the system -UserRight.Desc.TREATMENT_CREATE = Able to create new treatments -UserRight.Desc.TREATMENT_EDIT = Able to edit existing treatments -UserRight.Desc.TREATMENT_DELETE = Able to delete treatments from the system -UserRight.Desc.CLINICAL_COURSE_VIEW = Able to view the clinical course of cases -UserRight.Desc.CLINICAL_COURSE_EDIT = Able to edit the clinical course of cases -UserRight.Desc.CLINICAL_VISIT_CREATE = Able to create new clinical visits -UserRight.Desc.CLINICAL_VISIT_EDIT = Able to edit existing clinical visits -UserRight.Desc.CLINICAL_VISIT_DELETE = Able to delete clinical visits from the system -UserRight.Desc.PORT_HEALTH_INFO_VIEW = Able to view port health info -UserRight.Desc.PORT_HEALTH_INFO_EDIT = Able to edit existing port health info -UserRight.Desc.POPULATION_MANAGE = Able to manage population data -UserRight.Desc.DOCUMENT_TEMPLATE_MANAGEMENT = Able to manage document templates -UserRight.Desc.QUARANTINE_ORDER_CREATE = Able to create new quarantine orders -UserRight.Desc.LINE_LISTING_CONFIGURE = Able to configure line listing -UserRight.Desc.AGGREGATE_REPORT_VIEW = Able to create new aggregate reports -UserRight.Desc.AGGREGATE_REPORT_EXPORT = Able to export aggregate reports from SORMAS -UserRight.Desc.AGGREGATE_REPORT_EDIT = Able to edit existing aggregate reports -UserRight.Desc.SEE_PERSONAL_DATA_IN_JURISDICTION = Able to see personal data in jurisdiction -UserRight.Desc.SEE_PERSONAL_DATA_OUTSIDE_JURISDICTION = Able to see personal data outside jurisdiction -UserRight.Desc.SEE_SENSITIVE_DATA_IN_JURISDICTION = Able to see sensitive data in jurisdiction -UserRight.Desc.SEE_SENSITIVE_DATA_OUTSIDE_JURISDICTION = Able to see sensitive data outside jurisdiction -UserRight.Desc.CAMPAIGN_VIEW = Able to view existing campaigns -UserRight.Desc.CAMPAIGN_VIEW_ARCHIVED = Able to view archived campaigns -UserRight.Desc.CAMPAIGN_EDIT = Able to edit existing campaigns -UserRight.Desc.CAMPAIGN_ARCHIVE = Able to archive campaigns -UserRight.Desc.CAMPAIGN_DELETE = Able to delete campaigns from the system -UserRight.Desc.CAMPAIGN_FORM_DATA_VIEW = Able to view existing campaign form data -UserRight.Desc.CAMPAIGN_FORM_DATA_VIEW_ARCHIVED = Able to view archived campaign form data -UserRight.Desc.CAMPAIGN_FORM_DATA_EDIT = Able to edit existing campaign form data -UserRight.Desc.CAMPAIGN_FORM_DATA_ARCHIVE = Able to archive campaign form data -UserRight.Desc.CAMPAIGN_FORM_DATA_DELETE = Able to delete campaign form data from the system -UserRight.Desc.CAMPAIGN_FORM_DATA_EXPORT = Able to export campaign form data from SORMAS -UserRight.Desc.BAG_EXPORT = Able to perform BAG export -UserRight.Desc.SORMAS_TO_SORMAS_SHARE = Users with this right can initiate a share to another SORMAS instance -UserRight.Desc.SORMAS_TO_SORMAS_PROCESS = Only users with this right are allowed to see & use the share directory. -UserRight.Desc.EXTERNAL_SURVEILLANCE_SHARE = Allows sharing cases or events to external surveillance tools. In order to do so the related edit user right is needed as-well. -UserRight.Desc.EXTERNAL_SURVEILLANCE_DELETE = Allows deleting cases or events in external surveillance tools. In order to do so the related edit user right is needed as-well. -UserRight.Desc.EXTERNAL_MESSAGE_PUSH = Able to push external messages to the system -UserRight.Desc.EXTERNAL_MESSAGE_ACCESS = Able to access external messages -UserRight.Desc.EXTERNAL_MESSAGE_LABORATORY_VIEW = Able to view laboratory messages -UserRight.Desc.EXTERNAL_MESSAGE_DOCTOR_DECLARATION_VIEW = Able to view doctor declaration messages -UserRight.Desc.EXTERNAL_MESSAGE_LABORATORY_PROCESS = Able to work with laboratory messages -UserRight.Desc.EXTERNAL_MESSAGE_DOCTOR_DECLARATION_PROCESS = Able to process doctor declaration messages -UserRight.Desc.EXTERNAL_MESSAGE_LABORATORY_DELETE = Able to delete laboratory messages -UserRight.Desc.EXTERNAL_MESSAGE_DOCTOR_DECLARATION_DELETE = Able to delete doctor declaration messages -UserRight.Desc.CASE_SHARE = Able to share cases with the whole country -UserRight.Desc.IMMUNIZATION_VIEW = Able to view existing immunizations and vaccinations -UserRight.Desc.IMMUNIZATION_VIEW_ARCHIVED = Able to view arhived immunizations and vaccinations -UserRight.Desc.IMMUNIZATION_CREATE = Able to create new immunizations and vaccinations -UserRight.Desc.IMMUNIZATION_EDIT = Able to edit existing immunizations and vaccinations -UserRight.Desc.IMMUNIZATION_DELETE = Able to delete immunizations and vaccinations from the system -UserRight.Desc.IMMUNIZATION_ARCHIVE = Able to archive immunizations -UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_VIEW = Able to view existing adverse events following immunization -UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_CREATE = Able to create new adverse event following immunization -UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_EDIT = Able to edit existing adverse events following immunization -UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_DELETE = Able to delete adverse events following immunization from the system -UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_ARCHIVE = Able to archive adverse events following immunization -UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_EXPORT = Able to export adverse events following immunization -UserRight.Desc.PERSON_EXPORT = Able to export persons -UserRight.Desc.CONTACT_MERGE = Able to merge contacts -UserRight.Desc.EVENTGROUP_CREATE = Able to create new event groups -UserRight.Desc.EVENTGROUP_EDIT = Able to edit existing event groups -UserRight.Desc.EVENTGROUP_LINK = Able to link events to event groups -UserRight.Desc.EVENTGROUP_ARCHIVE = Able to archive event groups -UserRight.Desc.EVENTGROUP_DELETE = Able to delete event groups from the system -UserRight.Desc.EVENTGROUP_VIEW_ARCHIVED = Able to view archived event groups from the system -UserRight.Desc.TRAVEL_ENTRY_MANAGEMENT_ACCESS = Able to access the travel entry directory -UserRight.Desc.TRAVEL_ENTRY_VIEW = Able to view existing travel entries -UserRight.Desc.TRAVEL_ENTRY_VIEW_ARCHIVED = Able to view archived travel entries -UserRight.Desc.TRAVEL_ENTRY_CREATE = Able to create new travel entries -UserRight.Desc.TRAVEL_ENTRY_EDIT = Able to edit existing travel entries -UserRight.Desc.TRAVEL_ENTRY_DELETE = Able to delete travel entries from the system -UserRight.Desc.TRAVEL_ENTRY_ARCHIVE = Able to archive travel entries -UserRight.Desc.EXPORT_DATA_PROTECTION_DATA = Able to export data protection data -UserRight.Desc.OUTBREAK_VIEW = Able to view outbreaks -UserRight.Desc.OUTBREAK_EDIT = Able to edit outbreaks -UserRight.Desc.PERFORM_BULK_OPERATIONS_PSEUDONYM = Able to perform bulk pseudonomization -UserRight.Desc.SORMAS_TO_SORMAS_CLIENT = Techincal user right for the SORMAS to SORMAS interface -UserRight.Desc.SORMAS_REST = Able to access the SORMAS REST interface -UserRight.Desc.EXTERNAL_VISITS = Able to access external visits REST endpoints -UserRight.Desc.SORMAS_UI = Able to access the SORMAS graphical user interface -UserRight.Desc.DEV_MODE = Able to access developer options in the configuration directory -UserRight.Desc.CUSTOMIZABLE_ENUM_MANAGEMENT = Able to create, edit and delete customizable enum values -UserRight.Desc.DISEASE_MANAGEMENT = Able to configure diseases -UserRight.Desc.DOCUMENT_VIEW = Able to view existing documents -UserRight.Desc.DOCUMENT_UPLOAD = Able to upload documents -UserRight.Desc.DOCUMENT_DELETE = Able to delete documents from the system -UserRight.Desc.PERSON_MERGE = Able to merge persons -UserRight.Desc.ENVIRONMENT_CREATE = Able to create new environments -UserRight.Desc.ENVIRONMENT_EDIT = Able to edit existing environments -UserRight.Desc.ENVIRONMENT_ARCHIVE = Able to archive environments -UserRight.Desc.ENVIRONMENT_DELETE = Able to delete environments from the system -UserRight.Desc.ENVIRONMENT_IMPORT = Able to import environments -UserRight.Desc.ENVIRONMENT_EXPORT = Able to export environments -UserRight.Desc.ENVIRONMENT_LINK = Able to link environments -UserRight.Desc.ENVIRONMENT_SAMPLE_VIEW = Able to view existing environment samples -UserRight.Desc.ENVIRONMENT_SAMPLE_CREATE = Able to create new environment samples -UserRight.Desc.ENVIRONMENT_SAMPLE_EDIT = Able to edit existing environment samples -UserRight.Desc.ENVIRONMENT_SAMPLE_EDIT_DISPATCH = Able to edit environment samples dispatch information -UserRight.Desc.ENVIRONMENT_SAMPLE_EDIT_RECEIVAL = Able to edit environment samples receival information -UserRight.Desc.ENVIRONMENT_SAMPLE_DELETE = Able to delete environment samples from the system -UserRight.Desc.ENVIRONMENT_SAMPLE_IMPORT = Able to import environment samples -UserRight.Desc.ENVIRONMENT_SAMPLE_EXPORT = Able to export environment samples -UserRight.Desc.ENVIRONMENT_PATHOGEN_TEST_CREATE = Able to create environment sample pathogen tests -UserRight.Desc.ENVIRONMENT_PATHOGEN_TEST_EDIT = Able to edit environment sample pathogen tests -UserRight.Desc.ENVIRONMENT_PATHOGEN_TEST_DELETE = Able to delete environment sample pathogen tests +UserRight.Desc.CASE_ARCHIVE=Able to archive cases +UserRight.Desc.CASE_CHANGE_DISEASE=Able to edit case disease +UserRight.Desc.CASE_CHANGE_EPID_NUMBER=Able to edit case epid number +UserRight.Desc.CASE_CLASSIFY=Able to edit case classification and outcome +UserRight.Desc.CASE_CREATE=Able to create new cases +UserRight.Desc.CASE_DELETE=Able to delete cases from the system +UserRight.Desc.CASE_EDIT=Able to edit existing cases +UserRight.Desc.CASE_EXPORT=Able to export cases from SORMAS +UserRight.Desc.CASE_IMPORT=Able to import cases into SORMAS +UserRight.Desc.CASE_INVESTIGATE=Able to edit case investigation status +UserRight.Desc.CASE_TRANSFER=Able to transfer cases to another region/district/facility +UserRight.Desc.CASE_REFER_FROM_POE=Able to refer case from point of entry +UserRight.Desc.CASE_RESPONSIBLE=Can be responsible for a case +UserRight.Desc.CASE_VIEW=Able to view existing cases +UserRight.Desc.CASE_VIEW_ARCHIVED=Able to view archived cases +UserRight.Desc.CONTACT_ASSIGN=Able to assign contacts to officers +UserRight.Desc.CONTACT_CLASSIFY=Able to edit contact classification +UserRight.Desc.CONTACT_CONVERT=Able to create resulting cases from contacts +UserRight.Desc.CONTACT_CREATE=Able to create new contacts +UserRight.Desc.CONTACT_IMPORT=Able to import contacts +UserRight.Desc.CONTACT_DELETE=Able to delete contacts from the system +UserRight.Desc.CONTACT_EDIT=Able to edit existing contacts +UserRight.Desc.CONTACT_EXPORT=Able to export contacts from SORMAS +UserRight.Desc.CONTACT_RESPONSIBLE=Can be responsible for a contact +UserRight.Desc.CONTACT_VIEW=Able to view existing contacts +UserRight.Desc.CONTACT_VIEW_ARCHIVED=Able to view archived contacts +UserRight.Desc.CONTACT_ARCHIVE=Able to archive contacts +UserRight.Desc.DASHBOARD_CONTACT_VIEW=Able to access the contact supervisor dashboard +UserRight.Desc.DASHBOARD_SURVEILLANCE_VIEW=Able to access the surveillance supervisor dashboard +UserRight.Desc.DATABASE_EXPORT_ACCESS=Able to export the whole database +UserRight.Desc.EVENT_ARCHIVE=Able to archive events +UserRight.Desc.EVENT_CREATE=Able to create new events +UserRight.Desc.EVENT_EDIT=Able to edit existing events +UserRight.Desc.EVENT_EXPORT=Able to export events from SORMAS +UserRight.Desc.EVENT_RESPONSIBLE=Can be responsible for an event +UserRight.Desc.EVENT_VIEW=Able to view existing events +UserRight.Desc.EVENT_VIEW_ARCHIVED=Able to view archived events +UserRight.Desc.EVENTPARTICIPANT_CREATE=Able to create new event participants +UserRight.Desc.EVENTPARTICIPANT_EDIT=Able to edit existing event participants +UserRight.Desc.EVENTPARTICIPANT_ARCHIVE=Able to archive event participants +UserRight.Desc.EVENTPARTICIPANT_VIEW=Able to view existing event participants +UserRight.Desc.EVENTPARTICIPANT_VIEW_ARCHIVED=Able to view archived event participants +UserRight.Desc.INFRASTRUCTURE_CREATE=Able to create new regions/districts/communities/facilities +UserRight.Desc.INFRASTRUCTURE_EDIT=Able to edit regions/districts/communities/facilities +UserRight.Desc.INFRASTRUCTURE_VIEW=Able to view regions/districts/communities/facilities in the system +UserRight.Desc.INFRASTRUCTURE_VIEW_ARCHIVED=Able to view archived infrastructure data +UserRight.Desc.PERFORM_BULK_OPERATIONS=Able to perform bulk operations in lists +UserRight.Desc.SAMPLE_CREATE=Able to create new samples +UserRight.Desc.SAMPLE_EDIT=Able to edit existing samples +UserRight.Desc.SAMPLE_EXPORT=Able to export samples from SORMAS +UserRight.Desc.SAMPLE_DELETE=Able to delete samples from the system +UserRight.Desc.SAMPLE_TRANSFER=Able to transfer samples to another lab +UserRight.Desc.SAMPLE_VIEW=Able to view existing samples +UserRight.Desc.SAMPLETEST_CREATE=Able to create new sample tests +UserRight.Desc.SAMPLETEST_EDIT=Able to edit existing sample tests +UserRight.Desc.STATISTICS_EXPORT=Able to export detailed statistics from SORMAS +UserRight.Desc.TASK_ASSIGN=Able to assign tasks to users +UserRight.Desc.TASK_CREATE=Able to create new tasks +UserRight.Desc.TASK_EDIT=Able to edit existing tasks +UserRight.Desc.TASK_VIEW=Able to view existing tasks +UserRight.Desc.TASK_VIEW_ARCHIVED=Able to view archived tasks +UserRight.Desc.TASK_ARCHIVE=Able to archive tasks +UserRight.Desc.USER_CREATE=Able to create new users +UserRight.Desc.USER_EDIT=Able to edit existing users +UserRight.Desc.USER_VIEW=Able to view existing users +UserRight.Desc.VISIT_CREATE=Able to create new visits +UserRight.Desc.VISIT_EDIT=Able to edit existing visits +UserRight.Desc.WEEKLYREPORT_CREATE=Able to create weekly reports +UserRight.Desc.WEEKLYREPORT_VIEW=Able to view weekly reports +UserRight.Desc.CASE_MERGE=Able to merge cases +UserRight.Desc.PERSON_VIEW=Able to view existing persons +UserRight.Desc.PERSON_EDIT=Able to edit existing persons +UserRight.Desc.PERSON_DELETE=Able to delete persons from the system +UserRight.Desc.PERSON_CONTACT_DETAILS_DELETE=Able to delete person contact details +UserRight.Desc.SAMPLE_EDIT_NOT_OWNED=Able to edit samples reported by other users +UserRight.Desc.PATHOGEN_TEST_CREATE=Able to create new pathogen tests +UserRight.Desc.PATHOGEN_TEST_EDIT=Able to edit existing pathogen tests +UserRight.Desc.PATHOGEN_TEST_DELETE=Able to delete pathogen tests from the system +UserRight.Desc.ADDITIONAL_TEST_VIEW=Able to view existing additional tests +UserRight.Desc.ADDITIONAL_TEST_CREATE=Able to create new additional tests +UserRight.Desc.ADDITIONAL_TEST_EDIT=Able to edit existing additional tests +UserRight.Desc.ADDITIONAL_TEST_DELETE=Able to delete additional tests from the system +UserRight.Desc.CONTACT_REASSIGN_CASE=Able to reassign the source case of contacts +UserRight.Desc.MANAGE_EXTERNAL_SYMPTOM_JOURNAL=Able to manage external symptom journal +UserRight.Desc.VISIT_DELETE=Able to delete visits from the system +UserRight.Desc.VISIT_EXPORT=Able to export visits from SORMAS +UserRight.Desc.TASK_DELETE=Able to delete tasks from the system +UserRight.Desc.TASK_EXPORT=Able to export tasks from SORMAS +UserRight.Desc.ACTION_CREATE=Able to create new actions +UserRight.Desc.ACTION_DELETE=Able to delete actions from the system +UserRight.Desc.ACTION_EDIT=Able to edit existing actions +UserRight.Desc.EVENT_IMPORT=Able to import events +UserRight.Desc.EVENT_DELETE=Able to delete events from the system +UserRight.Desc.EVENTPARTICIPANT_DELETE=Able to delete event participants from the system +UserRight.Desc.EVENTPARTICIPANT_IMPORT=Able to import event participants +UserRight.Desc.SEND_MANUAL_EXTERNAL_MESSAGES=Able to send manual external messages +UserRight.Desc.STATISTICS_ACCESS=Able to access statistics +UserRight.Desc.MANAGE_PUBLIC_EXPORT_CONFIGURATION=Able to manage public export configurations +UserRight.Desc.INFRASTRUCTURE_EXPORT=Able to export infrastructure data from SORMAS +UserRight.Desc.INFRASTRUCTURE_IMPORT=Able to import infrastructure data +UserRight.Desc.INFRASTRUCTURE_ARCHIVE=Able to archive infrastructure data +UserRight.Desc.DASHBOARD_CONTACT_VIEW_TRANSMISSION_CHAINS=Able to view contact transmission chains on the dashboard +UserRight.Desc.DASHBOARD_CAMPAIGNS_VIEW=Able to access campaigns dashboard +UserRight.Desc.CASE_CLINICIAN_VIEW=Able to access case sections concerned with clinician +UserRight.Desc.THERAPY_VIEW=Able to view existing therapies +UserRight.Desc.PRESCRIPTION_CREATE=Able to create new prescriptions +UserRight.Desc.PRESCRIPTION_EDIT=Able to edit existing prescriptions +UserRight.Desc.PRESCRIPTION_DELETE=Able to delete prescriptions from the system +UserRight.Desc.TREATMENT_CREATE=Able to create new treatments +UserRight.Desc.TREATMENT_EDIT=Able to edit existing treatments +UserRight.Desc.TREATMENT_DELETE=Able to delete treatments from the system +UserRight.Desc.CLINICAL_COURSE_VIEW=Able to view the clinical course of cases +UserRight.Desc.CLINICAL_COURSE_EDIT=Able to edit the clinical course of cases +UserRight.Desc.CLINICAL_VISIT_CREATE=Able to create new clinical visits +UserRight.Desc.CLINICAL_VISIT_EDIT=Able to edit existing clinical visits +UserRight.Desc.CLINICAL_VISIT_DELETE=Able to delete clinical visits from the system +UserRight.Desc.PORT_HEALTH_INFO_VIEW=Able to view port health info +UserRight.Desc.PORT_HEALTH_INFO_EDIT=Able to edit existing port health info +UserRight.Desc.POPULATION_MANAGE=Able to manage population data +UserRight.Desc.DOCUMENT_TEMPLATE_MANAGEMENT=Able to manage document templates +UserRight.Desc.QUARANTINE_ORDER_CREATE=Able to create new quarantine orders +UserRight.Desc.LINE_LISTING_CONFIGURE=Able to configure line listing +UserRight.Desc.AGGREGATE_REPORT_VIEW=Able to create new aggregate reports +UserRight.Desc.AGGREGATE_REPORT_EXPORT=Able to export aggregate reports from SORMAS +UserRight.Desc.AGGREGATE_REPORT_EDIT=Able to edit existing aggregate reports +UserRight.Desc.SEE_PERSONAL_DATA_IN_JURISDICTION=Able to see personal data in jurisdiction +UserRight.Desc.SEE_PERSONAL_DATA_OUTSIDE_JURISDICTION=Able to see personal data outside jurisdiction +UserRight.Desc.SEE_SENSITIVE_DATA_IN_JURISDICTION=Able to see sensitive data in jurisdiction +UserRight.Desc.SEE_SENSITIVE_DATA_OUTSIDE_JURISDICTION=Able to see sensitive data outside jurisdiction +UserRight.Desc.CAMPAIGN_VIEW=Able to view existing campaigns +UserRight.Desc.CAMPAIGN_VIEW_ARCHIVED=Able to view archived campaigns +UserRight.Desc.CAMPAIGN_EDIT=Able to edit existing campaigns +UserRight.Desc.CAMPAIGN_ARCHIVE=Able to archive campaigns +UserRight.Desc.CAMPAIGN_DELETE=Able to delete campaigns from the system +UserRight.Desc.CAMPAIGN_FORM_DATA_VIEW=Able to view existing campaign form data +UserRight.Desc.CAMPAIGN_FORM_DATA_VIEW_ARCHIVED=Able to view archived campaign form data +UserRight.Desc.CAMPAIGN_FORM_DATA_EDIT=Able to edit existing campaign form data +UserRight.Desc.CAMPAIGN_FORM_DATA_ARCHIVE=Able to archive campaign form data +UserRight.Desc.CAMPAIGN_FORM_DATA_DELETE=Able to delete campaign form data from the system +UserRight.Desc.CAMPAIGN_FORM_DATA_EXPORT=Able to export campaign form data from SORMAS +UserRight.Desc.BAG_EXPORT=Able to perform BAG export +UserRight.Desc.SORMAS_TO_SORMAS_SHARE=Users with this right can initiate a share to another SORMAS instance +UserRight.Desc.SORMAS_TO_SORMAS_PROCESS=Only users with this right are allowed to see & use the share directory. +UserRight.Desc.EXTERNAL_SURVEILLANCE_SHARE=Allows sharing cases or events to external surveillance tools. In order to do so the related edit user right is needed as-well. +UserRight.Desc.EXTERNAL_SURVEILLANCE_DELETE=Allows deleting cases or events in external surveillance tools. In order to do so the related edit user right is needed as-well. +UserRight.Desc.EXTERNAL_MESSAGE_PUSH=Able to push external messages to the system +UserRight.Desc.EXTERNAL_MESSAGE_ACCESS=Able to access external messages +UserRight.Desc.EXTERNAL_MESSAGE_LABORATORY_VIEW=Able to view laboratory messages +UserRight.Desc.EXTERNAL_MESSAGE_DOCTOR_DECLARATION_VIEW=Able to view doctor declaration messages +UserRight.Desc.EXTERNAL_MESSAGE_LABORATORY_PROCESS=Able to work with laboratory messages +UserRight.Desc.EXTERNAL_MESSAGE_DOCTOR_DECLARATION_PROCESS=Able to process doctor declaration messages +UserRight.Desc.EXTERNAL_MESSAGE_LABORATORY_DELETE=Able to delete laboratory messages +UserRight.Desc.EXTERNAL_MESSAGE_DOCTOR_DECLARATION_DELETE=Able to delete doctor declaration messages +UserRight.Desc.CASE_SHARE=Able to share cases with the whole country +UserRight.Desc.IMMUNIZATION_VIEW=Able to view existing immunizations and vaccinations +UserRight.Desc.IMMUNIZATION_VIEW_ARCHIVED=Able to view arhived immunizations and vaccinations +UserRight.Desc.IMMUNIZATION_CREATE=Able to create new immunizations and vaccinations +UserRight.Desc.IMMUNIZATION_EDIT=Able to edit existing immunizations and vaccinations +UserRight.Desc.IMMUNIZATION_DELETE=Able to delete immunizations and vaccinations from the system +UserRight.Desc.IMMUNIZATION_ARCHIVE=Able to archive immunizations +UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_VIEW=Able to view existing adverse events following immunization +UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_CREATE=Able to create new adverse event following immunization +UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_EDIT=Able to edit existing adverse events following immunization +UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_DELETE=Able to delete adverse events following immunization from the system +UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_ARCHIVE=Able to archive adverse events following immunization +UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_EXPORT=Able to export adverse events following immunization +UserRight.Desc.PERSON_EXPORT=Able to export persons +UserRight.Desc.CONTACT_MERGE=Able to merge contacts +UserRight.Desc.EVENTGROUP_CREATE=Able to create new event groups +UserRight.Desc.EVENTGROUP_EDIT=Able to edit existing event groups +UserRight.Desc.EVENTGROUP_LINK=Able to link events to event groups +UserRight.Desc.EVENTGROUP_ARCHIVE=Able to archive event groups +UserRight.Desc.EVENTGROUP_DELETE=Able to delete event groups from the system +UserRight.Desc.EVENTGROUP_VIEW_ARCHIVED=Able to view archived event groups from the system +UserRight.Desc.TRAVEL_ENTRY_MANAGEMENT_ACCESS=Able to access the travel entry directory +UserRight.Desc.TRAVEL_ENTRY_VIEW=Able to view existing travel entries +UserRight.Desc.TRAVEL_ENTRY_VIEW_ARCHIVED=Able to view archived travel entries +UserRight.Desc.TRAVEL_ENTRY_CREATE=Able to create new travel entries +UserRight.Desc.TRAVEL_ENTRY_EDIT=Able to edit existing travel entries +UserRight.Desc.TRAVEL_ENTRY_DELETE=Able to delete travel entries from the system +UserRight.Desc.TRAVEL_ENTRY_ARCHIVE=Able to archive travel entries +UserRight.Desc.EXPORT_DATA_PROTECTION_DATA=Able to export data protection data +UserRight.Desc.OUTBREAK_VIEW=Able to view outbreaks +UserRight.Desc.OUTBREAK_EDIT=Able to edit outbreaks +UserRight.Desc.PERFORM_BULK_OPERATIONS_PSEUDONYM=Able to perform bulk pseudonomization +UserRight.Desc.SORMAS_TO_SORMAS_CLIENT=Techincal user right for the SORMAS to SORMAS interface +UserRight.Desc.SORMAS_REST=Able to access the SORMAS REST interface +UserRight.Desc.EXTERNAL_VISITS=Able to access external visits REST endpoints +UserRight.Desc.SORMAS_UI=Able to access the SORMAS graphical user interface +UserRight.Desc.DEV_MODE=Able to access developer options in the configuration directory +UserRight.Desc.CUSTOMIZABLE_ENUM_MANAGEMENT=Able to create, edit and delete customizable enum values +UserRight.Desc.DISEASE_MANAGEMENT=Able to configure diseases +UserRight.Desc.DOCUMENT_VIEW=Able to view existing documents +UserRight.Desc.DOCUMENT_UPLOAD=Able to upload documents +UserRight.Desc.DOCUMENT_DELETE=Able to delete documents from the system +UserRight.Desc.PERSON_MERGE=Able to merge persons +UserRight.Desc.ENVIRONMENT_CREATE=Able to create new environments +UserRight.Desc.ENVIRONMENT_EDIT=Able to edit existing environments +UserRight.Desc.ENVIRONMENT_ARCHIVE=Able to archive environments +UserRight.Desc.ENVIRONMENT_DELETE=Able to delete environments from the system +UserRight.Desc.ENVIRONMENT_IMPORT=Able to import environments +UserRight.Desc.ENVIRONMENT_EXPORT=Able to export environments +UserRight.Desc.ENVIRONMENT_LINK=Able to link environments +UserRight.Desc.ENVIRONMENT_SAMPLE_VIEW=Able to view existing environment samples +UserRight.Desc.ENVIRONMENT_SAMPLE_CREATE=Able to create new environment samples +UserRight.Desc.ENVIRONMENT_SAMPLE_EDIT=Able to edit existing environment samples +UserRight.Desc.ENVIRONMENT_SAMPLE_EDIT_DISPATCH=Able to edit environment samples dispatch information +UserRight.Desc.ENVIRONMENT_SAMPLE_EDIT_RECEIVAL=Able to edit environment samples receival information +UserRight.Desc.ENVIRONMENT_SAMPLE_DELETE=Able to delete environment samples from the system +UserRight.Desc.ENVIRONMENT_SAMPLE_IMPORT=Able to import environment samples +UserRight.Desc.ENVIRONMENT_SAMPLE_EXPORT=Able to export environment samples +UserRight.Desc.ENVIRONMENT_PATHOGEN_TEST_CREATE=Able to create environment sample pathogen tests +UserRight.Desc.ENVIRONMENT_PATHOGEN_TEST_EDIT=Able to edit environment sample pathogen tests +UserRight.Desc.ENVIRONMENT_PATHOGEN_TEST_DELETE=Able to delete environment sample pathogen tests UserRight.Desc.EMAIL_TEMPLATE_MANAGEMENT=Able to manage email templates UserRight.Desc.EXTERNAL_EMAIL_SEND=Able to send external emails UserRight.Desc.EXTERNAL_EMAIL_ATTACH_DOCUMENTS=Able to attach documents to external emails @@ -2144,149 +1983,129 @@ UserRight.Desc.EPIPULSE_EXPORT_VIEW=Able to view Epipulse export UserRight.Desc.EPIPULSE_EXPORT_CREATE=Able to create Epipulse export UserRight.Desc.EPIPULSE_EXPORT_DOWNLOAD=Able to download Epipulse export UserRight.Desc.EPIPULSE_EXPORT_DELETE=Able to delete Epipulse export - # UserRightGroup -UserRightGroup.GENERAL = General -UserRightGroup.DATA_PROTECTION = Data Protection -UserRightGroup.PERSON = Persons -UserRightGroup.CASE = Case Surveillance -UserRightGroup.CASE_MANAGEMENT = Case Management -UserRightGroup.PORT_HEALTH = Port Health -UserRightGroup.CONTACT = Contact Surveillance -UserRightGroup.VISIT = Follow-Up -UserRightGroup.SAMPLE = Sample Testing -UserRightGroup.IMMUNIZATION = Immunization -UserRightGroup.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION = Adverse Events Following Immunization -UserRightGroup.TRAVEL_ENTRY = Travel Entries -UserRightGroup.TASK = Tasks -UserRightGroup.EVENT = Events -UserRightGroup.AGGREGATED_REPORTING = Aggregated Reporting -UserRightGroup.CAMPAIGN = Campaigns -UserRightGroup.DASHBOARD = Dashboard -UserRightGroup.STATISTICS = Statistics -UserRightGroup.EXPORT = Export -UserRightGroup.EXTERNAL = External Systems -UserRightGroup.USER = Users -UserRightGroup.INFRASTRUCTURE = Infrastructure -UserRightGroup.CONFIGURATION = Configuration -UserRightGroup.DOCUMENT = Documents +UserRightGroup.GENERAL=General +UserRightGroup.DATA_PROTECTION=Data Protection +UserRightGroup.PERSON=Persons +UserRightGroup.CASE=Case Surveillance +UserRightGroup.CASE_MANAGEMENT=Case Management +UserRightGroup.PORT_HEALTH=Port Health +UserRightGroup.CONTACT=Contact Surveillance +UserRightGroup.VISIT=Follow-Up +UserRightGroup.SAMPLE=Sample Testing +UserRightGroup.IMMUNIZATION=Immunization +UserRightGroup.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION=Adverse Events Following Immunization +UserRightGroup.TRAVEL_ENTRY=Travel Entries +UserRightGroup.TASK=Tasks +UserRightGroup.EVENT=Events +UserRightGroup.AGGREGATED_REPORTING=Aggregated Reporting +UserRightGroup.CAMPAIGN=Campaigns +UserRightGroup.DASHBOARD=Dashboard +UserRightGroup.STATISTICS=Statistics +UserRightGroup.EXPORT=Export +UserRightGroup.EXTERNAL=External Systems +UserRightGroup.USER=Users +UserRightGroup.INFRASTRUCTURE=Infrastructure +UserRightGroup.CONFIGURATION=Configuration +UserRightGroup.DOCUMENT=Documents UserRightGroup.EXTERNAL_EMAILS=External emails -UserRightGroup.ENVIRONMENT = Environments +UserRightGroup.ENVIRONMENT=Environments UserRightGroup.SELF_REPORT=Self Reports UserRightGroup.SURVEY=Surveys UserRightGroup.EPIPULSE=Epipulse export - # Vaccination -VaccinationStatus.UNKNOWN = Unknown -VaccinationStatus.OTHER = Other -VaccinationStatus.UNVACCINATED = Unvaccinated -VaccinationStatus.VACCINATED = Vaccinated -VaccinationStatus.VACCINATED_ONE_DOSE = Vaccinated one dose -VaccinationStatus.VACCINATED_TWO_DOSE = Vaccinated two dose -VaccinationStatus.RECOVERED = Had the disease - +VaccinationStatus.UNKNOWN=Unknown +VaccinationStatus.OTHER=Other +VaccinationStatus.UNVACCINATED=Unvaccinated +VaccinationStatus.VACCINATED=Vaccinated +VaccinationStatus.VACCINATED_ONE_DOSE=Vaccinated one dose +VaccinationStatus.VACCINATED_TWO_DOSE=Vaccinated two dose +VaccinationStatus.RECOVERED=Had the disease # VaccinationInfoSource -VaccinationInfoSource.ORAL_COMMUNICATION = Oral communication -VaccinationInfoSource.VACCINATION_CARD = Vaccination card -VaccinationInfoSource.NO_EVIDENCE = No evidence -VaccinationInfoSource.UNKNOWN = Unknown - +VaccinationInfoSource.ORAL_COMMUNICATION=Oral communication +VaccinationInfoSource.VACCINATION_CARD=Vaccination card +VaccinationInfoSource.NO_EVIDENCE=No evidence +VaccinationInfoSource.UNKNOWN=Unknown # ValueSeparator -ValueSeparator.DEFAULT = Default (%s) -ValueSeparator.COMMA = Comma -ValueSeparator.SEMICOLON = Semicolon -ValueSeparator.TAB = Tab - +ValueSeparator.DEFAULT=Default (%s) +ValueSeparator.COMMA=Comma +ValueSeparator.SEMICOLON=Semicolon +ValueSeparator.TAB=Tab # ViewMode -ViewMode.NORMAL = Normal view -ViewMode.SIMPLE = Simple view - -VisitResult.NOT_SYMPTOMATIC = Seen (no signs) -VisitResult.SYMPTOMATIC = Seen with signs -VisitResult.UNAVAILABLE = Unavailable -VisitResult.UNCOOPERATIVE = Uncooperative -VisitResult.NOT_PERFORMED = Not performed - +ViewMode.NORMAL=Normal view +ViewMode.SIMPLE=Simple view +VisitResult.NOT_SYMPTOMATIC=Seen (no signs) +VisitResult.SYMPTOMATIC=Seen with signs +VisitResult.UNAVAILABLE=Unavailable +VisitResult.UNCOOPERATIVE=Uncooperative +VisitResult.NOT_PERFORMED=Not performed # VisitStatus -VisitStatus.COOPERATIVE = Available and cooperative -VisitStatus.UNAVAILABLE = Unavailable -VisitStatus.UNCOOPERATIVE = Available, but uncooperative -VisitStatus.Short.COOPERATIVE = Cooperative -VisitStatus.Short.UNAVAILABLE = Unavailable -VisitStatus.Short.UNCOOPERATIVE = Uncooperative - +VisitStatus.COOPERATIVE=Available and cooperative +VisitStatus.UNAVAILABLE=Unavailable +VisitStatus.UNCOOPERATIVE=Available, but uncooperative +VisitStatus.Short.COOPERATIVE=Cooperative +VisitStatus.Short.UNAVAILABLE=Unavailable +VisitStatus.Short.UNCOOPERATIVE=Uncooperative # VisitOrigin -VisitOrigin.USER = Created by user -VisitOrigin.EXTERNAL_JOURNAL = External symptom journal - +VisitOrigin.USER=Created by user +VisitOrigin.EXTERNAL_JOURNAL=External symptom journal # VectorType - -VectorType.MOSQUITOS = Mosquitos -VectorType.TICKS = Ticks - +VectorType.MOSQUITOS=Mosquitos +VectorType.TICKS=Ticks # WaterSource -WaterSource.COMMUNITY_BOREHOLE_WELL = Community borehole/well -WaterSource.OTHER = Other -WaterSource.PIPE_NETWORK = Pipe network -WaterSource.PRIVATE_BOREHOLE_WELL = Private borehole/well -WaterSource.STREAM = Stream - +WaterSource.COMMUNITY_BOREHOLE_WELL=Community borehole/well +WaterSource.OTHER=Other +WaterSource.PIPE_NETWORK=Pipe network +WaterSource.PRIVATE_BOREHOLE_WELL=Private borehole/well +WaterSource.STREAM=Stream # WaterType -WaterType.WASTEWATER = Wastewater -WaterType.GROUNDWATER = Groundwater -WaterType.SURFACE_WATER = Surface water (lakes, rivers, runoff, etc.) -WaterType.PRECIPITATION = Precipitation (rain or snow) -WaterType.OTHER = Other -WaterType.UNKNOWN = Unknown - +WaterType.WASTEWATER=Wastewater +WaterType.GROUNDWATER=Groundwater +WaterType.SURFACE_WATER=Surface water (lakes, rivers, runoff, etc.) +WaterType.PRECIPITATION=Precipitation (rain or snow) +WaterType.OTHER=Other +WaterType.UNKNOWN=Unknown # WaterUse -WaterUse.DRINKING_HOUSEHOLD_NEEDS = Drinking and household needs -WaterUse.RECREATION = Recreation -WaterUse.INDUSTRY_COMMERCE = Industry and commerce -WaterUse.AGRICULTURE = Agriculture (plants or livestock) -WaterUse.THERMOELECTRICITY_ENERGY = Thermoelectricity/Energy -WaterUse.INSTITUTIONAL_USE = Institutional use -WaterUse.OTHER = Other -WaterUse.UNKNOWN = Unknown - +WaterUse.DRINKING_HOUSEHOLD_NEEDS=Drinking and household needs +WaterUse.RECREATION=Recreation +WaterUse.INDUSTRY_COMMERCE=Industry and commerce +WaterUse.AGRICULTURE=Agriculture (plants or livestock) +WaterUse.THERMOELECTRICITY_ENERGY=Thermoelectricity/Energy +WaterUse.INSTITUTIONAL_USE=Institutional use +WaterUse.OTHER=Other +WaterUse.UNKNOWN=Unknown # Work environment -WorkEnvironment.UNKNOWN = Unknown -WorkEnvironment.OPEN_SPACE_OFFICE = Open space office -WorkEnvironment.FOOD_SECTOR = Food sector -WorkEnvironment.BUILDING_SECTOR = Building sector -WorkEnvironment.LOGISTICS_CENTER = Logistics center -WorkEnvironment.OTHER = Other - +WorkEnvironment.UNKNOWN=Unknown +WorkEnvironment.OPEN_SPACE_OFFICE=Open space office +WorkEnvironment.FOOD_SECTOR=Food sector +WorkEnvironment.BUILDING_SECTOR=Building sector +WorkEnvironment.LOGISTICS_CENTER=Logistics center +WorkEnvironment.OTHER=Other # WorkPlace -WorkPlace.SCHOOL = School -WorkPlace.NURSERY = Nursery -WorkPlace.UNKNOWN = Unknown -WorkPlace.OTHER = Other - +WorkPlace.SCHOOL=School +WorkPlace.NURSERY=Nursery +WorkPlace.UNKNOWN=Unknown +WorkPlace.OTHER=Other # YesNoUnknown -YesNoUnknown.NO = No -YesNoUnknown.UNKNOWN = Unknown -YesNoUnknown.YES = Yes - +YesNoUnknown.NO=No +YesNoUnknown.UNKNOWN=Unknown +YesNoUnknown.YES=Yes #SamplePurpose -SamplePurpose.EXTERNAL = External lab testing -SamplePurpose.INTERNAL = Internal/in-house testing - +SamplePurpose.EXTERNAL=External lab testing +SamplePurpose.INTERNAL=Internal/in-house testing #JurisdictionLevel -JurisdictionLevel.NONE = None -JurisdictionLevel.NATION = Nation -JurisdictionLevel.REGION = Region -JurisdictionLevel.DISTRICT = District -JurisdictionLevel.COMMUNITY = Community -JurisdictionLevel.HEALTH_FACILITY = Facility -JurisdictionLevel.LABORATORY = Laboratory -JurisdictionLevel.POINT_OF_ENTRY = Point of entry -JurisdictionLevel.EXTERNAL_LABORATORY = External laboratory - +JurisdictionLevel.NONE=None +JurisdictionLevel.NATION=Nation +JurisdictionLevel.REGION=Region +JurisdictionLevel.DISTRICT=District +JurisdictionLevel.COMMUNITY=Community +JurisdictionLevel.HEALTH_FACILITY=Facility +JurisdictionLevel.LABORATORY=Laboratory +JurisdictionLevel.POINT_OF_ENTRY=Point of entry +JurisdictionLevel.EXTERNAL_LABORATORY=External laboratory #CampaignFormElementImportance -CampaignFormElementImportance.ALL = All columns -CampaignFormElementImportance.IMPORTANT = Important - +CampaignFormElementImportance.ALL=All columns +CampaignFormElementImportance.IMPORTANT=Important SamplingReason.PRESENCE_OF_SYMPTOMS=Presence of symptoms SamplingReason.OUTBREAK=Exposed to an outbreak area SamplingReason.SCREENING=Screening @@ -2317,7 +2136,6 @@ EndOfQuarantineReason.ASYMPTOMATIC=Asymptomatic after 10 days EndOfQuarantineReason.ISOLATED_AS_CASE=Isolated as Case EndOfQuarantineReason.LOST_TO_FOLLOWUP=Lost to follow-up EndOfQuarantineReason.OTHER=Other - #InfectionSetting InfectionSetting.UNKNOWN=Unknown InfectionSetting.AMBULATORY=Ambulatory @@ -2338,7 +2156,6 @@ InfectionSetting.OTHER_STATION=Other station InfectionSetting.NURSING_HOME=Nursing home InfectionSetting.REHAB_FACILITY=Rehab facility InfectionSetting.OTHER_STATIONARY_FACILITY=Other in-patient facililty - SymptomGroup.GENERAL=General SymptomGroup.RESPIRATORY=Respiratory SymptomGroup.CARDIOVASCULAR=Cardiovascular @@ -2347,7 +2164,6 @@ SymptomGroup.URINARY=Urinary SymptomGroup.NERVOUS_SYSTEM=Nervous system SymptomGroup.SKIN=Skin SymptomGroup.OTHER=Other - #Salutation Salutation.MR=Dear Sir Salutation.MRS=Dear Madame @@ -2355,7 +2171,6 @@ Salutation.MR_AND_MRS=Dear Sir and Madame Salutation.FAMILY=Dear family Salutation.GUARDIAN_OF_MINOR=Dear guardian of the child Salutation.OTHER=Other - #PersonAssociation PersonAssociation.ALL=All PersonAssociation.CASE=Case @@ -2363,26 +2178,22 @@ PersonAssociation.CONTACT=Contact PersonAssociation.EVENT_PARTICIPANT=Event Participant PersonAssociation.IMMUNIZATION=Immunization PersonAssociation.TRAVEL_ENTRY=Travel Entry - -ReinfectionDetail.GENOME_SEQUENCE_PREVIOUS_INFECTION_KNOWN = Genome sequence of virus from previous SARS-CoV-2 infection is known -ReinfectionDetail.GENOME_SEQUENCE_CURRENT_INFECTION_KNOWN = Genome sequence of virus from current SARS-CoV-2 infection is known -ReinfectionDetail.GENOME_SEQUENCES_NOT_MATCHING = Genome sequences of viruses from previous and current SARS-CoV-2 infections do not match -ReinfectionDetail.GENOME_COPY_NUMBER_ABOVE_THRESHOLD = SARS-CoV-2 genome copy number within current PCR detection >= 10^6/ml or Ct value < 30 -ReinfectionDetail.GENOME_COPY_NUMBER_BELOW_THRESHOLD = Individual tested positive for SARS-CoV-2 by PCR, but SARS-CoV-2 genome copy number within current PCR detection < 10^6/ml or Ct value >= 30, or both not known -ReinfectionDetail.ACUTE_RESPIRATORY_ILLNESS_OVERCOME = Person has overcome acute respiratory illness following confirmed SARS-CoV-2 infection -ReinfectionDetail.PREVIOUS_ASYMPTOMATIC_INFECTION = Person had an asymptomatic SARS-CoV-2 infection -ReinfectionDetail.TESTED_NEGATIVE_AFTER_PREVIOUS_INFECTION = Person tested conclusively negative by PCR at least once after previous SARS-CoV-2 infection -ReinfectionDetail.LAST_PCR_DETECTION_NOT_RECENT = The last positive PCR detection of the preceding infection was more than 3 months ago - -ReinfectionDetailGroup.GENOME_SEQUENCE = -ReinfectionDetailGroup.PRECEDING_INFECTION = Information on the preceding infection -ReinfectionDetailGroup.REINFECTION_EVALUATION = More information on the evaluation of reinfection -ReinfectionDetailGroup.PREVIOUS_INFECTION_COMPLETED = Previous infection completed - -ReinfectionStatus.CONFIRMED = Confirmed reinfection -ReinfectionStatus.PROBABLE = Probable reinfection -ReinfectionStatus.POSSIBLE = Possible reinfection - +ReinfectionDetail.GENOME_SEQUENCE_PREVIOUS_INFECTION_KNOWN=Genome sequence of virus from previous SARS-CoV-2 infection is known +ReinfectionDetail.GENOME_SEQUENCE_CURRENT_INFECTION_KNOWN=Genome sequence of virus from current SARS-CoV-2 infection is known +ReinfectionDetail.GENOME_SEQUENCES_NOT_MATCHING=Genome sequences of viruses from previous and current SARS-CoV-2 infections do not match +ReinfectionDetail.GENOME_COPY_NUMBER_ABOVE_THRESHOLD=SARS-CoV-2 genome copy number within current PCR detection >= 10^6/ml or Ct value < 30 +ReinfectionDetail.GENOME_COPY_NUMBER_BELOW_THRESHOLD=Individual tested positive for SARS-CoV-2 by PCR, but SARS-CoV-2 genome copy number within current PCR detection < 10^6/ml or Ct value >= 30, or both not known +ReinfectionDetail.ACUTE_RESPIRATORY_ILLNESS_OVERCOME=Person has overcome acute respiratory illness following confirmed SARS-CoV-2 infection +ReinfectionDetail.PREVIOUS_ASYMPTOMATIC_INFECTION=Person had an asymptomatic SARS-CoV-2 infection +ReinfectionDetail.TESTED_NEGATIVE_AFTER_PREVIOUS_INFECTION=Person tested conclusively negative by PCR at least once after previous SARS-CoV-2 infection +ReinfectionDetail.LAST_PCR_DETECTION_NOT_RECENT=The last positive PCR detection of the preceding infection was more than 3 months ago +ReinfectionDetailGroup.GENOME_SEQUENCE= +ReinfectionDetailGroup.PRECEDING_INFECTION=Information on the preceding infection +ReinfectionDetailGroup.REINFECTION_EVALUATION=More information on the evaluation of reinfection +ReinfectionDetailGroup.PREVIOUS_INFECTION_COMPLETED=Previous infection completed +ReinfectionStatus.CONFIRMED=Confirmed reinfection +ReinfectionStatus.PROBABLE=Probable reinfection +ReinfectionStatus.POSSIBLE=Possible reinfection # Vaccine Vaccine.COMIRNATY=Pfizer-BioNTech COVID-19 vaccine Vaccine.MRNA_1273=Moderna COVID-19 Vaccine @@ -2404,12 +2215,10 @@ Vaccine.LC_16=LC-16 Vaccine.MVA_BN=JYNNEOS Vaccine.UNKNOWN=Unknown Vaccine.OTHER=Other -Vaccine.PREVENAR_13_PFIZER = Pneumococcal polysaccharide conjugate vaccine 13-valent-adsorb (Pfizer) -Vaccine.VAXNEUVANCE_MERCK = Pneumococcal polysaccharide conjugate vaccine 15-valent (Merck) -Vaccine.PREVNAR_20_PFIZER = Pneumococcal polysaccharide conjugate vaccine 20-valent (Pfizer) -Vaccine.PNEUMOVAX_23_MERCK = Pneumococcal polysaccharide vaccine 23-valent (Merck) - - +Vaccine.PREVENAR_13_PFIZER=Pneumococcal polysaccharide conjugate vaccine 13-valent-adsorb (Pfizer) +Vaccine.VAXNEUVANCE_MERCK=Pneumococcal polysaccharide conjugate vaccine 15-valent (Merck) +Vaccine.PREVNAR_20_PFIZER=Pneumococcal polysaccharide conjugate vaccine 20-valent (Pfizer) +Vaccine.PNEUMOVAX_23_MERCK=Pneumococcal polysaccharide vaccine 23-valent (Merck) # VaccineManufacturer VaccineManufacturer.BIONTECH_PFIZER=BioNTech/Pfizer VaccineManufacturer.PFIZER=Pfizer @@ -2427,13 +2236,11 @@ VaccineManufacturer.VALNEVA=Valneva VaccineManufacturer.MERCK=Merck VaccineManufacturer.UNKNOWN=Unknown VaccineManufacturer.OTHER=Other - # InfectionPathCertainty InfectionPathCertainty.SUSPECT=Suspect InfectionPathCertainty.PROBABLE=Probable InfectionPathCertainty.CONFIRMED=Confirmed InfectionPathCertainty.UNKNOWN=Unknown - # HumanTransmissionMode HumanTransmissionMode.FECAL_ORAL_SMEAR_INFECTION=Fecal-oral/smear infection HumanTransmissionMode.PARENTERAL=Parenteral @@ -2442,7 +2249,6 @@ HumanTransmissionMode.RESPIRATORY=Respiratory HumanTransmissionMode.SEXUAL=Sexual HumanTransmissionMode.CONNATAL=Connatal HumanTransmissionMode.OTHER=Other - # ParenteralTransmissionMode ParenteralTransmissionMode.INTRAVENOUS_DRUG_USE=Intravenous drug use ParenteralTransmissionMode.HOUSEHOLD_CONTACT=Household contact @@ -2450,53 +2256,42 @@ ParenteralTransmissionMode.MEDICALLY_ASSOCIATED=Medically associated ParenteralTransmissionMode.TATTOOING_PIERCING=Tattooing/piercing ParenteralTransmissionMode.PEDICURE_MANICURE=Pedicure/manicure ParenteralTransmissionMode.OTHER=Other - # MedicallyAssociatedTransmissionMode MedicallyAssociatedTransmissionMode.OPERATIVE_OR_DIAGNOSTIC_PROCEDURE=Operative or diagnostic procedure MedicallyAssociatedTransmissionMode.BLOOD_PRODUCTS=Blood products MedicallyAssociatedTransmissionMode.ORGAN_TRANSPLANTATION=Organ transplantation MedicallyAssociatedTransmissionMode.DIALYSIS=Dialysis MedicallyAssociatedTransmissionMode.INJECTION_FOR_MEDICAL_PURPOSES=Injection for medical purposes - - # MultipleBirth MultipleBirth.SINGLE=Single birth (Singleton - 1) MultipleBirth.TWINS=Twin birth (Twins - 2) MultipleBirth.MULTIPLE=Multiple birth (Triplet 3+ or more) - # ExternalShareDateType -ExternalShareDateType.LAST_EXTERNAL_SURVEILLANCE_TOOL_SHARE = Last share with reporting tool - +ExternalShareDateType.LAST_EXTERNAL_SURVEILLANCE_TOOL_SHARE=Last share with reporting tool # ExternalShareStatus ExternalShareStatus.SHARED=Shared ExternalShareStatus.DELETED=Deleted - # ExternalMessageStatus ExternalMessageStatus.UNPROCESSED=Unprocessed ExternalMessageStatus.PROCESSED=Processed ExternalMessageStatus.FORWARDED=Forwarded ExternalMessageStatus.UNCLEAR=Unclear - # ExternalMessageType ExternalMessageType.LAB_MESSAGE=Lab message ExternalMessageType.PHYSICIANS_REPORT=Physician's report ExternalMessageType.SURVEY_RESPONSE=Survey response - # ShareRequestDataType -ShareRequestDataType.CASE = Case -ShareRequestDataType.CONTACT = Contact -ShareRequestDataType.EVENT = Event - +ShareRequestDataType.CASE=Case +ShareRequestDataType.CONTACT=Contact +ShareRequestDataType.EVENT=Event # ShareRequestStatus -ShareRequestStatus.PENDING = Pending -ShareRequestStatus.ACCEPTED = Accepted -ShareRequestStatus.REJECTED = Rejected -ShareRequestStatus.REVOKED = Revoked - +ShareRequestStatus.PENDING=Pending +ShareRequestStatus.ACCEPTED=Accepted +ShareRequestStatus.REJECTED=Rejected +ShareRequestStatus.REVOKED=Revoked # EventCriteriaDateType -EventCriteriaDateType.EVENT_DATE = Event date -EventCriteriaDateType.REPORT_DATE = Report date - +EventCriteriaDateType.EVENT_DATE=Event date +EventCriteriaDateType.REPORT_DATE=Report date #EpidemiologicalEvidenceDetail EpidemiologicalEvidenceDetail.STUDY=Study EpidemiologicalEvidenceDetail.CASE_CONTROL_STUDY=Case control study @@ -2511,7 +2306,6 @@ EpidemiologicalEvidenceDetail.DIRECT_OCCURENCE=Person: cases were in direct or i EpidemiologicalEvidenceDetail.SUSPICION=Suspicion EpidemiologicalEvidenceDetail.EXPRESSED_BY_DISEASED=Expressed by the diseased person EpidemiologicalEvidenceDetail.EXPRESSED_BY_HEALTH_DEPARTMENT=Expressed by the health department - #LaboratoryDiagnosticEvidenceDetail LaboratoryDiagnosticEvidenceDetail.VERIFICATION_OF_AT_LEAST_TWO_INFECTED=Verification of at least two infected or diseased persons LaboratoryDiagnosticEvidenceDetail.COMPLIANT_PATHOGEN_FINE_TYPING=Compliant pathogen fine typing @@ -2520,158 +2314,142 @@ LaboratoryDiagnosticEvidenceDetail.IMPRESSION_TEST=Impression test LaboratoryDiagnosticEvidenceDetail.WATER_SAMPLE=Water sample LaboratoryDiagnosticEvidenceDetail.OTHER=Other LaboratoryDiagnosticEvidenceDetail.PATHOGEN_FINE_TYPING_COMPLIANT_WITH_CASE=Pathogen fine typing compliant with the one of cases - #ImmunizationStatus -ImmunizationStatus.PENDING = Pending -ImmunizationStatus.ACQUIRED = Acquired -ImmunizationStatus.NOT_ACQUIRED = Not acquired -ImmunizationStatus.EXPIRED = Expired - +ImmunizationStatus.PENDING=Pending +ImmunizationStatus.ACQUIRED=Acquired +ImmunizationStatus.NOT_ACQUIRED=Not acquired +ImmunizationStatus.EXPIRED=Expired #ImmunizationManagementStatus -ImmunizationManagementStatus.SCHEDULED = Scheduled -ImmunizationManagementStatus.ONGOING = Ongoing -ImmunizationManagementStatus.COMPLETED = Completed -ImmunizationManagementStatus.CANCELED = Canceled - +ImmunizationManagementStatus.SCHEDULED=Scheduled +ImmunizationManagementStatus.ONGOING=Ongoing +ImmunizationManagementStatus.COMPLETED=Completed +ImmunizationManagementStatus.CANCELED=Canceled #MeansOfImmunization -MeansOfImmunization.VACCINATION = Vaccination -MeansOfImmunization.RECOVERY = Recovery -MeansOfImmunization.VACCINATION_RECOVERY = Vaccination/Recovery -MeansOfImmunization.MATERNAL_VACCINATION = Maternal vaccination -MeansOfImmunization.MONOCLONAL_ANTIBODY = Monoclonal antibody -MeansOfImmunization.OTHER = Other - +MeansOfImmunization.VACCINATION=Vaccination +MeansOfImmunization.RECOVERY=Recovery +MeansOfImmunization.VACCINATION_RECOVERY=Vaccination/Recovery +MeansOfImmunization.MATERNAL_VACCINATION=Maternal vaccination +MeansOfImmunization.MONOCLONAL_ANTIBODY=Monoclonal antibody +MeansOfImmunization.OTHER=Other #InjectionFacility -InjectionFacility.MATERNITY_WARD = Maternity ward -InjectionFacility.PAEDIATRIC_PRACTICE = Paediatric practice -InjectionFacility.HOSPITAL = Hospital - +InjectionFacility.MATERNITY_WARD=Maternity ward +InjectionFacility.PAEDIATRIC_PRACTICE=Paediatric practice +InjectionFacility.HOSPITAL=Hospital #EnumColumn -EnumColumn.TYPE = Type -EnumColumn.VALUE = Value -EnumColumn.CAPTION = Caption -EnumColumn.DESCRIPTION = Description -EnumColumn.SHORT = Short - +EnumColumn.TYPE=Type +EnumColumn.VALUE=Value +EnumColumn.CAPTION=Caption +EnumColumn.DESCRIPTION=Description +EnumColumn.SHORT=Short #NotificationType -NotificationType.CASE_CLASSIFICATION_CHANGED = Case classification changed -NotificationType.Desc.CASE_CLASSIFICATION_CHANGED = Sent to all users associated to the region or responsible region of a case. -NotificationType.CASE_INVESTIGATION_DONE = Case investigation done -NotificationType.Desc.CASE_INVESTIGATION_DONE = Sent to all users associated to the region or responsible region of a case. -NotificationType.EVENT_PARTICIPANT_CASE_CLASSIFICATION_CONFIRMED = Event participant case classification confirmed -NotificationType.Desc.EVENT_PARTICIPANT_CASE_CLASSIFICATION_CONFIRMED = When a case is set to a confirmed classification, this is sent to all responsible users of active events in which the case person participated and which took place no earlier than 30 days before the case was classified. -NotificationType.EVENT_PARTICIPANT_RELATED_TO_OTHER_EVENTS = Event participant related to other events -NotificationType.Desc.EVENT_PARTICIPANT_RELATED_TO_OTHER_EVENTS = When a new event participant is created, this is sent to all responsible users of active events in which the person also participated and which took place no earlier than 30 days before. -NotificationType.CASE_LAB_RESULT_ARRIVED = Case lab result arrived -NotificationType.Desc.CASE_LAB_RESULT_ARRIVED = Sent to all users associated to the region or responsible region of a case when a pathogen test result is entered or modified (non-pending). -NotificationType.CONTACT_LAB_RESULT_ARRIVED = Contact lab result arrived -NotificationType.Desc.CONTACT_LAB_RESULT_ARRIVED = Sent to all users associated to the region of a contact when a pathogen test result is entered or modified (non-pending). If the contact has no region the region of the source case is used. -NotificationType.EVENT_PARTICIPANT_LAB_RESULT_ARRIVED = Event participant lab result arrived -NotificationType.Desc.EVENT_PARTICIPANT_LAB_RESULT_ARRIVED = Sent to all users associated to the region of an event participant when a pathogen test result is entered or modified (non-pending). -NotificationType.LAB_SAMPLE_SHIPPED = Lab sample shipped -NotificationType.Desc.LAB_SAMPLE_SHIPPED = Sent to all users of a laboratory when a sample of that laboratory is shipped. -NotificationType.CONTACT_SYMPTOMATIC = Contact symptomatic -NotificationType.Desc.CONTACT_SYMPTOMATIC = Sent to all users associated to the region of a contact when a new symptomatic visit is created and the contact was previously asymptomatic. If the contact has no region the region of the source case is used. -NotificationType.TASK_START= Task start -NotificationType.Desc.TASK_START= Sent to the assignee of a task and all observer users when the task start date is within the last 10 minutes. -NotificationType.TASK_DUE = Task due -NotificationType.Desc.TASK_DUE = Sent to the assignee of a task and all observer users when the task due date is within the last 10 minutes. -NotificationType.TASK_UPDATED_ASSIGNEE = Task assignee updated -NotificationType.Desc.TASK_UPDATED_ASSIGNEE = Sent to the previous and new assignee of a task. -NotificationType.CONTACT_VISIT_COMPLETED = Contact visit completed -NotificationType.Desc.CONTACT_VISIT_COMPLETED = Sent to all users associated to the region of a contact and all observer users when a "Contact follow-up" task is completed. If the contact has no region the region of the source case is used. -NotificationType.CASE_DISEASE_CHANGED = Case disease changed -NotificationType.Desc.CASE_DISEASE_CHANGED = Sent to all users associated to the region or responsible region of a case when the disease was previously set to 'Unspecified VHF'. -NotificationType.EVENT_GROUP_CREATED = Event group created -NotificationType.Desc.EVENT_GROUP_CREATED = Sent to all responsible users of events that are part of a newly created event group. -NotificationType.EVENT_ADDED_TO_EVENT_GROUP = Event added to event group -NotificationType.Desc.EVENT_ADDED_TO_EVENT_GROUP = Sent to all responsible users of events that are part of the modified event group. -NotificationType.EVENT_REMOVED_FROM_EVENT_GROUP = Event removed from event group -NotificationType.Desc.EVENT_REMOVED_FROM_EVENT_GROUP = Sent to all responsible users of the removed event and events that are part of the modified event group. - - #NotificationTypeGroup -NotificationTypeGroup.CASES = Cases -NotificationTypeGroup.CONTACTS = Contacts -NotificationTypeGroup.EVENTS = Events -NotificationTypeGroup.SAMPLES = Samples -NotificationTypeGroup.TASKS = Tasks - +NotificationType.CASE_CLASSIFICATION_CHANGED=Case classification changed +NotificationType.Desc.CASE_CLASSIFICATION_CHANGED=Sent to all users associated to the region or responsible region of a case. +NotificationType.CASE_INVESTIGATION_DONE=Case investigation done +NotificationType.Desc.CASE_INVESTIGATION_DONE=Sent to all users associated to the region or responsible region of a case. +NotificationType.EVENT_PARTICIPANT_CASE_CLASSIFICATION_CONFIRMED=Event participant case classification confirmed +NotificationType.Desc.EVENT_PARTICIPANT_CASE_CLASSIFICATION_CONFIRMED=When a case is set to a confirmed classification, this is sent to all responsible users of active events in which the case person participated and which took place no earlier than 30 days before the case was classified. +NotificationType.EVENT_PARTICIPANT_RELATED_TO_OTHER_EVENTS=Event participant related to other events +NotificationType.Desc.EVENT_PARTICIPANT_RELATED_TO_OTHER_EVENTS=When a new event participant is created, this is sent to all responsible users of active events in which the person also participated and which took place no earlier than 30 days before. +NotificationType.CASE_LAB_RESULT_ARRIVED=Case lab result arrived +NotificationType.Desc.CASE_LAB_RESULT_ARRIVED=Sent to all users associated to the region or responsible region of a case when a pathogen test result is entered or modified (non-pending). +NotificationType.CONTACT_LAB_RESULT_ARRIVED=Contact lab result arrived +NotificationType.Desc.CONTACT_LAB_RESULT_ARRIVED=Sent to all users associated to the region of a contact when a pathogen test result is entered or modified (non-pending). If the contact has no region the region of the source case is used. +NotificationType.EVENT_PARTICIPANT_LAB_RESULT_ARRIVED=Event participant lab result arrived +NotificationType.Desc.EVENT_PARTICIPANT_LAB_RESULT_ARRIVED=Sent to all users associated to the region of an event participant when a pathogen test result is entered or modified (non-pending). +NotificationType.LAB_SAMPLE_SHIPPED=Lab sample shipped +NotificationType.Desc.LAB_SAMPLE_SHIPPED=Sent to all users of a laboratory when a sample of that laboratory is shipped. +NotificationType.CONTACT_SYMPTOMATIC=Contact symptomatic +NotificationType.Desc.CONTACT_SYMPTOMATIC=Sent to all users associated to the region of a contact when a new symptomatic visit is created and the contact was previously asymptomatic. If the contact has no region the region of the source case is used. +NotificationType.TASK_START=Task start +NotificationType.Desc.TASK_START=Sent to the assignee of a task and all observer users when the task start date is within the last 10 minutes. +NotificationType.TASK_DUE=Task due +NotificationType.Desc.TASK_DUE=Sent to the assignee of a task and all observer users when the task due date is within the last 10 minutes. +NotificationType.TASK_UPDATED_ASSIGNEE=Task assignee updated +NotificationType.Desc.TASK_UPDATED_ASSIGNEE=Sent to the previous and new assignee of a task. +NotificationType.CONTACT_VISIT_COMPLETED=Contact visit completed +NotificationType.Desc.CONTACT_VISIT_COMPLETED=Sent to all users associated to the region of a contact and all observer users when a "Contact follow-up" task is completed. If the contact has no region the region of the source case is used. +NotificationType.CASE_DISEASE_CHANGED=Case disease changed +NotificationType.Desc.CASE_DISEASE_CHANGED=Sent to all users associated to the region or responsible region of a case when the disease was previously set to 'Unspecified VHF'. +NotificationType.EVENT_GROUP_CREATED=Event group created +NotificationType.Desc.EVENT_GROUP_CREATED=Sent to all responsible users of events that are part of a newly created event group. +NotificationType.EVENT_ADDED_TO_EVENT_GROUP=Event added to event group +NotificationType.Desc.EVENT_ADDED_TO_EVENT_GROUP=Sent to all responsible users of events that are part of the modified event group. +NotificationType.EVENT_REMOVED_FROM_EVENT_GROUP=Event removed from event group +NotificationType.Desc.EVENT_REMOVED_FROM_EVENT_GROUP=Sent to all responsible users of the removed event and events that are part of the modified event group. +#NotificationTypeGroup +NotificationTypeGroup.CASES=Cases +NotificationTypeGroup.CONTACTS=Contacts +NotificationTypeGroup.EVENTS=Events +NotificationTypeGroup.SAMPLES=Samples +NotificationTypeGroup.TASKS=Tasks #S2SOwnershipStatusFilter S2SOwnershipStatusFilter.OWNED=With ownership S2SOwnershipStatusFilter.NOT_OWNED=To view S2SOwnershipStatusFilter.ALL=All - #ShareRequestViewType ShareRequestViewType.INCOMING=Incoming ShareRequestViewType.OUTGOING=Outgoing - # SampleDashboardFilterDateType SampleDashboardFilterDateType.SAMPLE_DATE_TIME=Date sample was collected SampleDashboardFilterDateType.ASSOCIATED_ENTITY_REPORT_DATE=Report date of associated entity SampleDashboardFilterDateType.MOST_RELEVANT=Most relevant date - #SampleDashboardCustomDiseaseFilter -SampleDashboardCustomDiseaseFilter.NO_DISEASE = No Disease - +SampleDashboardCustomDiseaseFilter.NO_DISEASE=No Disease #SampleShipmentStatus SampleShipmentStatus.SHIPPED=Shipped SampleShipmentStatus.NOT_SHIPPED=Not shipped SampleShipmentStatus.RECEIVED=Received - #Pathogen Customizable enum -Pathogen.CAMPYLOBACTER_JEJUNI = Campylobacter jejuni -Pathogen.ESCHERICHIA_COLI = Escherichia coli -Pathogen.SALMONELLA_SPP = Salmonella spp. -Pathogen.SHIGELLA_SPP = Shigella spp. -Pathogen.VIBRIO_CHOLERAE = Vibrio cholerae -Pathogen.YERSINIA_SPP = Yersinia spp. -Pathogen.SARS_COV_2 = SARS-CoV-2 -Pathogen.ADENOVIRUS = Adenovirus -Pathogen.ASTROVIRUS = Astrovirus -Pathogen.COXSACKIE_VIRUS = Coxsackie virus -Pathogen.ECHOVIRUS = Echovirus -Pathogen.HEPATITIS_A_VIRUS = Hepatitis A virus -Pathogen.HEPATITIS_E_VIRUS = Hepatitis E virus -Pathogen.HUMAN_CALICIVIRUS = Human calicivirus -Pathogen.POLIO_VIRUS = Polio virus 2 -Pathogen.REOVIRUS = Reovirus -Pathogen.ROTAVIRUS = Rotavirus -Pathogen.TT_HEPATITIS = TT hepatitis -Pathogen.OTHER = Other - +Pathogen.CAMPYLOBACTER_JEJUNI=Campylobacter jejuni +Pathogen.ESCHERICHIA_COLI=Escherichia coli +Pathogen.SALMONELLA_SPP=Salmonella spp. +Pathogen.SHIGELLA_SPP=Shigella spp. +Pathogen.VIBRIO_CHOLERAE=Vibrio cholerae +Pathogen.YERSINIA_SPP=Yersinia spp. +Pathogen.SARS_COV_2=SARS-CoV-2 +Pathogen.ADENOVIRUS=Adenovirus +Pathogen.ASTROVIRUS=Astrovirus +Pathogen.COXSACKIE_VIRUS=Coxsackie virus +Pathogen.ECHOVIRUS=Echovirus +Pathogen.HEPATITIS_A_VIRUS=Hepatitis A virus +Pathogen.HEPATITIS_E_VIRUS=Hepatitis E virus +Pathogen.HUMAN_CALICIVIRUS=Human calicivirus +Pathogen.POLIO_VIRUS=Polio virus 2 +Pathogen.REOVIRUS=Reovirus +Pathogen.ROTAVIRUS=Rotavirus +Pathogen.TT_HEPATITIS=TT hepatitis +Pathogen.OTHER=Other # EnvironmentSampleMaterial -EnvironmentSampleMaterial.WATER = Water -EnvironmentSampleMaterial.SOIL = Soil -EnvironmentSampleMaterial.AIR = Air -EnvironmentSampleMaterial.VECTORS = Vectors -EnvironmentSampleMaterial.OTHER = Other - +EnvironmentSampleMaterial.WATER=Water +EnvironmentSampleMaterial.SOIL=Soil +EnvironmentSampleMaterial.AIR=Air +EnvironmentSampleMaterial.VECTORS=Vectors +EnvironmentSampleMaterial.OTHER=Other # WeatherCondition -WeatherCondition.SUNNY = Sunny -WeatherCondition.CLOUDY = Cloudy -WeatherCondition.RAINING = Raining -WeatherCondition.WINDY = Windy - +WeatherCondition.SUNNY=Sunny +WeatherCondition.CLOUDY=Cloudy +WeatherCondition.RAINING=Raining +WeatherCondition.WINDY=Windy #Pathogen Customizable enum -Pathogen.CAMPYLOBACTER_JEJUNI = Campylobacter jejuni -Pathogen.ESCHERICHIA_COLI = Escherichia coli -Pathogen.SALMONELLA_SPP = Salmonella spp. -Pathogen.SHIGELLA_SPP = Shigella spp. -Pathogen.VIBRIO_CHOLERAE = Vibrio cholerae -Pathogen.YERSINIA_SPP = Yersinia spp. -Pathogen.SARS_COV_2 = SARS-CoV-2 -Pathogen.ADENOVIRUS = Adenovirus -Pathogen.ASTROVIRUS = Astrovirus -Pathogen.COXSACKIE_VIRUS = Coxsackie virus -Pathogen.ECHOVIRUS = Echovirus -Pathogen.HEPATITIS_A_VIRUS = Hepatitis A virus -Pathogen.HEPATITIS_E_VIRUS = Hepatitis E virus -Pathogen.HUMAN_CALICIVIRUS = Human calicivirus -Pathogen.POLIO_VIRUS = Polio virus 2 -Pathogen.REOVIRUS = Reovirus -Pathogen.ROTAVIRUS = Rotavirus -Pathogen.TT_HEPATITIS = TT hepatitis -Pathogen.OTHER = Other +Pathogen.CAMPYLOBACTER_JEJUNI=Campylobacter jejuni +Pathogen.ESCHERICHIA_COLI=Escherichia coli +Pathogen.SALMONELLA_SPP=Salmonella spp. +Pathogen.SHIGELLA_SPP=Shigella spp. +Pathogen.VIBRIO_CHOLERAE=Vibrio cholerae +Pathogen.YERSINIA_SPP=Yersinia spp. +Pathogen.SARS_COV_2=SARS-CoV-2 +Pathogen.ADENOVIRUS=Adenovirus +Pathogen.ASTROVIRUS=Astrovirus +Pathogen.COXSACKIE_VIRUS=Coxsackie virus +Pathogen.ECHOVIRUS=Echovirus +Pathogen.HEPATITIS_A_VIRUS=Hepatitis A virus +Pathogen.HEPATITIS_E_VIRUS=Hepatitis E virus +Pathogen.HUMAN_CALICIVIRUS=Human calicivirus +Pathogen.POLIO_VIRUS=Polio virus 2 +Pathogen.REOVIRUS=Reovirus +Pathogen.ROTAVIRUS=Rotavirus +Pathogen.TT_HEPATITIS=TT hepatitis +Pathogen.OTHER=Other # SelfReportType SelfReportType.CASE=Case SelfReportType.CONTACT=Contact @@ -2683,18 +2461,15 @@ SelfReportInvestigationStatus.REJECTED=Rejected # SelfReportProcessingStatus SelfReportProcessingStatus.UNPROCESSED=Unprocessed SelfReportProcessingStatus.PROCESSED=Processed - # AefiAgeGroup -AefiAgeGroup.ZERO_TO_ONE = 0 < 1 year -AefiAgeGroup.ONE_TO_FIVE = 1- 5 years -AefiAgeGroup.FIVE_TO_EIGHTEEN = > 5 years - 18 years -AefiAgeGroup.EIGHTEEN_TO_SIXTY = > 18 years - 60 years -AefiAgeGroup.SIXY_AND_ABOVE = > 60 years - +AefiAgeGroup.ZERO_TO_ONE=0 < 1 year +AefiAgeGroup.ONE_TO_FIVE=1- 5 years +AefiAgeGroup.FIVE_TO_EIGHTEEN=> 5 years - 18 years +AefiAgeGroup.EIGHTEEN_TO_SIXTY=> 18 years - 60 years +AefiAgeGroup.SIXY_AND_ABOVE=> 60 years # SeizureType SeizureType.FEBRILE=Febrile SeizureType.AFEBRILE=Afebrile - # SeriousAefiReason SeriousAefiReason.DEATH=Death SeriousAefiReason.LIFE_THREATENING=Life threatening @@ -2702,7 +2477,6 @@ SeriousAefiReason.DISABILITY=Disability SeriousAefiReason.HOSPITALIZATION=Hospitalization SeriousAefiReason.CONGENITAL_ANOMALY=Congenital anomaly SeriousAefiReason.OTHER=Other - # AefiOutcome AefiOutcome.RECOVERING=Recovering AefiOutcome.RECOVERED=Recovered @@ -2710,137 +2484,109 @@ AefiOutcome.RECOVERED_WITH_SEQUELAE=Recovered with sequelae AefiOutcome.NOT_RECOVERED=Not Recovered AefiOutcome.UNKNOWN=Unknown AefiOutcome.DIED=Died - # AefiType AefiType.SERIOUS=Serious AefiType.NON_SERIOUS=Non-serious - # AefiDateType AefiDateType.REPORT_DATE=Date of report AefiDateType.START_DATE=Date of onset AefiDateType.VACCINATION_DATE=Date of vaccination - # AefiDashboardFilterDateType AefiDashboardFilterDateType.REPORT_DATE=Date of report AefiDashboardFilterDateType.START_DATE=Date of onset - # AefiInvestigationDateType AefiInvestigationDateType.REPORT_DATE=Date of report AefiInvestigationDateType.INVESTIGATION_DATE=Date of investigation AefiInvestigationDateType.VACCINATION_DATE=Date of vaccination - # PlaceOfVaccination PlaceOfVaccination.GOVERNMENT_HEALTH_FACILITY=Government health facility PlaceOfVaccination.PRIVATE_HEALTH_FACILITY=Private health facility PlaceOfVaccination.OTHER=Other - # VaccinationActivity VaccinationActivity.CAMPAIGN=Campaign VaccinationActivity.ROUTINE=Routine VaccinationActivity.OTHER=Other - # AefiInvestigationStage AefiInvestigationStage.FIRST=First AefiInvestigationStage.INTERIM=Interim AefiInvestigationStage.FINAL=Final - # VaccinationSite VaccinationSite.FIXED=Fixed VaccinationSite.MOBILE=Mobile VaccinationSite.OUTREACH=Outreach VaccinationSite.OTHER=Other - # PatientStatusAtAefiInvestigation PatientStatusAtAefiInvestigation.DIED=Died PatientStatusAtAefiInvestigation.DISABLED=Disabled PatientStatusAtAefiInvestigation.RECOVERED=Recovering PatientStatusAtAefiInvestigation.RECOVERED_COMPLETELY=Recovered completely PatientStatusAtAefiInvestigation.UNKNOWN=Unknown - # BirthTerm BirthTerm.FULL_TERM=Full-term BirthTerm.PRE_TERM=Pre-term BirthTerm.POST_TERM=Post-term - # BirthWeightCategory BirthWeightCategory.NORMAL=Normal birth weight BirthWeightCategory.LOW_BIRTH_WEIGHT=Low birth weight (stunted growth) - # DeliveryProcedure DeliveryProcedure.NORMAL=Normal DeliveryProcedure.CAESAREAN=Caesarean DeliveryProcedure.ASSISTED=Assisted (forceps, vacuum etc.) DeliveryProcedure.WITH_COMPLICATION=with complication - # SeriousAefiInfoSource SeriousAefiInfoSource.EXAMINATION=Examination by the investigator SeriousAefiInfoSource.DOCUMENTS=Documents SeriousAefiInfoSource.VERBAL_AUTOPSY=Verbal autopsy SeriousAefiInfoSource.OTHER=Other - # AefiImmunizationPeriod AefiImmunizationPeriod.WITHIN_FIRST_VACCINATIONS=Within the first vaccinations of the session AefiImmunizationPeriod.WITHIN_LAST_VACCINATIONS=Within the last vaccinations of the session AefiImmunizationPeriod.UNKNOWN=Unknown - # AefiVaccinationPeriod AefiVaccinationPeriod.WITHIN_FIRST_FEW_DOSES=Within the first few doses of the vial administered AefiVaccinationPeriod.WITHIN_LAST_DOSES=Within the last doses of the vial administered AefiVaccinationPeriod.UNKNOWN=Unknown - # SyringeType SyringeType.GLASS=Glass SyringeType.DISPOSABLE=Disposable SyringeType.RECYCLED_DISPOSABLE=Recycled disposable SyringeType.OTHER=Other - # VaccineCarrier VaccineCarrier.SHORT_RANGE=Short range VaccineCarrier.LONG_RANGE=Long range VaccineCarrier.OTHER=Other - # AefiInvestigationStatus AefiInvestigationStatus.DONE=Done AefiInvestigationStatus.DISCARDED=Discarded - # AefiCausality AefiCausality.CONFIRMED=Confirmed AefiCausality.INCONCLUSIVE=Inconclusive - # AefiClassification AefiClassification.RELATED_TO_VACCINE_OR_VACCINATION=Related to vaccine or vaccination AefiClassification.COINCIDENTAL_ADVERSE_EVENT=Coincidental adverse event AefiClassification.UNDETERMINED=Undetermined - # AefiClassificationSubType AefiClassificationSubType.VACCINE_PRODUCT_RELATED=Vaccine product related AefiClassificationSubType.VACCINE_QUALITY_DEFECT_RELATED=Vaccine quality defect related AefiClassificationSubType.IMMUNIZATION_ERROR_RELATED=Immunization error related AefiClassificationSubType.IMMUNIZATION_ANXIETY_RELATED=Immunization anxiety related - # SurveyResponseStatus SurveyResponseStatus.RECEIVED=Response received SurveyResponseStatus.NOT_RECEIVED=No response received - - # DiseaseConfigurationFilterReportingType DiseaseConfigurationFilterReportingType.CASE_BASED_SURVEILLANCE=Case surveillance DiseaseConfigurationFilterReportingType.AGGREGATE_REPORTING=Aggregate reporting - # ActiveRelevanceStatus ActiveRelevanceStatus.ALL=Active and inactive records ActiveRelevanceStatus.ACTIVE=Active records ActiveRelevanceStatus.INACTIVE=Inactive records - # RadiographyCompatibility -RadiographyCompatibility.COMPATIBLE_WITH_TB = Compatible with TB regardless of the anatomical site the sites of the disease -RadiographyCompatibility.NOT_COMPATIBLE_WITH_TB = Not compatible with TB regardless of the anatomical site - +RadiographyCompatibility.COMPATIBLE_WITH_TB=Compatible with TB regardless of the anatomical site the sites of the disease +RadiographyCompatibility.NOT_COMPATIBLE_WITH_TB=Not compatible with TB regardless of the anatomical site # ClinicalPresentationStatus ClinicalPresentationStatus.ASYMPTOMATIC=Asymtomatic ClinicalPresentationStatus.COMPATIBLE=Compatible with %s regardless of the anatomical site ClinicalPresentationStatus.UNKNOWN=Unknown - # InfectionSite InfectionSite.NOT_APPLICABLE=Not applicable InfectionSite.BONES_JOINTS_OTHER_THAN_VERTEBRAE=Bones/ joints (other than vertebrae) @@ -2858,26 +2604,36 @@ InfectionSite.UROGENITAL_SYSTEM=Urogenital system InfectionSite.VERTEBRAE=Vertebrae InfectionSite.UNKNOWN=Unknown InfectionSite.OTHER=Other - # DiagnosisType DiagnosisType.PULMONARY=Pulmonary DiagnosisType.EXTRAPULMONARY=Extrapulmonary - # EpipulseExportStatus EpipulseExportStatus.PENDING=Pending EpipulseExportStatus.IN_PROGRESS=In Progress EpipulseExportStatus.COMPLETED=Completed EpipulseExportStatus.FAILED=Failed EpipulseExportStatus.CANCELLED=Cancelled - # EpipulseSubjectCode -EpipulseSubjectCode.PERT = Pertussis -EpipulseSubjectCode.MEAS = Measles -EpipulseSubjectCode.PNEU = Invasive Pneumococcal Infection -EpipulseSubjectCode.MENI = Invasive Meningococcal Infection - +EpipulseSubjectCode.PERT=Pertussis +EpipulseSubjectCode.MEAS=Measles +EpipulseSubjectCode.PNEU=Invasive Pneumococcal Infection +EpipulseSubjectCode.MENI=Invasive Meningococcal Infection # EpipulseDiseaseRef -EpipulseDiseaseRef.PERT = Pertussis -EpipulseDiseaseRef.MEAS = Measles -EpipulseDiseaseRef.PNEU = Invasive Pneumococcal Infection -EpipulseDiseaseRef.MENI = Invasive Meningococcal Infection +EpipulseDiseaseRef.PERT=Pertussis +EpipulseDiseaseRef.MEAS=Measles +EpipulseDiseaseRef.PNEU=Invasive Pneumococcal Infection +EpipulseDiseaseRef.MENI=Invasive Meningococcal Infection +# DataPatchFailureCause +DataPatchFailureCause.INVALID_MULTIPLE_FIELDS_FORMAT=Invalid multiple-fields path format +DataPatchFailureCause.MISSING_MANDATORY_FIELD_FOR_GROUP=Missing mandatory field required by this group +DataPatchFailureCause.FORBIDDEN_NON_UNIQUE_ALIAS=Alias maps to multiple fields and cannot be used +DataPatchFailureCause.NOT_PRESENT_IN_REFERENCE_DATA_LIST=Value not found in the allowed reference data list +DataPatchFailureCause.UNSUPPORTED_FIELD_FOR_DISEASE_OR_COUNTRY_OR_FEATURE=Field not supported for this disease, country or feature configuration +DataPatchFailureCause.UNSUPPORTED_PREFIX=Path prefix is not supported (must start with CaseData or Person) +DataPatchFailureCause.FIELD_DOES_NOT_EXIST=Field does not exist +DataPatchFailureCause.FORBIDDEN_FIELD=Field is not allowed to be modified +DataPatchFailureCause.FORBIDDEN_VALUE_OVERRIDE=Field already has a value and the replacement strategy prevents overwriting it +DataPatchFailureCause.INVALID_VALUE_TYPE=Provided value has the wrong type for this field +DataPatchFailureCause.UNSUPPORTED_TARGET_TYPE=Field type is not yet supported for patching +DataPatchFailureCause.INVALID_PATH_FORMAT=Field path has an invalid format +DataPatchFailureCause.TECHNICAL=Internal processing error diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailureEditor.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailureEditor.java index 7bf18ccd022..913af8ab84c 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailureEditor.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailureEditor.java @@ -84,7 +84,8 @@ public SurveyResponseFailureEditor(ExternalMessageDto externalMessage, Displayab String fieldLabel = resolveFieldName(fieldPath, displayData); String currentValue = resolveCurrentValue(fieldPath, displayData); - String causeName = failure.getDataPatchFailureCause() != null ? failure.getDataPatchFailureCause().name() : ""; + String causeName = + failure.getDataPatchFailureCause() != null ? I18nProperties.getEnumCaption(failure.getDataPatchFailureCause()) : ""; VerticalLayout fieldContainer = new VerticalLayout(); fieldContainer.setMargin(false); diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailurePanel.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailurePanel.java index ca486c3cdba..f59b57de661 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailurePanel.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailurePanel.java @@ -51,7 +51,10 @@ public SurveyResponseFailurePanel(Map failures, Displa .setId("field") .setExpandRatio(2); - grid.addColumn(entry -> entry.getValue().getDataPatchFailureCause() != null ? entry.getValue().getDataPatchFailureCause().name() : "") + grid.addColumn( + entry -> entry.getValue().getDataPatchFailureCause() != null + ? I18nProperties.getEnumCaption(entry.getValue().getDataPatchFailureCause()) + : "") .setCaption(I18nProperties.getCaption(Captions.surveyResponseFailureCause)) .setId("cause") .setExpandRatio(2); From a9d0bf54088c44cd9f2a6c18c1e765cf522c3065 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Tue, 17 Mar 2026 08:30:22 +0100 Subject: [PATCH 060/134] Added symptoms mapping --- .../java/de/symeda/sormas/api/Disease.java | 3 + .../sormas/backend/symptoms/Symptoms.java | 60 +++++++++++++++++++ .../backend/symptoms/SymptomsFacadeEjb.java | 12 ++++ .../main/resources/sql/sormas_schema_next.sql | 14 +++++ 4 files changed, 89 insertions(+) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/Disease.java b/sormas-api/src/main/java/de/symeda/sormas/api/Disease.java index 0fad227f003..5e737a1583e 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/Disease.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/Disease.java @@ -97,6 +97,9 @@ public enum Disease OTHER(true, true, true, false, true, 21, false, false, false), UNDEFINED(true, true, true, false, true, 0, false, false, false); + /** + * Immutable that eager loads all available diseases. + */ public static final Set ALL_DISEASES = Arrays.stream(Disease.values()).collect(Collectors.collectingAndThen(Collectors.toSet(), ImmutableSet::copyOf)); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/symptoms/Symptoms.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/symptoms/Symptoms.java index d8bcf208433..2b353ff48c2 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/symptoms/Symptoms.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/symptoms/Symptoms.java @@ -281,6 +281,12 @@ public class Symptoms extends AbstractDomainObject { private SymptomState reoccurrence; private SymptomState overnightStayRequired; private SymptomState bloating; + private SymptomState lossOfAppetite; + private SymptomState flatulence; + private SymptomState smellyBurps; + private SymptomState coughingAttacks; + private SymptomState coughingAtNight; + private SymptomState abdominalCramps; // when adding new fields make sure to extend toHumanString @@ -2186,4 +2192,58 @@ public SymptomState getBloating() { public void setBloating(SymptomState bloating) { this.bloating = bloating; } + + @Enumerated(EnumType.STRING) + public SymptomState getLossOfAppetite() { + return lossOfAppetite; + } + + public void setLossOfAppetite(SymptomState lossOfAppetite) { + this.lossOfAppetite = lossOfAppetite; + } + + @Enumerated(EnumType.STRING) + public SymptomState getFlatulence() { + return flatulence; + } + + public void setFlatulence(SymptomState flatulence) { + this.flatulence = flatulence; + } + + @Enumerated(EnumType.STRING) + public SymptomState getSmellyBurps() { + return smellyBurps; + } + + public void setSmellyBurps(SymptomState smellyBurps) { + this.smellyBurps = smellyBurps; + } + + @Enumerated(EnumType.STRING) + public SymptomState getCoughingAttacks() { + return coughingAttacks; + } + + public void setCoughingAttacks(SymptomState coughingAttacks) { + this.coughingAttacks = coughingAttacks; + } + + @Enumerated(EnumType.STRING) + public SymptomState getCoughingAtNight() { + return coughingAtNight; + } + + public void setCoughingAtNight(SymptomState coughingAtNight) { + this.coughingAtNight = coughingAtNight; + } + + @Enumerated(EnumType.STRING) + public SymptomState getAbdominalCramps() { + return abdominalCramps; + } + + public void setAbdominalCramps(SymptomState abdominalCramps) { + this.abdominalCramps = abdominalCramps; + } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/symptoms/SymptomsFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/symptoms/SymptomsFacadeEjb.java index cf5bc834f47..947efab0e04 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/symptoms/SymptomsFacadeEjb.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/symptoms/SymptomsFacadeEjb.java @@ -247,6 +247,12 @@ public Symptoms fillOrBuildEntity(SymptomsDto source, Symptoms target, boolean c target.setWeightLossAmount(source.getWeightLossAmount()); target.setBloating(source.getBloating()); target.setOvernightStayRequired(source.getOvernightStayRequired()); + target.setLossOfAppetite(source.getLossOfAppetite()); + target.setFlatulence(source.getFlatulence()); + target.setSmellyBurps(source.getSmellyBurps()); + target.setCoughingAttacks(source.getCoughingAttacks()); + target.setCoughingAtNight(source.getCoughingAtNight()); + target.setAbdominalCramps(source.getAbdominalCramps()); return target; } @@ -478,6 +484,12 @@ public static SymptomsDto toSymptomsDto(Symptoms symptoms) { target.setDurationOfSymptoms(source.getDurationOfSymptoms()); target.setWeightLoss(source.getWeightLoss()); target.setWeightLossAmount(source.getWeightLossAmount()); + target.setLossOfAppetite(source.getLossOfAppetite()); + target.setFlatulence(source.getFlatulence()); + target.setSmellyBurps(source.getSmellyBurps()); + target.setCoughingAttacks(source.getCoughingAttacks()); + target.setCoughingAtNight(source.getCoughingAtNight()); + target.setAbdominalCramps(source.getAbdominalCramps()); return target; } diff --git a/sormas-backend/src/main/resources/sql/sormas_schema_next.sql b/sormas-backend/src/main/resources/sql/sormas_schema_next.sql index 6cf8fa3a570..6b0a95f3737 100644 --- a/sormas-backend/src/main/resources/sql/sormas_schema_next.sql +++ b/sormas-backend/src/main/resources/sql/sormas_schema_next.sql @@ -6,5 +6,19 @@ ALTER TABLE surveys ALTER TABLE surveytokens ADD COLUMN external_respondent_id TEXT; + +ALTER TABLE symptoms + ADD COLUMN IF NOT EXISTS lossOfAppetite TEXT; +ALTER TABLE symptoms + ADD COLUMN IF NOT EXISTS flatulence TEXT; +ALTER TABLE symptoms + ADD COLUMN IF NOT EXISTS smellyBurps TEXT; +ALTER TABLE symptoms + ADD COLUMN IF NOT EXISTS coughingAttacks TEXT; +ALTER TABLE symptoms + ADD COLUMN IF NOT EXISTS coughingAtNight TEXT; +ALTER TABLE symptoms + ADD COLUMN IF NOT EXISTS abdominalCramps TEXT; + INSERT INTO schema_version (version_number, comment) VALUES (609, '#13832 - External Survey facade'); \ No newline at end of file From b3d8126206c9a031059c13d5d417ac10efc26474 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Tue, 17 Mar 2026 08:40:39 +0100 Subject: [PATCH 061/134] cleanup --- .../sormas/backend/common/CronService.java | 2 + .../labmessage/TestReport.java | 1 - .../vaccine/RsvVaccinationPatchHelper.java | 53 ------------------- .../rest/resources/LabMessageResource.java | 8 +++ 4 files changed, 10 insertions(+), 54 deletions(-) delete mode 100644 sormas-backend/src/main/java/de/symeda/sormas/backend/patch/vaccine/RsvVaccinationPatchHelper.java diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/common/CronService.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/common/CronService.java index 2e138a296cd..412f93b3e26 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/common/CronService.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/common/CronService.java @@ -239,6 +239,8 @@ public void fetchSurveyResponses() { return; } + logger.error("fetchSurveyResponses is triggered"); + List externalMessageDtos = externalMessageFacade.saveAndProcessSurveyResponses(); if (logger.isInfoEnabled()) { diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/labmessage/TestReport.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/labmessage/TestReport.java index 50346358400..9b230b2f889 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/labmessage/TestReport.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/labmessage/TestReport.java @@ -128,7 +128,6 @@ public class TestReport extends AbstractDomainObject { private RsvSubtype rsvSubtype; private PathogenSpecie specie; - private Float tubeNil; private Boolean tubeNilGT10; private Float tubeAgTb1; diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/vaccine/RsvVaccinationPatchHelper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/vaccine/RsvVaccinationPatchHelper.java deleted file mode 100644 index 5e4bd8215d6..00000000000 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/vaccine/RsvVaccinationPatchHelper.java +++ /dev/null @@ -1,53 +0,0 @@ -package de.symeda.sormas.backend.patch.vaccine; - -import java.util.Date; -import java.util.List; - -import de.symeda.sormas.api.caze.CaseDataDto; -import de.symeda.sormas.api.caze.Vaccine; -import de.symeda.sormas.api.immunization.ImmunizationDto; -import de.symeda.sormas.api.immunization.ImmunizationStatus; -import de.symeda.sormas.api.immunization.MeansOfImmunization; -import de.symeda.sormas.api.vaccination.VaccinationDto; - -public class RsvVaccinationPatchHelper { - - public void createImmunziation(Request request) { - CaseDataDto caze = request.caze; - ImmunizationDto result = ImmunizationDto.build(caze.getPerson()); - result.setDisease(caze.getDisease()); - result.setReportDate(new Date()); - - // TODO: for successfull vaccine - result.setMeansOfImmunization(MeansOfImmunization.VACCINATION); - result.setImmunizationStatus(ImmunizationStatus.ACQUIRED); - - // TODO: mandatory - result.setNumberOfDoses(5); - - // TODO: not vaccinated - result.setMeansOfImmunization(MeansOfImmunization.OTHER); - result.setMeansOfImmunizationDetails("NOT_VACCINATED: TODO: must be retrieved from the text ?"); - // OR - result.setMeansOfImmunizationDetails("DON'T KNOW"); - result.setImmunizationStatus(ImmunizationStatus.NOT_ACQUIRED); - - // TODO: create ngSurvey user - VaccinationDto vaccine = VaccinationDto.build(null); - - // TODO: missing vaccines for RSV and Pertusis - vaccine.setVaccineName(Vaccine.LC_16); - vaccine.setVaccineType("Something useful here ?"); - // TODO: set actual date // MANDATORY - vaccine.setVaccinationDate(new Date()); - - // TODO: create - - result.setVaccinations(List.of(vaccine)); - } - - public static class Request { - - private CaseDataDto caze; - } -} diff --git a/sormas-rest/src/main/java/de/symeda/sormas/rest/resources/LabMessageResource.java b/sormas-rest/src/main/java/de/symeda/sormas/rest/resources/LabMessageResource.java index bf26812b830..a6b81e571c5 100644 --- a/sormas-rest/src/main/java/de/symeda/sormas/rest/resources/LabMessageResource.java +++ b/sormas-rest/src/main/java/de/symeda/sormas/rest/resources/LabMessageResource.java @@ -15,6 +15,8 @@ package de.symeda.sormas.rest.resources; +import java.util.List; + import javax.ws.rs.GET; import javax.ws.rs.POST; import javax.ws.rs.Path; @@ -41,6 +43,12 @@ public ExternalMessageDto getByUuid(@PathParam("uuid") String uuid) { return FacadeProvider.getExternalMessageFacade().getByUuid(uuid); } + @POST + @Path("/surveyResponses/process") + public List saveAndProcessSurveyResponses() { + return FacadeProvider.getExternalMessageFacade().saveAndProcessSurveyResponses(); + } + @POST @Path("/indexList") public Page getIndexList( From 36cba46f4b8e821753499b0f8bb05875d0440637 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Tue, 17 Mar 2026 08:45:49 +0100 Subject: [PATCH 062/134] =?UTF-8?q?=E2=9C=A8=20respect=20skip=20if=20alrea?= =?UTF-8?q?dy=20processed=20during=20cron?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../survey/AutomaticSurveyResponseProcessor.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java index 80d3cdac342..cf7dd7b1266 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java @@ -50,9 +50,6 @@ public class AutomaticSurveyResponseProcessor { public List processSurveyResponses(List externalMessages) throws InterruptedException, ExecutionException { - // TODO: check if already processed + flag to determine if something should be done about it. - logger.error("TODO: check if already processed + flag to determine if something should be done about it"); - List surveyResponseWrappers = externalMessages.stream().map(ExternalMessageDto::getSurveyResponseData).collect(Collectors.toList()); @@ -82,6 +79,13 @@ public List processSurveyResponses(List surveyToken = surveyTokens.stream().filter(tokenCandidate -> tokenCandidate.getToken().equals(request.getToken())).findAny(); From c5738fdbdd1ab328b0f660be28524a927419170e Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Tue, 17 Mar 2026 09:12:14 +0100 Subject: [PATCH 063/134] =?UTF-8?q?=E2=9C=A8=20display=20of=20questionnair?= =?UTF-8?q?e=20results?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sormas/api/survey/SurveyTokenFacade.java | 7 +++++ .../externalmessage/ExternalMessage.java | 10 +++---- .../ExternalMessageFacadeEjb.java | 6 ++--- .../AutomaticSurveyResponseProcessor.java | 14 +++++----- .../SurveyResponseProcessingResult.java | 4 +++ .../backend/survey/SurveyTokenFacadeEjb.java | 27 +++++++++++++++++++ .../main/resources/sql/sormas_schema_next.sql | 12 +++++++-- .../ui/survey/SurveyListComponentLayout.java | 9 +++++++ 8 files changed, 71 insertions(+), 18 deletions(-) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/survey/SurveyTokenFacade.java b/sormas-api/src/main/java/de/symeda/sormas/api/survey/SurveyTokenFacade.java index 8acc37990b4..322616bac51 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/survey/SurveyTokenFacade.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/survey/SurveyTokenFacade.java @@ -20,6 +20,7 @@ import javax.ejb.Remote; import javax.validation.Valid; +import de.symeda.sormas.api.survey.external.views.ExternalSurveyView; import de.symeda.sormas.api.utils.SortProperty; import de.symeda.sormas.api.utils.Tuple; @@ -51,4 +52,10 @@ public interface SurveyTokenFacade { boolean exists(String uuid); SurveyTokenReferenceDto getReferenceByUuid(String uuid); + + /** + * Fetches the questionnaire view for a survey token from the external survey provider. + * Returns null if the provider is unavailable or the token has no external respondent ID. + */ + ExternalSurveyView getExternalSurveyView(String surveyTokenUuid); } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessage.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessage.java index 388dfedc538..06a77e340b3 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessage.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessage.java @@ -229,7 +229,7 @@ public class ExternalMessage extends AbstractDomainObject { private ExternalMessageAdditionalDataType additionalDataType; - private String additionalData; + private String additionalDataJson; @Enumerated(EnumType.STRING) public ExternalMessageType getType() { @@ -948,12 +948,12 @@ public ExternalMessage setAdditionalDataType(ExternalMessageAdditionalDataType a @Column(columnDefinition = "jsonb") @Type(type = "jsonb") - public String getAdditionalData() { - return additionalData; + public String getAdditionalDataJson() { + return additionalDataJson; } - public ExternalMessage setAdditionalData(String additionalData) { - this.additionalData = additionalData; + public ExternalMessage setAdditionalDataJson(String additionalData) { + this.additionalDataJson = additionalData; return this; } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java index bee44aef4f6..4e3cb0bf7ed 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java @@ -534,10 +534,10 @@ public ExternalMessageDto toDto(ExternalMessage source) { target.setTuberculosisBeijingLineage(source.getTuberculosisBeijingLineage()); ExternalMessageAdditionalDataType additionalDataType = source.getAdditionalDataType(); - String additionalData = source.getAdditionalData(); - if (additionalDataType != null && additionalData != null) { + String additionalDataJson = source.getAdditionalDataJson(); + if (additionalDataType != null && additionalDataJson != null) { try { - Object additionalDataInstance = ObjectMapperProvider.getInstance().readValue(additionalData, additionalDataType.getDataClass()); + Object additionalDataInstance = ObjectMapperProvider.getInstance().readValue(additionalDataJson, additionalDataType.getDataClass()); if (additionalDataInstance instanceof ExternalSurveyResponseData) { target.setSurveyResponseData((ExternalSurveyResponseData) additionalDataInstance); } else { diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java index cf7dd7b1266..1dc36f12a8e 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java @@ -20,7 +20,6 @@ import de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseRequest; import de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseResult; import de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseWrapper; -import de.symeda.sormas.api.externalmessage.survey.ExternalSurveyResponseData; import de.symeda.sormas.api.patch.CaseDataPatchRequest; import de.symeda.sormas.api.patch.DataPatchResponse; import de.symeda.sormas.api.patch.DataPatcher; @@ -50,20 +49,17 @@ public class AutomaticSurveyResponseProcessor { public List processSurveyResponses(List externalMessages) throws InterruptedException, ExecutionException { - List surveyResponseWrappers = - externalMessages.stream().map(ExternalMessageDto::getSurveyResponseData).collect(Collectors.toList()); - - Map tokenByExternalTokenIdDictionary = + Map tokenByExternalSurveyIdDictionary = externalMessages.stream().map(ExternalMessageDto::getSurveyResponseData).map(responseData -> { ExternalMessageSurveyResponseRequest request = responseData.getLatest().getRequest(); return new Tuple<>(request.getExternalSurveyId(), request.getToken()); }).collect(CollectorUtils.toOrderedNullSafeMap(Tuple::getFirst, Tuple::getSecond)); - List externalSurveyIds = new ArrayList<>(tokenByExternalTokenIdDictionary.keySet()); + List externalSurveyIds = new ArrayList<>(tokenByExternalSurveyIdDictionary.keySet()); List> tokenBySurveyReferenceTuples = surveyFacade.getByExternalIds(externalSurveyIds) .stream() - .map(survey -> new Tuple<>(survey.toReference(), tokenByExternalTokenIdDictionary.get(survey.getExternalId()))) + .map(survey -> new Tuple<>(survey.toReference(), tokenByExternalSurveyIdDictionary.get(survey.getExternalId()))) .collect(Collectors.toList()); List surveyTokens = surveyTokenFacade.getBySurveyReferenceTokenTuples(tokenBySurveyReferenceTuples); @@ -86,10 +82,12 @@ public List processSurveyResponses(List surveyToken = - surveyTokens.stream().filter(tokenCandidate -> tokenCandidate.getToken().equals(request.getToken())).findAny(); + surveyTokens.stream().filter(tokenCandidate -> tokenCandidate.getToken().equals(requestToken)).findAny(); if (surveyToken.isEmpty()) { + logger.error("Token could not be found within available survey token DTOs: [{}]. Survey response processing is cancelled.", requestToken); return surveyResponseProcessingResult.setResultStatus(ProcessingResultStatus.CANCELED); } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/SurveyResponseProcessingResult.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/SurveyResponseProcessingResult.java index 3656d17a606..007e2bc1dd0 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/SurveyResponseProcessingResult.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/SurveyResponseProcessingResult.java @@ -5,6 +5,10 @@ import de.symeda.sormas.api.externalmessage.ExternalMessageDto; import de.symeda.sormas.api.utils.dataprocessing.ProcessingResultStatus; +/** + * Wrapper object once a SurveyResponse external message was processed. + * Exceptions are caught to be able to continue with the next message from the list. + */ public class SurveyResponseProcessingResult { private ExternalMessageDto externalMessage; diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyTokenFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyTokenFacadeEjb.java index ceb98d118ec..ff91ddc929e 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyTokenFacadeEjb.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyTokenFacadeEjb.java @@ -26,6 +26,7 @@ import javax.ejb.EJB; import javax.ejb.LocalBean; import javax.ejb.Stateless; +import javax.inject.Inject; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; import javax.persistence.Tuple; @@ -44,6 +45,8 @@ import de.symeda.sormas.api.survey.SurveyTokenFacade; import de.symeda.sormas.api.survey.SurveyTokenIndexDto; import de.symeda.sormas.api.survey.SurveyTokenReferenceDto; +import de.symeda.sormas.api.survey.external.ExternalSurveyProviderFacade; +import de.symeda.sormas.api.survey.external.views.ExternalSurveyView; import de.symeda.sormas.api.user.UserRight; import de.symeda.sormas.api.utils.DataHelper; import de.symeda.sormas.api.utils.SortProperty; @@ -89,6 +92,8 @@ public class SurveyTokenFacadeEjb implements SurveyTokenFacade { private ConfigFacadeEjb.ConfigFacadeEjbLocal configFacade; @EJB private DocumentService documentService; + @Inject + private ExternalSurveyProviderFacade externalSurveyProviderFacade; private static final String SURVEY_TOKEN_IMPORT_TEMPLATE_FILE_NAME = "import_survey_tokens_template.csv"; @@ -307,10 +312,32 @@ private SurveyTokenDto toDto(SurveyToken source) { target.setGeneratedDocument(DocumentFacadeEjb.toReferenceDto(source.getGeneratedDocument())); target.setResponseReceived(source.isResponseReceived()); target.setResponseReceivedDate(source.getResponseReceivedDate()); + target.setExternalRespondentId(source.getExternalRespondentId()); return target; } + @Override + public ExternalSurveyView getExternalSurveyView(String surveyTokenUuid) { + if (externalSurveyProviderFacade == null) { + return null; + } + + SurveyToken surveyToken = surveyTokenService.getByUuid(surveyTokenUuid); + if (surveyToken == null) { + return null; + } + + String externalRespondentId = surveyToken.getExternalRespondentId(); + String externalSurveyId = surveyToken.getSurvey() != null ? surveyToken.getSurvey().getExternalId() : null; + + if (externalSurveyId == null || externalRespondentId == null) { + return null; + } + + return externalSurveyProviderFacade.getExternalSurveyView(externalSurveyId, externalRespondentId); + } + public static SurveyTokenReferenceDto toReferenceDto(SurveyToken entity) { if (entity == null) { diff --git a/sormas-backend/src/main/resources/sql/sormas_schema_next.sql b/sormas-backend/src/main/resources/sql/sormas_schema_next.sql index 6b0a95f3737..0af811844bf 100644 --- a/sormas-backend/src/main/resources/sql/sormas_schema_next.sql +++ b/sormas-backend/src/main/resources/sql/sormas_schema_next.sql @@ -1,12 +1,14 @@ -- TODO: meant to be merged into sormas_schema.sql - used to avoid conflicts with development branch --- Add fields used for +-- Surveys ALTER TABLE surveys ADD COLUMN external_survey_id TEXT; + +-- Survey tokens ALTER TABLE surveytokens ADD COLUMN external_respondent_id TEXT; - +-- Surveys ALTER TABLE symptoms ADD COLUMN IF NOT EXISTS lossOfAppetite TEXT; ALTER TABLE symptoms @@ -20,5 +22,11 @@ ALTER TABLE symptoms ALTER TABLE symptoms ADD COLUMN IF NOT EXISTS abdominalCramps TEXT; +-- ExternalMessage +ALTER TABLE externalmessage + ADD COLUMN IF NOT EXISTS additionalDataType TEXT; +ALTER TABLE externalmessage + ADD COLUMN IF NOT EXISTS additionalDataJson JSONB; + INSERT INTO schema_version (version_number, comment) VALUES (609, '#13832 - External Survey facade'); \ No newline at end of file diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/survey/SurveyListComponentLayout.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/survey/SurveyListComponentLayout.java index 872c875d28e..dd14eee210c 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/survey/SurveyListComponentLayout.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/survey/SurveyListComponentLayout.java @@ -179,6 +179,15 @@ protected void drawDisplayedEntries() { listEntry.setComponentAlignment(downloadButton, Alignment.TOP_RIGHT); listEntry.setExpandRatio(downloadButton, 0); + if (Boolean.TRUE.equals(token.getResponseReceived())) { + Button eyeButton = ButtonHelper.createIconButton(null, VaadinIcons.EYE, e -> { + new SurveyQuestionnaireWindow(listEntry.getToken().toReference()); + }, ValoTheme.BUTTON_LINK, CssStyles.BUTTON_COMPACT); + listEntry.addComponent(eyeButton); + listEntry.setComponentAlignment(eyeButton, Alignment.TOP_RIGHT); + listEntry.setExpandRatio(eyeButton, 0); + } + listEntry.addActionButton(String.valueOf(i), (Button.ClickListener) clickEvent -> { ControllerProvider.getSurveyTokenController().showCaseSurveyDetails(listEntry.getToken().toReference(), this::reload); }, UiUtil.permitted(isEditAllowed, UserRight.SURVEY_EDIT)); From 45e5309235fe4aa61a7de10804a2e83625f9effd Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Tue, 17 Mar 2026 16:13:38 +0100 Subject: [PATCH 064/134] =?UTF-8?q?=F0=9F=92=A1cleanup=20and=20minor=20enh?= =?UTF-8?q?ancements?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/survey/SurveyTokenIndexDto.java | 10 +- .../ExternalMessageFacadeEjb.java | 10 +- .../backend/json/ObjectMapperProvider.java | 3 + .../backend/patch/BusinessDtoFacade.java | 37 +++ .../sormas/backend/patch/DataPatcherImpl.java | 2 - .../backend/patch/PathFailureCause.java | 3 + .../backend/patch/alias/PathAliasHelper.java | 3 - .../PersonBirthDateFieldMapper.java | 2 - .../PersonContactDetailsFieldMapper.java | 3 + .../ImmunizationGroupedFieldMapper.java | 270 ------------------ .../backend/survey/SurveyTokenFacadeEjb.java | 44 ++- .../backend/survey/SurveyTokenService.java | 4 +- .../sormas/backend/util/InstanceProvider.java | 6 - .../sormas/patch/PropertyAccessorTest.java | 48 ---- .../ui/survey/SurveyListComponentLayout.java | 2 +- .../ui/survey/SurveyQuestionnaireWindow.java | 131 +++++++++ 16 files changed, 231 insertions(+), 347 deletions(-) delete mode 100644 sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/groupedfieldmapper/ImmunizationGroupedFieldMapper.java create mode 100644 sormas-ui/src/main/java/de/symeda/sormas/ui/survey/SurveyQuestionnaireWindow.java diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/survey/SurveyTokenIndexDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/survey/SurveyTokenIndexDto.java index f179803a7f0..f21d7b622b3 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/survey/SurveyTokenIndexDto.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/survey/SurveyTokenIndexDto.java @@ -23,7 +23,6 @@ public class SurveyTokenIndexDto extends PseudonymizableIndexDto { public static final String I18N_PREFIX = "SurveyToken"; private static final long serialVersionUID = 4358173798026207265L; - public static final String TOKEN = "token"; public static final String ASSIGNED_CASE_UUID = "assignedCaseUuid"; public static final String ASSIGNEMENT_DATE = "assignmentDate"; @@ -41,6 +40,7 @@ public class SurveyTokenIndexDto extends PseudonymizableIndexDto { private final String generatedDocumentUuid; private final String generatedDocumentName; private final String generatedDocumentMimeType; + private final String externalRespondentId; public SurveyTokenIndexDto( String uuid, @@ -54,7 +54,8 @@ public SurveyTokenIndexDto( String generatedDocumentUuid, String generatedDocumentName, String generatedDocumentMimeType, - Date generatedDocumentDate) { + Date generatedDocumentDate, + String externalRespondentId) { super(uuid); this.surveyUuid = surveyUuid; this.surveyName = surveyName; @@ -67,6 +68,7 @@ public SurveyTokenIndexDto( this.generatedDocumentName = generatedDocumentName; this.generatedDocumentMimeType = generatedDocumentMimeType; this.responseReceivedDate = generatedDocumentDate; + this.externalRespondentId = externalRespondentId; } public String getSurveyUuid() { @@ -116,4 +118,8 @@ public String getGeneratedDocumentMimeType() { public Date getResponseReceivedDate() { return responseReceivedDate; } + + public String getExternalRespondentId() { + return externalRespondentId; + } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java index 4e3cb0bf7ed..c52f3a6135b 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java @@ -22,6 +22,7 @@ import java.util.Date; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.Set; import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; @@ -136,6 +137,8 @@ UserRight._EXTERNAL_MESSAGE_DOCTOR_DECLARATION_VIEW }) public class ExternalMessageFacadeEjb implements ExternalMessageFacade { + public static final String SURVEY_PERIOD_INTERVAL_HOURS = "SURVEY_PERIOD_INTERVAL_HOURS"; + private final Logger logger = LoggerFactory.getLogger(getClass()); @PersistenceContext(unitName = ModelConstants.PERSISTENCE_UNIT_NAME) @@ -327,9 +330,10 @@ public ExternalMessageDto saveAndProcessLabmessage(@Valid ExternalMessageDto lab public List saveAndProcessSurveyResponses(Date since) { if (since == null) { - // TODO: configurable date value. - logger.error("Since date should be configurable"); - since = DateHelper.addDays(new Date(), -7); + int hoursRange = + Integer.parseInt(Optional.ofNullable(systemConfigurationValueFacade.getValue(SURVEY_PERIOD_INTERVAL_HOURS)).orElse("168")); + + since = DateHelper.addSeconds(new Date(), -(hoursRange * 3600)); } ExternalMessageAdapterFacade externalLabResultsFacade = getSurveyExternalMessageFacade(); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/json/ObjectMapperProvider.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/json/ObjectMapperProvider.java index d369cff063e..2b4f09ca054 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/json/ObjectMapperProvider.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/json/ObjectMapperProvider.java @@ -24,6 +24,9 @@ import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +/** + * Permits unified access to a pre-configured {@link ObjectMapper} instance. + */ public final class ObjectMapperProvider { private static final Logger logger = LoggerFactory.getLogger(ObjectMapperProvider.class); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java index aec75c31728..deb54b33ebe 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java @@ -24,6 +24,9 @@ import de.symeda.sormas.backend.immunization.ImmunizationFacadeEjb; import de.symeda.sormas.backend.person.PersonFacadeEjb; +/** + * Meant as single entry point for usages were multiple Business DTOs must be fetched or saved. + */ @ApplicationScoped public class BusinessDtoFacade { @@ -99,6 +102,17 @@ public CaseDataDto getCaseDataDto(String caseUuid) { .orElseThrow(() -> new IllegalStateException(String.format("No CaseDataDto found for [%s]", caseUuid))); } + /** + * Meant for creational purposes. + * + * @param entityClass + * target class + * @param caseDataDto + * linked case + * @return DTO if found. + * @param + * types + */ @Nullable public T fetch(@NotNull Class entityClass, CaseDataDto caseDataDto) { return Optional.ofNullable((Function) dtoRetrieverDictionary.get(entityClass)) @@ -106,6 +120,15 @@ public T fetch(@NotNull Class entityClass, CaseDataDto .apply(caseDataDto); } + /** + * Meant for display purposes. + * + * @param i18nName + * DtoPrefix per example {@link PersonDto#I18N_PREFIX}. + * @param caseDataDto + * linked case. + * @return entity dto if found. + */ @Nullable public List fetchByI18nName(@NotNull String i18nName, CaseDataDto caseDataDto) { return Optional.ofNullable(dtoRetrieverByI18nDictionary.get(i18nName)) @@ -113,10 +136,24 @@ public List fetchByI18nName(@NotNull String i18nName, CaseD .apply(caseDataDto); } + /** + * For displaying purposes what purposes can be retrieved. + * + * @return prefixes that can be fetched through their I18n Prefix. + */ public Set fetchablePrefixes() { return dtoRetrieverByI18nDictionary.keySet(); } + /** + * Single entry for saving a business DTO. + * + * @param entityDto + * business DTO + * @return saved DTO. + * @param + * type + */ public T save(@NotNull EntityDto entityDto) { Class entityDtoClass = entityDto.getClass(); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java index 4a61166ee51..d99ca1451cc 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java @@ -237,7 +237,6 @@ private boolean anyFieldPatchedWithPrefix(Map validPatchDictiona .collect(CollectorUtils.toNullSafeMap(de.symeda.sormas.api.patch.SinglePatchResult::getFieldName, fct)); } - // TODO: make usable for external use private @NotNull de.symeda.sormas.api.patch.SinglePatchResult valueMappingResult( Tuple> entry, Disease disease, @@ -314,7 +313,6 @@ private DataPatchFailureCause extractFailureCause(Tuple fieldMappingResult( Tuple> entry, Disease disease, diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PathFailureCause.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PathFailureCause.java index 9b0b0b79e5f..086aa48ce15 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PathFailureCause.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PathFailureCause.java @@ -5,6 +5,9 @@ import de.symeda.sormas.api.patch.DataPatchFailureCause; import de.symeda.sormas.api.patch.partial_retrieval.PartialRetrievalFailureCause; +/** + * Occurs when trying to access path. + */ public enum PathFailureCause { INVALID_PATH_FORMAT(DataPatchFailureCause.INVALID_PATH_FORMAT, PartialRetrievalFailureCause.INVALID_PATH_FORMAT), diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java index a80f68d5e66..cda05973c1a 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java @@ -32,8 +32,6 @@ public class PathAliasHelper { private final static Logger logger = LoggerFactory.getLogger(PathAliasHelper.class); - // TODO: define configurable additional aliases ? - public static final Map DEFAULT_ALIAS_DICTIONARY = buildDefaultAliasDictionary(); public static final Map> DEFAULT_FORBIDDEN_ALIASES_DICTIONARY = @@ -78,7 +76,6 @@ public Tuple resolveAlias(String pathWithPotentialAlia return tupleWithFailure(PathFailureCause.FORBIDDEN_NON_UNIQUE_ALIAS); } - // TODO: refactor this String pathWithFixedRootObjectReferences = REFERENCE_TO_ROOT_DICTIONARY.values() .stream() .reduce( diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonBirthDateFieldMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonBirthDateFieldMapper.java index 09d642814c3..1d8a31ebfad 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonBirthDateFieldMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonBirthDateFieldMapper.java @@ -47,11 +47,9 @@ public Optional map(FieldPatchRequest request) { Date birthDate = result.getData(); - // TODO: remove duplication. Calendar calendar = Calendar.getInstance(); calendar.setTime(birthDate); int dayOfMonth = calendar.get(Calendar.DAY_OF_MONTH); - // In calendar API months are indexed from 0 @see https://docs.oracle.com/javase/7/docs/api/java/util/Calendar.html#MONTH int birthdateMonth = calendar.get(Calendar.MONTH) + 1; int year = calendar.get(Calendar.YEAR); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapper.java index 2df60993ee0..8c57d60cd65 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapper.java @@ -25,6 +25,9 @@ import de.symeda.sormas.api.person.PhoneNumberType; import de.symeda.sormas.api.utils.DataHelper; +/** + * Allows to set the phone number or email contact info of a person with within a single mapper. + */ @ApplicationScoped public class PersonContactDetailsFieldMapper implements FieldCustomMapper { diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/groupedfieldmapper/ImmunizationGroupedFieldMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/groupedfieldmapper/ImmunizationGroupedFieldMapper.java deleted file mode 100644 index 7babc3a5ad7..00000000000 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/groupedfieldmapper/ImmunizationGroupedFieldMapper.java +++ /dev/null @@ -1,270 +0,0 @@ -package de.symeda.sormas.backend.patch.mapping.impl.groupedfieldmapper; - -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import javax.ejb.EJB; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - -import org.jetbrains.annotations.NotNull; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import de.symeda.sormas.api.caze.Vaccine; -import de.symeda.sormas.api.clinicalcourse.HealthConditionsDto; -import de.symeda.sormas.api.immunization.ImmunizationDto; -import de.symeda.sormas.api.immunization.ImmunizationStatus; -import de.symeda.sormas.api.immunization.MeansOfImmunization; -import de.symeda.sormas.api.patch.DataPatchFailure; -import de.symeda.sormas.api.patch.DataPatchFailureCause; -import de.symeda.sormas.api.patch.SinglePatchResult; -import de.symeda.sormas.api.patch.mapping.GroupedFieldsMapper; -import de.symeda.sormas.api.patch.mapping.GroupedFieldsRequest; -import de.symeda.sormas.api.patch.mapping.GroupedFieldsResponse; -import de.symeda.sormas.api.patch.mapping.ValueMappingResult; -import de.symeda.sormas.api.patch.mapping.ValuePatchRequest; -import de.symeda.sormas.api.utils.YesNoUnknown; -import de.symeda.sormas.api.vaccination.VaccinationDto; -import de.symeda.sormas.backend.patch.DataPatcherImpl; -import de.symeda.sormas.backend.patch.PatchFieldHelper; -import de.symeda.sormas.backend.patch.mapping.ValueMapperRegistry; -import de.symeda.sormas.backend.user.UserFacadeEjb; -import de.symeda.sormas.backend.util.InstanceProvider; -import de.symeda.sormas.backend.util.StringNormalizer; - -@ApplicationScoped -public class ImmunizationGroupedFieldMapper implements GroupedFieldsMapper { - - private final static Logger logger = LoggerFactory.getLogger(ImmunizationGroupedFieldMapper.class); - - public static final String IMMUNIZATION_STATUS_KEY = ImmunizationDto.I18N_PREFIX + "." + ImmunizationDto.IMMUNIZATION_STATUS; - public static final String MEANS_IMMUNIZATION_KEY = ImmunizationDto.I18N_PREFIX + "." + ImmunizationDto.MEANS_OF_IMMUNIZATION; - private static final Set SUPPORTED_PREFIXES = Stream.of(ImmunizationDto.I18N_PREFIX, VaccinationDto.I18N_PREFIX) - .map(prefix -> prefix + PatchFieldHelper.PATH_SEPARATOR) - .collect(Collectors.toSet()); - - public static final String UNKNOWN_STATE = StringNormalizer.normalize("UNKNOWN"); - public static final String YES_UNKNOWN_VACCINE_STATE = StringNormalizer.normalize("YES_UNKNOWN"); - public static final String VACCINATION_VACCINE_NAME_KEY = VaccinationDto.I18N_PREFIX + "." + VaccinationDto.VACCINE_NAME; - - @Inject - private ValueMapperRegistry valueMapperRegistry; - - @EJB - private UserFacadeEjb.UserFacadeEjbLocal userFacade; - - @Inject - private DataPatcherImpl dataPatcher; - - @Override - public GroupedFieldsResponse aggregatedPatch(GroupedFieldsRequest request) { - // TODO: use a field as reference to trigger one or another logic: Immunization.immunizationStatus - - Map originalPatchDictionary = request.getPartialPatchDictionary(); - - ImmunizationDto build = ImmunizationDto.build(request.getPerson().get()); - build.setDisease(request.getDisease()); - - // TODO: mother vaccine - // TODO: case for NO. - // TODO: some additional hack could be added for mother vaccine: RSV: could be another ImmunizationDto - - Object immunizationStatus = originalPatchDictionary.get(IMMUNIZATION_STATUS_KEY); - if (immunizationStatus == null) { - return new GroupedFieldsResponse().setPatchingResults( - originalPatchDictionary.entrySet() - .stream() - .map( - entry -> new SinglePatchResult().setFieldName(entry.getKey()) - .setFailure( - new DataPatchFailure().setProvidedFieldValue(entry.getValue()) - .setDataPatchFailureCause(DataPatchFailureCause.MISSING_MANDATORY_FIELD_FOR_GROUP))) - .collect(Collectors.toList())); - } - - // TODO: add check for vaccination. - Object meansOfImmunization = originalPatchDictionary.get(ImmunizationDto.I18N_PREFIX + "." + ImmunizationDto.MEANS_OF_IMMUNIZATION); - - // TODO: also mother - Optional maternalImmunization = Optional.empty(); - if (meansOfImmunization != null) { - ValueMappingResult meansOfImmunizationValueMappingResult = - getValueAsTarget(request, meansOfImmunization, MeansOfImmunization.class); - - if (meansOfImmunizationValueMappingResult.getData() == MeansOfImmunization.MATERNAL_VACCINATION) { - ImmunizationDto immunizationDto = buildImmunizationFrom(request); - immunizationDto.setImmunizationStatus(ImmunizationStatus.ACQUIRED); - immunizationDto.setMeansOfImmunization(MeansOfImmunization.MATERNAL_VACCINATION); - - maternalImmunization = Optional.of(immunizationDto); - } - } - - // TODO: remove this, use YesNoUnknow enum instead. - ValueMappingResult booleanResult = getValueAsTarget(request, immunizationStatus, Boolean.class); - - if (Boolean.TRUE.equals(booleanResult.getData())) { - ImmunizationDto immunizationDto = buildImmunizationFrom(request); - immunizationDto.setImmunizationStatus(ImmunizationStatus.ACQUIRED); - immunizationDto.setMeansOfImmunization(MeansOfImmunization.VACCINATION); - VaccinationDto vaccinationDto = buildVaccine(); - immunizationDto.setVaccinations(List.of(vaccinationDto)); - - return new GroupedFieldsResponse().setEntityDto(buildEntityList(immunizationDto, maternalImmunization)) - .setPatchingResults( - Stream.concat(patch(request, immunizationDto).stream(), patch(request, vaccinationDto).stream()).collect(Collectors.toList())); - } - - ValueMappingResult stringResult = getValueAsTarget(request, immunizationStatus, String.class); - - ValueMappingResult enumYesNoUnknown = getValueAsTarget(request, immunizationStatus, YesNoUnknown.class); - - String dataAsString = stringResult.getData(); - if (YES_UNKNOWN_VACCINE_STATE.equals(StringNormalizer.normalize(dataAsString))) { - ImmunizationDto immunizationDto = buildImmunizationFrom(request); - immunizationDto.setImmunizationStatus(ImmunizationStatus.ACQUIRED); - immunizationDto.setMeansOfImmunization(MeansOfImmunization.VACCINATION); - - VaccinationDto vaccinationDto = buildVaccine(); - vaccinationDto.setVaccineName(Vaccine.UNKNOWN); - - immunizationDto.setVaccinations(List.of(vaccinationDto)); - - return new GroupedFieldsResponse().setEntityDto(buildEntityList(immunizationDto, maternalImmunization)) - .setPatchingResults( - Stream.concat(patch(request, immunizationDto).stream(), patch(request, vaccinationDto).stream()).collect(Collectors.toList())); - - } else if (UNKNOWN_STATE.equals(StringNormalizer.normalize(dataAsString)) || enumYesNoUnknown.getData() == YesNoUnknown.NO) { - ImmunizationDto immunizationDto = buildImmunizationFrom(request); - immunizationDto.setImmunizationStatus(ImmunizationStatus.NOT_ACQUIRED); - - return new GroupedFieldsResponse().setEntityDto(buildEntityList(immunizationDto, maternalImmunization)) - .setPatchingResults(patch(request, immunizationDto)); - } else { - ImmunizationDto immunizationDto = buildImmunizationFrom(request); - immunizationDto.setImmunizationStatus(ImmunizationStatus.ACQUIRED); - immunizationDto.setMeansOfImmunization(MeansOfImmunization.VACCINATION); - - VaccinationDto vaccinationDto = buildVaccine(); - vaccinationDto.setVaccineName(Vaccine.OTHER); - - vaccinationDto.setOtherVaccineName(dataAsString); - - immunizationDto.setVaccinations(List.of(vaccinationDto)); - - return new GroupedFieldsResponse().setEntityDto(buildEntityList(immunizationDto, maternalImmunization)) - .setPatchingResults( - Stream.concat(patch(request, immunizationDto).stream(), patch(request, vaccinationDto).stream()).collect(Collectors.toList())); - } - - // TODO: use (Field ID) Vaccination.vaccineType: to determine if it is a vaccine for the mother. - - /* - * Implementation steps: - * - Retrieve value for: 'Immunization.immunizationStatus' - * - Try to detect what is it: - * - Yes: must be a vaccine that will be specified in the rest of the object - * - No OR don't know: create "dummy-object" that says: - * booleanResult.setImmunizationStatus(ImmunizationStatus.NOT_ACQUIRED).setMeansOfImmunization(MeansOfImmunization.OTHER); - * - no: booleanResult.setMeansOfImmunizationDetails("NOT_VACCINATED") - * - don't know: booleanResult.setMeansOfImmunizationDetails("DON'T KNOW") - * YES detailed explanation: - * - create ImmunizationDto - * - create VaccineDto - * - Patch the remaining values as usual ? - * - Can use the DataPatcher again to be able to set all single field values: values or exact fields. (focus on values now) - */ - - } - - private static @NotNull List buildEntityList(ImmunizationDto immunizationDto, Optional maternalImmunization) { - return Stream.of(Optional.of(immunizationDto), maternalImmunization).flatMap(Optional::stream).collect(Collectors.toList()); - } - - @NotNull - private VaccinationDto buildVaccine() { - VaccinationDto vaccinationDto = new VaccinationDto(); - - vaccinationDto.setVaccineName(Vaccine.OTHER); - vaccinationDto.setReportDate(new Date()); - vaccinationDto.setReportingUser(userFacade.getCurrentUserAsReference()); - - vaccinationDto.setHealthConditions(HealthConditionsDto.build()); - - return vaccinationDto; - } - - @NotNull - private ImmunizationDto buildImmunizationFrom(GroupedFieldsRequest request) { - ImmunizationDto immunizationDto = new ImmunizationDto(); - - immunizationDto.setRelatedCase(request.getCaseData()); - immunizationDto.setPerson(request.getPerson().get()); - immunizationDto.setReportDate(new Date()); - immunizationDto.setDisease(request.getDisease()); - - // TODO: this is not correct and hardcoded. - logger.error("User ist still harcoded for now"); - immunizationDto.setReportingUser(userFacade.getCurrentUserAsReference()); - - return immunizationDto; - } - - private @NotNull List patch(GroupedFieldsRequest request, ImmunizationDto immunizationDto) { - return Stream.concat( - request.getPartialPatchDictionary() - .entrySet() - .stream() - .filter(entry -> !IMMUNIZATION_STATUS_KEY.equals(entry.getKey())) - .filter(entry -> entry.getKey().startsWith(ImmunizationDto.I18N_PREFIX)) - // TODO: if needed put back single mapping -// .map( -// entry -> dataPatcher.produceSinglePatchResult( -// new CaseDataPatchRequest().setReplacementStrategy(request.getReplacementStrategy()), -// new Tuple<>(entry.getKey(), new Tuple<>(null, entry.getValue())), -// request.getDisease(), -// () -> immunizationDto)), - .map(a -> new SinglePatchResult().setFieldName(a.getKey()).setValue(a.getValue())), - Stream.of(new SinglePatchResult().setFieldName(IMMUNIZATION_STATUS_KEY).setValue(immunizationDto.getImmunizationStatus()))) - .collect(Collectors.toList()); - } - - private static @NotNull List patch(GroupedFieldsRequest request, VaccinationDto vaccineDto) { - DataPatcherImpl dataPatcher = InstanceProvider.getInstanceFor(DataPatcherImpl.class); - return Stream.concat( - request.getPartialPatchDictionary() - .entrySet() - .stream() - .filter(entry -> !VACCINATION_VACCINE_NAME_KEY.equals(entry.getKey())) - .filter(entry -> entry.getKey().startsWith(VaccinationDto.I18N_PREFIX)) -// .map( -// entry -> dataPatcher.produceSinglePatchResult( -// new CaseDataPatchRequest().setReplacementStrategy(request.getReplacementStrategy()), -// new Tuple<>(entry.getKey(), new Tuple<>(null, entry.getValue())), -// request.getDisease(), -// () -> vaccineDto)), - .map(a -> new SinglePatchResult().setFieldName(a.getKey()).setValue(a.getValue())), - - Stream.of(new SinglePatchResult().setFieldName(VACCINATION_VACCINE_NAME_KEY).setValue(vaccineDto.getVaccineName()))) - .collect(Collectors.toList()); - } - - private ValueMappingResult getValueAsTarget(GroupedFieldsRequest request, Object immunizationStatus, Class targetType) { - return valueMapperRegistry.map( - new ValuePatchRequest().setValue(immunizationStatus) - .setInputLanguages(request.getInputLanguages()) - .setAllowFallbackValues(request.isAllowFallbackValues()) - .setTargetType(targetType)); - } - - @Override - public Set aggregatedPrefixes() { - return SUPPORTED_PREFIXES; - } -} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyTokenFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyTokenFacadeEjb.java index ff91ddc929e..381bf77b76c 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyTokenFacadeEjb.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyTokenFacadeEjb.java @@ -20,13 +20,15 @@ import java.nio.file.Paths; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import java.util.stream.Collectors; import java.util.stream.Stream; import javax.ejb.EJB; import javax.ejb.LocalBean; import javax.ejb.Stateless; -import javax.inject.Inject; +import javax.naming.InitialContext; +import javax.naming.NamingException; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; import javax.persistence.Tuple; @@ -39,6 +41,9 @@ import javax.persistence.criteria.Selection; import javax.validation.Valid; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import de.symeda.sormas.api.survey.SurveyReferenceDto; import de.symeda.sormas.api.survey.SurveyTokenCriteria; import de.symeda.sormas.api.survey.SurveyTokenDto; @@ -47,6 +52,7 @@ import de.symeda.sormas.api.survey.SurveyTokenReferenceDto; import de.symeda.sormas.api.survey.external.ExternalSurveyProviderFacade; import de.symeda.sormas.api.survey.external.views.ExternalSurveyView; +import de.symeda.sormas.api.systemconfiguration.SystemConfigurationValueFacade; import de.symeda.sormas.api.user.UserRight; import de.symeda.sormas.api.utils.DataHelper; import de.symeda.sormas.api.utils.SortProperty; @@ -71,6 +77,8 @@ @RightsAllowed(UserRight._SURVEY_TOKEN_VIEW) public class SurveyTokenFacadeEjb implements SurveyTokenFacade { + private final Logger logger = LoggerFactory.getLogger(getClass()); + @PersistenceContext(unitName = ModelConstants.PERSISTENCE_UNIT_NAME) private EntityManager em; @@ -92,8 +100,10 @@ public class SurveyTokenFacadeEjb implements SurveyTokenFacade { private ConfigFacadeEjb.ConfigFacadeEjbLocal configFacade; @EJB private DocumentService documentService; - @Inject - private ExternalSurveyProviderFacade externalSurveyProviderFacade; + @EJB + private SystemConfigurationValueFacade systemConfigurationValueFacade; + + public static final String EXTERNAL_SURVEY_PROVIDER_JNDI_KEY = "EXTERNAL_SURVEY_PROVIDER_JNDI_NAME"; private static final String SURVEY_TOKEN_IMPORT_TEMPLATE_FILE_NAME = "import_survey_tokens_template.csv"; @@ -319,12 +329,9 @@ private SurveyTokenDto toDto(SurveyToken source) { @Override public ExternalSurveyView getExternalSurveyView(String surveyTokenUuid) { - if (externalSurveyProviderFacade == null) { - return null; - } - SurveyToken surveyToken = surveyTokenService.getByUuid(surveyTokenUuid); if (surveyToken == null) { + logger.error("SurveyToken with uuid [{}] not found", surveyTokenUuid); return null; } @@ -332,13 +339,32 @@ public ExternalSurveyView getExternalSurveyView(String surveyTokenUuid) { String externalSurveyId = surveyToken.getSurvey() != null ? surveyToken.getSurvey().getExternalId() : null; if (externalSurveyId == null || externalRespondentId == null) { + logger.error("SurveyToken with uuid [{}] had no externalSurveyId [{}] or [{}]", surveyTokenUuid, externalSurveyId, externalRespondentId); return null; } - return externalSurveyProviderFacade.getExternalSurveyView(externalSurveyId, externalRespondentId); + ExternalSurveyProviderFacade facade = getExternalSurveyProviderFacade(); + if (facade == null) { + logger.error("Facade not found"); + return null; + } + + return facade.getExternalSurveyView(externalSurveyId, externalRespondentId); + } + + private ExternalSurveyProviderFacade getExternalSurveyProviderFacade() { + String jndiName = Optional.ofNullable(systemConfigurationValueFacade.getValue(EXTERNAL_SURVEY_PROVIDER_JNDI_KEY)).orElseGet(() -> { + logger.info("External Survey Provider JNDI Key not found, using default"); + return "interface.externalMessageAdapter.jndiName=java:global/sormas-esante-adapter/NgSurveyMessageFacade"; + }); + try { + return (ExternalSurveyProviderFacade) new InitialContext().lookup(jndiName); + } catch (NamingException e) { + throw new RuntimeException("Could not look up ExternalSurveyProviderFacade via JNDI: " + jndiName, e); + } } - public static SurveyTokenReferenceDto toReferenceDto(SurveyToken entity) { + public SurveyTokenReferenceDto toReferenceDto(SurveyToken entity) { if (entity == null) { return null; diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyTokenService.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyTokenService.java index 3c8104a047e..613d1401ffc 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyTokenService.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyTokenService.java @@ -38,6 +38,8 @@ @LocalBean public class SurveyTokenService extends BaseAdoService { + public static final int MAX_SURVEY_TOKEN_RESULTS_SIZE = 1000; + public SurveyTokenService() { super(SurveyToken.class); } @@ -135,6 +137,6 @@ public List getBySurveyReferenceTokenTuples(List, Set>> type = PropertyAccessor.getNestedPropertyType(bean, "name"); -// assertTrue(type.isPresent()); -// assertEquals(String.class, type.get()); -// } -// -// @Test -// void getNestedPropertyType_nestedProperty_returnsCorrectType() { -// Optional, Set>> type = PropertyAccessor.getNestedPropertyType(bean, "address.city"); -// assertTrue(type.isPresent()); -// assertEquals(String.class, type.get()); -// } -// -// @Test -// void getNestedPropertyType_indexedProperty_returnsElementType() { -// Optional, Set>> type = PropertyAccessor.getNestedPropertyType(bean, "items[0].name"); -// assertTrue(type.isPresent()); -// assertEquals(String.class, type.get()); -// } -// -// @Test -// void getNestedPropertyType_array_returnsComponentType() { -// Optional, Set>> type = PropertyAccessor.getNestedPropertyType(bean, "array[0]"); -// assertTrue(type.isPresent()); -// assertEquals(String.class, type.get()); -// } -// -// @Test -// void getNestedPropertyType_iterable_returnsObjectClass() { -// Optional, Set>> type = PropertyAccessor.getNestedPropertyType(bean, "items[0]"); -// assertTrue(type.isPresent()); -// assertEquals(Object.class, type.get()); -// } -// -// @Test -// void getNestedPropertyType_invalidProperty_returnsEmpty() { -// Optional, Set>> type = PropertyAccessor.getNestedPropertyType(bean, "nonexistent"); -// assertFalse(type.isPresent()); -// } -// -// @Test -// void getNestedPropertyType_nullInputs_returnsEmpty() { -// assertFalse(PropertyAccessor.getNestedPropertyType(null, "name").isPresent()); -// assertFalse(PropertyAccessor.getNestedPropertyType(bean, null).isPresent()); -// assertFalse(PropertyAccessor.getNestedPropertyType(bean, "").isPresent()); -// } @Test void getNestedProperty_readsSimpleProperty() { diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/survey/SurveyListComponentLayout.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/survey/SurveyListComponentLayout.java index dd14eee210c..c55b8da13bb 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/survey/SurveyListComponentLayout.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/survey/SurveyListComponentLayout.java @@ -179,7 +179,7 @@ protected void drawDisplayedEntries() { listEntry.setComponentAlignment(downloadButton, Alignment.TOP_RIGHT); listEntry.setExpandRatio(downloadButton, 0); - if (Boolean.TRUE.equals(token.getResponseReceived())) { + if (Boolean.TRUE.equals(token.getResponseReceived()) && StringUtils.isNotBlank(token.getExternalRespondentId())) { Button eyeButton = ButtonHelper.createIconButton(null, VaadinIcons.EYE, e -> { new SurveyQuestionnaireWindow(listEntry.getToken().toReference()); }, ValoTheme.BUTTON_LINK, CssStyles.BUTTON_COMPACT); diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/survey/SurveyQuestionnaireWindow.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/survey/SurveyQuestionnaireWindow.java new file mode 100644 index 00000000000..04f2a77d09d --- /dev/null +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/survey/SurveyQuestionnaireWindow.java @@ -0,0 +1,131 @@ +/* + * SORMAS® - Surveillance Outbreak Response Management & Analysis System + * Copyright © 2016-2026 SORMAS Foundation gGmbH + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package de.symeda.sormas.ui.survey; + +import java.util.List; + +import com.vaadin.shared.ui.ContentMode; +import com.vaadin.ui.Label; +import com.vaadin.ui.Panel; +import com.vaadin.ui.UI; +import com.vaadin.ui.VerticalLayout; +import com.vaadin.ui.Window; + +import de.symeda.sormas.api.FacadeProvider; +import de.symeda.sormas.api.survey.SurveyTokenReferenceDto; +import de.symeda.sormas.api.survey.external.views.ExternalSurveyView; +import de.symeda.sormas.api.survey.external.views.QuestionAnswersView; + +/** + * Modal window displaying a survey questionnaire as a structured HTML view. + * Shows questions, their answers and nested subquestions. + */ +public class SurveyQuestionnaireWindow { + + public SurveyQuestionnaireWindow(SurveyTokenReferenceDto surveyTokenRef) { + ExternalSurveyView surveyView; + try { + surveyView = FacadeProvider.getSurveyTokenFacade().getExternalSurveyView(surveyTokenRef.getUuid()); + } catch (Exception e) { + surveyView = null; + } + + Window window = new Window(surveyTokenRef.getCaption()); + window.setModal(true); + window.setResizable(true); + window.setWidth(700, com.vaadin.server.Sizeable.Unit.PIXELS); + window.setHeight(80, com.vaadin.server.Sizeable.Unit.PERCENTAGE); + + VerticalLayout mainLayout = new VerticalLayout(); + mainLayout.setMargin(true); + mainLayout.setSpacing(false); + + if (surveyView == null || surveyView.getQuestionAnswersViews() == null || surveyView.getQuestionAnswersViews().isEmpty()) { + mainLayout.addComponent(new Label("No questionnaire data available.")); + } else { + Label htmlContent = new Label(buildHtml(surveyView.getQuestionAnswersViews()), ContentMode.HTML); + htmlContent.setSizeFull(); + mainLayout.addComponent(htmlContent); + } + + Panel scrollPanel = new Panel(mainLayout); + scrollPanel.setSizeFull(); + + window.setContent(scrollPanel); + UI.getCurrent().addWindow(window); + } + + private String buildHtml(List questions) { + StringBuilder sb = new StringBuilder(); + sb.append(""); + sb.append("") + .append("") + .append("") + .append(""); + sb.append(""); + + for (QuestionAnswersView q : questions) { + appendQuestion(sb, q, 0); + } + + sb.append("
QuestionAnswer
"); + return sb.toString(); + } + + private void appendQuestion(StringBuilder sb, QuestionAnswersView q, int depth) { + boolean hasSubquestions = q.getSubquestions() != null && !q.getSubquestions().isEmpty(); + String indent = depth > 0 ? "padding-left:" + (depth * 20) + "px;" : ""; + String rowStyle = depth > 0 ? "background:#fafafa;" : "background:#fff;"; + String questionStyle = hasSubquestions && q.getAnswer() == null ? "font-weight:bold;color:#333;" : "color:#333;"; + + sb.append("") + .append("") + .append(escapeHtml(q.getQuestion())) + .append("") + .append("") + .append(resolveAnswer(q)) + .append("") + .append(""); + + if (hasSubquestions) { + for (QuestionAnswersView sub : q.getSubquestions()) { + appendQuestion(sb, sub, depth + 1); + } + } + } + + private String resolveAnswer(QuestionAnswersView q) { + // Prefer human-readable answerText, fall back to raw answer + if (q.getAnswerText() != null && !q.getAnswerText().isEmpty()) { + return escapeHtml(q.getAnswerText()); + } + if (q.getAnswer() != null && !q.getAnswer().isEmpty()) { + return escapeHtml(q.getAnswer()); + } + return "—"; + } + + private String escapeHtml(String text) { + if (text == null) { + return ""; + } + return text.replace("&", "&").replace("<", "<").replace(">", ">").replace("\"", """); + } +} From bd659d1e9c93c2597b83b9378aabc50e7769f925 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Wed, 18 Mar 2026 07:18:34 +0100 Subject: [PATCH 065/134] reverting format --- .../src/main/resources/captions.properties | 480 +- .../main/resources/captions_de-CH.properties | 285 +- .../main/resources/captions_de-DE.properties | 285 +- .../main/resources/captions_en-AF.properties | 285 +- .../main/resources/captions_en-GH.properties | 285 +- .../main/resources/captions_en-GM.properties | 285 +- .../main/resources/captions_en-KE.properties | 285 +- .../main/resources/captions_en-LR.properties | 285 +- .../main/resources/captions_en-NG.properties | 285 +- .../main/resources/captions_es-ES.properties | 211 +- .../main/resources/captions_fa-AF.properties | 285 +- .../main/resources/captions_fil-PH.properties | 211 +- .../main/resources/captions_fj-FJ.properties | 211 +- .../main/resources/captions_fr-CD.properties | 211 +- .../main/resources/captions_haw-US.properties | 191 +- .../main/resources/captions_hi-IN.properties | 211 +- .../main/resources/captions_hr-HR.properties | 211 +- .../main/resources/captions_ja-JP.properties | 211 +- .../main/resources/captions_ks-PK.properties | 191 +- .../main/resources/captions_ku-TR.properties | 252 +- .../main/resources/captions_la-LA.properties | 191 +- .../main/resources/captions_lv-LV.properties | 211 +- .../main/resources/captions_mt-MT.properties | 191 +- .../main/resources/captions_ne-NP.properties | 211 +- .../main/resources/captions_nl-NL.properties | 211 +- .../main/resources/captions_no-NO.properties | 211 +- .../main/resources/captions_pt-BR.properties | 285 +- .../main/resources/captions_pt-CV.properties | 285 +- .../main/resources/captions_pt-PT.properties | 211 +- .../main/resources/captions_ro-RO.properties | 211 +- .../main/resources/captions_ru-RU.properties | 285 +- .../main/resources/captions_sv-SE.properties | 211 +- .../main/resources/captions_sw-KE.properties | 211 +- .../main/resources/captions_tr-TR.properties | 211 +- .../main/resources/captions_uk-UA.properties | 211 +- .../main/resources/captions_zh-CN.properties | 285 +- .../main/resources/captions_zu-ZA.properties | 191 +- sormas-api/src/main/resources/enum.properties | 3918 +++++++++-------- .../src/main/resources/enum_fr-FR.properties | 3383 +++++++------- .../src/main/resources/strings.properties | 3477 +++++++-------- .../backend/survey/SurveyTokenFacadeEjb.java | 3 +- .../SurveyTokenIndexDtoResultTransformer.java | 3 +- 42 files changed, 10676 insertions(+), 9087 deletions(-) diff --git a/sormas-api/src/main/resources/captions.properties b/sormas-api/src/main/resources/captions.properties index 4f11d5f800f..18d37297bb4 100644 --- a/sormas-api/src/main/resources/captions.properties +++ b/sormas-api/src/main/resources/captions.properties @@ -52,7 +52,7 @@ creationDate=Creation date changeDate=Date of last change notAvailableShort=NA inaccessibleValue=Confidential -includePartialBirthdates=Include partial birthdates +includePartialBirthdates = Include partial birthdates numberOfCharacters=Number of characters: %d / %d remove=Remove notTestedYet=Not tested yet @@ -189,17 +189,17 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge=Okay, and continue to merge overview -actionOkAndGoToContactDirectory=Okay, and continue to contact directory -actionOkAndGoToContactDetails=Okay, and continue to contact -actionOkAndGoToPersonDirectory=Okay, and continue to person directory -actionExecuteAutomaticDeletion=Execute automatic deletion -actionDone=Done -actionConfirmAction=Confirm action -actionAefiSelectPrimarySuspectVaccination=Select Suspect Vaccination -actionAefiAssignNewReportingIdNumber="Assign New AEFI ID" -actionImportSurveyTokens=Import survey tokens -actionImportSurveyTokenResponses=Import survey token responses +actionOkAndGoToMerge = Okay, and continue to merge overview +actionOkAndGoToContactDirectory = Okay, and continue to contact directory +actionOkAndGoToContactDetails = Okay, and continue to contact +actionOkAndGoToPersonDirectory = Okay, and continue to person directory +actionExecuteAutomaticDeletion = Execute automatic deletion +actionDone = Done +actionConfirmAction = Confirm action +actionAefiSelectPrimarySuspectVaccination = Select Suspect Vaccination +actionAefiAssignNewReportingIdNumber = "Assign New AEFI ID" +actionImportSurveyTokens = Import survey tokens +actionImportSurveyTokenResponses = Import survey token responses activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -253,10 +253,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows=Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups=Expired -aggregateReportNoAgeGroup=No age group -aggregateReportShowOnlyDuplicateReports=Display only duplicate reports +aggregateReportShowZeroRows = Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups = Expired +aggregateReportNoAgeGroup = No age group +aggregateReportShowOnlyDuplicateReports = Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -280,7 +280,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend=Send emails +bulkEmailSend = Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -422,7 +422,7 @@ CaseData.caseIdentificationSource=Case identification source CaseData.screeningType=Screening CaseData.clinicalConfirmation=Clinical confirmation CaseData.community=Community -CaseData.epidemiologicalConfirmation=An epidemiological link to a confirmed case +CaseData.epidemiologicalConfirmation= An epidemiological link to a confirmed case CaseData.laboratoryDiagnosticConfirmation=Laboratory diagnostic confirmation CaseData.caseConfirmationBasis=Basis for confirmation CaseData.caseOfficer=Case officer @@ -439,7 +439,6 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name -CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -579,7 +578,8 @@ CaseData.changeDate=Date of last change CaseData.creationDate=Creation date CaseData.radiographyCompatibility=Radiography CaseData.otherDiagnosticCriteria=Other diagnostic details -CaseData.clinicalConfirmation.PERTUSSIS=Any person diagnosed as pertussis by a physician + +CaseData.clinicalConfirmation.PERTUSSIS= Any person diagnosed as pertussis by a physician # CaseExport CaseExport.address=Address CaseExport.addressRegion=Address Region @@ -863,9 +863,9 @@ Contact.expectedFollowUpUntil=Expected follow-up until Contact.vaccinationStatus=Vaccination status Contact.changeDate=Date of last change Contact.creationDate=Creation date -Contact.prophylaxisPrescribed=Prophylaxis Prescribed -Contact.prescribedDrug=Prescribed Drug -Contact.prescribedDrugText=Specify Prescribed Drug +Contact.prophylaxisPrescribed = Prophylaxis Prescribed +Contact.prescribedDrug = Prescribed Drug +Contact.prescribedDrugText = Specify Prescribed Drug # ContactExport ContactExport.address=Address ContactExport.addressDistrict=Address District @@ -1061,6 +1061,7 @@ aefiDashboardAefiInvestigationDiscarded=Investigation Discarded aefiDashboardAefiClassificationRelatedToVaccination=Related to vaccine or vaccination aefiDashboardAefiClassificationCoincidentalAdverseEvent=Coincidental adverse event aefiDashboardAefiClassificationUndetermined=Undetermined + captionDefault=Default defaultRegion=Default Region defaultDistrict=Default District @@ -1152,18 +1153,18 @@ EpiData.clusterRelated=Cluster Related EpiData.clusterType=Cluster type EpiData.clusterTypeText=Specify cluster type text EpiData.modeOfTransmission=Suspected main mode of transmission -EpiData.modeOfTransmissionType=Specify mode of transmission -EpiData.infectionSource=Suspected vehicle or source of infection -EpiData.infectionSourceText=Specify source of infection -EpiData.importedCase=Imported Case -EpiData.country=Country of contamination +EpiData.modeOfTransmissionType= Specify mode of transmission +EpiData.infectionSource= Suspected vehicle or source of infection +EpiData.infectionSourceText= Specify source of infection +EpiData.importedCase= Imported Case +EpiData.country= Country of contamination #Therapy -Therapy.directlyObservedTreatment=Directly observed treatment -Therapy.mdrXdrTuberculosis=MDR/XDR tuberculosis -Therapy.beijingLineage=Beijing lineage -Therapy.treatmentStarted=Treatment started -Therapy.treatmentNotApplicable=Treatment not applicable -Therapy.treatmentStartedDate=Treatment started date +Therapy.directlyObservedTreatment = Directly observed treatment +Therapy.mdrXdrTuberculosis = MDR/XDR tuberculosis +Therapy.beijingLineage = Beijing lineage +Therapy.treatmentStarted = Treatment started +Therapy.treatmentNotApplicable = Treatment not applicable +Therapy.treatmentStartedDate = Treatment started date # Documents documentUploadDocument=New document documentNoDocuments=There are no documents for this %s @@ -1198,20 +1199,22 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities: + # Entity columns -EntityColumn.ENTITY=Entity -EntityColumn.FIELD_ID=Field ID -EntityColumn.FIELD=Field -EntityColumn.TYPE=Type -EntityColumn.DATA_PROTECTION=Data protection -EntityColumn.CAPTION=Caption -EntityColumn.DESCRIPTION=Description -EntityColumn.REQUIRED=Required -EntityColumn.NEW_DISEASE=New disease -EntityColumn.DISEASES=Diseases -EntityColumn.OUTBREAKS=Outbreaks -EntityColumn.IGNORED_COUNTRIES=Ignored countries -EntityColumn.EXCLUSIVE_COUNTRIES=Exclusive countries +EntityColumn.ENTITY = Entity +EntityColumn.FIELD_ID = Field ID +EntityColumn.FIELD = Field +EntityColumn.TYPE = Type +EntityColumn.DATA_PROTECTION = Data protection +EntityColumn.CAPTION = Caption +EntityColumn.DESCRIPTION = Description +EntityColumn.REQUIRED = Required +EntityColumn.NEW_DISEASE = New disease +EntityColumn.DISEASES = Diseases +EntityColumn.OUTBREAKS = Outbreaks +EntityColumn.IGNORED_COUNTRIES = Ignored countries +EntityColumn.EXCLUSIVE_COUNTRIES = Exclusive countries + # Environment Environment=Environment Environment.uuid=Environment ID @@ -1231,52 +1234,55 @@ Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location Environment.vectorType=Vector Type + environmentActiveEnvironments=Active environments -environmentArchivedEnvironments=Archived environments -environmentAllActiveAndArchivedEnvironments=All active and archived environments -environmentDeletedEnvironments=Deleted environments -environmentNewEnvironment=New environment +environmentArchivedEnvironments = Archived environments +environmentAllActiveAndArchivedEnvironments = All active and archived environments +environmentDeletedEnvironments = Deleted environments +environmentNewEnvironment= New environment environmentEnvironmentsList=Environments list + # EnvironmentSample -EnvironmentSample=Environment Sample -EnvironmentSample.uuid=Sample ID -EnvironmentSample.environment=Environment -EnvironmentSample.sampleDateTime=Date of sampling -EnvironmentSample.sampleMaterial=Sample material -EnvironmentSample.otherSampleMaterial=Specify sample material -EnvironmentSample.sampleVolume=Volume (in mL) -EnvironmentSample.fieldSampleId=Field sample ID -EnvironmentSample.turbidity=Turbidity (in NTU) -EnvironmentSample.phValue=pH of sample -EnvironmentSample.sampleTemperature=Temperature (in °C) -EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) -EnvironmentSample.laboratory=Laboratory -EnvironmentSample.laboratoryDetails=Laboratory details -EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested -EnvironmentSample.reportingUser=Reporting user -EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested -EnvironmentSample.weatherConditions=Weather conditions at time of sampling -EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched=Sent/dispatched -EnvironmentSample.dispatchDate=Dispatchment date -EnvironmentSample.dispatchDetails=Dispatchment details -EnvironmentSample.received=Received -EnvironmentSample.receivalDate=Receival date -EnvironmentSample.labSampleId=Lab sample ID -EnvironmentSample.specimenCondition=Specimen condition -EnvironmentSample.location=Location of sampling site -EnvironmentSample.generalComment=General comment -EnvironmentSample.positivePathogenTests=Positive pathogen tests -EnvironmentSample.latestPathogenTest=Latest pathogen test -EnvironmentSample.numberOfTests=Number of tests +EnvironmentSample = Environment Sample +EnvironmentSample.uuid = Sample ID +EnvironmentSample.environment = Environment +EnvironmentSample.sampleDateTime = Date of sampling +EnvironmentSample.sampleMaterial = Sample material +EnvironmentSample.otherSampleMaterial = Specify sample material +EnvironmentSample.sampleVolume = Volume (in mL) +EnvironmentSample.fieldSampleId = Field sample ID +EnvironmentSample.turbidity = Turbidity (in NTU) +EnvironmentSample.phValue = pH of sample +EnvironmentSample.sampleTemperature = Temperature (in °C) +EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) +EnvironmentSample.laboratory = Laboratory +EnvironmentSample.laboratoryDetails = Laboratory details +EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested +EnvironmentSample.reportingUser = Reporting user +EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested +EnvironmentSample.weatherConditions = Weather conditions at time of sampling +EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched = Sent/dispatched +EnvironmentSample.dispatchDate = Dispatchment date +EnvironmentSample.dispatchDetails = Dispatchment details +EnvironmentSample.received = Received +EnvironmentSample.receivalDate = Receival date +EnvironmentSample.labSampleId = Lab sample ID +EnvironmentSample.specimenCondition = Specimen condition +EnvironmentSample.location = Location of sampling site +EnvironmentSample.generalComment = General comment +EnvironmentSample.positivePathogenTests = Positive pathogen tests +EnvironmentSample.latestPathogenTest = Latest pathogen test +EnvironmentSample.numberOfTests = Number of tests EnvironmentSample.vectorType=Vector Type + # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents=Deleted events +eventDeletedEvents = Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1397,8 +1403,9 @@ Event.district=District Event.community=Community Event.changeDate=Date of last change Event.creationDate=Creation date -Event.environmentMedia=Media -Event.environment.investigationStatus=Status + +Event.environmentMedia = Media +Event.environment.investigationStatus = Status Event.environmentReportDate=Report Date # Event action EventAction.eventUuid=Event id @@ -1429,7 +1436,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants=Deleted event participants +eventParticipantDeletedEventParticipants = Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1442,7 +1449,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser=Reporting user +EventParticipant.reportingUser = Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1479,9 +1486,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink=Event participant ID -EventParticipantSelection.eventUuidLink=Event ID -EventParticipantSelection.resultingCaseUuidLink=Resulting case ID +EventParticipantSelection.eventParticipantUuidLink = Event participant ID +EventParticipantSelection.eventUuidLink = Event ID +EventParticipantSelection.resultingCaseUuidLink = Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1573,12 +1580,13 @@ Exposure.domesticSwimming=Swimming in Luxembourg Exposure.internationalSwimming=Swimming abroad Exposure.swimmingLocation=Swimming Location Exposure.swimmingLocationType=Specify swimming location -Exposure.animalLocation=Animal location -Exposure.animalLocationText=Specify animal location -Exposure.sexualExposureText=Specify sexual exposure -Exposure.rawFoodContact=Contact with raw pet food -Exposure.rawFoodContactText=Specify contact with raw pet food -Exposure.symptomaticIndividualText=Specify contact with symptomatic individual +Exposure.animalLocation= Animal location +Exposure.animalLocationText= Specify animal location +Exposure.sexualExposureText= Specify sexual exposure + +Exposure.rawFoodContact= Contact with raw pet food +Exposure.rawFoodContactText= Specify contact with raw pet food +Exposure.symptomaticIndividualText= Specify contact with symptomatic individual # Facility facilityActiveFacilities=Active facilities facilityArchivedFacilities=Archived facilities @@ -1712,19 +1720,6 @@ ExternalMessage.personPhoneNumberType=Phone number type ExternalMessage.personCountry=Country externalMessageFetch=Fetch messages externalMessageProcess=Process -surveyResponseField=Field -surveyResponseSubmittedValue=Submitted Value -surveyResponseCurrentCaseValue=Current Case Value -surveyResponseFailureCause=Failure Cause -surveyResponseDescription=Description -surveyResponseCaseLink=Case -surveyResponseApplied=Applied -surveyResponseMetadata=Metadata -surveyResponsePatchDictionary=Patch Dictionary -surveyResponseProcessingResult=Processing Result -surveyResponseValidFields=Valid Fields (already applied) -actionCorrectAndReprocess=Correct & Reprocess -actionSaveAndReprocess=Save & Reprocess externalMessageNoDisease=No disease found externalMessageNoNewMessages=No new messages available externalMessageForwardedMessageFound=Related forwarded message(s) found @@ -1735,6 +1730,7 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message + #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1745,7 +1741,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList=List of new event participants +lineListingNewEventParticipantsList = List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1826,7 +1822,7 @@ mainMenuUsers=Users mainMenuAggregateReports=Aggregate mainMenuShareRequests=Shares mainMenuSelfReports=Self Reports -mainMenuSurveys=Surveys +mainMenuSurveys = Surveys MaternalHistory.childrenNumber=Total number of children MaternalHistory.ageAtBirth=Mother's age at birth of infant patient MaternalHistory.conjunctivitis=Conjunctivitis @@ -1945,10 +1941,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples=See samples for this person -caseLinkToSamples=See samples for this case -contactLinkToSamples=See samples for this contact -eventParticipantLinkToSamples=See samples for this event participant +personLinkToSamples = See samples for this person +caseLinkToSamples = See samples for this case +contactLinkToSamples = See samples for this contact +eventParticipantLinkToSamples = See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning: This might replace coordinates which were intentionally set differently! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2269,9 +2265,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity=Community of event participant -SampleExport.eventParticipantDistrict=District of event participant -SampleExport.eventParticipantRegion=Region of event participant +SampleExport.eventParticipantCommunity = Community of event participant +SampleExport.eventParticipantDistrict = District of event participant +SampleExport.eventParticipantRegion = Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2330,7 +2326,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser=Reporting user +Immunization.reportingUser = Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2375,10 +2371,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations=Active immunizations -immunizationArchivedImmunizations=Archived immunizations -immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations -immunizationDeletedImmunizations=Deleted immunizations +immunizationActiveImmunizations = Active immunizations +immunizationArchivedImmunizations = Archived immunizations +immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations +immunizationDeletedImmunizations = Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2444,10 +2440,10 @@ aefiVaccinationsDiluentInformation=Diluent Information aefiVaccinationsDiluentBatchLotNumber=Batch/Lot number aefiVaccinationsDiluentExpiryDate=Expiry date aefiVaccinationsDiluentTimeOfReconstitution=Reconstitution time -aefiActiveAdverseEvents=Active adverse events -aefiArchivedAdverseEvents=Archived adverse events -aefiAllActiveAndArchivedAdverseEvents=All active and archived adverse events -aefiDeletedAdverseEvents=Deleted adverse events +aefiActiveAdverseEvents = Active adverse events +aefiArchivedAdverseEvents = Archived adverse events +aefiAllActiveAndArchivedAdverseEvents = All active and archived adverse events +aefiDeletedAdverseEvents = Deleted adverse events # Adverse Events AdverseEvents.severeLocalReaction=Severe local reaction AdverseEvents.severeLocalReactionMoreThanThreeDays=>3 days @@ -2698,13 +2694,13 @@ aefiInvestigationMedicalCareDetailsInstruction=**Instructions ? Attach copies of aefiInvestigationReconstitutionProcedure=Reconstitution procedure aefiInvestigationOfThoseAffected=Of those effected, how many are aefiAefiInvestigationList=Adverse Event Investigations -aefiNewAefiInvestigation=New Investigation +aefiNewAefiInvestigation = New Investigation aefiAefiInvestigationDataView=Adverse Event Investigation aefiNewAefiInvestigationStageTitle=Investigation -aefiActiveInvestigations=Active AEFI investigations -aefiArchivedInvestigations=Archived AEFI investigations -aefiAllActiveAndArchivedInvestigations=All active and archived AEFI investigations -aefiDeletedInvestigations=Deleted AEFI investigations +aefiActiveInvestigations = Active AEFI investigations +aefiArchivedInvestigations = Archived AEFI investigations +aefiAllActiveAndArchivedInvestigations = All active and archived AEFI investigations +aefiDeletedInvestigations = Deleted AEFI investigations titleAefiInvestigationBasicDetails=Section A: Basic details titleAefiInvestigationRelevantPatientInformation=Section B: Relevant patient information prior to immunization titleAefiInvestigationFirstExaminationDetails=Section C: Details of first examination** of serious AEFI case @@ -2973,7 +2969,7 @@ Symptoms.hemorrhagicRash=Hemorrhagic Rash Symptoms.arthritis=Septic Arthritis Symptoms.meningitis=Meningitis Symptoms.septicaemia=Septicaemia -Symptoms.nocturnalCough=Nocturnal Cough +Symptoms.nocturnalCough= Nocturnal Cough Symptoms.otherClinicalPresentation=Other Symptoms Symptoms.otherClinicalPresentationText=Specify Other Symptoms Symptoms.imi.shock=Septic Shock @@ -2999,13 +2995,14 @@ Symptoms.skinRash.lu-MEASLES=Any person not recently vaccinated Symptoms.eggyBurps=Eggy Burps Symptoms.weightLoss=Weight Loss Symptoms.weightLossAmount=Weight Loss Amount (kg) -Symptoms.symptomStatus=Symptom Status -Symptoms.reoccurrence=Reoccurrence -Symptoms.overnightStayRequired=Overnight hospitalization required -Symptoms.bloating=Bloating -Symptoms.symptomCurrentStatus=Symptom persistence -Symptoms.durationOfSymptoms=Duration of symptoms (days) +Symptoms.symptomStatus= Symptom Status +Symptoms.reoccurrence= Reoccurrence +Symptoms.overnightStayRequired= Overnight hospitalization required +Symptoms.bloating= Bloating +Symptoms.symptomCurrentStatus= Symptom persistence +Symptoms.durationOfSymptoms= Duration of symptoms (days) Symptoms.timeOffWorkDays.giardiasis=Duration of absence from work (days) + # Task taskMyTasks=My tasks taskNewTask=New task @@ -3024,7 +3021,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment=Associated environment +Task.environment = Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -3086,7 +3083,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser=Reporting user +TravelEntry.reportingUser = Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -3433,9 +3430,9 @@ cancelExternalFollowUpButton=Cancel external follow-up createSymptomJournalAccountButton=Create PIA Account registerInPatientDiaryButton=Register in CLIMEDO eDiary symptomJournalOptionsButton=PIA eDiary -surveyNewSurvey=New survey -surveySurveyList=Survey list -surveySurveyTokenList=Survey token list +surveyNewSurvey = New survey +surveySurveyList = Survey list +surveySurveyTokenList = Survey token list patientDiaryOptionsButton=CLIMEDO eDiary openInSymptomJournalButton=Open in PIA openInPatientDiaryButton=Open in CLIMEDO @@ -3468,19 +3465,22 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms=SMS -userRoleNotificationTypeEmail=EMAIL +userRoleNotificationTypeSms = SMS +userRoleNotificationTypeEmail = EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template -Contact.vaccinationProposed=Vaccination proposed -Contact.immuneGlobulinProposed=Immune globulin proposed -Contact.vaccinationDoseOneDate=Vaccination dose one date -Contact.vaccinationDoseTwoDate=Vaccination dose two date + +Contact.vaccinationProposed = Vaccination proposed +Contact.immuneGlobulinProposed = Immune globulin proposed +Contact.vaccinationDoseOneDate = Vaccination dose one date +Contact.vaccinationDoseTwoDate = Vaccination dose two date + notificationType=Notification type -notificationType.group=Group -notificationType.caption=Caption -notificationType.description=Description +notificationType.group = Group +notificationType.caption = Caption +notificationType.description = Description + SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -3515,10 +3515,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails=Person contact details -environmentSampleNotShipped=Not shipped -environmentSampleShipped=Shipped -environmentSampleReceived=Received +TaskExport.personOtherContactDetails = Person contact details +environmentSampleNotShipped = Not shipped +environmentSampleShipped = Shipped +environmentSampleReceived = Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -3535,75 +3535,85 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents -environmentNoEnvs=There are no environments for this event %s +environmentNoEnvs = There are no environments for this event %s + # SpecialCaseAccess SpecialCaseAccess=Special case access -caze=Case -assignedTo=Assigned to -assignedBy=Assigned by -endDateTime=Access until -assignmentDate=Date assigned +caze = Case +assignedTo = Assigned to +assignedBy = Assigned by +endDateTime = Access until +assignmentDate = Date assigned + specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case + # SelfReport -SelfReport=Self report -SelfReport.type=Type -SelfReport.reportDate=Report date -SelfReport.caseReference=Case reference number -SelfReport.disease=Disease -SelfReport.diseaseDetails=Disease details -SelfReport.diseaseVariant=Disease variant -SelfReport.diseaseVariantDetails=Disease variant details -SelfReport.firstName=First name -SelfReport.lastName=Last name -SelfReport.sex=Sex -SelfReport.birthDate=Birth date -SelfReport.birthdateDD=Day of birth -SelfReport.birthdateMM=Month of birth -SelfReport.birthdateYYYY=Year of birth -SelfReport.nationalHealthId=National health ID -SelfReport.email=Email -SelfReport.phoneNumber=Phone number -SelfReport.address=Address -SelfReport.dateOfTest=Date of test -SelfReport.dateOfSymptoms=Date of symptoms -SelfReport.workplace=Workplace -SelfReport.dateWorkplace=Date workplace -SelfReport.isolationDate=Date of isolation -SelfReport.contactDate=Date of contact -SelfReport.comment=Comment -SelfReport.responsibleUser=Responsible user -SelfReport.investigationStatus=Investigation status -SelfReport.processingStatus=Processing status +SelfReport = Self report +SelfReport.type = Type +SelfReport.reportDate = Report date +SelfReport.caseReference = Case reference number +SelfReport.disease = Disease +SelfReport.diseaseDetails = Disease details +SelfReport.diseaseVariant = Disease variant +SelfReport.diseaseVariantDetails = Disease variant details +SelfReport.firstName = First name +SelfReport.lastName = Last name +SelfReport.sex = Sex +SelfReport.birthDate = Birth date +SelfReport.birthdateDD = Day of birth +SelfReport.birthdateMM = Month of birth +SelfReport.birthdateYYYY = Year of birth +SelfReport.nationalHealthId = National health ID +SelfReport.email = Email +SelfReport.phoneNumber = Phone number +SelfReport.address = Address +SelfReport.dateOfTest = Date of test +SelfReport.dateOfSymptoms = Date of symptoms +SelfReport.workplace = Workplace +SelfReport.dateWorkplace = Date workplace +SelfReport.isolationDate = Date of isolation +SelfReport.contactDate = Date of contact +SelfReport.comment = Comment +SelfReport.responsibleUser = Responsible user +SelfReport.investigationStatus = Investigation status +SelfReport.processingStatus = Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports selfReportDeletedEnvironments=Deleted self reports selfReportSelfReportsList=Self reports list selfReportProcess=Process + confirmChangesField=Field: confirmChangesValue=Will be changed to: + # Survey surveyNew=New Survey surveyGenerate=Generate Document surveySend=Send Document -SurveyToken=Survey token -SurveyToken.uuid=Token ID -SurveyToken.survey=Survey -SurveyToken.token=Token -SurveyToken.assignedCaseUuid=Case assigned to -SurveyToken.assignmentDate=Assignment date -SurveyToken.recipientEmail=Recipient email -SurveyToken.generatedDocument=Generated document -SurveyToken.responseReceived=Response received -SurveyToken.responseReceivedDate=Response received date -surveyTokenDeleteSurveyToken=Delete survey token -surveyTokenFilterResponseReceived=Response received -surveyTokenFilterTokenNotAssigned=Token not assigned yet -SurveyDocumentOptions.survey=Survey -SurveyDocumentOptions.recipientEmail=Recipient email + +SurveyToken = Survey token +SurveyToken.uuid = Token ID +SurveyToken.survey = Survey +SurveyToken.token = Token +SurveyToken.assignedCaseUuid = Case assigned to +SurveyToken.assignmentDate = Assignment date +SurveyToken.recipientEmail = Recipient email +SurveyToken.generatedDocument = Generated document +SurveyToken.responseReceived = Response received +SurveyToken.responseReceivedDate = Response received date +surveyTokenDeleteSurveyToken = Delete survey token +surveyTokenFilterResponseReceived = Response received +surveyTokenFilterTokenNotAssigned = Token not assigned yet + + +SurveyDocumentOptions.survey = Survey +SurveyDocumentOptions.recipientEmail = Recipient email + # Disease configuration diseaseConfigurationReportingTypeFilter=Reporting Type + # DiseaseConfiguration DiseaseConfiguration.disease=Disease DiseaseConfiguration.active=Active @@ -3618,35 +3628,39 @@ DiseaseConfiguration.extendedClassification=Extended classification DiseaseConfiguration.extendedClassificationMulti=Extended classification multi DiseaseConfiguration.ageGroups=Age groups DiseaseConfiguration.automaticSampleAssignmentThreshold=Automatic sample assignment threshold + # System Configuration -SystemConfigurationValue.category=Category -SystemConfigurationValue.categoryName=Category -SystemConfigurationValue.encrytp=Encrypt -SystemConfigurationValue.key=Key -SystemConfigurationValue.pattern=Pattern -SystemConfigurationValue.value=Value -SystemConfigurationValue.General=General +SystemConfigurationValue.category = Category +SystemConfigurationValue.categoryName = Category +SystemConfigurationValue.encrytp = Encrypt +SystemConfigurationValue.key = Key +SystemConfigurationValue.pattern = Pattern +SystemConfigurationValue.value = Value +SystemConfigurationValue.General = General + # Notifier -Notifier.notification=Notification -Notification.dateOfNotification=Date of notification -Notification.noNotification=There are no notifications -Notification.reportingAgent=Reporting Health Agent: -Notification.registrationNumber=Registration Number -Notification.createNotification=Create Notification -Notification.editNotification=Edit Notification -Notification.viewNotification=View Notification -Notification.notificationTypeExternal=External notification -Notification.notificationTypePhone=Phone notification -Notification.notifierInformation=Notifier information +Notifier.notification = Notification +Notification.dateOfNotification = Date of notification +Notification.noNotification = There are no notifications +Notification.reportingAgent = Reporting Health Agent: +Notification.registrationNumber = Registration Number +Notification.createNotification = Create Notification +Notification.editNotification = Edit Notification +Notification.viewNotification = View Notification +Notification.notificationTypeExternal = External notification +Notification.notificationTypePhone = Phone notification +Notification.notifierInformation = Notifier information + # Diagnosis Criteria Lab Test Details -diagnosisCriteriaDetailTestResult=Result -diagnosisCriteriaDetailTestResultDate=Date -diagnosisCriteriaDetailTestTypeYes=Yes -diagnosisCriteriaDetailTestTypeNo=No -diagnosisCriteriaDetailTestTypeNotApplicable=N/A -diagnosisCriteriaDetailTestResultPos=Pos -diagnosisCriteriaDetailTestResultNeg=Neg -diagnosisCriteriaDetailTestResultOngoing=Ongoing +diagnosisCriteriaDetailTestResult = Result +diagnosisCriteriaDetailTestResultDate = Date +diagnosisCriteriaDetailTestTypeYes = Yes +diagnosisCriteriaDetailTestTypeNo = No +diagnosisCriteriaDetailTestTypeNotApplicable = N/A +diagnosisCriteriaDetailTestResultPos = Pos +diagnosisCriteriaDetailTestResultNeg = Neg +diagnosisCriteriaDetailTestResultOngoing = Ongoing + # Epipulse Export EpipulseExport.uuid=Export ID EpipulseExport.subjectCode=Disease diff --git a/sormas-api/src/main/resources/captions_de-CH.properties b/sormas-api/src/main/resources/captions_de-CH.properties index 0686419237f..94d20705a48 100644 --- a/sormas-api/src/main/resources/captions_de-CH.properties +++ b/sormas-api/src/main/resources/captions_de-CH.properties @@ -52,7 +52,7 @@ creationDate=Erstellungsdatum changeDate=Datum der letzten Änderung notAvailableShort=k. A inaccessibleValue=Vertraulich -includePartialBirthdates=Include partial birthdates +includePartialBirthdates = Include partial birthdates numberOfCharacters=Anzahl der Zeichen\: %d / %d remove=Entfernen notTestedYet=Noch nicht getestet @@ -189,15 +189,15 @@ actionDiscardAndContinue=Verwerfen und fortfahren actionNext=Weiter actionYesAll=Alle ja actionNoAll=Alle nein -actionOkAndGoToMerge=Okay, weiter zur Zusammenführungsübersicht -actionOkAndGoToContactDirectory=Okay, weiter zum Kontaktverzeichnis -actionOkAndGoToContactDetails=Okay, weiter zum Kontakt -actionOkAndGoToPersonDirectory=Okay, und weiter zum Personenverzeichnis -actionExecuteAutomaticDeletion=Automatisches Löschen ausführen -actionDone=Erledigt -actionConfirmAction=Confirm action -actionAefiSelectPrimarySuspectVaccination=Select Suspect Vaccination -actionAefiAssignNewReportingIdNumber="Assign New AEFI ID" +actionOkAndGoToMerge = Okay, weiter zur Zusammenführungsübersicht +actionOkAndGoToContactDirectory = Okay, weiter zum Kontaktverzeichnis +actionOkAndGoToContactDetails = Okay, weiter zum Kontakt +actionOkAndGoToPersonDirectory = Okay, und weiter zum Personenverzeichnis +actionExecuteAutomaticDeletion = Automatisches Löschen ausführen +actionDone = Erledigt +actionConfirmAction = Confirm action +actionAefiSelectPrimarySuspectVaccination = Select Suspect Vaccination +actionAefiAssignNewReportingIdNumber = "Assign New AEFI ID" activityAsCaseFlightNumber=Flugnummer ActivityAsCase=Betreuung/Unterbringung/Tätigkeit in Einrichtung ActivityAsCase.startDate=Start der Aktivität @@ -251,10 +251,10 @@ aggregateReportDiscardSelection=Auswahl abbrechen aggregateReportEditAggregateReport=Gesamtbericht bearbeiten aggregateReportEditReport=Bericht bearbeiten aggregateReportReportFound=Zusammenfassender Bericht gefunden -aggregateReportShowZeroRows=Zeige 0-Zeilen für Krankheit(en) -aggregateReportExpiredAgeGroups=Verfallen -aggregateReportNoAgeGroup=Keine Altersgruppe -aggregateReportShowOnlyDuplicateReports=Nur doppelte Berichte anzeigen +aggregateReportShowZeroRows = Zeige 0-Zeilen für Krankheit(en) +aggregateReportExpiredAgeGroups = Verfallen +aggregateReportNoAgeGroup = Keine Altersgruppe +aggregateReportShowOnlyDuplicateReports = Nur doppelte Berichte anzeigen aggregateReportNewAggregateReport=Neuer Gesamtbericht aggregateReportNewCasesShort=F aggregateReportThisWeek=Diese Woche @@ -278,7 +278,7 @@ days=Tage # Bulk actions bulkActions=Massenbearbeitung bulkEditAssignee=Zuweisung bearbeiten -bulkEmailSend=Send emails +bulkEmailSend = Send emails bulkCancelFollowUp=Nachverfolgung abbrechen bulkCaseClassification=Falldefinitionskategorie ändern bulkCaseOutcome=Verlauf der Erkrankung des Falls ändern @@ -437,7 +437,6 @@ CaseData.contactOfficer=(Gesundheitsamts-)Mitarbeiter*in CaseData.dengueFeverType=Dengue-Fieber Art CaseData.diseaseVariant=Krankheitsvariante CaseData.diseaseDetails=Name der Krankheit -CaseData.disease=Krankheit CaseData.district=Bezirk CaseData.districtLevelDate=Anfragedatum der klinischen Meldung CaseData.doses=Wie viele Dosen @@ -1037,6 +1036,7 @@ aefiDashboardAefiInvestigationDiscarded=Investigation Discarded aefiDashboardAefiClassificationRelatedToVaccination=Related to vaccine or vaccination aefiDashboardAefiClassificationCoincidentalAdverseEvent=Coincidental adverse event aefiDashboardAefiClassificationUndetermined=Undetermined + captionDefault=Standard defaultRegion=Voreingestellte Kantone defaultDistrict=Voreingestellter Bezirk @@ -1154,20 +1154,22 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Generierte Dokumente auch de DocumentTemplate.documentUploadWarning=Dokumenten-Upload Warnung DocumentTemplate.fileTooBig=Die Dokumente wurden erfolgreich generiert, aber mindestens ein Dokument konnte nicht in seine Entität hochgeladen werden, da die Dateigröße die spezifizierte Dateigrößengrenze von %dMB übersteigt DocumentTemplate.notUploaded=Dokumente konnten nicht in die folgenden Entitäten hochgeladen werden\: + # Entity columns -EntityColumn.ENTITY=Entity -EntityColumn.FIELD_ID=Field ID -EntityColumn.FIELD=Field -EntityColumn.TYPE=Type -EntityColumn.DATA_PROTECTION=Data protection -EntityColumn.CAPTION=Caption -EntityColumn.DESCRIPTION=Description -EntityColumn.REQUIRED=Required -EntityColumn.NEW_DISEASE=New disease -EntityColumn.DISEASES=Diseases -EntityColumn.OUTBREAKS=Outbreaks -EntityColumn.IGNORED_COUNTRIES=Ignored countries -EntityColumn.EXCLUSIVE_COUNTRIES=Exclusive countries +EntityColumn.ENTITY = Entity +EntityColumn.FIELD_ID = Field ID +EntityColumn.FIELD = Field +EntityColumn.TYPE = Type +EntityColumn.DATA_PROTECTION = Data protection +EntityColumn.CAPTION = Caption +EntityColumn.DESCRIPTION = Description +EntityColumn.REQUIRED = Required +EntityColumn.NEW_DISEASE = New disease +EntityColumn.DISEASES = Diseases +EntityColumn.OUTBREAKS = Outbreaks +EntityColumn.IGNORED_COUNTRIES = Ignored countries +EntityColumn.EXCLUSIVE_COUNTRIES = Exclusive countries + # Environment Environment=Environment Environment.uuid=Environment ID @@ -1186,51 +1188,54 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location + environmentActiveEnvironments=Active environments -environmentArchivedEnvironments=Archived environments -environmentAllActiveAndArchivedEnvironments=All active and archived environments -environmentDeletedEnvironments=Deleted environments -environmentNewEnvironment=New environment +environmentArchivedEnvironments = Archived environments +environmentAllActiveAndArchivedEnvironments = All active and archived environments +environmentDeletedEnvironments = Deleted environments +environmentNewEnvironment= New environment environmentEnvironmentsList=Environments list + # EnvironmentSample -EnvironmentSample=Environment Sample -EnvironmentSample.uuid=Sample ID -EnvironmentSample.environment=Environment -EnvironmentSample.sampleDateTime=Date of sampling -EnvironmentSample.sampleMaterial=Sample material -EnvironmentSample.otherSampleMaterial=Specify sample material -EnvironmentSample.sampleVolume=Volume (in mL) -EnvironmentSample.fieldSampleId=Field sample ID -EnvironmentSample.turbidity=Turbidity (in NTU) -EnvironmentSample.phValue=pH of sample -EnvironmentSample.sampleTemperature=Temperature (in °C) -EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) -EnvironmentSample.laboratory=Laboratory -EnvironmentSample.laboratoryDetails=Laboratory details -EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested -EnvironmentSample.reportingUser=Reporting user -EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested -EnvironmentSample.weatherConditions=Weather conditions at time of sampling -EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched=Sent/dispatched -EnvironmentSample.dispatchDate=Dispatchment date -EnvironmentSample.dispatchDetails=Dispatchment details -EnvironmentSample.received=Received -EnvironmentSample.receivalDate=Receival date -EnvironmentSample.labSampleId=Lab sample ID -EnvironmentSample.specimenCondition=Specimen condition -EnvironmentSample.location=Location of sampling site -EnvironmentSample.generalComment=General comment -EnvironmentSample.positivePathogenTests=Positive pathogen tests -EnvironmentSample.latestPathogenTest=Latest pathogen test -EnvironmentSample.numberOfTests=Number of tests +EnvironmentSample = Environment Sample +EnvironmentSample.uuid = Sample ID +EnvironmentSample.environment = Environment +EnvironmentSample.sampleDateTime = Date of sampling +EnvironmentSample.sampleMaterial = Sample material +EnvironmentSample.otherSampleMaterial = Specify sample material +EnvironmentSample.sampleVolume = Volume (in mL) +EnvironmentSample.fieldSampleId = Field sample ID +EnvironmentSample.turbidity = Turbidity (in NTU) +EnvironmentSample.phValue = pH of sample +EnvironmentSample.sampleTemperature = Temperature (in °C) +EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) +EnvironmentSample.laboratory = Laboratory +EnvironmentSample.laboratoryDetails = Laboratory details +EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested +EnvironmentSample.reportingUser = Reporting user +EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested +EnvironmentSample.weatherConditions = Weather conditions at time of sampling +EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched = Sent/dispatched +EnvironmentSample.dispatchDate = Dispatchment date +EnvironmentSample.dispatchDetails = Dispatchment details +EnvironmentSample.received = Received +EnvironmentSample.receivalDate = Receival date +EnvironmentSample.labSampleId = Lab sample ID +EnvironmentSample.specimenCondition = Specimen condition +EnvironmentSample.location = Location of sampling site +EnvironmentSample.generalComment = General comment +EnvironmentSample.positivePathogenTests = Positive pathogen tests +EnvironmentSample.latestPathogenTest = Latest pathogen test +EnvironmentSample.numberOfTests = Number of tests + # Event eventActiveEvents=Aktive Ereignisse eventArchivedEvents=Archivierte Ereignisse eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Aktive Gruppen eventArchivedGroups=Archivierte Gruppen -eventDeletedEvents=Deleted events +eventDeletedEvents = Deleted events eventAllGroups=Alle Gruppen eventEventActions=Ereignisaktionen eventEventParticipants=Ereignisteilnehmer @@ -1374,7 +1379,7 @@ eventParticipantAddPerson=Ereignisteilnehmer hinzufügen eventParticipantContactCountOnlyWithSourceCaseInEvent=Zählt nur Kontakte, deren Indexfall mit diesem Ereignis verbunden ist eventParticipantSelect=Ereignisteilnehmer auswählen eventParticipantCreateNew=Neuen Ereignisteilnehmer erstellen -eventParticipantDeletedEventParticipants=Deleted event participants +eventParticipantDeletedEventParticipants = Deleted event participants eventParticipantActiveEventParticipants=Aktive Ereignisteilnehmer eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archivierte Ereignisteilnehmer @@ -1387,7 +1392,7 @@ EventParticipant.caseUuid=Fall-ID EventParticipant.approximateAge=Alter EventParticipant.name=Name EventParticipant.sex=Geschlecht -EventParticipant.reportingUser=Reporting user +EventParticipant.reportingUser = Reporting user EventParticipant.responsibleRegion=Zuständiger Kanton EventParticipant.responsibleDistrict=Zuständiger Bezirk EventParticipant.personUuid=Personen-ID @@ -1424,9 +1429,9 @@ EventParticipantExport.personNationalHealthId=Nationale Gesundheits-ID der Perso EventParticipantExport.eventParticipantInvolvmentDescription=Beschreibung der Beteiligung EventParticipantExport.eventParticipantUuid=Ereignisteilnehmer ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink=Event participant ID -EventParticipantSelection.eventUuidLink=Event ID -EventParticipantSelection.resultingCaseUuidLink=Resulting case ID +EventParticipantSelection.eventParticipantUuidLink = Event participant ID +EventParticipantSelection.eventUuidLink = Event ID +EventParticipantSelection.resultingCaseUuidLink = Resulting case ID # Event Group EventGroup=Ereignisgruppe EventGroup.uuid=Gruppen-ID @@ -1646,6 +1651,7 @@ ExternalMessageCriteria.messageDateTo=... bis ExternalMessageCriteria.birthDateFrom=Geburtsdatum von... ExternalMessageCriteria.birthDateTo=... bis externalMessageValueNotSpecified=Value not specified in external message + #Physician report physiciansReportCaseImmunizations=Immunisierungen physiciansReportCaseAddVaccination=Impfung hinzufügen @@ -1656,7 +1662,7 @@ lineListingDiseaseOfSourceCase=Krankheit des Indexfalls lineListingInfrastructureData=Infrastrukturdaten der letzten Zeile übernehmen lineListingNewCasesList=Liste neuer Fälle lineListingNewContactsList=Liste neuer Kontakte -lineListingNewEventParticipantsList=List of new event participants +lineListingNewEventParticipantsList = List of new event participants lineListingSharedInformation=Weitergegebene Informationen lineListingEdit=Line Listing/Zeilenauflistung bearbeiten lineListingDisableAll=Alle Line Listing/Zeilenauflistungen deaktivieren @@ -1832,10 +1838,10 @@ personNoContactLinkedToPerson=Kein Kontakt mit Person verknüpft personLinkToEvents=Ereignisse für diese Person ansehen personLinkToCases=Fälle für diese Person ansehen personLinkToContacts=Kontakte für diese Person ansehen -personLinkToSamples=See samples for this person -caseLinkToSamples=See samples for this case -contactLinkToSamples=See samples for this contact -eventParticipantLinkToSamples=See samples for this event participant +personLinkToSamples = See samples for this person +caseLinkToSamples = See samples for this case +contactLinkToSamples = See samples for this contact +eventParticipantLinkToSamples = See samples for this event participant personsReplaceGeoCoordinates=Auch bestehende Koordinaten ersetzen. Warnung\: Dies könnte Koordinaten ersetzen, die absichtlich anders gesetzt wurden\! personsSetMissingGeoCoordinates=Fehlende Geo-Koordinaten generieren personsUpdated=Aktualisierte Personen @@ -2143,9 +2149,9 @@ SampleExport.caseReportDate=Fallmeldedatum SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity=Community of event participant -SampleExport.eventParticipantDistrict=District of event participant -SampleExport.eventParticipantRegion=Region of event participant +SampleExport.eventParticipantCommunity = Community of event participant +SampleExport.eventParticipantDistrict = District of event participant +SampleExport.eventParticipantRegion = Region of event participant SampleExport.personSex=Geschlecht des Falls/Kontakts/Ereignisteilnehmers/in SampleExport.caseUuid=Fall UUID (Universally Unique Identifier) SampleExport.contactUuid=Kontakt-UUID @@ -2204,7 +2210,7 @@ SampleExport.wbcCount=Anzahl an weissen Blutkörperchen beim letzten zusätzlich # Immunization Immunization=Immunisierung Immunization.reportDate=Meldedatum -Immunization.reportingUser=Reporting user +Immunization.reportingUser = Reporting user Immunization.externalId=Externe ID Immunization.country=Immunisierungs-Land Immunization.deletionReason=Grund des Löschens @@ -2247,10 +2253,10 @@ Immunization.district=Bezirk Immunization.community=Gemeinde Immunization.changeDate=Datum der letzten Änderung Immunization.creationDate=Erstellungsdatum -immunizationActiveImmunizations=Active immunizations -immunizationArchivedImmunizations=Archived immunizations -immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations -immunizationDeletedImmunizations=Deleted immunizations +immunizationActiveImmunizations = Active immunizations +immunizationArchivedImmunizations = Archived immunizations +immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations +immunizationDeletedImmunizations = Deleted immunizations immunizationImmunizationsList=Immunisierungsliste linkImmunizationToCaseButton=Fall verknüpfen openLinkedCaseToImmunizationButton=Fall öffnen @@ -2315,10 +2321,10 @@ aefiVaccinationsDiluentInformation=Diluent Information aefiVaccinationsDiluentBatchLotNumber=Batch/Lot number aefiVaccinationsDiluentExpiryDate=Expiry date aefiVaccinationsDiluentTimeOfReconstitution=Reconstitution time -aefiActiveAdverseEvents=Active adverse events -aefiArchivedAdverseEvents=Archived adverse events -aefiAllActiveAndArchivedAdverseEvents=All active and archived adverse events -aefiDeletedAdverseEvents=Deleted adverse events +aefiActiveAdverseEvents = Active adverse events +aefiArchivedAdverseEvents = Archived adverse events +aefiAllActiveAndArchivedAdverseEvents = All active and archived adverse events +aefiDeletedAdverseEvents = Deleted adverse events # Adverse Events AdverseEvents.severeLocalReaction=Severe local reaction AdverseEvents.severeLocalReactionMoreThanThreeDays=>3 days @@ -2569,13 +2575,13 @@ aefiInvestigationMedicalCareDetailsInstruction=**Instructions ? Attach copies of aefiInvestigationReconstitutionProcedure=Reconstitution procedure aefiInvestigationOfThoseAffected=Of those effected, how many are aefiAefiInvestigationList=Adverse Event Investigations -aefiNewAefiInvestigation=New Investigation +aefiNewAefiInvestigation = New Investigation aefiAefiInvestigationDataView=Adverse Event Investigation aefiNewAefiInvestigationStageTitle=Investigation -aefiActiveInvestigations=Active AEFI investigations -aefiArchivedInvestigations=Archived AEFI investigations -aefiAllActiveAndArchivedInvestigations=All active and archived AEFI investigations -aefiDeletedInvestigations=Deleted AEFI investigations +aefiActiveInvestigations = Active AEFI investigations +aefiArchivedInvestigations = Archived AEFI investigations +aefiAllActiveAndArchivedInvestigations = All active and archived AEFI investigations +aefiDeletedInvestigations = Deleted AEFI investigations titleAefiInvestigationBasicDetails=Section A\: Basic details titleAefiInvestigationRelevantPatientInformation=Section B\: Relevant patient information prior to immunization titleAefiInvestigationFirstExaminationDetails=Section C\: Details of first examination** of serious AEFI case @@ -2848,7 +2854,7 @@ Task.contextReference=Verknüpfter Link Task.creatorComment=Kommentare zur Aufgabe Task.creatorUser=Erstellt von Task.dueDate=Fälligkeitsdatum -Task.environment=Associated environment +Task.environment = Associated environment Task.event=Zugehöriges Ereignis Task.observerUsers=Beobachtet von Task.perceivedStart=Erfasster Start @@ -2901,7 +2907,7 @@ travelEntriesNoTravelEntriesForPerson=Es gibt keine Einreisen für diese Person TravelEntry=Einreise TravelEntry.person=Einreiseperson TravelEntry.reportDate=Meldedatum -TravelEntry.reportingUser=Reporting user +TravelEntry.reportingUser = Reporting user TravelEntry.uuid=Einreise-ID TravelEntry.externalId=Externe ID TravelEntry.personFirstName=Vorname der Person @@ -3272,15 +3278,17 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=Liste der Benutzerrollen userRoleNotifications=Benachrichtigungen -userRoleNotificationTypeSms=SMS -userRoleNotificationTypeEmail=E-Mail +userRoleNotificationTypeSms = SMS +userRoleNotificationTypeEmail = E-Mail userrole.main=Benutzerrolle userrole.notifications=Benachrichtigungen userrole.applyUserRoleTemplate=Benutzerrollenvorlage anwenden + notificationType=SMS-Benachrichtigungstypen -notificationType.group=Gruppe -notificationType.caption=Bezeichnung -notificationType.description=Beschreibung +notificationType.group = Gruppe +notificationType.caption = Bezeichnung +notificationType.description = Beschreibung + SormasToSormasShareRequest.uuid=Anfrage ID SormasToSormasShareRequest.creationDate=Datum der Übergabe SormasToSormasShareRequest.dataType=Typ @@ -3315,10 +3323,10 @@ TaskExport.personAddressPostalCode=Postleitzahl der Personenadresse TaskExport.personPhone=Telefonnummer der Person TaskExport.personPhoneOwner=Telefonbesitzer des Telefons der Person TaskExport.personEmailAddress=E-Mail Adresse der Person -TaskExport.personOtherContactDetails=Kontaktdetails der Person -environmentSampleNotShipped=Not shipped -environmentSampleShipped=Shipped -environmentSampleReceived=Received +TaskExport.personOtherContactDetails = Kontaktdetails der Person +environmentSampleNotShipped = Not shipped +environmentSampleShipped = Shipped +environmentSampleReceived = Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -3335,45 +3343,48 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents + # SpecialCaseAccess SpecialCaseAccess=Special case access -caze=Case -assignedTo=Assigned to -assignedBy=Assigned by -endDateTime=Access until -assignmentDate=Date assigned +caze = Case +assignedTo = Assigned to +assignedBy = Assigned by +endDateTime = Access until +assignmentDate = Date assigned + specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case + # SelfReport -SelfReport=Self report -SelfReport.type=Type -SelfReport.reportDate=Report date -SelfReport.caseReference=Case reference number -SelfReport.disease=Disease -SelfReport.diseaseDetails=Disease details -SelfReport.diseaseVariant=Disease variant -SelfReport.diseaseVariantDetails=Disease variant details -SelfReport.firstName=First name -SelfReport.lastName=Last name -SelfReport.sex=Sex -SelfReport.birthDate=Birth date -SelfReport.birthdateDD=Day of birth -SelfReport.birthdateMM=Month of birth -SelfReport.birthdateYYYY=Year of birth -SelfReport.nationalHealthId=National health ID -SelfReport.email=Email -SelfReport.phoneNumber=Phone number -SelfReport.address=Address -SelfReport.dateOfTest=Date of test -SelfReport.dateOfSymptoms=Date of symptoms -SelfReport.workplace=Workplace -SelfReport.dateWorkplace=Date workplace -SelfReport.isolationDate=Date of isolation -SelfReport.contactDate=Date of contact -SelfReport.comment=Comment -SelfReport.responsibleUser=Responsible user -SelfReport.investigationStatus=Investigation status -SelfReport.processingStatus=Processing status +SelfReport = Self report +SelfReport.type = Type +SelfReport.reportDate = Report date +SelfReport.caseReference = Case reference number +SelfReport.disease = Disease +SelfReport.diseaseDetails = Disease details +SelfReport.diseaseVariant = Disease variant +SelfReport.diseaseVariantDetails = Disease variant details +SelfReport.firstName = First name +SelfReport.lastName = Last name +SelfReport.sex = Sex +SelfReport.birthDate = Birth date +SelfReport.birthdateDD = Day of birth +SelfReport.birthdateMM = Month of birth +SelfReport.birthdateYYYY = Year of birth +SelfReport.nationalHealthId = National health ID +SelfReport.email = Email +SelfReport.phoneNumber = Phone number +SelfReport.address = Address +SelfReport.dateOfTest = Date of test +SelfReport.dateOfSymptoms = Date of symptoms +SelfReport.workplace = Workplace +SelfReport.dateWorkplace = Date workplace +SelfReport.isolationDate = Date of isolation +SelfReport.contactDate = Date of contact +SelfReport.comment = Comment +SelfReport.responsibleUser = Responsible user +SelfReport.investigationStatus = Investigation status +SelfReport.processingStatus = Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_de-DE.properties b/sormas-api/src/main/resources/captions_de-DE.properties index 78c243bfe6a..2a45726efd6 100644 --- a/sormas-api/src/main/resources/captions_de-DE.properties +++ b/sormas-api/src/main/resources/captions_de-DE.properties @@ -52,7 +52,7 @@ creationDate=Erstellungsdatum changeDate=Datum der letzten Änderung notAvailableShort=k. A inaccessibleValue=Vertraulich -includePartialBirthdates=Include partial birthdates +includePartialBirthdates = Include partial birthdates numberOfCharacters=Anzahl der Zeichen\: %d / %d remove=Entfernen notTestedYet=Noch nicht getestet @@ -189,15 +189,15 @@ actionDiscardAndContinue=Verwerfen und fortfahren actionNext=Weiter actionYesAll=Alle ja actionNoAll=Alle nein -actionOkAndGoToMerge=Okay, weiter zur Zusammenführungsübersicht -actionOkAndGoToContactDirectory=Okay, weiter zum Kontaktverzeichnis -actionOkAndGoToContactDetails=Okay, weiter zum Kontakt -actionOkAndGoToPersonDirectory=Okay, weiter zum Personenverzeichnis -actionExecuteAutomaticDeletion=Automatisches Löschen ausführen -actionDone=Erledigt -actionConfirmAction=Vorgang bestätigen -actionAefiSelectPrimarySuspectVaccination=Select Suspect Vaccination -actionAefiAssignNewReportingIdNumber="Assign New AEFI ID" +actionOkAndGoToMerge = Okay, weiter zur Zusammenführungsübersicht +actionOkAndGoToContactDirectory = Okay, weiter zum Kontaktverzeichnis +actionOkAndGoToContactDetails = Okay, weiter zum Kontakt +actionOkAndGoToPersonDirectory = Okay, weiter zum Personenverzeichnis +actionExecuteAutomaticDeletion = Automatisches Löschen ausführen +actionDone = Erledigt +actionConfirmAction = Vorgang bestätigen +actionAefiSelectPrimarySuspectVaccination = Select Suspect Vaccination +actionAefiAssignNewReportingIdNumber = "Assign New AEFI ID" activityAsCaseFlightNumber=Flugnummer ActivityAsCase=Betreuung/Unterbringung/Tätigkeit in Einrichtung ActivityAsCase.startDate=Start der Aktivität @@ -251,10 +251,10 @@ aggregateReportDiscardSelection=Auswahl verwerfen aggregateReportEditAggregateReport=Gesamtbericht bearbeiten aggregateReportEditReport=Bericht bearbeiten aggregateReportReportFound=Zusammenfassender Bericht gefunden -aggregateReportShowZeroRows=Zeige 0-Zeilen für Krankheit(en) -aggregateReportExpiredAgeGroups=Verfallen -aggregateReportNoAgeGroup=Keine Altersgruppe -aggregateReportShowOnlyDuplicateReports=Nur doppelte Berichte anzeigen +aggregateReportShowZeroRows = Zeige 0-Zeilen für Krankheit(en) +aggregateReportExpiredAgeGroups = Verfallen +aggregateReportNoAgeGroup = Keine Altersgruppe +aggregateReportShowOnlyDuplicateReports = Nur doppelte Berichte anzeigen aggregateReportNewAggregateReport=Neuer Gesamtbericht aggregateReportNewCasesShort=F aggregateReportThisWeek=Diese Woche @@ -278,7 +278,7 @@ days=Tage # Bulk actions bulkActions=Massenbearbeitung bulkEditAssignee=Zuweisung bearbeiten -bulkEmailSend=Send emails +bulkEmailSend = Send emails bulkCancelFollowUp=Nachverfolgung abbrechen bulkCaseClassification=Falldefinitionskategorie ändern bulkCaseOutcome=Verlauf der Erkrankung des Falls ändern @@ -437,7 +437,6 @@ CaseData.contactOfficer=Kontaktbeauftragte*r CaseData.dengueFeverType=Dengue-Fieber Art CaseData.diseaseVariant=Krankheitsvariante CaseData.diseaseDetails=Name der Krankheit -CaseData.disease=Krankheit CaseData.district=Landkreis/Kreisfreie Stadt CaseData.districtLevelDate=Empfangsdatum auf Landkreis-Ebene CaseData.doses=Wie viele Dosen @@ -1037,6 +1036,7 @@ aefiDashboardAefiInvestigationDiscarded=Investigation Discarded aefiDashboardAefiClassificationRelatedToVaccination=Related to vaccine or vaccination aefiDashboardAefiClassificationCoincidentalAdverseEvent=Coincidental adverse event aefiDashboardAefiClassificationUndetermined=Undetermined + captionDefault=Standard defaultRegion=Voreingestelltes Bundesland defaultDistrict=Voreingestellter Landkreis @@ -1154,20 +1154,22 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Generierte Dokumente auch de DocumentTemplate.documentUploadWarning=Dokumenten-Upload Warnung DocumentTemplate.fileTooBig=Die Dokumente wurden erfolgreich generiert, aber mindestens ein Dokument konnte nicht in seine Entität hochgeladen werden, da die Dateigröße die spezifizierte Dateigrößengrenze von %dMB übersteigt DocumentTemplate.notUploaded=Dokumente konnten nicht in die folgenden Entitäten hochgeladen werden\: + # Entity columns -EntityColumn.ENTITY=Entity -EntityColumn.FIELD_ID=Field ID -EntityColumn.FIELD=Field -EntityColumn.TYPE=Type -EntityColumn.DATA_PROTECTION=Data protection -EntityColumn.CAPTION=Caption -EntityColumn.DESCRIPTION=Description -EntityColumn.REQUIRED=Required -EntityColumn.NEW_DISEASE=New disease -EntityColumn.DISEASES=Diseases -EntityColumn.OUTBREAKS=Outbreaks -EntityColumn.IGNORED_COUNTRIES=Ignored countries -EntityColumn.EXCLUSIVE_COUNTRIES=Exclusive countries +EntityColumn.ENTITY = Entity +EntityColumn.FIELD_ID = Field ID +EntityColumn.FIELD = Field +EntityColumn.TYPE = Type +EntityColumn.DATA_PROTECTION = Data protection +EntityColumn.CAPTION = Caption +EntityColumn.DESCRIPTION = Description +EntityColumn.REQUIRED = Required +EntityColumn.NEW_DISEASE = New disease +EntityColumn.DISEASES = Diseases +EntityColumn.OUTBREAKS = Outbreaks +EntityColumn.IGNORED_COUNTRIES = Ignored countries +EntityColumn.EXCLUSIVE_COUNTRIES = Exclusive countries + # Environment Environment=Umgebung Environment.uuid=Umgebungs-ID @@ -1186,51 +1188,54 @@ Environment.otherInfrastructureDetails=andere Infrastrukturdetails Environment.waterUse=Wassernutzung Environment.otherWaterUse=Andere Wassernutzung Environment.location=Standort + environmentActiveEnvironments=Aktive Umgebungen -environmentArchivedEnvironments=Archivierte Umgebungen -environmentAllActiveAndArchivedEnvironments=Alle aktiven und archivierten Umgebungen -environmentDeletedEnvironments=gelöschte Umgebungen -environmentNewEnvironment=Neue Umgebungen +environmentArchivedEnvironments = Archivierte Umgebungen +environmentAllActiveAndArchivedEnvironments = Alle aktiven und archivierten Umgebungen +environmentDeletedEnvironments = gelöschte Umgebungen +environmentNewEnvironment= Neue Umgebungen environmentEnvironmentsList=Liste der Umgebungen + # EnvironmentSample -EnvironmentSample=Environment Sample -EnvironmentSample.uuid=Proben-ID -EnvironmentSample.environment=Umgebung -EnvironmentSample.sampleDateTime=Datum der Probenentnahme -EnvironmentSample.sampleMaterial=Probenmaterial -EnvironmentSample.otherSampleMaterial=anderes Probenmaterial -EnvironmentSample.sampleVolume=Volumen (in ml) -EnvironmentSample.fieldSampleId=Feld Proben-ID -EnvironmentSample.turbidity=Trübung (in NTU) -EnvironmentSample.phValue=pH Wert der Probe -EnvironmentSample.sampleTemperature=Temperature (in °C) -EnvironmentSample.chlorineResiduals=Gesamte Chlorreste (mg/L) -EnvironmentSample.laboratory=Labor -EnvironmentSample.laboratoryDetails=Labordetails -EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested -EnvironmentSample.reportingUser=Reporting user -EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested -EnvironmentSample.weatherConditions=Wetter zum Zeitpunkt der Probenahme -EnvironmentSample.heavyRain=Schwere Regen in den letzten 24 Stunden vor der Probe? -EnvironmentSample.dispatched=Sent/dispatched -EnvironmentSample.dispatchDate=Dispatchment date -EnvironmentSample.dispatchDetails=Dispatchment details -EnvironmentSample.received=Erhalten -EnvironmentSample.receivalDate=Empfangsdatum -EnvironmentSample.labSampleId=Lab sample ID -EnvironmentSample.specimenCondition=Probenzustand -EnvironmentSample.location=Location of sampling site -EnvironmentSample.generalComment=Allgemeiner Kommentar -EnvironmentSample.positivePathogenTests=Positive Erregertests -EnvironmentSample.latestPathogenTest=Neuester Erregertest -EnvironmentSample.numberOfTests=Anzahl der Tests +EnvironmentSample = Environment Sample +EnvironmentSample.uuid = Proben-ID +EnvironmentSample.environment = Umgebung +EnvironmentSample.sampleDateTime = Datum der Probenentnahme +EnvironmentSample.sampleMaterial = Probenmaterial +EnvironmentSample.otherSampleMaterial = anderes Probenmaterial +EnvironmentSample.sampleVolume = Volumen (in ml) +EnvironmentSample.fieldSampleId = Feld Proben-ID +EnvironmentSample.turbidity = Trübung (in NTU) +EnvironmentSample.phValue = pH Wert der Probe +EnvironmentSample.sampleTemperature = Temperature (in °C) +EnvironmentSample.chlorineResiduals = Gesamte Chlorreste (mg/L) +EnvironmentSample.laboratory = Labor +EnvironmentSample.laboratoryDetails = Labordetails +EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested +EnvironmentSample.reportingUser = Reporting user +EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested +EnvironmentSample.weatherConditions = Wetter zum Zeitpunkt der Probenahme +EnvironmentSample.heavyRain = Schwere Regen in den letzten 24 Stunden vor der Probe? +EnvironmentSample.dispatched = Sent/dispatched +EnvironmentSample.dispatchDate = Dispatchment date +EnvironmentSample.dispatchDetails = Dispatchment details +EnvironmentSample.received = Erhalten +EnvironmentSample.receivalDate = Empfangsdatum +EnvironmentSample.labSampleId = Lab sample ID +EnvironmentSample.specimenCondition = Probenzustand +EnvironmentSample.location = Location of sampling site +EnvironmentSample.generalComment = Allgemeiner Kommentar +EnvironmentSample.positivePathogenTests = Positive Erregertests +EnvironmentSample.latestPathogenTest = Neuester Erregertest +EnvironmentSample.numberOfTests = Anzahl der Tests + # Event eventActiveEvents=Aktive Ereignisse eventArchivedEvents=Abgeschlossene Ereignisse eventAllActiveAndArchivedEvents=Alle aktiven und archivierten Ereignisse eventActiveGroups=Aktive Gruppen eventArchivedGroups=Archivierte Gruppen -eventDeletedEvents=Gelöschte Ereignisse +eventDeletedEvents = Gelöschte Ereignisse eventAllGroups=Alle Gruppen eventEventActions=Ereignisaktionen eventEventParticipants=Ereignisteilnehmer @@ -1374,7 +1379,7 @@ eventParticipantAddPerson=Ereignisteilnehmer hinzufügen eventParticipantContactCountOnlyWithSourceCaseInEvent=Zählt nur Kontakte, deren Indexfall mit diesem Ereignis verbunden ist eventParticipantSelect=Ereignisteilnehmer auswählen eventParticipantCreateNew=Neuen Ereignisteilnehmer erstellen -eventParticipantDeletedEventParticipants=Gelöschte Ereignisteilnehmer +eventParticipantDeletedEventParticipants = Gelöschte Ereignisteilnehmer eventParticipantActiveEventParticipants=Aktive Ereignisteilnehmer eventParticipantActiveAndArchivedEventParticipants=Aktive und archivierte Veranstaltungsteilnehmer eventParticipantArchivedEventParticipants=Abgeschlossene Ereignisteilnehmer @@ -1387,7 +1392,7 @@ EventParticipant.caseUuid=Fall-ID EventParticipant.approximateAge=Alter EventParticipant.name=Name EventParticipant.sex=Geschlecht -EventParticipant.reportingUser=Reporting user +EventParticipant.reportingUser = Reporting user EventParticipant.responsibleRegion=Zuständiges Bundesland EventParticipant.responsibleDistrict=Zuständige/r Landkreis/Kreisfreie Stadt EventParticipant.personUuid=Personen-ID @@ -1424,9 +1429,9 @@ EventParticipantExport.personNationalHealthId=Krankenversicherungsnummer der Per EventParticipantExport.eventParticipantInvolvmentDescription=Beschreibung der Beteiligung EventParticipantExport.eventParticipantUuid=Ereignisteilnehmer ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink=Ereignisteilnehmer ID -EventParticipantSelection.eventUuidLink=Ereignis-ID -EventParticipantSelection.resultingCaseUuidLink=Resultierender Fall +EventParticipantSelection.eventParticipantUuidLink = Ereignisteilnehmer ID +EventParticipantSelection.eventUuidLink = Ereignis-ID +EventParticipantSelection.resultingCaseUuidLink = Resultierender Fall # Event Group EventGroup=Ereignisgruppe EventGroup.uuid=Gruppen-ID @@ -1646,6 +1651,7 @@ ExternalMessageCriteria.messageDateTo=... bis ExternalMessageCriteria.birthDateFrom=Geburtsdatum von... ExternalMessageCriteria.birthDateTo=... bis externalMessageValueNotSpecified=Value not specified in external message + #Physician report physiciansReportCaseImmunizations=Immunisierungen physiciansReportCaseAddVaccination=Impfung hinzufügen @@ -1656,7 +1662,7 @@ lineListingDiseaseOfSourceCase=Krankheit des Indexfalls lineListingInfrastructureData=Infrastrukturdaten der letzten Zeile übernehmen lineListingNewCasesList=Liste neuer Fälle lineListingNewContactsList=Liste neuer Kontakte -lineListingNewEventParticipantsList=List of new event participants +lineListingNewEventParticipantsList = List of new event participants lineListingSharedInformation=Weitergegebene Informationen lineListingEdit=Line Listing/Zeilenauflistung bearbeiten lineListingDisableAll=Alle Line Listing/Zeilenauflistungen deaktivieren @@ -1832,10 +1838,10 @@ personNoContactLinkedToPerson=Kein Kontakt mit Person verknüpft personLinkToEvents=Ereignisse für diese Person ansehen personLinkToCases=Fälle für diese Person ansehen personLinkToContacts=Kontakte für diese Person ansehen -personLinkToSamples=Proben für diese Person ansehen -caseLinkToSamples=See samples for this case -contactLinkToSamples=See samples for this contact -eventParticipantLinkToSamples=See samples for this event participant +personLinkToSamples = Proben für diese Person ansehen +caseLinkToSamples = See samples for this case +contactLinkToSamples = See samples for this contact +eventParticipantLinkToSamples = See samples for this event participant personsReplaceGeoCoordinates=Auch bestehende Koordinaten ersetzen. Warnung\: Dies könnte Koordinaten ersetzen, die absichtlich anders gesetzt wurden\! personsSetMissingGeoCoordinates=Fehlende Geo-Koordinaten generieren personsUpdated=Aktualisierte Personen @@ -2143,9 +2149,9 @@ SampleExport.caseReportDate=Fallmeldedatum SampleExport.caseResponsibleCommunity=Zuständige Gemeinde SampleExport.caseResponsibleDistrict=Zuständige/r Landkreis/Kreisfreie Stadt SampleExport.caseResponsibleRegion=Zuständiges Bundesland -SampleExport.eventParticipantCommunity=Community of event participant -SampleExport.eventParticipantDistrict=District of event participant -SampleExport.eventParticipantRegion=Region of event participant +SampleExport.eventParticipantCommunity = Community of event participant +SampleExport.eventParticipantDistrict = District of event participant +SampleExport.eventParticipantRegion = Region of event participant SampleExport.personSex=Geschlecht von Fall/Kontakt/Ereignisteilnehmer/in SampleExport.caseUuid=Fall UUID (Universally Unique Identifier) SampleExport.contactUuid=Kontakt-UUID @@ -2204,7 +2210,7 @@ SampleExport.wbcCount=Anzahl an weißen Blutkörperchen beim letzten zusätzlich # Immunization Immunization=Immunisierung Immunization.reportDate=Meldedatum -Immunization.reportingUser=Reporting user +Immunization.reportingUser = Reporting user Immunization.externalId=Externe ID Immunization.country=Immunisierungs-Land Immunization.deletionReason=Grund des Löschens @@ -2247,10 +2253,10 @@ Immunization.district=Landkreis/Kreisfreie Stadt Immunization.community=Gemeinde Immunization.changeDate=Datum der letzten Änderung Immunization.creationDate=Erstellungsdatum -immunizationActiveImmunizations=Aktive Immunisierungen -immunizationArchivedImmunizations=Archivierte Immunisierungen -immunizationAllActiveAndArchivedImmunizations=Alle aktiven und archivierten Immunisierungen -immunizationDeletedImmunizations=Gelöschte Immunisierungen +immunizationActiveImmunizations = Aktive Immunisierungen +immunizationArchivedImmunizations = Archivierte Immunisierungen +immunizationAllActiveAndArchivedImmunizations = Alle aktiven und archivierten Immunisierungen +immunizationDeletedImmunizations = Gelöschte Immunisierungen immunizationImmunizationsList=Immunisierungsliste linkImmunizationToCaseButton=Fall verknüpfen openLinkedCaseToImmunizationButton=Fall öffnen @@ -2315,10 +2321,10 @@ aefiVaccinationsDiluentInformation=Diluent Information aefiVaccinationsDiluentBatchLotNumber=Batch/Lot number aefiVaccinationsDiluentExpiryDate=Expiry date aefiVaccinationsDiluentTimeOfReconstitution=Reconstitution time -aefiActiveAdverseEvents=Active adverse events -aefiArchivedAdverseEvents=Archived adverse events -aefiAllActiveAndArchivedAdverseEvents=All active and archived adverse events -aefiDeletedAdverseEvents=Deleted adverse events +aefiActiveAdverseEvents = Active adverse events +aefiArchivedAdverseEvents = Archived adverse events +aefiAllActiveAndArchivedAdverseEvents = All active and archived adverse events +aefiDeletedAdverseEvents = Deleted adverse events # Adverse Events AdverseEvents.severeLocalReaction=Severe local reaction AdverseEvents.severeLocalReactionMoreThanThreeDays=>3 days @@ -2569,13 +2575,13 @@ aefiInvestigationMedicalCareDetailsInstruction=**Instructions ? Attach copies of aefiInvestigationReconstitutionProcedure=Reconstitution procedure aefiInvestigationOfThoseAffected=Of those effected, how many are aefiAefiInvestigationList=Adverse Event Investigations -aefiNewAefiInvestigation=New Investigation +aefiNewAefiInvestigation = New Investigation aefiAefiInvestigationDataView=Adverse Event Investigation aefiNewAefiInvestigationStageTitle=Investigation -aefiActiveInvestigations=Active AEFI investigations -aefiArchivedInvestigations=Archived AEFI investigations -aefiAllActiveAndArchivedInvestigations=All active and archived AEFI investigations -aefiDeletedInvestigations=Deleted AEFI investigations +aefiActiveInvestigations = Active AEFI investigations +aefiArchivedInvestigations = Archived AEFI investigations +aefiAllActiveAndArchivedInvestigations = All active and archived AEFI investigations +aefiDeletedInvestigations = Deleted AEFI investigations titleAefiInvestigationBasicDetails=Section A\: Basic details titleAefiInvestigationRelevantPatientInformation=Section B\: Relevant patient information prior to immunization titleAefiInvestigationFirstExaminationDetails=Section C\: Details of first examination** of serious AEFI case @@ -2848,7 +2854,7 @@ Task.contextReference=Verknüpfter Link Task.creatorComment=Kommentare zur Aufgabe Task.creatorUser=Erstellt von Task.dueDate=Fälligkeitsdatum -Task.environment=Zugeordnete Umgebung +Task.environment = Zugeordnete Umgebung Task.event=Zugehöriges Ereignis Task.observerUsers=Beobachtet von Task.perceivedStart=Erfasster Start @@ -2901,7 +2907,7 @@ travelEntriesNoTravelEntriesForPerson=Es gibt keine Einreisen für diese Person TravelEntry=Einreise TravelEntry.person=Einreiseperson TravelEntry.reportDate=Meldedatum -TravelEntry.reportingUser=Reporting user +TravelEntry.reportingUser = Reporting user TravelEntry.uuid=Einreise-ID TravelEntry.externalId=Externe ID TravelEntry.personFirstName=Vorname der Person @@ -3272,15 +3278,17 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=Liste der Benutzerrollen userRoleNotifications=Benachrichtigungen -userRoleNotificationTypeSms=SMS -userRoleNotificationTypeEmail=E-Mail +userRoleNotificationTypeSms = SMS +userRoleNotificationTypeEmail = E-Mail userrole.main=Benutzerrolle userrole.notifications=Benachrichtigungen userrole.applyUserRoleTemplate=Benutzerrollenvorlage anwenden + notificationType=Art der Benachrichtigung -notificationType.group=Gruppe -notificationType.caption=Bezeichnung -notificationType.description=Beschreibung +notificationType.group = Gruppe +notificationType.caption = Bezeichnung +notificationType.description = Beschreibung + SormasToSormasShareRequest.uuid=Anfrage ID SormasToSormasShareRequest.creationDate=Datum der Übergabe SormasToSormasShareRequest.dataType=Typ @@ -3315,10 +3323,10 @@ TaskExport.personAddressPostalCode=Postleitzahl der Personenadresse TaskExport.personPhone=Telefonnummer der Person TaskExport.personPhoneOwner=Telefonbesitzer des Telefons der Person TaskExport.personEmailAddress=E-Mail Adresse der Person -TaskExport.personOtherContactDetails=Kontaktdetails der Person -environmentSampleNotShipped=Nicht versendet -environmentSampleShipped=Versandt -environmentSampleReceived=Erhalten +TaskExport.personOtherContactDetails = Kontaktdetails der Person +environmentSampleNotShipped = Nicht versendet +environmentSampleShipped = Versandt +environmentSampleReceived = Erhalten environmentSampleActiveSamples=Aktive Umgebungs Proben environmentSampleArchivedSamples=Archivierte Umgebungs Proben environmentSampleAllActiveAndArchivedSamples=Alle aktiven und archivierten Umgebungs Proben @@ -3335,45 +3343,48 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents + # SpecialCaseAccess SpecialCaseAccess=Special case access -caze=Case -assignedTo=Assigned to -assignedBy=Assigned by -endDateTime=Access until -assignmentDate=Date assigned +caze = Case +assignedTo = Assigned to +assignedBy = Assigned by +endDateTime = Access until +assignmentDate = Date assigned + specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case + # SelfReport -SelfReport=Self report -SelfReport.type=Type -SelfReport.reportDate=Report date -SelfReport.caseReference=Case reference number -SelfReport.disease=Disease -SelfReport.diseaseDetails=Disease details -SelfReport.diseaseVariant=Disease variant -SelfReport.diseaseVariantDetails=Disease variant details -SelfReport.firstName=First name -SelfReport.lastName=Last name -SelfReport.sex=Sex -SelfReport.birthDate=Birth date -SelfReport.birthdateDD=Day of birth -SelfReport.birthdateMM=Month of birth -SelfReport.birthdateYYYY=Year of birth -SelfReport.nationalHealthId=National health ID -SelfReport.email=Email -SelfReport.phoneNumber=Phone number -SelfReport.address=Address -SelfReport.dateOfTest=Date of test -SelfReport.dateOfSymptoms=Date of symptoms -SelfReport.workplace=Workplace -SelfReport.dateWorkplace=Date workplace -SelfReport.isolationDate=Date of isolation -SelfReport.contactDate=Date of contact -SelfReport.comment=Comment -SelfReport.responsibleUser=Responsible user -SelfReport.investigationStatus=Investigation status -SelfReport.processingStatus=Processing status +SelfReport = Self report +SelfReport.type = Type +SelfReport.reportDate = Report date +SelfReport.caseReference = Case reference number +SelfReport.disease = Disease +SelfReport.diseaseDetails = Disease details +SelfReport.diseaseVariant = Disease variant +SelfReport.diseaseVariantDetails = Disease variant details +SelfReport.firstName = First name +SelfReport.lastName = Last name +SelfReport.sex = Sex +SelfReport.birthDate = Birth date +SelfReport.birthdateDD = Day of birth +SelfReport.birthdateMM = Month of birth +SelfReport.birthdateYYYY = Year of birth +SelfReport.nationalHealthId = National health ID +SelfReport.email = Email +SelfReport.phoneNumber = Phone number +SelfReport.address = Address +SelfReport.dateOfTest = Date of test +SelfReport.dateOfSymptoms = Date of symptoms +SelfReport.workplace = Workplace +SelfReport.dateWorkplace = Date workplace +SelfReport.isolationDate = Date of isolation +SelfReport.contactDate = Date of contact +SelfReport.comment = Comment +SelfReport.responsibleUser = Responsible user +SelfReport.investigationStatus = Investigation status +SelfReport.processingStatus = Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_en-AF.properties b/sormas-api/src/main/resources/captions_en-AF.properties index 218323983fb..9f9c7b22f16 100644 --- a/sormas-api/src/main/resources/captions_en-AF.properties +++ b/sormas-api/src/main/resources/captions_en-AF.properties @@ -52,7 +52,7 @@ creationDate=Creation date changeDate=Date of last change notAvailableShort=NA inaccessibleValue=Confidential -includePartialBirthdates=Include partial birthdates +includePartialBirthdates = Include partial birthdates numberOfCharacters=Number of characters\: %d / %d remove=Remove notTestedYet=Not tested yet @@ -189,15 +189,15 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge=Okay, and continue to merge overview -actionOkAndGoToContactDirectory=Okay, and continue to contact directory -actionOkAndGoToContactDetails=Okay, and continue to contact -actionOkAndGoToPersonDirectory=Okay, and continue to person directory -actionExecuteAutomaticDeletion=Execute automatic deletion -actionDone=Done -actionConfirmAction=Confirm action -actionAefiSelectPrimarySuspectVaccination=Select Suspect Vaccination -actionAefiAssignNewReportingIdNumber="Assign New AEFI ID" +actionOkAndGoToMerge = Okay, and continue to merge overview +actionOkAndGoToContactDirectory = Okay, and continue to contact directory +actionOkAndGoToContactDetails = Okay, and continue to contact +actionOkAndGoToPersonDirectory = Okay, and continue to person directory +actionExecuteAutomaticDeletion = Execute automatic deletion +actionDone = Done +actionConfirmAction = Confirm action +actionAefiSelectPrimarySuspectVaccination = Select Suspect Vaccination +actionAefiAssignNewReportingIdNumber = "Assign New AEFI ID" activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -251,10 +251,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows=Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups=Expired -aggregateReportNoAgeGroup=No age group -aggregateReportShowOnlyDuplicateReports=Display only duplicate reports +aggregateReportShowZeroRows = Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups = Expired +aggregateReportNoAgeGroup = No age group +aggregateReportShowOnlyDuplicateReports = Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -278,7 +278,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend=Send emails +bulkEmailSend = Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -437,7 +437,6 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name -CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1037,6 +1036,7 @@ aefiDashboardAefiInvestigationDiscarded=Investigation Discarded aefiDashboardAefiClassificationRelatedToVaccination=Related to vaccine or vaccination aefiDashboardAefiClassificationCoincidentalAdverseEvent=Coincidental adverse event aefiDashboardAefiClassificationUndetermined=Undetermined + captionDefault=Default defaultRegion=Default Province defaultDistrict=Default District @@ -1154,20 +1154,22 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: + # Entity columns -EntityColumn.ENTITY=Entity -EntityColumn.FIELD_ID=Field ID -EntityColumn.FIELD=Field -EntityColumn.TYPE=Type -EntityColumn.DATA_PROTECTION=Data protection -EntityColumn.CAPTION=Caption -EntityColumn.DESCRIPTION=Description -EntityColumn.REQUIRED=Required -EntityColumn.NEW_DISEASE=New disease -EntityColumn.DISEASES=Diseases -EntityColumn.OUTBREAKS=Outbreaks -EntityColumn.IGNORED_COUNTRIES=Ignored countries -EntityColumn.EXCLUSIVE_COUNTRIES=Exclusive countries +EntityColumn.ENTITY = Entity +EntityColumn.FIELD_ID = Field ID +EntityColumn.FIELD = Field +EntityColumn.TYPE = Type +EntityColumn.DATA_PROTECTION = Data protection +EntityColumn.CAPTION = Caption +EntityColumn.DESCRIPTION = Description +EntityColumn.REQUIRED = Required +EntityColumn.NEW_DISEASE = New disease +EntityColumn.DISEASES = Diseases +EntityColumn.OUTBREAKS = Outbreaks +EntityColumn.IGNORED_COUNTRIES = Ignored countries +EntityColumn.EXCLUSIVE_COUNTRIES = Exclusive countries + # Environment Environment=Environment Environment.uuid=Environment ID @@ -1186,51 +1188,54 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location + environmentActiveEnvironments=Active environments -environmentArchivedEnvironments=Archived environments -environmentAllActiveAndArchivedEnvironments=All active and archived environments -environmentDeletedEnvironments=Deleted environments -environmentNewEnvironment=New environment +environmentArchivedEnvironments = Archived environments +environmentAllActiveAndArchivedEnvironments = All active and archived environments +environmentDeletedEnvironments = Deleted environments +environmentNewEnvironment= New environment environmentEnvironmentsList=Environments list + # EnvironmentSample -EnvironmentSample=Environment Sample -EnvironmentSample.uuid=Sample ID -EnvironmentSample.environment=Environment -EnvironmentSample.sampleDateTime=Date of sampling -EnvironmentSample.sampleMaterial=Sample material -EnvironmentSample.otherSampleMaterial=Specify sample material -EnvironmentSample.sampleVolume=Volume (in mL) -EnvironmentSample.fieldSampleId=Field sample ID -EnvironmentSample.turbidity=Turbidity (in NTU) -EnvironmentSample.phValue=pH of sample -EnvironmentSample.sampleTemperature=Temperature (in °C) -EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) -EnvironmentSample.laboratory=Laboratory -EnvironmentSample.laboratoryDetails=Laboratory details -EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested -EnvironmentSample.reportingUser=Reporting user -EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested -EnvironmentSample.weatherConditions=Weather conditions at time of sampling -EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched=Sent/dispatched -EnvironmentSample.dispatchDate=Dispatchment date -EnvironmentSample.dispatchDetails=Dispatchment details -EnvironmentSample.received=Received -EnvironmentSample.receivalDate=Receival date -EnvironmentSample.labSampleId=Lab sample ID -EnvironmentSample.specimenCondition=Specimen condition -EnvironmentSample.location=Location of sampling site -EnvironmentSample.generalComment=General comment -EnvironmentSample.positivePathogenTests=Positive pathogen tests -EnvironmentSample.latestPathogenTest=Latest pathogen test -EnvironmentSample.numberOfTests=Number of tests +EnvironmentSample = Environment Sample +EnvironmentSample.uuid = Sample ID +EnvironmentSample.environment = Environment +EnvironmentSample.sampleDateTime = Date of sampling +EnvironmentSample.sampleMaterial = Sample material +EnvironmentSample.otherSampleMaterial = Specify sample material +EnvironmentSample.sampleVolume = Volume (in mL) +EnvironmentSample.fieldSampleId = Field sample ID +EnvironmentSample.turbidity = Turbidity (in NTU) +EnvironmentSample.phValue = pH of sample +EnvironmentSample.sampleTemperature = Temperature (in °C) +EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) +EnvironmentSample.laboratory = Laboratory +EnvironmentSample.laboratoryDetails = Laboratory details +EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested +EnvironmentSample.reportingUser = Reporting user +EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested +EnvironmentSample.weatherConditions = Weather conditions at time of sampling +EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched = Sent/dispatched +EnvironmentSample.dispatchDate = Dispatchment date +EnvironmentSample.dispatchDetails = Dispatchment details +EnvironmentSample.received = Received +EnvironmentSample.receivalDate = Receival date +EnvironmentSample.labSampleId = Lab sample ID +EnvironmentSample.specimenCondition = Specimen condition +EnvironmentSample.location = Location of sampling site +EnvironmentSample.generalComment = General comment +EnvironmentSample.positivePathogenTests = Positive pathogen tests +EnvironmentSample.latestPathogenTest = Latest pathogen test +EnvironmentSample.numberOfTests = Number of tests + # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents=Deleted events +eventDeletedEvents = Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1374,7 +1379,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants=Deleted event participants +eventParticipantDeletedEventParticipants = Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1387,7 +1392,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser=Reporting user +EventParticipant.reportingUser = Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1424,9 +1429,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink=Event participant ID -EventParticipantSelection.eventUuidLink=Event ID -EventParticipantSelection.resultingCaseUuidLink=Resulting case ID +EventParticipantSelection.eventParticipantUuidLink = Event participant ID +EventParticipantSelection.eventUuidLink = Event ID +EventParticipantSelection.resultingCaseUuidLink = Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1646,6 +1651,7 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message + #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1656,7 +1662,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList=List of new event participants +lineListingNewEventParticipantsList = List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1832,10 +1838,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples=See samples for this person -caseLinkToSamples=See samples for this case -contactLinkToSamples=See samples for this contact -eventParticipantLinkToSamples=See samples for this event participant +personLinkToSamples = See samples for this person +caseLinkToSamples = See samples for this case +contactLinkToSamples = See samples for this contact +eventParticipantLinkToSamples = See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2143,9 +2149,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity=Community of event participant -SampleExport.eventParticipantDistrict=District of event participant -SampleExport.eventParticipantRegion=Region of event participant +SampleExport.eventParticipantCommunity = Community of event participant +SampleExport.eventParticipantDistrict = District of event participant +SampleExport.eventParticipantRegion = Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2204,7 +2210,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser=Reporting user +Immunization.reportingUser = Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2247,10 +2253,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations=Active immunizations -immunizationArchivedImmunizations=Archived immunizations -immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations -immunizationDeletedImmunizations=Deleted immunizations +immunizationActiveImmunizations = Active immunizations +immunizationArchivedImmunizations = Archived immunizations +immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations +immunizationDeletedImmunizations = Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2315,10 +2321,10 @@ aefiVaccinationsDiluentInformation=Diluent Information aefiVaccinationsDiluentBatchLotNumber=Batch/Lot number aefiVaccinationsDiluentExpiryDate=Expiry date aefiVaccinationsDiluentTimeOfReconstitution=Reconstitution time -aefiActiveAdverseEvents=Active adverse events -aefiArchivedAdverseEvents=Archived adverse events -aefiAllActiveAndArchivedAdverseEvents=All active and archived adverse events -aefiDeletedAdverseEvents=Deleted adverse events +aefiActiveAdverseEvents = Active adverse events +aefiArchivedAdverseEvents = Archived adverse events +aefiAllActiveAndArchivedAdverseEvents = All active and archived adverse events +aefiDeletedAdverseEvents = Deleted adverse events # Adverse Events AdverseEvents.severeLocalReaction=Severe local reaction AdverseEvents.severeLocalReactionMoreThanThreeDays=>3 days @@ -2569,13 +2575,13 @@ aefiInvestigationMedicalCareDetailsInstruction=**Instructions ? Attach copies of aefiInvestigationReconstitutionProcedure=Reconstitution procedure aefiInvestigationOfThoseAffected=Of those effected, how many are aefiAefiInvestigationList=Adverse Event Investigations -aefiNewAefiInvestigation=New Investigation +aefiNewAefiInvestigation = New Investigation aefiAefiInvestigationDataView=Adverse Event Investigation aefiNewAefiInvestigationStageTitle=Investigation -aefiActiveInvestigations=Active AEFI investigations -aefiArchivedInvestigations=Archived AEFI investigations -aefiAllActiveAndArchivedInvestigations=All active and archived AEFI investigations -aefiDeletedInvestigations=Deleted AEFI investigations +aefiActiveInvestigations = Active AEFI investigations +aefiArchivedInvestigations = Archived AEFI investigations +aefiAllActiveAndArchivedInvestigations = All active and archived AEFI investigations +aefiDeletedInvestigations = Deleted AEFI investigations titleAefiInvestigationBasicDetails=Section A\: Basic details titleAefiInvestigationRelevantPatientInformation=Section B\: Relevant patient information prior to immunization titleAefiInvestigationFirstExaminationDetails=Section C\: Details of first examination** of serious AEFI case @@ -2848,7 +2854,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment=Associated environment +Task.environment = Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2901,7 +2907,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser=Reporting user +TravelEntry.reportingUser = Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -3272,15 +3278,17 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms=SMS -userRoleNotificationTypeEmail=EMAIL +userRoleNotificationTypeSms = SMS +userRoleNotificationTypeEmail = EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template + notificationType=Notification type -notificationType.group=Group -notificationType.caption=Caption -notificationType.description=Description +notificationType.group = Group +notificationType.caption = Caption +notificationType.description = Description + SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -3315,10 +3323,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails=Person contact details -environmentSampleNotShipped=Not shipped -environmentSampleShipped=Shipped -environmentSampleReceived=Received +TaskExport.personOtherContactDetails = Person contact details +environmentSampleNotShipped = Not shipped +environmentSampleShipped = Shipped +environmentSampleReceived = Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -3335,45 +3343,48 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents + # SpecialCaseAccess SpecialCaseAccess=Special case access -caze=Case -assignedTo=Assigned to -assignedBy=Assigned by -endDateTime=Access until -assignmentDate=Date assigned +caze = Case +assignedTo = Assigned to +assignedBy = Assigned by +endDateTime = Access until +assignmentDate = Date assigned + specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case + # SelfReport -SelfReport=Self report -SelfReport.type=Type -SelfReport.reportDate=Report date -SelfReport.caseReference=Case reference number -SelfReport.disease=Disease -SelfReport.diseaseDetails=Disease details -SelfReport.diseaseVariant=Disease variant -SelfReport.diseaseVariantDetails=Disease variant details -SelfReport.firstName=First name -SelfReport.lastName=Last name -SelfReport.sex=Sex -SelfReport.birthDate=Birth date -SelfReport.birthdateDD=Day of birth -SelfReport.birthdateMM=Month of birth -SelfReport.birthdateYYYY=Year of birth -SelfReport.nationalHealthId=National health ID -SelfReport.email=Email -SelfReport.phoneNumber=Phone number -SelfReport.address=Address -SelfReport.dateOfTest=Date of test -SelfReport.dateOfSymptoms=Date of symptoms -SelfReport.workplace=Workplace -SelfReport.dateWorkplace=Date workplace -SelfReport.isolationDate=Date of isolation -SelfReport.contactDate=Date of contact -SelfReport.comment=Comment -SelfReport.responsibleUser=Responsible user -SelfReport.investigationStatus=Investigation status -SelfReport.processingStatus=Processing status +SelfReport = Self report +SelfReport.type = Type +SelfReport.reportDate = Report date +SelfReport.caseReference = Case reference number +SelfReport.disease = Disease +SelfReport.diseaseDetails = Disease details +SelfReport.diseaseVariant = Disease variant +SelfReport.diseaseVariantDetails = Disease variant details +SelfReport.firstName = First name +SelfReport.lastName = Last name +SelfReport.sex = Sex +SelfReport.birthDate = Birth date +SelfReport.birthdateDD = Day of birth +SelfReport.birthdateMM = Month of birth +SelfReport.birthdateYYYY = Year of birth +SelfReport.nationalHealthId = National health ID +SelfReport.email = Email +SelfReport.phoneNumber = Phone number +SelfReport.address = Address +SelfReport.dateOfTest = Date of test +SelfReport.dateOfSymptoms = Date of symptoms +SelfReport.workplace = Workplace +SelfReport.dateWorkplace = Date workplace +SelfReport.isolationDate = Date of isolation +SelfReport.contactDate = Date of contact +SelfReport.comment = Comment +SelfReport.responsibleUser = Responsible user +SelfReport.investigationStatus = Investigation status +SelfReport.processingStatus = Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_en-GH.properties b/sormas-api/src/main/resources/captions_en-GH.properties index 39f7671cd7b..8898160030b 100644 --- a/sormas-api/src/main/resources/captions_en-GH.properties +++ b/sormas-api/src/main/resources/captions_en-GH.properties @@ -52,7 +52,7 @@ creationDate=Creation date changeDate=Date of last change notAvailableShort=NA inaccessibleValue=Confidential -includePartialBirthdates=Include partial birthdates +includePartialBirthdates = Include partial birthdates numberOfCharacters=Number of characters\: %d / %d remove=Remove notTestedYet=Not tested yet @@ -189,15 +189,15 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge=Okay, and continue to merge overview -actionOkAndGoToContactDirectory=Okay, and continue to contact directory -actionOkAndGoToContactDetails=Okay, and continue to contact -actionOkAndGoToPersonDirectory=Okay, and continue to person directory -actionExecuteAutomaticDeletion=Execute automatic deletion -actionDone=Done -actionConfirmAction=Confirm action -actionAefiSelectPrimarySuspectVaccination=Select Suspect Vaccination -actionAefiAssignNewReportingIdNumber="Assign New AEFI ID" +actionOkAndGoToMerge = Okay, and continue to merge overview +actionOkAndGoToContactDirectory = Okay, and continue to contact directory +actionOkAndGoToContactDetails = Okay, and continue to contact +actionOkAndGoToPersonDirectory = Okay, and continue to person directory +actionExecuteAutomaticDeletion = Execute automatic deletion +actionDone = Done +actionConfirmAction = Confirm action +actionAefiSelectPrimarySuspectVaccination = Select Suspect Vaccination +actionAefiAssignNewReportingIdNumber = "Assign New AEFI ID" activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -251,10 +251,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows=Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups=Expired -aggregateReportNoAgeGroup=No age group -aggregateReportShowOnlyDuplicateReports=Display only duplicate reports +aggregateReportShowZeroRows = Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups = Expired +aggregateReportNoAgeGroup = No age group +aggregateReportShowOnlyDuplicateReports = Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -278,7 +278,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend=Send emails +bulkEmailSend = Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -437,7 +437,6 @@ CaseData.contactOfficer=Contact district disease control officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name -CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1037,6 +1036,7 @@ aefiDashboardAefiInvestigationDiscarded=Investigation Discarded aefiDashboardAefiClassificationRelatedToVaccination=Related to vaccine or vaccination aefiDashboardAefiClassificationCoincidentalAdverseEvent=Coincidental adverse event aefiDashboardAefiClassificationUndetermined=Undetermined + captionDefault=Default defaultRegion=Default Region defaultDistrict=Default District @@ -1154,20 +1154,22 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: + # Entity columns -EntityColumn.ENTITY=Entity -EntityColumn.FIELD_ID=Field ID -EntityColumn.FIELD=Field -EntityColumn.TYPE=Type -EntityColumn.DATA_PROTECTION=Data protection -EntityColumn.CAPTION=Caption -EntityColumn.DESCRIPTION=Description -EntityColumn.REQUIRED=Required -EntityColumn.NEW_DISEASE=New disease -EntityColumn.DISEASES=Diseases -EntityColumn.OUTBREAKS=Outbreaks -EntityColumn.IGNORED_COUNTRIES=Ignored countries -EntityColumn.EXCLUSIVE_COUNTRIES=Exclusive countries +EntityColumn.ENTITY = Entity +EntityColumn.FIELD_ID = Field ID +EntityColumn.FIELD = Field +EntityColumn.TYPE = Type +EntityColumn.DATA_PROTECTION = Data protection +EntityColumn.CAPTION = Caption +EntityColumn.DESCRIPTION = Description +EntityColumn.REQUIRED = Required +EntityColumn.NEW_DISEASE = New disease +EntityColumn.DISEASES = Diseases +EntityColumn.OUTBREAKS = Outbreaks +EntityColumn.IGNORED_COUNTRIES = Ignored countries +EntityColumn.EXCLUSIVE_COUNTRIES = Exclusive countries + # Environment Environment=Environment Environment.uuid=Environment ID @@ -1186,51 +1188,54 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location + environmentActiveEnvironments=Active environments -environmentArchivedEnvironments=Archived environments -environmentAllActiveAndArchivedEnvironments=All active and archived environments -environmentDeletedEnvironments=Deleted environments -environmentNewEnvironment=New environment +environmentArchivedEnvironments = Archived environments +environmentAllActiveAndArchivedEnvironments = All active and archived environments +environmentDeletedEnvironments = Deleted environments +environmentNewEnvironment= New environment environmentEnvironmentsList=Environments list + # EnvironmentSample -EnvironmentSample=Environment Sample -EnvironmentSample.uuid=Sample ID -EnvironmentSample.environment=Environment -EnvironmentSample.sampleDateTime=Date of sampling -EnvironmentSample.sampleMaterial=Sample material -EnvironmentSample.otherSampleMaterial=Specify sample material -EnvironmentSample.sampleVolume=Volume (in mL) -EnvironmentSample.fieldSampleId=Field sample ID -EnvironmentSample.turbidity=Turbidity (in NTU) -EnvironmentSample.phValue=pH of sample -EnvironmentSample.sampleTemperature=Temperature (in °C) -EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) -EnvironmentSample.laboratory=Laboratory -EnvironmentSample.laboratoryDetails=Laboratory details -EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested -EnvironmentSample.reportingUser=Reporting user -EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested -EnvironmentSample.weatherConditions=Weather conditions at time of sampling -EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched=Sent/dispatched -EnvironmentSample.dispatchDate=Dispatchment date -EnvironmentSample.dispatchDetails=Dispatchment details -EnvironmentSample.received=Received -EnvironmentSample.receivalDate=Receival date -EnvironmentSample.labSampleId=Lab sample ID -EnvironmentSample.specimenCondition=Specimen condition -EnvironmentSample.location=Location of sampling site -EnvironmentSample.generalComment=General comment -EnvironmentSample.positivePathogenTests=Positive pathogen tests -EnvironmentSample.latestPathogenTest=Latest pathogen test -EnvironmentSample.numberOfTests=Number of tests +EnvironmentSample = Environment Sample +EnvironmentSample.uuid = Sample ID +EnvironmentSample.environment = Environment +EnvironmentSample.sampleDateTime = Date of sampling +EnvironmentSample.sampleMaterial = Sample material +EnvironmentSample.otherSampleMaterial = Specify sample material +EnvironmentSample.sampleVolume = Volume (in mL) +EnvironmentSample.fieldSampleId = Field sample ID +EnvironmentSample.turbidity = Turbidity (in NTU) +EnvironmentSample.phValue = pH of sample +EnvironmentSample.sampleTemperature = Temperature (in °C) +EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) +EnvironmentSample.laboratory = Laboratory +EnvironmentSample.laboratoryDetails = Laboratory details +EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested +EnvironmentSample.reportingUser = Reporting user +EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested +EnvironmentSample.weatherConditions = Weather conditions at time of sampling +EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched = Sent/dispatched +EnvironmentSample.dispatchDate = Dispatchment date +EnvironmentSample.dispatchDetails = Dispatchment details +EnvironmentSample.received = Received +EnvironmentSample.receivalDate = Receival date +EnvironmentSample.labSampleId = Lab sample ID +EnvironmentSample.specimenCondition = Specimen condition +EnvironmentSample.location = Location of sampling site +EnvironmentSample.generalComment = General comment +EnvironmentSample.positivePathogenTests = Positive pathogen tests +EnvironmentSample.latestPathogenTest = Latest pathogen test +EnvironmentSample.numberOfTests = Number of tests + # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents=Deleted events +eventDeletedEvents = Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1374,7 +1379,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants=Deleted event participants +eventParticipantDeletedEventParticipants = Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1387,7 +1392,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser=Reporting user +EventParticipant.reportingUser = Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1424,9 +1429,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink=Event participant ID -EventParticipantSelection.eventUuidLink=Event ID -EventParticipantSelection.resultingCaseUuidLink=Resulting case ID +EventParticipantSelection.eventParticipantUuidLink = Event participant ID +EventParticipantSelection.eventUuidLink = Event ID +EventParticipantSelection.resultingCaseUuidLink = Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1646,6 +1651,7 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message + #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1656,7 +1662,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList=List of new event participants +lineListingNewEventParticipantsList = List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1832,10 +1838,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples=See samples for this person -caseLinkToSamples=See samples for this case -contactLinkToSamples=See samples for this contact -eventParticipantLinkToSamples=See samples for this event participant +personLinkToSamples = See samples for this person +caseLinkToSamples = See samples for this case +contactLinkToSamples = See samples for this contact +eventParticipantLinkToSamples = See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2143,9 +2149,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity=Community of event participant -SampleExport.eventParticipantDistrict=District of event participant -SampleExport.eventParticipantRegion=Region of event participant +SampleExport.eventParticipantCommunity = Community of event participant +SampleExport.eventParticipantDistrict = District of event participant +SampleExport.eventParticipantRegion = Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2204,7 +2210,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser=Reporting user +Immunization.reportingUser = Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2247,10 +2253,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations=Active immunizations -immunizationArchivedImmunizations=Archived immunizations -immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations -immunizationDeletedImmunizations=Deleted immunizations +immunizationActiveImmunizations = Active immunizations +immunizationArchivedImmunizations = Archived immunizations +immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations +immunizationDeletedImmunizations = Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2315,10 +2321,10 @@ aefiVaccinationsDiluentInformation=Diluent Information aefiVaccinationsDiluentBatchLotNumber=Batch/Lot number aefiVaccinationsDiluentExpiryDate=Expiry date aefiVaccinationsDiluentTimeOfReconstitution=Reconstitution time -aefiActiveAdverseEvents=Active adverse events -aefiArchivedAdverseEvents=Archived adverse events -aefiAllActiveAndArchivedAdverseEvents=All active and archived adverse events -aefiDeletedAdverseEvents=Deleted adverse events +aefiActiveAdverseEvents = Active adverse events +aefiArchivedAdverseEvents = Archived adverse events +aefiAllActiveAndArchivedAdverseEvents = All active and archived adverse events +aefiDeletedAdverseEvents = Deleted adverse events # Adverse Events AdverseEvents.severeLocalReaction=Severe local reaction AdverseEvents.severeLocalReactionMoreThanThreeDays=>3 days @@ -2569,13 +2575,13 @@ aefiInvestigationMedicalCareDetailsInstruction=**Instructions ? Attach copies of aefiInvestigationReconstitutionProcedure=Reconstitution procedure aefiInvestigationOfThoseAffected=Of those effected, how many are aefiAefiInvestigationList=Adverse Event Investigations -aefiNewAefiInvestigation=New Investigation +aefiNewAefiInvestigation = New Investigation aefiAefiInvestigationDataView=Adverse Event Investigation aefiNewAefiInvestigationStageTitle=Investigation -aefiActiveInvestigations=Active AEFI investigations -aefiArchivedInvestigations=Archived AEFI investigations -aefiAllActiveAndArchivedInvestigations=All active and archived AEFI investigations -aefiDeletedInvestigations=Deleted AEFI investigations +aefiActiveInvestigations = Active AEFI investigations +aefiArchivedInvestigations = Archived AEFI investigations +aefiAllActiveAndArchivedInvestigations = All active and archived AEFI investigations +aefiDeletedInvestigations = Deleted AEFI investigations titleAefiInvestigationBasicDetails=Section A\: Basic details titleAefiInvestigationRelevantPatientInformation=Section B\: Relevant patient information prior to immunization titleAefiInvestigationFirstExaminationDetails=Section C\: Details of first examination** of serious AEFI case @@ -2848,7 +2854,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment=Associated environment +Task.environment = Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2901,7 +2907,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser=Reporting user +TravelEntry.reportingUser = Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -3272,15 +3278,17 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms=SMS -userRoleNotificationTypeEmail=EMAIL +userRoleNotificationTypeSms = SMS +userRoleNotificationTypeEmail = EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template + notificationType=Notification type -notificationType.group=Group -notificationType.caption=Caption -notificationType.description=Description +notificationType.group = Group +notificationType.caption = Caption +notificationType.description = Description + SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -3315,10 +3323,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails=Person contact details -environmentSampleNotShipped=Not shipped -environmentSampleShipped=Shipped -environmentSampleReceived=Received +TaskExport.personOtherContactDetails = Person contact details +environmentSampleNotShipped = Not shipped +environmentSampleShipped = Shipped +environmentSampleReceived = Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -3335,45 +3343,48 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents + # SpecialCaseAccess SpecialCaseAccess=Special case access -caze=Case -assignedTo=Assigned to -assignedBy=Assigned by -endDateTime=Access until -assignmentDate=Date assigned +caze = Case +assignedTo = Assigned to +assignedBy = Assigned by +endDateTime = Access until +assignmentDate = Date assigned + specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case + # SelfReport -SelfReport=Self report -SelfReport.type=Type -SelfReport.reportDate=Report date -SelfReport.caseReference=Case reference number -SelfReport.disease=Disease -SelfReport.diseaseDetails=Disease details -SelfReport.diseaseVariant=Disease variant -SelfReport.diseaseVariantDetails=Disease variant details -SelfReport.firstName=First name -SelfReport.lastName=Last name -SelfReport.sex=Sex -SelfReport.birthDate=Birth date -SelfReport.birthdateDD=Day of birth -SelfReport.birthdateMM=Month of birth -SelfReport.birthdateYYYY=Year of birth -SelfReport.nationalHealthId=National health ID -SelfReport.email=Email -SelfReport.phoneNumber=Phone number -SelfReport.address=Address -SelfReport.dateOfTest=Date of test -SelfReport.dateOfSymptoms=Date of symptoms -SelfReport.workplace=Workplace -SelfReport.dateWorkplace=Date workplace -SelfReport.isolationDate=Date of isolation -SelfReport.contactDate=Date of contact -SelfReport.comment=Comment -SelfReport.responsibleUser=Responsible user -SelfReport.investigationStatus=Investigation status -SelfReport.processingStatus=Processing status +SelfReport = Self report +SelfReport.type = Type +SelfReport.reportDate = Report date +SelfReport.caseReference = Case reference number +SelfReport.disease = Disease +SelfReport.diseaseDetails = Disease details +SelfReport.diseaseVariant = Disease variant +SelfReport.diseaseVariantDetails = Disease variant details +SelfReport.firstName = First name +SelfReport.lastName = Last name +SelfReport.sex = Sex +SelfReport.birthDate = Birth date +SelfReport.birthdateDD = Day of birth +SelfReport.birthdateMM = Month of birth +SelfReport.birthdateYYYY = Year of birth +SelfReport.nationalHealthId = National health ID +SelfReport.email = Email +SelfReport.phoneNumber = Phone number +SelfReport.address = Address +SelfReport.dateOfTest = Date of test +SelfReport.dateOfSymptoms = Date of symptoms +SelfReport.workplace = Workplace +SelfReport.dateWorkplace = Date workplace +SelfReport.isolationDate = Date of isolation +SelfReport.contactDate = Date of contact +SelfReport.comment = Comment +SelfReport.responsibleUser = Responsible user +SelfReport.investigationStatus = Investigation status +SelfReport.processingStatus = Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_en-GM.properties b/sormas-api/src/main/resources/captions_en-GM.properties index f27b56025c3..8b11bb90c15 100644 --- a/sormas-api/src/main/resources/captions_en-GM.properties +++ b/sormas-api/src/main/resources/captions_en-GM.properties @@ -52,7 +52,7 @@ creationDate=Creation date changeDate=Date of last change notAvailableShort=NA inaccessibleValue=Confidential -includePartialBirthdates=Include partial birthdates +includePartialBirthdates = Include partial birthdates numberOfCharacters=Number of characters\: %d / %d remove=Remove notTestedYet=Not tested yet @@ -189,15 +189,15 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge=Okay, and continue to merge overview -actionOkAndGoToContactDirectory=Okay, and continue to contact directory -actionOkAndGoToContactDetails=Okay, and continue to contact -actionOkAndGoToPersonDirectory=Okay, and continue to person directory -actionExecuteAutomaticDeletion=Execute automatic deletion -actionDone=Done -actionConfirmAction=Confirm action -actionAefiSelectPrimarySuspectVaccination=Select Suspect Vaccination -actionAefiAssignNewReportingIdNumber="Assign New AEFI ID" +actionOkAndGoToMerge = Okay, and continue to merge overview +actionOkAndGoToContactDirectory = Okay, and continue to contact directory +actionOkAndGoToContactDetails = Okay, and continue to contact +actionOkAndGoToPersonDirectory = Okay, and continue to person directory +actionExecuteAutomaticDeletion = Execute automatic deletion +actionDone = Done +actionConfirmAction = Confirm action +actionAefiSelectPrimarySuspectVaccination = Select Suspect Vaccination +actionAefiAssignNewReportingIdNumber = "Assign New AEFI ID" activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -251,10 +251,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows=Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups=Expired -aggregateReportNoAgeGroup=No age group -aggregateReportShowOnlyDuplicateReports=Display only duplicate reports +aggregateReportShowZeroRows = Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups = Expired +aggregateReportNoAgeGroup = No age group +aggregateReportShowOnlyDuplicateReports = Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -278,7 +278,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend=Send emails +bulkEmailSend = Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -437,7 +437,6 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name -CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1037,6 +1036,7 @@ aefiDashboardAefiInvestigationDiscarded=Investigation Discarded aefiDashboardAefiClassificationRelatedToVaccination=Related to vaccine or vaccination aefiDashboardAefiClassificationCoincidentalAdverseEvent=Coincidental adverse event aefiDashboardAefiClassificationUndetermined=Undetermined + captionDefault=Default defaultRegion=Default Region defaultDistrict=Default District @@ -1154,20 +1154,22 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: + # Entity columns -EntityColumn.ENTITY=Entity -EntityColumn.FIELD_ID=Field ID -EntityColumn.FIELD=Field -EntityColumn.TYPE=Type -EntityColumn.DATA_PROTECTION=Data protection -EntityColumn.CAPTION=Caption -EntityColumn.DESCRIPTION=Description -EntityColumn.REQUIRED=Required -EntityColumn.NEW_DISEASE=New disease -EntityColumn.DISEASES=Diseases -EntityColumn.OUTBREAKS=Outbreaks -EntityColumn.IGNORED_COUNTRIES=Ignored countries -EntityColumn.EXCLUSIVE_COUNTRIES=Exclusive countries +EntityColumn.ENTITY = Entity +EntityColumn.FIELD_ID = Field ID +EntityColumn.FIELD = Field +EntityColumn.TYPE = Type +EntityColumn.DATA_PROTECTION = Data protection +EntityColumn.CAPTION = Caption +EntityColumn.DESCRIPTION = Description +EntityColumn.REQUIRED = Required +EntityColumn.NEW_DISEASE = New disease +EntityColumn.DISEASES = Diseases +EntityColumn.OUTBREAKS = Outbreaks +EntityColumn.IGNORED_COUNTRIES = Ignored countries +EntityColumn.EXCLUSIVE_COUNTRIES = Exclusive countries + # Environment Environment=Environment Environment.uuid=Environment ID @@ -1186,51 +1188,54 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location + environmentActiveEnvironments=Active environments -environmentArchivedEnvironments=Archived environments -environmentAllActiveAndArchivedEnvironments=All active and archived environments -environmentDeletedEnvironments=Deleted environments -environmentNewEnvironment=New environment +environmentArchivedEnvironments = Archived environments +environmentAllActiveAndArchivedEnvironments = All active and archived environments +environmentDeletedEnvironments = Deleted environments +environmentNewEnvironment= New environment environmentEnvironmentsList=Environments list + # EnvironmentSample -EnvironmentSample=Environment Sample -EnvironmentSample.uuid=Sample ID -EnvironmentSample.environment=Environment -EnvironmentSample.sampleDateTime=Date of sampling -EnvironmentSample.sampleMaterial=Sample material -EnvironmentSample.otherSampleMaterial=Specify sample material -EnvironmentSample.sampleVolume=Volume (in mL) -EnvironmentSample.fieldSampleId=Field sample ID -EnvironmentSample.turbidity=Turbidity (in NTU) -EnvironmentSample.phValue=pH of sample -EnvironmentSample.sampleTemperature=Temperature (in °C) -EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) -EnvironmentSample.laboratory=Laboratory -EnvironmentSample.laboratoryDetails=Laboratory details -EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested -EnvironmentSample.reportingUser=Reporting user -EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested -EnvironmentSample.weatherConditions=Weather conditions at time of sampling -EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched=Sent/dispatched -EnvironmentSample.dispatchDate=Dispatchment date -EnvironmentSample.dispatchDetails=Dispatchment details -EnvironmentSample.received=Received -EnvironmentSample.receivalDate=Receival date -EnvironmentSample.labSampleId=Lab sample ID -EnvironmentSample.specimenCondition=Specimen condition -EnvironmentSample.location=Location of sampling site -EnvironmentSample.generalComment=General comment -EnvironmentSample.positivePathogenTests=Positive pathogen tests -EnvironmentSample.latestPathogenTest=Latest pathogen test -EnvironmentSample.numberOfTests=Number of tests +EnvironmentSample = Environment Sample +EnvironmentSample.uuid = Sample ID +EnvironmentSample.environment = Environment +EnvironmentSample.sampleDateTime = Date of sampling +EnvironmentSample.sampleMaterial = Sample material +EnvironmentSample.otherSampleMaterial = Specify sample material +EnvironmentSample.sampleVolume = Volume (in mL) +EnvironmentSample.fieldSampleId = Field sample ID +EnvironmentSample.turbidity = Turbidity (in NTU) +EnvironmentSample.phValue = pH of sample +EnvironmentSample.sampleTemperature = Temperature (in °C) +EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) +EnvironmentSample.laboratory = Laboratory +EnvironmentSample.laboratoryDetails = Laboratory details +EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested +EnvironmentSample.reportingUser = Reporting user +EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested +EnvironmentSample.weatherConditions = Weather conditions at time of sampling +EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched = Sent/dispatched +EnvironmentSample.dispatchDate = Dispatchment date +EnvironmentSample.dispatchDetails = Dispatchment details +EnvironmentSample.received = Received +EnvironmentSample.receivalDate = Receival date +EnvironmentSample.labSampleId = Lab sample ID +EnvironmentSample.specimenCondition = Specimen condition +EnvironmentSample.location = Location of sampling site +EnvironmentSample.generalComment = General comment +EnvironmentSample.positivePathogenTests = Positive pathogen tests +EnvironmentSample.latestPathogenTest = Latest pathogen test +EnvironmentSample.numberOfTests = Number of tests + # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents=Deleted events +eventDeletedEvents = Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1374,7 +1379,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants=Deleted event participants +eventParticipantDeletedEventParticipants = Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1387,7 +1392,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser=Reporting user +EventParticipant.reportingUser = Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1424,9 +1429,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink=Event participant ID -EventParticipantSelection.eventUuidLink=Event ID -EventParticipantSelection.resultingCaseUuidLink=Resulting case ID +EventParticipantSelection.eventParticipantUuidLink = Event participant ID +EventParticipantSelection.eventUuidLink = Event ID +EventParticipantSelection.resultingCaseUuidLink = Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1646,6 +1651,7 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message + #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1656,7 +1662,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList=List of new event participants +lineListingNewEventParticipantsList = List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1832,10 +1838,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples=See samples for this person -caseLinkToSamples=See samples for this case -contactLinkToSamples=See samples for this contact -eventParticipantLinkToSamples=See samples for this event participant +personLinkToSamples = See samples for this person +caseLinkToSamples = See samples for this case +contactLinkToSamples = See samples for this contact +eventParticipantLinkToSamples = See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2143,9 +2149,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity=Community of event participant -SampleExport.eventParticipantDistrict=District of event participant -SampleExport.eventParticipantRegion=Region of event participant +SampleExport.eventParticipantCommunity = Community of event participant +SampleExport.eventParticipantDistrict = District of event participant +SampleExport.eventParticipantRegion = Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2204,7 +2210,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser=Reporting user +Immunization.reportingUser = Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2247,10 +2253,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations=Active immunizations -immunizationArchivedImmunizations=Archived immunizations -immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations -immunizationDeletedImmunizations=Deleted immunizations +immunizationActiveImmunizations = Active immunizations +immunizationArchivedImmunizations = Archived immunizations +immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations +immunizationDeletedImmunizations = Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2315,10 +2321,10 @@ aefiVaccinationsDiluentInformation=Diluent Information aefiVaccinationsDiluentBatchLotNumber=Batch/Lot number aefiVaccinationsDiluentExpiryDate=Expiry date aefiVaccinationsDiluentTimeOfReconstitution=Reconstitution time -aefiActiveAdverseEvents=Active adverse events -aefiArchivedAdverseEvents=Archived adverse events -aefiAllActiveAndArchivedAdverseEvents=All active and archived adverse events -aefiDeletedAdverseEvents=Deleted adverse events +aefiActiveAdverseEvents = Active adverse events +aefiArchivedAdverseEvents = Archived adverse events +aefiAllActiveAndArchivedAdverseEvents = All active and archived adverse events +aefiDeletedAdverseEvents = Deleted adverse events # Adverse Events AdverseEvents.severeLocalReaction=Severe local reaction AdverseEvents.severeLocalReactionMoreThanThreeDays=>3 days @@ -2569,13 +2575,13 @@ aefiInvestigationMedicalCareDetailsInstruction=**Instructions ? Attach copies of aefiInvestigationReconstitutionProcedure=Reconstitution procedure aefiInvestigationOfThoseAffected=Of those effected, how many are aefiAefiInvestigationList=Adverse Event Investigations -aefiNewAefiInvestigation=New Investigation +aefiNewAefiInvestigation = New Investigation aefiAefiInvestigationDataView=Adverse Event Investigation aefiNewAefiInvestigationStageTitle=Investigation -aefiActiveInvestigations=Active AEFI investigations -aefiArchivedInvestigations=Archived AEFI investigations -aefiAllActiveAndArchivedInvestigations=All active and archived AEFI investigations -aefiDeletedInvestigations=Deleted AEFI investigations +aefiActiveInvestigations = Active AEFI investigations +aefiArchivedInvestigations = Archived AEFI investigations +aefiAllActiveAndArchivedInvestigations = All active and archived AEFI investigations +aefiDeletedInvestigations = Deleted AEFI investigations titleAefiInvestigationBasicDetails=Section A\: Basic details titleAefiInvestigationRelevantPatientInformation=Section B\: Relevant patient information prior to immunization titleAefiInvestigationFirstExaminationDetails=Section C\: Details of first examination** of serious AEFI case @@ -2848,7 +2854,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment=Associated environment +Task.environment = Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2901,7 +2907,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser=Reporting user +TravelEntry.reportingUser = Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -3272,15 +3278,17 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms=SMS -userRoleNotificationTypeEmail=EMAIL +userRoleNotificationTypeSms = SMS +userRoleNotificationTypeEmail = EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template + notificationType=Notification type -notificationType.group=Group -notificationType.caption=Caption -notificationType.description=Description +notificationType.group = Group +notificationType.caption = Caption +notificationType.description = Description + SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -3315,10 +3323,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails=Person contact details -environmentSampleNotShipped=Not shipped -environmentSampleShipped=Shipped -environmentSampleReceived=Received +TaskExport.personOtherContactDetails = Person contact details +environmentSampleNotShipped = Not shipped +environmentSampleShipped = Shipped +environmentSampleReceived = Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -3335,45 +3343,48 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents + # SpecialCaseAccess SpecialCaseAccess=Special case access -caze=Case -assignedTo=Assigned to -assignedBy=Assigned by -endDateTime=Access until -assignmentDate=Date assigned +caze = Case +assignedTo = Assigned to +assignedBy = Assigned by +endDateTime = Access until +assignmentDate = Date assigned + specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case + # SelfReport -SelfReport=Self report -SelfReport.type=Type -SelfReport.reportDate=Report date -SelfReport.caseReference=Case reference number -SelfReport.disease=Disease -SelfReport.diseaseDetails=Disease details -SelfReport.diseaseVariant=Disease variant -SelfReport.diseaseVariantDetails=Disease variant details -SelfReport.firstName=First name -SelfReport.lastName=Last name -SelfReport.sex=Sex -SelfReport.birthDate=Birth date -SelfReport.birthdateDD=Day of birth -SelfReport.birthdateMM=Month of birth -SelfReport.birthdateYYYY=Year of birth -SelfReport.nationalHealthId=National health ID -SelfReport.email=Email -SelfReport.phoneNumber=Phone number -SelfReport.address=Address -SelfReport.dateOfTest=Date of test -SelfReport.dateOfSymptoms=Date of symptoms -SelfReport.workplace=Workplace -SelfReport.dateWorkplace=Date workplace -SelfReport.isolationDate=Date of isolation -SelfReport.contactDate=Date of contact -SelfReport.comment=Comment -SelfReport.responsibleUser=Responsible user -SelfReport.investigationStatus=Investigation status -SelfReport.processingStatus=Processing status +SelfReport = Self report +SelfReport.type = Type +SelfReport.reportDate = Report date +SelfReport.caseReference = Case reference number +SelfReport.disease = Disease +SelfReport.diseaseDetails = Disease details +SelfReport.diseaseVariant = Disease variant +SelfReport.diseaseVariantDetails = Disease variant details +SelfReport.firstName = First name +SelfReport.lastName = Last name +SelfReport.sex = Sex +SelfReport.birthDate = Birth date +SelfReport.birthdateDD = Day of birth +SelfReport.birthdateMM = Month of birth +SelfReport.birthdateYYYY = Year of birth +SelfReport.nationalHealthId = National health ID +SelfReport.email = Email +SelfReport.phoneNumber = Phone number +SelfReport.address = Address +SelfReport.dateOfTest = Date of test +SelfReport.dateOfSymptoms = Date of symptoms +SelfReport.workplace = Workplace +SelfReport.dateWorkplace = Date workplace +SelfReport.isolationDate = Date of isolation +SelfReport.contactDate = Date of contact +SelfReport.comment = Comment +SelfReport.responsibleUser = Responsible user +SelfReport.investigationStatus = Investigation status +SelfReport.processingStatus = Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_en-KE.properties b/sormas-api/src/main/resources/captions_en-KE.properties index 238d8e09844..ea936995d74 100644 --- a/sormas-api/src/main/resources/captions_en-KE.properties +++ b/sormas-api/src/main/resources/captions_en-KE.properties @@ -52,7 +52,7 @@ creationDate=Creation date changeDate=Date of last change notAvailableShort=NA inaccessibleValue=Confidential -includePartialBirthdates=Include partial birthdates +includePartialBirthdates = Include partial birthdates numberOfCharacters=Number of characters\: %d / %d remove=Remove notTestedYet=Not tested yet @@ -189,15 +189,15 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge=Okay, and continue to merge overview -actionOkAndGoToContactDirectory=Okay, and continue to contact directory -actionOkAndGoToContactDetails=Okay, and continue to contact -actionOkAndGoToPersonDirectory=Okay, and continue to person directory -actionExecuteAutomaticDeletion=Execute automatic deletion -actionDone=Done -actionConfirmAction=Confirm action -actionAefiSelectPrimarySuspectVaccination=Select Suspect Vaccination -actionAefiAssignNewReportingIdNumber="Assign New AEFI ID" +actionOkAndGoToMerge = Okay, and continue to merge overview +actionOkAndGoToContactDirectory = Okay, and continue to contact directory +actionOkAndGoToContactDetails = Okay, and continue to contact +actionOkAndGoToPersonDirectory = Okay, and continue to person directory +actionExecuteAutomaticDeletion = Execute automatic deletion +actionDone = Done +actionConfirmAction = Confirm action +actionAefiSelectPrimarySuspectVaccination = Select Suspect Vaccination +actionAefiAssignNewReportingIdNumber = "Assign New AEFI ID" activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -251,10 +251,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows=Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups=Expired -aggregateReportNoAgeGroup=No age group -aggregateReportShowOnlyDuplicateReports=Display only duplicate reports +aggregateReportShowZeroRows = Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups = Expired +aggregateReportNoAgeGroup = No age group +aggregateReportShowOnlyDuplicateReports = Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -278,7 +278,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend=Send emails +bulkEmailSend = Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -437,7 +437,6 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name -CaseData.disease=Disease CaseData.district=Sub County CaseData.districtLevelDate=Date received at Sub county level CaseData.doses=How many doses @@ -1037,6 +1036,7 @@ aefiDashboardAefiInvestigationDiscarded=Investigation Discarded aefiDashboardAefiClassificationRelatedToVaccination=Related to vaccine or vaccination aefiDashboardAefiClassificationCoincidentalAdverseEvent=Coincidental adverse event aefiDashboardAefiClassificationUndetermined=Undetermined + captionDefault=Default defaultRegion=Default County defaultDistrict=Default Sub County @@ -1154,20 +1154,22 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: + # Entity columns -EntityColumn.ENTITY=Entity -EntityColumn.FIELD_ID=Field ID -EntityColumn.FIELD=Field -EntityColumn.TYPE=Type -EntityColumn.DATA_PROTECTION=Data protection -EntityColumn.CAPTION=Caption -EntityColumn.DESCRIPTION=Description -EntityColumn.REQUIRED=Required -EntityColumn.NEW_DISEASE=New disease -EntityColumn.DISEASES=Diseases -EntityColumn.OUTBREAKS=Outbreaks -EntityColumn.IGNORED_COUNTRIES=Ignored countries -EntityColumn.EXCLUSIVE_COUNTRIES=Exclusive countries +EntityColumn.ENTITY = Entity +EntityColumn.FIELD_ID = Field ID +EntityColumn.FIELD = Field +EntityColumn.TYPE = Type +EntityColumn.DATA_PROTECTION = Data protection +EntityColumn.CAPTION = Caption +EntityColumn.DESCRIPTION = Description +EntityColumn.REQUIRED = Required +EntityColumn.NEW_DISEASE = New disease +EntityColumn.DISEASES = Diseases +EntityColumn.OUTBREAKS = Outbreaks +EntityColumn.IGNORED_COUNTRIES = Ignored countries +EntityColumn.EXCLUSIVE_COUNTRIES = Exclusive countries + # Environment Environment=Environment Environment.uuid=Environment ID @@ -1186,51 +1188,54 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location + environmentActiveEnvironments=Active environments -environmentArchivedEnvironments=Archived environments -environmentAllActiveAndArchivedEnvironments=All active and archived environments -environmentDeletedEnvironments=Deleted environments -environmentNewEnvironment=New environment +environmentArchivedEnvironments = Archived environments +environmentAllActiveAndArchivedEnvironments = All active and archived environments +environmentDeletedEnvironments = Deleted environments +environmentNewEnvironment= New environment environmentEnvironmentsList=Environments list + # EnvironmentSample -EnvironmentSample=Environment Sample -EnvironmentSample.uuid=Sample ID -EnvironmentSample.environment=Environment -EnvironmentSample.sampleDateTime=Date of sampling -EnvironmentSample.sampleMaterial=Sample material -EnvironmentSample.otherSampleMaterial=Specify sample material -EnvironmentSample.sampleVolume=Volume (in mL) -EnvironmentSample.fieldSampleId=Field sample ID -EnvironmentSample.turbidity=Turbidity (in NTU) -EnvironmentSample.phValue=pH of sample -EnvironmentSample.sampleTemperature=Temperature (in °C) -EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) -EnvironmentSample.laboratory=Laboratory -EnvironmentSample.laboratoryDetails=Laboratory details -EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested -EnvironmentSample.reportingUser=Reporting user -EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested -EnvironmentSample.weatherConditions=Weather conditions at time of sampling -EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched=Sent/dispatched -EnvironmentSample.dispatchDate=Dispatchment date -EnvironmentSample.dispatchDetails=Dispatchment details -EnvironmentSample.received=Received -EnvironmentSample.receivalDate=Receival date -EnvironmentSample.labSampleId=Lab sample ID -EnvironmentSample.specimenCondition=Specimen condition -EnvironmentSample.location=Location of sampling site -EnvironmentSample.generalComment=General comment -EnvironmentSample.positivePathogenTests=Positive pathogen tests -EnvironmentSample.latestPathogenTest=Latest pathogen test -EnvironmentSample.numberOfTests=Number of tests +EnvironmentSample = Environment Sample +EnvironmentSample.uuid = Sample ID +EnvironmentSample.environment = Environment +EnvironmentSample.sampleDateTime = Date of sampling +EnvironmentSample.sampleMaterial = Sample material +EnvironmentSample.otherSampleMaterial = Specify sample material +EnvironmentSample.sampleVolume = Volume (in mL) +EnvironmentSample.fieldSampleId = Field sample ID +EnvironmentSample.turbidity = Turbidity (in NTU) +EnvironmentSample.phValue = pH of sample +EnvironmentSample.sampleTemperature = Temperature (in °C) +EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) +EnvironmentSample.laboratory = Laboratory +EnvironmentSample.laboratoryDetails = Laboratory details +EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested +EnvironmentSample.reportingUser = Reporting user +EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested +EnvironmentSample.weatherConditions = Weather conditions at time of sampling +EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched = Sent/dispatched +EnvironmentSample.dispatchDate = Dispatchment date +EnvironmentSample.dispatchDetails = Dispatchment details +EnvironmentSample.received = Received +EnvironmentSample.receivalDate = Receival date +EnvironmentSample.labSampleId = Lab sample ID +EnvironmentSample.specimenCondition = Specimen condition +EnvironmentSample.location = Location of sampling site +EnvironmentSample.generalComment = General comment +EnvironmentSample.positivePathogenTests = Positive pathogen tests +EnvironmentSample.latestPathogenTest = Latest pathogen test +EnvironmentSample.numberOfTests = Number of tests + # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents=Deleted events +eventDeletedEvents = Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1374,7 +1379,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants=Deleted event participants +eventParticipantDeletedEventParticipants = Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1387,7 +1392,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser=Reporting user +EventParticipant.reportingUser = Reporting user EventParticipant.responsibleRegion=Responsible County EventParticipant.responsibleDistrict=Responsible Sub County EventParticipant.personUuid=Person ID @@ -1424,9 +1429,9 @@ EventParticipantExport.personNationalHealthId=Person National Unique Patient Ide EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink=Event participant ID -EventParticipantSelection.eventUuidLink=Event ID -EventParticipantSelection.resultingCaseUuidLink=Resulting case ID +EventParticipantSelection.eventParticipantUuidLink = Event participant ID +EventParticipantSelection.eventUuidLink = Event ID +EventParticipantSelection.resultingCaseUuidLink = Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1646,6 +1651,7 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message + #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1656,7 +1662,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList=List of new event participants +lineListingNewEventParticipantsList = List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1832,10 +1838,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples=See samples for this person -caseLinkToSamples=See samples for this case -contactLinkToSamples=See samples for this contact -eventParticipantLinkToSamples=See samples for this event participant +personLinkToSamples = See samples for this person +caseLinkToSamples = See samples for this case +contactLinkToSamples = See samples for this contact +eventParticipantLinkToSamples = See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2143,9 +2149,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible ward SampleExport.caseResponsibleDistrict=Case responsible sub county SampleExport.caseResponsibleRegion=Case responsible county -SampleExport.eventParticipantCommunity=Ward of event participant -SampleExport.eventParticipantDistrict=Sub County of event participant -SampleExport.eventParticipantRegion=County of event participant +SampleExport.eventParticipantCommunity = Ward of event participant +SampleExport.eventParticipantDistrict = Sub County of event participant +SampleExport.eventParticipantRegion = County of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2204,7 +2210,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser=Reporting user +Immunization.reportingUser = Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2247,10 +2253,10 @@ Immunization.district=Sub County Immunization.community=Ward Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations=Active immunizations -immunizationArchivedImmunizations=Archived immunizations -immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations -immunizationDeletedImmunizations=Deleted immunizations +immunizationActiveImmunizations = Active immunizations +immunizationArchivedImmunizations = Archived immunizations +immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations +immunizationDeletedImmunizations = Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2315,10 +2321,10 @@ aefiVaccinationsDiluentInformation=Diluent Information aefiVaccinationsDiluentBatchLotNumber=Batch/Lot number aefiVaccinationsDiluentExpiryDate=Expiry date aefiVaccinationsDiluentTimeOfReconstitution=Reconstitution time -aefiActiveAdverseEvents=Active adverse events -aefiArchivedAdverseEvents=Archived adverse events -aefiAllActiveAndArchivedAdverseEvents=All active and archived adverse events -aefiDeletedAdverseEvents=Deleted adverse events +aefiActiveAdverseEvents = Active adverse events +aefiArchivedAdverseEvents = Archived adverse events +aefiAllActiveAndArchivedAdverseEvents = All active and archived adverse events +aefiDeletedAdverseEvents = Deleted adverse events # Adverse Events AdverseEvents.severeLocalReaction=Severe local reaction AdverseEvents.severeLocalReactionMoreThanThreeDays=>3 days @@ -2569,13 +2575,13 @@ aefiInvestigationMedicalCareDetailsInstruction=**Instructions ? Attach copies of aefiInvestigationReconstitutionProcedure=Reconstitution procedure aefiInvestigationOfThoseAffected=Of those effected, how many are aefiAefiInvestigationList=Adverse Event Investigations -aefiNewAefiInvestigation=New Investigation +aefiNewAefiInvestigation = New Investigation aefiAefiInvestigationDataView=Adverse Event Investigation aefiNewAefiInvestigationStageTitle=Investigation -aefiActiveInvestigations=Active AEFI investigations -aefiArchivedInvestigations=Archived AEFI investigations -aefiAllActiveAndArchivedInvestigations=All active and archived AEFI investigations -aefiDeletedInvestigations=Deleted AEFI investigations +aefiActiveInvestigations = Active AEFI investigations +aefiArchivedInvestigations = Archived AEFI investigations +aefiAllActiveAndArchivedInvestigations = All active and archived AEFI investigations +aefiDeletedInvestigations = Deleted AEFI investigations titleAefiInvestigationBasicDetails=Section A\: Basic details titleAefiInvestigationRelevantPatientInformation=Section B\: Relevant patient information prior to immunization titleAefiInvestigationFirstExaminationDetails=Section C\: Details of first examination** of serious AEFI case @@ -2848,7 +2854,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment=Associated environment +Task.environment = Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2901,7 +2907,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser=Reporting user +TravelEntry.reportingUser = Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -3272,15 +3278,17 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms=SMS -userRoleNotificationTypeEmail=EMAIL +userRoleNotificationTypeSms = SMS +userRoleNotificationTypeEmail = EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template + notificationType=Notification type -notificationType.group=Group -notificationType.caption=Caption -notificationType.description=Description +notificationType.group = Group +notificationType.caption = Caption +notificationType.description = Description + SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -3315,10 +3323,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails=Person contact details -environmentSampleNotShipped=Not shipped -environmentSampleShipped=Shipped -environmentSampleReceived=Received +TaskExport.personOtherContactDetails = Person contact details +environmentSampleNotShipped = Not shipped +environmentSampleShipped = Shipped +environmentSampleReceived = Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -3335,45 +3343,48 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents + # SpecialCaseAccess SpecialCaseAccess=Special case access -caze=Case -assignedTo=Assigned to -assignedBy=Assigned by -endDateTime=Access until -assignmentDate=Date assigned +caze = Case +assignedTo = Assigned to +assignedBy = Assigned by +endDateTime = Access until +assignmentDate = Date assigned + specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case + # SelfReport -SelfReport=Self report -SelfReport.type=Type -SelfReport.reportDate=Report date -SelfReport.caseReference=Case reference number -SelfReport.disease=Disease -SelfReport.diseaseDetails=Disease details -SelfReport.diseaseVariant=Disease variant -SelfReport.diseaseVariantDetails=Disease variant details -SelfReport.firstName=First name -SelfReport.lastName=Last name -SelfReport.sex=Sex -SelfReport.birthDate=Birth date -SelfReport.birthdateDD=Day of birth -SelfReport.birthdateMM=Month of birth -SelfReport.birthdateYYYY=Year of birth -SelfReport.nationalHealthId=National Unique Patient Identifier -SelfReport.email=Email -SelfReport.phoneNumber=Phone number -SelfReport.address=Address -SelfReport.dateOfTest=Date of test -SelfReport.dateOfSymptoms=Date of symptoms -SelfReport.workplace=Workplace -SelfReport.dateWorkplace=Date workplace -SelfReport.isolationDate=Date of isolation -SelfReport.contactDate=Date of contact -SelfReport.comment=Comment -SelfReport.responsibleUser=Responsible user -SelfReport.investigationStatus=Investigation status -SelfReport.processingStatus=Processing status +SelfReport = Self report +SelfReport.type = Type +SelfReport.reportDate = Report date +SelfReport.caseReference = Case reference number +SelfReport.disease = Disease +SelfReport.diseaseDetails = Disease details +SelfReport.diseaseVariant = Disease variant +SelfReport.diseaseVariantDetails = Disease variant details +SelfReport.firstName = First name +SelfReport.lastName = Last name +SelfReport.sex = Sex +SelfReport.birthDate = Birth date +SelfReport.birthdateDD = Day of birth +SelfReport.birthdateMM = Month of birth +SelfReport.birthdateYYYY = Year of birth +SelfReport.nationalHealthId = National Unique Patient Identifier +SelfReport.email = Email +SelfReport.phoneNumber = Phone number +SelfReport.address = Address +SelfReport.dateOfTest = Date of test +SelfReport.dateOfSymptoms = Date of symptoms +SelfReport.workplace = Workplace +SelfReport.dateWorkplace = Date workplace +SelfReport.isolationDate = Date of isolation +SelfReport.contactDate = Date of contact +SelfReport.comment = Comment +SelfReport.responsibleUser = Responsible user +SelfReport.investigationStatus = Investigation status +SelfReport.processingStatus = Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_en-LR.properties b/sormas-api/src/main/resources/captions_en-LR.properties index f27b56025c3..8b11bb90c15 100644 --- a/sormas-api/src/main/resources/captions_en-LR.properties +++ b/sormas-api/src/main/resources/captions_en-LR.properties @@ -52,7 +52,7 @@ creationDate=Creation date changeDate=Date of last change notAvailableShort=NA inaccessibleValue=Confidential -includePartialBirthdates=Include partial birthdates +includePartialBirthdates = Include partial birthdates numberOfCharacters=Number of characters\: %d / %d remove=Remove notTestedYet=Not tested yet @@ -189,15 +189,15 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge=Okay, and continue to merge overview -actionOkAndGoToContactDirectory=Okay, and continue to contact directory -actionOkAndGoToContactDetails=Okay, and continue to contact -actionOkAndGoToPersonDirectory=Okay, and continue to person directory -actionExecuteAutomaticDeletion=Execute automatic deletion -actionDone=Done -actionConfirmAction=Confirm action -actionAefiSelectPrimarySuspectVaccination=Select Suspect Vaccination -actionAefiAssignNewReportingIdNumber="Assign New AEFI ID" +actionOkAndGoToMerge = Okay, and continue to merge overview +actionOkAndGoToContactDirectory = Okay, and continue to contact directory +actionOkAndGoToContactDetails = Okay, and continue to contact +actionOkAndGoToPersonDirectory = Okay, and continue to person directory +actionExecuteAutomaticDeletion = Execute automatic deletion +actionDone = Done +actionConfirmAction = Confirm action +actionAefiSelectPrimarySuspectVaccination = Select Suspect Vaccination +actionAefiAssignNewReportingIdNumber = "Assign New AEFI ID" activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -251,10 +251,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows=Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups=Expired -aggregateReportNoAgeGroup=No age group -aggregateReportShowOnlyDuplicateReports=Display only duplicate reports +aggregateReportShowZeroRows = Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups = Expired +aggregateReportNoAgeGroup = No age group +aggregateReportShowOnlyDuplicateReports = Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -278,7 +278,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend=Send emails +bulkEmailSend = Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -437,7 +437,6 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name -CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1037,6 +1036,7 @@ aefiDashboardAefiInvestigationDiscarded=Investigation Discarded aefiDashboardAefiClassificationRelatedToVaccination=Related to vaccine or vaccination aefiDashboardAefiClassificationCoincidentalAdverseEvent=Coincidental adverse event aefiDashboardAefiClassificationUndetermined=Undetermined + captionDefault=Default defaultRegion=Default Region defaultDistrict=Default District @@ -1154,20 +1154,22 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: + # Entity columns -EntityColumn.ENTITY=Entity -EntityColumn.FIELD_ID=Field ID -EntityColumn.FIELD=Field -EntityColumn.TYPE=Type -EntityColumn.DATA_PROTECTION=Data protection -EntityColumn.CAPTION=Caption -EntityColumn.DESCRIPTION=Description -EntityColumn.REQUIRED=Required -EntityColumn.NEW_DISEASE=New disease -EntityColumn.DISEASES=Diseases -EntityColumn.OUTBREAKS=Outbreaks -EntityColumn.IGNORED_COUNTRIES=Ignored countries -EntityColumn.EXCLUSIVE_COUNTRIES=Exclusive countries +EntityColumn.ENTITY = Entity +EntityColumn.FIELD_ID = Field ID +EntityColumn.FIELD = Field +EntityColumn.TYPE = Type +EntityColumn.DATA_PROTECTION = Data protection +EntityColumn.CAPTION = Caption +EntityColumn.DESCRIPTION = Description +EntityColumn.REQUIRED = Required +EntityColumn.NEW_DISEASE = New disease +EntityColumn.DISEASES = Diseases +EntityColumn.OUTBREAKS = Outbreaks +EntityColumn.IGNORED_COUNTRIES = Ignored countries +EntityColumn.EXCLUSIVE_COUNTRIES = Exclusive countries + # Environment Environment=Environment Environment.uuid=Environment ID @@ -1186,51 +1188,54 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location + environmentActiveEnvironments=Active environments -environmentArchivedEnvironments=Archived environments -environmentAllActiveAndArchivedEnvironments=All active and archived environments -environmentDeletedEnvironments=Deleted environments -environmentNewEnvironment=New environment +environmentArchivedEnvironments = Archived environments +environmentAllActiveAndArchivedEnvironments = All active and archived environments +environmentDeletedEnvironments = Deleted environments +environmentNewEnvironment= New environment environmentEnvironmentsList=Environments list + # EnvironmentSample -EnvironmentSample=Environment Sample -EnvironmentSample.uuid=Sample ID -EnvironmentSample.environment=Environment -EnvironmentSample.sampleDateTime=Date of sampling -EnvironmentSample.sampleMaterial=Sample material -EnvironmentSample.otherSampleMaterial=Specify sample material -EnvironmentSample.sampleVolume=Volume (in mL) -EnvironmentSample.fieldSampleId=Field sample ID -EnvironmentSample.turbidity=Turbidity (in NTU) -EnvironmentSample.phValue=pH of sample -EnvironmentSample.sampleTemperature=Temperature (in °C) -EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) -EnvironmentSample.laboratory=Laboratory -EnvironmentSample.laboratoryDetails=Laboratory details -EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested -EnvironmentSample.reportingUser=Reporting user -EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested -EnvironmentSample.weatherConditions=Weather conditions at time of sampling -EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched=Sent/dispatched -EnvironmentSample.dispatchDate=Dispatchment date -EnvironmentSample.dispatchDetails=Dispatchment details -EnvironmentSample.received=Received -EnvironmentSample.receivalDate=Receival date -EnvironmentSample.labSampleId=Lab sample ID -EnvironmentSample.specimenCondition=Specimen condition -EnvironmentSample.location=Location of sampling site -EnvironmentSample.generalComment=General comment -EnvironmentSample.positivePathogenTests=Positive pathogen tests -EnvironmentSample.latestPathogenTest=Latest pathogen test -EnvironmentSample.numberOfTests=Number of tests +EnvironmentSample = Environment Sample +EnvironmentSample.uuid = Sample ID +EnvironmentSample.environment = Environment +EnvironmentSample.sampleDateTime = Date of sampling +EnvironmentSample.sampleMaterial = Sample material +EnvironmentSample.otherSampleMaterial = Specify sample material +EnvironmentSample.sampleVolume = Volume (in mL) +EnvironmentSample.fieldSampleId = Field sample ID +EnvironmentSample.turbidity = Turbidity (in NTU) +EnvironmentSample.phValue = pH of sample +EnvironmentSample.sampleTemperature = Temperature (in °C) +EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) +EnvironmentSample.laboratory = Laboratory +EnvironmentSample.laboratoryDetails = Laboratory details +EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested +EnvironmentSample.reportingUser = Reporting user +EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested +EnvironmentSample.weatherConditions = Weather conditions at time of sampling +EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched = Sent/dispatched +EnvironmentSample.dispatchDate = Dispatchment date +EnvironmentSample.dispatchDetails = Dispatchment details +EnvironmentSample.received = Received +EnvironmentSample.receivalDate = Receival date +EnvironmentSample.labSampleId = Lab sample ID +EnvironmentSample.specimenCondition = Specimen condition +EnvironmentSample.location = Location of sampling site +EnvironmentSample.generalComment = General comment +EnvironmentSample.positivePathogenTests = Positive pathogen tests +EnvironmentSample.latestPathogenTest = Latest pathogen test +EnvironmentSample.numberOfTests = Number of tests + # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents=Deleted events +eventDeletedEvents = Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1374,7 +1379,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants=Deleted event participants +eventParticipantDeletedEventParticipants = Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1387,7 +1392,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser=Reporting user +EventParticipant.reportingUser = Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1424,9 +1429,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink=Event participant ID -EventParticipantSelection.eventUuidLink=Event ID -EventParticipantSelection.resultingCaseUuidLink=Resulting case ID +EventParticipantSelection.eventParticipantUuidLink = Event participant ID +EventParticipantSelection.eventUuidLink = Event ID +EventParticipantSelection.resultingCaseUuidLink = Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1646,6 +1651,7 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message + #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1656,7 +1662,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList=List of new event participants +lineListingNewEventParticipantsList = List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1832,10 +1838,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples=See samples for this person -caseLinkToSamples=See samples for this case -contactLinkToSamples=See samples for this contact -eventParticipantLinkToSamples=See samples for this event participant +personLinkToSamples = See samples for this person +caseLinkToSamples = See samples for this case +contactLinkToSamples = See samples for this contact +eventParticipantLinkToSamples = See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2143,9 +2149,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity=Community of event participant -SampleExport.eventParticipantDistrict=District of event participant -SampleExport.eventParticipantRegion=Region of event participant +SampleExport.eventParticipantCommunity = Community of event participant +SampleExport.eventParticipantDistrict = District of event participant +SampleExport.eventParticipantRegion = Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2204,7 +2210,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser=Reporting user +Immunization.reportingUser = Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2247,10 +2253,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations=Active immunizations -immunizationArchivedImmunizations=Archived immunizations -immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations -immunizationDeletedImmunizations=Deleted immunizations +immunizationActiveImmunizations = Active immunizations +immunizationArchivedImmunizations = Archived immunizations +immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations +immunizationDeletedImmunizations = Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2315,10 +2321,10 @@ aefiVaccinationsDiluentInformation=Diluent Information aefiVaccinationsDiluentBatchLotNumber=Batch/Lot number aefiVaccinationsDiluentExpiryDate=Expiry date aefiVaccinationsDiluentTimeOfReconstitution=Reconstitution time -aefiActiveAdverseEvents=Active adverse events -aefiArchivedAdverseEvents=Archived adverse events -aefiAllActiveAndArchivedAdverseEvents=All active and archived adverse events -aefiDeletedAdverseEvents=Deleted adverse events +aefiActiveAdverseEvents = Active adverse events +aefiArchivedAdverseEvents = Archived adverse events +aefiAllActiveAndArchivedAdverseEvents = All active and archived adverse events +aefiDeletedAdverseEvents = Deleted adverse events # Adverse Events AdverseEvents.severeLocalReaction=Severe local reaction AdverseEvents.severeLocalReactionMoreThanThreeDays=>3 days @@ -2569,13 +2575,13 @@ aefiInvestigationMedicalCareDetailsInstruction=**Instructions ? Attach copies of aefiInvestigationReconstitutionProcedure=Reconstitution procedure aefiInvestigationOfThoseAffected=Of those effected, how many are aefiAefiInvestigationList=Adverse Event Investigations -aefiNewAefiInvestigation=New Investigation +aefiNewAefiInvestigation = New Investigation aefiAefiInvestigationDataView=Adverse Event Investigation aefiNewAefiInvestigationStageTitle=Investigation -aefiActiveInvestigations=Active AEFI investigations -aefiArchivedInvestigations=Archived AEFI investigations -aefiAllActiveAndArchivedInvestigations=All active and archived AEFI investigations -aefiDeletedInvestigations=Deleted AEFI investigations +aefiActiveInvestigations = Active AEFI investigations +aefiArchivedInvestigations = Archived AEFI investigations +aefiAllActiveAndArchivedInvestigations = All active and archived AEFI investigations +aefiDeletedInvestigations = Deleted AEFI investigations titleAefiInvestigationBasicDetails=Section A\: Basic details titleAefiInvestigationRelevantPatientInformation=Section B\: Relevant patient information prior to immunization titleAefiInvestigationFirstExaminationDetails=Section C\: Details of first examination** of serious AEFI case @@ -2848,7 +2854,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment=Associated environment +Task.environment = Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2901,7 +2907,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser=Reporting user +TravelEntry.reportingUser = Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -3272,15 +3278,17 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms=SMS -userRoleNotificationTypeEmail=EMAIL +userRoleNotificationTypeSms = SMS +userRoleNotificationTypeEmail = EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template + notificationType=Notification type -notificationType.group=Group -notificationType.caption=Caption -notificationType.description=Description +notificationType.group = Group +notificationType.caption = Caption +notificationType.description = Description + SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -3315,10 +3323,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails=Person contact details -environmentSampleNotShipped=Not shipped -environmentSampleShipped=Shipped -environmentSampleReceived=Received +TaskExport.personOtherContactDetails = Person contact details +environmentSampleNotShipped = Not shipped +environmentSampleShipped = Shipped +environmentSampleReceived = Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -3335,45 +3343,48 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents + # SpecialCaseAccess SpecialCaseAccess=Special case access -caze=Case -assignedTo=Assigned to -assignedBy=Assigned by -endDateTime=Access until -assignmentDate=Date assigned +caze = Case +assignedTo = Assigned to +assignedBy = Assigned by +endDateTime = Access until +assignmentDate = Date assigned + specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case + # SelfReport -SelfReport=Self report -SelfReport.type=Type -SelfReport.reportDate=Report date -SelfReport.caseReference=Case reference number -SelfReport.disease=Disease -SelfReport.diseaseDetails=Disease details -SelfReport.diseaseVariant=Disease variant -SelfReport.diseaseVariantDetails=Disease variant details -SelfReport.firstName=First name -SelfReport.lastName=Last name -SelfReport.sex=Sex -SelfReport.birthDate=Birth date -SelfReport.birthdateDD=Day of birth -SelfReport.birthdateMM=Month of birth -SelfReport.birthdateYYYY=Year of birth -SelfReport.nationalHealthId=National health ID -SelfReport.email=Email -SelfReport.phoneNumber=Phone number -SelfReport.address=Address -SelfReport.dateOfTest=Date of test -SelfReport.dateOfSymptoms=Date of symptoms -SelfReport.workplace=Workplace -SelfReport.dateWorkplace=Date workplace -SelfReport.isolationDate=Date of isolation -SelfReport.contactDate=Date of contact -SelfReport.comment=Comment -SelfReport.responsibleUser=Responsible user -SelfReport.investigationStatus=Investigation status -SelfReport.processingStatus=Processing status +SelfReport = Self report +SelfReport.type = Type +SelfReport.reportDate = Report date +SelfReport.caseReference = Case reference number +SelfReport.disease = Disease +SelfReport.diseaseDetails = Disease details +SelfReport.diseaseVariant = Disease variant +SelfReport.diseaseVariantDetails = Disease variant details +SelfReport.firstName = First name +SelfReport.lastName = Last name +SelfReport.sex = Sex +SelfReport.birthDate = Birth date +SelfReport.birthdateDD = Day of birth +SelfReport.birthdateMM = Month of birth +SelfReport.birthdateYYYY = Year of birth +SelfReport.nationalHealthId = National health ID +SelfReport.email = Email +SelfReport.phoneNumber = Phone number +SelfReport.address = Address +SelfReport.dateOfTest = Date of test +SelfReport.dateOfSymptoms = Date of symptoms +SelfReport.workplace = Workplace +SelfReport.dateWorkplace = Date workplace +SelfReport.isolationDate = Date of isolation +SelfReport.contactDate = Date of contact +SelfReport.comment = Comment +SelfReport.responsibleUser = Responsible user +SelfReport.investigationStatus = Investigation status +SelfReport.processingStatus = Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_en-NG.properties b/sormas-api/src/main/resources/captions_en-NG.properties index 53744598df3..bd66854678c 100644 --- a/sormas-api/src/main/resources/captions_en-NG.properties +++ b/sormas-api/src/main/resources/captions_en-NG.properties @@ -52,7 +52,7 @@ creationDate=Creation date changeDate=Date of last change notAvailableShort=NA inaccessibleValue=Confidential -includePartialBirthdates=Include partial birthdates +includePartialBirthdates = Include partial birthdates numberOfCharacters=Number of characters\: %d / %d remove=Remove notTestedYet=Not tested yet @@ -189,15 +189,15 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge=Okay, and continue to merge overview -actionOkAndGoToContactDirectory=Okay, and continue to contact directory -actionOkAndGoToContactDetails=Okay, and continue to contact -actionOkAndGoToPersonDirectory=Okay, and continue to person directory -actionExecuteAutomaticDeletion=Execute automatic deletion -actionDone=Done -actionConfirmAction=Confirm action -actionAefiSelectPrimarySuspectVaccination=Select Suspect Vaccination -actionAefiAssignNewReportingIdNumber="Assign New AEFI ID" +actionOkAndGoToMerge = Okay, and continue to merge overview +actionOkAndGoToContactDirectory = Okay, and continue to contact directory +actionOkAndGoToContactDetails = Okay, and continue to contact +actionOkAndGoToPersonDirectory = Okay, and continue to person directory +actionExecuteAutomaticDeletion = Execute automatic deletion +actionDone = Done +actionConfirmAction = Confirm action +actionAefiSelectPrimarySuspectVaccination = Select Suspect Vaccination +actionAefiAssignNewReportingIdNumber = "Assign New AEFI ID" activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -251,10 +251,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows=Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups=Expired -aggregateReportNoAgeGroup=No age group -aggregateReportShowOnlyDuplicateReports=Display only duplicate reports +aggregateReportShowZeroRows = Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups = Expired +aggregateReportNoAgeGroup = No age group +aggregateReportShowOnlyDuplicateReports = Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -278,7 +278,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend=Send emails +bulkEmailSend = Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -437,7 +437,6 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name -CaseData.disease=Disease CaseData.district=LGA CaseData.districtLevelDate=Date received at LGA level CaseData.doses=How many doses @@ -1037,6 +1036,7 @@ aefiDashboardAefiInvestigationDiscarded=Investigation Discarded aefiDashboardAefiClassificationRelatedToVaccination=Related to vaccine or vaccination aefiDashboardAefiClassificationCoincidentalAdverseEvent=Coincidental adverse event aefiDashboardAefiClassificationUndetermined=Undetermined + captionDefault=Default defaultRegion=Default State defaultDistrict=Default LGA @@ -1154,20 +1154,22 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: + # Entity columns -EntityColumn.ENTITY=Entity -EntityColumn.FIELD_ID=Field ID -EntityColumn.FIELD=Field -EntityColumn.TYPE=Type -EntityColumn.DATA_PROTECTION=Data protection -EntityColumn.CAPTION=Caption -EntityColumn.DESCRIPTION=Description -EntityColumn.REQUIRED=Required -EntityColumn.NEW_DISEASE=New disease -EntityColumn.DISEASES=Diseases -EntityColumn.OUTBREAKS=Outbreaks -EntityColumn.IGNORED_COUNTRIES=Ignored countries -EntityColumn.EXCLUSIVE_COUNTRIES=Exclusive countries +EntityColumn.ENTITY = Entity +EntityColumn.FIELD_ID = Field ID +EntityColumn.FIELD = Field +EntityColumn.TYPE = Type +EntityColumn.DATA_PROTECTION = Data protection +EntityColumn.CAPTION = Caption +EntityColumn.DESCRIPTION = Description +EntityColumn.REQUIRED = Required +EntityColumn.NEW_DISEASE = New disease +EntityColumn.DISEASES = Diseases +EntityColumn.OUTBREAKS = Outbreaks +EntityColumn.IGNORED_COUNTRIES = Ignored countries +EntityColumn.EXCLUSIVE_COUNTRIES = Exclusive countries + # Environment Environment=Environment Environment.uuid=Environment ID @@ -1186,51 +1188,54 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location + environmentActiveEnvironments=Active environments -environmentArchivedEnvironments=Archived environments -environmentAllActiveAndArchivedEnvironments=All active and archived environments -environmentDeletedEnvironments=Deleted environments -environmentNewEnvironment=New environment +environmentArchivedEnvironments = Archived environments +environmentAllActiveAndArchivedEnvironments = All active and archived environments +environmentDeletedEnvironments = Deleted environments +environmentNewEnvironment= New environment environmentEnvironmentsList=Environments list + # EnvironmentSample -EnvironmentSample=Environment Sample -EnvironmentSample.uuid=Sample ID -EnvironmentSample.environment=Environment -EnvironmentSample.sampleDateTime=Date of sampling -EnvironmentSample.sampleMaterial=Sample material -EnvironmentSample.otherSampleMaterial=Specify sample material -EnvironmentSample.sampleVolume=Volume (in mL) -EnvironmentSample.fieldSampleId=Field sample ID -EnvironmentSample.turbidity=Turbidity (in NTU) -EnvironmentSample.phValue=pH of sample -EnvironmentSample.sampleTemperature=Temperature (in °C) -EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) -EnvironmentSample.laboratory=Laboratory -EnvironmentSample.laboratoryDetails=Laboratory details -EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested -EnvironmentSample.reportingUser=Reporting user -EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested -EnvironmentSample.weatherConditions=Weather conditions at time of sampling -EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched=Sent/dispatched -EnvironmentSample.dispatchDate=Dispatchment date -EnvironmentSample.dispatchDetails=Dispatchment details -EnvironmentSample.received=Received -EnvironmentSample.receivalDate=Receival date -EnvironmentSample.labSampleId=Lab sample ID -EnvironmentSample.specimenCondition=Specimen condition -EnvironmentSample.location=Location of sampling site -EnvironmentSample.generalComment=General comment -EnvironmentSample.positivePathogenTests=Positive pathogen tests -EnvironmentSample.latestPathogenTest=Latest pathogen test -EnvironmentSample.numberOfTests=Number of tests +EnvironmentSample = Environment Sample +EnvironmentSample.uuid = Sample ID +EnvironmentSample.environment = Environment +EnvironmentSample.sampleDateTime = Date of sampling +EnvironmentSample.sampleMaterial = Sample material +EnvironmentSample.otherSampleMaterial = Specify sample material +EnvironmentSample.sampleVolume = Volume (in mL) +EnvironmentSample.fieldSampleId = Field sample ID +EnvironmentSample.turbidity = Turbidity (in NTU) +EnvironmentSample.phValue = pH of sample +EnvironmentSample.sampleTemperature = Temperature (in °C) +EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) +EnvironmentSample.laboratory = Laboratory +EnvironmentSample.laboratoryDetails = Laboratory details +EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested +EnvironmentSample.reportingUser = Reporting user +EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested +EnvironmentSample.weatherConditions = Weather conditions at time of sampling +EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched = Sent/dispatched +EnvironmentSample.dispatchDate = Dispatchment date +EnvironmentSample.dispatchDetails = Dispatchment details +EnvironmentSample.received = Received +EnvironmentSample.receivalDate = Receival date +EnvironmentSample.labSampleId = Lab sample ID +EnvironmentSample.specimenCondition = Specimen condition +EnvironmentSample.location = Location of sampling site +EnvironmentSample.generalComment = General comment +EnvironmentSample.positivePathogenTests = Positive pathogen tests +EnvironmentSample.latestPathogenTest = Latest pathogen test +EnvironmentSample.numberOfTests = Number of tests + # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents=Deleted events +eventDeletedEvents = Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1374,7 +1379,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants=Deleted event participants +eventParticipantDeletedEventParticipants = Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1387,7 +1392,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser=Reporting user +EventParticipant.reportingUser = Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1424,9 +1429,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink=Event participant ID -EventParticipantSelection.eventUuidLink=Event ID -EventParticipantSelection.resultingCaseUuidLink=Resulting case ID +EventParticipantSelection.eventParticipantUuidLink = Event participant ID +EventParticipantSelection.eventUuidLink = Event ID +EventParticipantSelection.resultingCaseUuidLink = Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1646,6 +1651,7 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message + #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1656,7 +1662,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList=List of new event participants +lineListingNewEventParticipantsList = List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1832,10 +1838,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples=See samples for this person -caseLinkToSamples=See samples for this case -contactLinkToSamples=See samples for this contact -eventParticipantLinkToSamples=See samples for this event participant +personLinkToSamples = See samples for this person +caseLinkToSamples = See samples for this case +contactLinkToSamples = See samples for this contact +eventParticipantLinkToSamples = See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2143,9 +2149,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity=Community of event participant -SampleExport.eventParticipantDistrict=District of event participant -SampleExport.eventParticipantRegion=Region of event participant +SampleExport.eventParticipantCommunity = Community of event participant +SampleExport.eventParticipantDistrict = District of event participant +SampleExport.eventParticipantRegion = Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2204,7 +2210,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser=Reporting user +Immunization.reportingUser = Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2247,10 +2253,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations=Active immunizations -immunizationArchivedImmunizations=Archived immunizations -immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations -immunizationDeletedImmunizations=Deleted immunizations +immunizationActiveImmunizations = Active immunizations +immunizationArchivedImmunizations = Archived immunizations +immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations +immunizationDeletedImmunizations = Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2315,10 +2321,10 @@ aefiVaccinationsDiluentInformation=Diluent Information aefiVaccinationsDiluentBatchLotNumber=Batch/Lot number aefiVaccinationsDiluentExpiryDate=Expiry date aefiVaccinationsDiluentTimeOfReconstitution=Reconstitution time -aefiActiveAdverseEvents=Active adverse events -aefiArchivedAdverseEvents=Archived adverse events -aefiAllActiveAndArchivedAdverseEvents=All active and archived adverse events -aefiDeletedAdverseEvents=Deleted adverse events +aefiActiveAdverseEvents = Active adverse events +aefiArchivedAdverseEvents = Archived adverse events +aefiAllActiveAndArchivedAdverseEvents = All active and archived adverse events +aefiDeletedAdverseEvents = Deleted adverse events # Adverse Events AdverseEvents.severeLocalReaction=Severe local reaction AdverseEvents.severeLocalReactionMoreThanThreeDays=>3 days @@ -2569,13 +2575,13 @@ aefiInvestigationMedicalCareDetailsInstruction=**Instructions ? Attach copies of aefiInvestigationReconstitutionProcedure=Reconstitution procedure aefiInvestigationOfThoseAffected=Of those effected, how many are aefiAefiInvestigationList=Adverse Event Investigations -aefiNewAefiInvestigation=New Investigation +aefiNewAefiInvestigation = New Investigation aefiAefiInvestigationDataView=Adverse Event Investigation aefiNewAefiInvestigationStageTitle=Investigation -aefiActiveInvestigations=Active AEFI investigations -aefiArchivedInvestigations=Archived AEFI investigations -aefiAllActiveAndArchivedInvestigations=All active and archived AEFI investigations -aefiDeletedInvestigations=Deleted AEFI investigations +aefiActiveInvestigations = Active AEFI investigations +aefiArchivedInvestigations = Archived AEFI investigations +aefiAllActiveAndArchivedInvestigations = All active and archived AEFI investigations +aefiDeletedInvestigations = Deleted AEFI investigations titleAefiInvestigationBasicDetails=Section A\: Basic details titleAefiInvestigationRelevantPatientInformation=Section B\: Relevant patient information prior to immunization titleAefiInvestigationFirstExaminationDetails=Section C\: Details of first examination** of serious AEFI case @@ -2848,7 +2854,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment=Associated environment +Task.environment = Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2901,7 +2907,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser=Reporting user +TravelEntry.reportingUser = Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -3272,15 +3278,17 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms=SMS -userRoleNotificationTypeEmail=EMAIL +userRoleNotificationTypeSms = SMS +userRoleNotificationTypeEmail = EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template + notificationType=Notification type -notificationType.group=Group -notificationType.caption=Caption -notificationType.description=Description +notificationType.group = Group +notificationType.caption = Caption +notificationType.description = Description + SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -3315,10 +3323,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails=Person contact details -environmentSampleNotShipped=Not shipped -environmentSampleShipped=Shipped -environmentSampleReceived=Received +TaskExport.personOtherContactDetails = Person contact details +environmentSampleNotShipped = Not shipped +environmentSampleShipped = Shipped +environmentSampleReceived = Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -3335,45 +3343,48 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents + # SpecialCaseAccess SpecialCaseAccess=Special case access -caze=Case -assignedTo=Assigned to -assignedBy=Assigned by -endDateTime=Access until -assignmentDate=Date assigned +caze = Case +assignedTo = Assigned to +assignedBy = Assigned by +endDateTime = Access until +assignmentDate = Date assigned + specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case + # SelfReport -SelfReport=Self report -SelfReport.type=Type -SelfReport.reportDate=Report date -SelfReport.caseReference=Case reference number -SelfReport.disease=Disease -SelfReport.diseaseDetails=Disease details -SelfReport.diseaseVariant=Disease variant -SelfReport.diseaseVariantDetails=Disease variant details -SelfReport.firstName=First name -SelfReport.lastName=Last name -SelfReport.sex=Sex -SelfReport.birthDate=Birth date -SelfReport.birthdateDD=Day of birth -SelfReport.birthdateMM=Month of birth -SelfReport.birthdateYYYY=Year of birth -SelfReport.nationalHealthId=National health ID -SelfReport.email=Email -SelfReport.phoneNumber=Phone number -SelfReport.address=Address -SelfReport.dateOfTest=Date of test -SelfReport.dateOfSymptoms=Date of symptoms -SelfReport.workplace=Workplace -SelfReport.dateWorkplace=Date workplace -SelfReport.isolationDate=Date of isolation -SelfReport.contactDate=Date of contact -SelfReport.comment=Comment -SelfReport.responsibleUser=Responsible user -SelfReport.investigationStatus=Investigation status -SelfReport.processingStatus=Processing status +SelfReport = Self report +SelfReport.type = Type +SelfReport.reportDate = Report date +SelfReport.caseReference = Case reference number +SelfReport.disease = Disease +SelfReport.diseaseDetails = Disease details +SelfReport.diseaseVariant = Disease variant +SelfReport.diseaseVariantDetails = Disease variant details +SelfReport.firstName = First name +SelfReport.lastName = Last name +SelfReport.sex = Sex +SelfReport.birthDate = Birth date +SelfReport.birthdateDD = Day of birth +SelfReport.birthdateMM = Month of birth +SelfReport.birthdateYYYY = Year of birth +SelfReport.nationalHealthId = National health ID +SelfReport.email = Email +SelfReport.phoneNumber = Phone number +SelfReport.address = Address +SelfReport.dateOfTest = Date of test +SelfReport.dateOfSymptoms = Date of symptoms +SelfReport.workplace = Workplace +SelfReport.dateWorkplace = Date workplace +SelfReport.isolationDate = Date of isolation +SelfReport.contactDate = Date of contact +SelfReport.comment = Comment +SelfReport.responsibleUser = Responsible user +SelfReport.investigationStatus = Investigation status +SelfReport.processingStatus = Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_es-ES.properties b/sormas-api/src/main/resources/captions_es-ES.properties index 48abd4b2a31..15a8bc2d06c 100644 --- a/sormas-api/src/main/resources/captions_es-ES.properties +++ b/sormas-api/src/main/resources/captions_es-ES.properties @@ -188,13 +188,13 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge=Okay, and continue to merge overview -actionOkAndGoToContactDirectory=Okay, and continue to contact directory -actionOkAndGoToContactDetails=Okay, and continue to contact -actionOkAndGoToPersonDirectory=Okay, and continue to person directory -actionExecuteAutomaticDeletion=Execute automatic deletion -actionDone=Done -actionConfirmAction=Confirm action +actionOkAndGoToMerge = Okay, and continue to merge overview +actionOkAndGoToContactDirectory = Okay, and continue to contact directory +actionOkAndGoToContactDetails = Okay, and continue to contact +actionOkAndGoToPersonDirectory = Okay, and continue to person directory +actionExecuteAutomaticDeletion = Execute automatic deletion +actionDone = Done +actionConfirmAction = Confirm action activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -248,10 +248,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows=Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups=Expired -aggregateReportNoAgeGroup=No age group -aggregateReportShowOnlyDuplicateReports=Display only duplicate reports +aggregateReportShowZeroRows = Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups = Expired +aggregateReportNoAgeGroup = No age group +aggregateReportShowOnlyDuplicateReports = Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -275,7 +275,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend=Send emails +bulkEmailSend = Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -434,7 +434,6 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name -CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1134,6 +1133,7 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: + # Environment Environment=Environment Environment.uuid=Environment ID @@ -1152,51 +1152,54 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location + environmentActiveEnvironments=Active environments -environmentArchivedEnvironments=Archived environments -environmentAllActiveAndArchivedEnvironments=All active and archived environments -environmentDeletedEnvironments=Deleted environments -environmentNewEnvironment=New environment +environmentArchivedEnvironments = Archived environments +environmentAllActiveAndArchivedEnvironments = All active and archived environments +environmentDeletedEnvironments = Deleted environments +environmentNewEnvironment= New environment environmentEnvironmentsList=Environments list + # EnvironmentSample -EnvironmentSample=Environment Sample -EnvironmentSample.uuid=Sample ID -EnvironmentSample.environment=Environment -EnvironmentSample.sampleDateTime=Date of sampling -EnvironmentSample.sampleMaterial=Sample material -EnvironmentSample.otherSampleMaterial=Specify sample material -EnvironmentSample.sampleVolume=Volume (in mL) -EnvironmentSample.fieldSampleId=Field sample ID -EnvironmentSample.turbidity=Turbidity (in NTU) -EnvironmentSample.phValue=pH of sample -EnvironmentSample.sampleTemperature=Temperature (in °C) -EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) -EnvironmentSample.laboratory=Laboratory -EnvironmentSample.laboratoryDetails=Laboratory details -EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested -EnvironmentSample.reportingUser=Reporting user -EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested -EnvironmentSample.weatherConditions=Weather conditions at time of sampling -EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched=Sent/dispatched -EnvironmentSample.dispatchDate=Dispatchment date -EnvironmentSample.dispatchDetails=Dispatchment details -EnvironmentSample.received=Received -EnvironmentSample.receivalDate=Receival date -EnvironmentSample.labSampleId=Lab sample ID -EnvironmentSample.specimenCondition=Specimen condition -EnvironmentSample.location=Location of sampling site -EnvironmentSample.generalComment=General comment -EnvironmentSample.positivePathogenTests=Positive pathogen tests -EnvironmentSample.latestPathogenTest=Latest pathogen test -EnvironmentSample.numberOfTests=Number of tests +EnvironmentSample = Environment Sample +EnvironmentSample.uuid = Sample ID +EnvironmentSample.environment = Environment +EnvironmentSample.sampleDateTime = Date of sampling +EnvironmentSample.sampleMaterial = Sample material +EnvironmentSample.otherSampleMaterial = Specify sample material +EnvironmentSample.sampleVolume = Volume (in mL) +EnvironmentSample.fieldSampleId = Field sample ID +EnvironmentSample.turbidity = Turbidity (in NTU) +EnvironmentSample.phValue = pH of sample +EnvironmentSample.sampleTemperature = Temperature (in °C) +EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) +EnvironmentSample.laboratory = Laboratory +EnvironmentSample.laboratoryDetails = Laboratory details +EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested +EnvironmentSample.reportingUser = Reporting user +EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested +EnvironmentSample.weatherConditions = Weather conditions at time of sampling +EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched = Sent/dispatched +EnvironmentSample.dispatchDate = Dispatchment date +EnvironmentSample.dispatchDetails = Dispatchment details +EnvironmentSample.received = Received +EnvironmentSample.receivalDate = Receival date +EnvironmentSample.labSampleId = Lab sample ID +EnvironmentSample.specimenCondition = Specimen condition +EnvironmentSample.location = Location of sampling site +EnvironmentSample.generalComment = General comment +EnvironmentSample.positivePathogenTests = Positive pathogen tests +EnvironmentSample.latestPathogenTest = Latest pathogen test +EnvironmentSample.numberOfTests = Number of tests + # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents=Deleted events +eventDeletedEvents = Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1340,7 +1343,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants=Deleted event participants +eventParticipantDeletedEventParticipants = Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1353,7 +1356,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser=Reporting user +EventParticipant.reportingUser = Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1390,9 +1393,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink=Event participant ID -EventParticipantSelection.eventUuidLink=Event ID -EventParticipantSelection.resultingCaseUuidLink=Resulting case ID +EventParticipantSelection.eventParticipantUuidLink = Event participant ID +EventParticipantSelection.eventUuidLink = Event ID +EventParticipantSelection.resultingCaseUuidLink = Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1612,6 +1615,7 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message + #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1622,7 +1626,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList=List of new event participants +lineListingNewEventParticipantsList = List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1796,10 +1800,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples=See samples for this person -caseLinkToSamples=See samples for this case -contactLinkToSamples=See samples for this contact -eventParticipantLinkToSamples=See samples for this event participant +personLinkToSamples = See samples for this person +caseLinkToSamples = See samples for this case +contactLinkToSamples = See samples for this contact +eventParticipantLinkToSamples = See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2107,9 +2111,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity=Community of event participant -SampleExport.eventParticipantDistrict=District of event participant -SampleExport.eventParticipantRegion=Region of event participant +SampleExport.eventParticipantCommunity = Community of event participant +SampleExport.eventParticipantDistrict = District of event participant +SampleExport.eventParticipantRegion = Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2168,7 +2172,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser=Reporting user +Immunization.reportingUser = Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2211,10 +2215,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations=Active immunizations -immunizationArchivedImmunizations=Archived immunizations -immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations -immunizationDeletedImmunizations=Deleted immunizations +immunizationActiveImmunizations = Active immunizations +immunizationArchivedImmunizations = Archived immunizations +immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations +immunizationDeletedImmunizations = Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2457,7 +2461,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment=Associated environment +Task.environment = Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2510,7 +2514,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser=Reporting user +TravelEntry.reportingUser = Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -2877,15 +2881,17 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms=SMS -userRoleNotificationTypeEmail=EMAIL +userRoleNotificationTypeSms = SMS +userRoleNotificationTypeEmail = EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template + notificationType=Notification type -notificationType.group=Group -notificationType.caption=Caption -notificationType.description=Description +notificationType.group = Group +notificationType.caption = Caption +notificationType.description = Description + SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -2920,10 +2926,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails=Person contact details -environmentSampleNotShipped=Not shipped -environmentSampleShipped=Shipped -environmentSampleReceived=Received +TaskExport.personOtherContactDetails = Person contact details +environmentSampleNotShipped = Not shipped +environmentSampleShipped = Shipped +environmentSampleReceived = Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -2940,34 +2946,37 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents + # SpecialCaseAccess SpecialCaseAccess=Special case access -caze=Case -assignedTo=Assigned to -assignedBy=Assigned by -endDateTime=Access until -assignmentDate=Date assigned +caze = Case +assignedTo = Assigned to +assignedBy = Assigned by +endDateTime = Access until +assignmentDate = Date assigned + specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case + # SelfReport -SelfReport.type=Type -SelfReport.reportDate=Report date -SelfReport.disease=Disease -SelfReport.diseaseVariant=Disease variant -SelfReport.firstName=First name -SelfReport.lastName=Last name -SelfReport.sex=Sex -SelfReport.birthdateDD=Day of birth -SelfReport.birthdateMM=Month of birth -SelfReport.birthdateYYYY=Year of birth -SelfReport.nationalHealthId=National health ID -SelfReport.email=Email -SelfReport.phoneNumber=Phone number -SelfReport.address=Address -SelfReport.comment=Comment -SelfReport.responsibleUser=Responsible user -SelfReport.investigationStatus=Investigation status -SelfReport.processingStatus=Processing status +SelfReport.type = Type +SelfReport.reportDate = Report date +SelfReport.disease = Disease +SelfReport.diseaseVariant = Disease variant +SelfReport.firstName = First name +SelfReport.lastName = Last name +SelfReport.sex = Sex +SelfReport.birthdateDD = Day of birth +SelfReport.birthdateMM = Month of birth +SelfReport.birthdateYYYY = Year of birth +SelfReport.nationalHealthId = National health ID +SelfReport.email = Email +SelfReport.phoneNumber = Phone number +SelfReport.address = Address +SelfReport.comment = Comment +SelfReport.responsibleUser = Responsible user +SelfReport.investigationStatus = Investigation status +SelfReport.processingStatus = Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_fa-AF.properties b/sormas-api/src/main/resources/captions_fa-AF.properties index 96555bd99dc..2243bd02ef6 100644 --- a/sormas-api/src/main/resources/captions_fa-AF.properties +++ b/sormas-api/src/main/resources/captions_fa-AF.properties @@ -52,7 +52,7 @@ creationDate=تاریخ ایجاد changeDate=Date of last change notAvailableShort=NA inaccessibleValue=Confidential -includePartialBirthdates=Include partial birthdates +includePartialBirthdates = Include partial birthdates numberOfCharacters=Number of characters\: %d / %d remove=برداشتن notTestedYet=Not tested yet @@ -189,15 +189,15 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge=Okay, and continue to merge overview -actionOkAndGoToContactDirectory=Okay, and continue to contact directory -actionOkAndGoToContactDetails=Okay, and continue to contact -actionOkAndGoToPersonDirectory=Okay, and continue to person directory -actionExecuteAutomaticDeletion=Execute automatic deletion -actionDone=Done -actionConfirmAction=Confirm action -actionAefiSelectPrimarySuspectVaccination=Select Suspect Vaccination -actionAefiAssignNewReportingIdNumber="Assign New AEFI ID" +actionOkAndGoToMerge = Okay, and continue to merge overview +actionOkAndGoToContactDirectory = Okay, and continue to contact directory +actionOkAndGoToContactDetails = Okay, and continue to contact +actionOkAndGoToPersonDirectory = Okay, and continue to person directory +actionExecuteAutomaticDeletion = Execute automatic deletion +actionDone = Done +actionConfirmAction = Confirm action +actionAefiSelectPrimarySuspectVaccination = Select Suspect Vaccination +actionAefiAssignNewReportingIdNumber = "Assign New AEFI ID" activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -251,10 +251,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows=Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups=Expired -aggregateReportNoAgeGroup=No age group -aggregateReportShowOnlyDuplicateReports=Display only duplicate reports +aggregateReportShowZeroRows = Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups = Expired +aggregateReportNoAgeGroup = No age group +aggregateReportShowOnlyDuplicateReports = Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -278,7 +278,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend=Send emails +bulkEmailSend = Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -437,7 +437,6 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name -CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1037,6 +1036,7 @@ aefiDashboardAefiInvestigationDiscarded=Investigation Discarded aefiDashboardAefiClassificationRelatedToVaccination=Related to vaccine or vaccination aefiDashboardAefiClassificationCoincidentalAdverseEvent=Coincidental adverse event aefiDashboardAefiClassificationUndetermined=Undetermined + captionDefault=Default defaultRegion=حوزه defaultDistrict=ولسوالی @@ -1154,20 +1154,22 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: + # Entity columns -EntityColumn.ENTITY=Entity -EntityColumn.FIELD_ID=Field ID -EntityColumn.FIELD=Field -EntityColumn.TYPE=Type -EntityColumn.DATA_PROTECTION=Data protection -EntityColumn.CAPTION=Caption -EntityColumn.DESCRIPTION=Description -EntityColumn.REQUIRED=Required -EntityColumn.NEW_DISEASE=New disease -EntityColumn.DISEASES=Diseases -EntityColumn.OUTBREAKS=Outbreaks -EntityColumn.IGNORED_COUNTRIES=Ignored countries -EntityColumn.EXCLUSIVE_COUNTRIES=Exclusive countries +EntityColumn.ENTITY = Entity +EntityColumn.FIELD_ID = Field ID +EntityColumn.FIELD = Field +EntityColumn.TYPE = Type +EntityColumn.DATA_PROTECTION = Data protection +EntityColumn.CAPTION = Caption +EntityColumn.DESCRIPTION = Description +EntityColumn.REQUIRED = Required +EntityColumn.NEW_DISEASE = New disease +EntityColumn.DISEASES = Diseases +EntityColumn.OUTBREAKS = Outbreaks +EntityColumn.IGNORED_COUNTRIES = Ignored countries +EntityColumn.EXCLUSIVE_COUNTRIES = Exclusive countries + # Environment Environment=Environment Environment.uuid=Environment ID @@ -1186,51 +1188,54 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location + environmentActiveEnvironments=Active environments -environmentArchivedEnvironments=Archived environments -environmentAllActiveAndArchivedEnvironments=All active and archived environments -environmentDeletedEnvironments=Deleted environments -environmentNewEnvironment=New environment +environmentArchivedEnvironments = Archived environments +environmentAllActiveAndArchivedEnvironments = All active and archived environments +environmentDeletedEnvironments = Deleted environments +environmentNewEnvironment= New environment environmentEnvironmentsList=Environments list + # EnvironmentSample -EnvironmentSample=Environment Sample -EnvironmentSample.uuid=Sample ID -EnvironmentSample.environment=Environment -EnvironmentSample.sampleDateTime=Date of sampling -EnvironmentSample.sampleMaterial=Sample material -EnvironmentSample.otherSampleMaterial=Specify sample material -EnvironmentSample.sampleVolume=Volume (in mL) -EnvironmentSample.fieldSampleId=Field sample ID -EnvironmentSample.turbidity=Turbidity (in NTU) -EnvironmentSample.phValue=pH of sample -EnvironmentSample.sampleTemperature=Temperature (in °C) -EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) -EnvironmentSample.laboratory=Laboratory -EnvironmentSample.laboratoryDetails=Laboratory details -EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested -EnvironmentSample.reportingUser=Reporting user -EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested -EnvironmentSample.weatherConditions=Weather conditions at time of sampling -EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched=Sent/dispatched -EnvironmentSample.dispatchDate=Dispatchment date -EnvironmentSample.dispatchDetails=Dispatchment details -EnvironmentSample.received=Received -EnvironmentSample.receivalDate=Receival date -EnvironmentSample.labSampleId=Lab sample ID -EnvironmentSample.specimenCondition=Specimen condition -EnvironmentSample.location=Location of sampling site -EnvironmentSample.generalComment=General comment -EnvironmentSample.positivePathogenTests=Positive pathogen tests -EnvironmentSample.latestPathogenTest=Latest pathogen test -EnvironmentSample.numberOfTests=Number of tests +EnvironmentSample = Environment Sample +EnvironmentSample.uuid = Sample ID +EnvironmentSample.environment = Environment +EnvironmentSample.sampleDateTime = Date of sampling +EnvironmentSample.sampleMaterial = Sample material +EnvironmentSample.otherSampleMaterial = Specify sample material +EnvironmentSample.sampleVolume = Volume (in mL) +EnvironmentSample.fieldSampleId = Field sample ID +EnvironmentSample.turbidity = Turbidity (in NTU) +EnvironmentSample.phValue = pH of sample +EnvironmentSample.sampleTemperature = Temperature (in °C) +EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) +EnvironmentSample.laboratory = Laboratory +EnvironmentSample.laboratoryDetails = Laboratory details +EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested +EnvironmentSample.reportingUser = Reporting user +EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested +EnvironmentSample.weatherConditions = Weather conditions at time of sampling +EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched = Sent/dispatched +EnvironmentSample.dispatchDate = Dispatchment date +EnvironmentSample.dispatchDetails = Dispatchment details +EnvironmentSample.received = Received +EnvironmentSample.receivalDate = Receival date +EnvironmentSample.labSampleId = Lab sample ID +EnvironmentSample.specimenCondition = Specimen condition +EnvironmentSample.location = Location of sampling site +EnvironmentSample.generalComment = General comment +EnvironmentSample.positivePathogenTests = Positive pathogen tests +EnvironmentSample.latestPathogenTest = Latest pathogen test +EnvironmentSample.numberOfTests = Number of tests + # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents=Deleted events +eventDeletedEvents = Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1374,7 +1379,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants=Deleted event participants +eventParticipantDeletedEventParticipants = Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1387,7 +1392,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser=Reporting user +EventParticipant.reportingUser = Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1424,9 +1429,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink=Event participant ID -EventParticipantSelection.eventUuidLink=Event ID -EventParticipantSelection.resultingCaseUuidLink=Resulting case ID +EventParticipantSelection.eventParticipantUuidLink = Event participant ID +EventParticipantSelection.eventUuidLink = Event ID +EventParticipantSelection.resultingCaseUuidLink = Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1646,6 +1651,7 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message + #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1656,7 +1662,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList=List of new event participants +lineListingNewEventParticipantsList = List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1832,10 +1838,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples=See samples for this person -caseLinkToSamples=See samples for this case -contactLinkToSamples=See samples for this contact -eventParticipantLinkToSamples=See samples for this event participant +personLinkToSamples = See samples for this person +caseLinkToSamples = See samples for this case +contactLinkToSamples = See samples for this contact +eventParticipantLinkToSamples = See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2143,9 +2149,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity=Community of event participant -SampleExport.eventParticipantDistrict=District of event participant -SampleExport.eventParticipantRegion=Region of event participant +SampleExport.eventParticipantCommunity = Community of event participant +SampleExport.eventParticipantDistrict = District of event participant +SampleExport.eventParticipantRegion = Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2204,7 +2210,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser=Reporting user +Immunization.reportingUser = Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2247,10 +2253,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations=Active immunizations -immunizationArchivedImmunizations=Archived immunizations -immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations -immunizationDeletedImmunizations=Deleted immunizations +immunizationActiveImmunizations = Active immunizations +immunizationArchivedImmunizations = Archived immunizations +immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations +immunizationDeletedImmunizations = Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2315,10 +2321,10 @@ aefiVaccinationsDiluentInformation=Diluent Information aefiVaccinationsDiluentBatchLotNumber=Batch/Lot number aefiVaccinationsDiluentExpiryDate=Expiry date aefiVaccinationsDiluentTimeOfReconstitution=Reconstitution time -aefiActiveAdverseEvents=Active adverse events -aefiArchivedAdverseEvents=Archived adverse events -aefiAllActiveAndArchivedAdverseEvents=All active and archived adverse events -aefiDeletedAdverseEvents=Deleted adverse events +aefiActiveAdverseEvents = Active adverse events +aefiArchivedAdverseEvents = Archived adverse events +aefiAllActiveAndArchivedAdverseEvents = All active and archived adverse events +aefiDeletedAdverseEvents = Deleted adverse events # Adverse Events AdverseEvents.severeLocalReaction=Severe local reaction AdverseEvents.severeLocalReactionMoreThanThreeDays=>3 days @@ -2569,13 +2575,13 @@ aefiInvestigationMedicalCareDetailsInstruction=**Instructions ? Attach copies of aefiInvestigationReconstitutionProcedure=Reconstitution procedure aefiInvestigationOfThoseAffected=Of those effected, how many are aefiAefiInvestigationList=Adverse Event Investigations -aefiNewAefiInvestigation=New Investigation +aefiNewAefiInvestigation = New Investigation aefiAefiInvestigationDataView=Adverse Event Investigation aefiNewAefiInvestigationStageTitle=Investigation -aefiActiveInvestigations=Active AEFI investigations -aefiArchivedInvestigations=Archived AEFI investigations -aefiAllActiveAndArchivedInvestigations=All active and archived AEFI investigations -aefiDeletedInvestigations=Deleted AEFI investigations +aefiActiveInvestigations = Active AEFI investigations +aefiArchivedInvestigations = Archived AEFI investigations +aefiAllActiveAndArchivedInvestigations = All active and archived AEFI investigations +aefiDeletedInvestigations = Deleted AEFI investigations titleAefiInvestigationBasicDetails=Section A\: Basic details titleAefiInvestigationRelevantPatientInformation=Section B\: Relevant patient information prior to immunization titleAefiInvestigationFirstExaminationDetails=Section C\: Details of first examination** of serious AEFI case @@ -2848,7 +2854,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment=Associated environment +Task.environment = Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2901,7 +2907,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser=Reporting user +TravelEntry.reportingUser = Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -3272,15 +3278,17 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms=SMS -userRoleNotificationTypeEmail=EMAIL +userRoleNotificationTypeSms = SMS +userRoleNotificationTypeEmail = EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template + notificationType=Notification type -notificationType.group=Group -notificationType.caption=Caption -notificationType.description=Description +notificationType.group = Group +notificationType.caption = Caption +notificationType.description = Description + SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -3315,10 +3323,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails=Person contact details -environmentSampleNotShipped=Not shipped -environmentSampleShipped=Shipped -environmentSampleReceived=Received +TaskExport.personOtherContactDetails = Person contact details +environmentSampleNotShipped = Not shipped +environmentSampleShipped = Shipped +environmentSampleReceived = Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -3335,45 +3343,48 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents + # SpecialCaseAccess SpecialCaseAccess=Special case access -caze=Case -assignedTo=Assigned to -assignedBy=Assigned by -endDateTime=Access until -assignmentDate=Date assigned +caze = Case +assignedTo = Assigned to +assignedBy = Assigned by +endDateTime = Access until +assignmentDate = Date assigned + specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case + # SelfReport -SelfReport=Self report -SelfReport.type=Type -SelfReport.reportDate=Report date -SelfReport.caseReference=Case reference number -SelfReport.disease=Disease -SelfReport.diseaseDetails=Disease details -SelfReport.diseaseVariant=Disease variant -SelfReport.diseaseVariantDetails=Disease variant details -SelfReport.firstName=First name -SelfReport.lastName=Last name -SelfReport.sex=Sex -SelfReport.birthDate=Birth date -SelfReport.birthdateDD=Day of birth -SelfReport.birthdateMM=Month of birth -SelfReport.birthdateYYYY=Year of birth -SelfReport.nationalHealthId=National health ID -SelfReport.email=Email -SelfReport.phoneNumber=Phone number -SelfReport.address=Address -SelfReport.dateOfTest=Date of test -SelfReport.dateOfSymptoms=Date of symptoms -SelfReport.workplace=Workplace -SelfReport.dateWorkplace=Date workplace -SelfReport.isolationDate=Date of isolation -SelfReport.contactDate=Date of contact -SelfReport.comment=Comment -SelfReport.responsibleUser=Responsible user -SelfReport.investigationStatus=Investigation status -SelfReport.processingStatus=Processing status +SelfReport = Self report +SelfReport.type = Type +SelfReport.reportDate = Report date +SelfReport.caseReference = Case reference number +SelfReport.disease = Disease +SelfReport.diseaseDetails = Disease details +SelfReport.diseaseVariant = Disease variant +SelfReport.diseaseVariantDetails = Disease variant details +SelfReport.firstName = First name +SelfReport.lastName = Last name +SelfReport.sex = Sex +SelfReport.birthDate = Birth date +SelfReport.birthdateDD = Day of birth +SelfReport.birthdateMM = Month of birth +SelfReport.birthdateYYYY = Year of birth +SelfReport.nationalHealthId = National health ID +SelfReport.email = Email +SelfReport.phoneNumber = Phone number +SelfReport.address = Address +SelfReport.dateOfTest = Date of test +SelfReport.dateOfSymptoms = Date of symptoms +SelfReport.workplace = Workplace +SelfReport.dateWorkplace = Date workplace +SelfReport.isolationDate = Date of isolation +SelfReport.contactDate = Date of contact +SelfReport.comment = Comment +SelfReport.responsibleUser = Responsible user +SelfReport.investigationStatus = Investigation status +SelfReport.processingStatus = Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_fil-PH.properties b/sormas-api/src/main/resources/captions_fil-PH.properties index 1e611b51ccf..7ca0f1f4687 100644 --- a/sormas-api/src/main/resources/captions_fil-PH.properties +++ b/sormas-api/src/main/resources/captions_fil-PH.properties @@ -188,13 +188,13 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge=Okay, and continue to merge overview -actionOkAndGoToContactDirectory=Okay, and continue to contact directory -actionOkAndGoToContactDetails=Okay, and continue to contact -actionOkAndGoToPersonDirectory=Okay, and continue to person directory -actionExecuteAutomaticDeletion=Execute automatic deletion -actionDone=Done -actionConfirmAction=Confirm action +actionOkAndGoToMerge = Okay, and continue to merge overview +actionOkAndGoToContactDirectory = Okay, and continue to contact directory +actionOkAndGoToContactDetails = Okay, and continue to contact +actionOkAndGoToPersonDirectory = Okay, and continue to person directory +actionExecuteAutomaticDeletion = Execute automatic deletion +actionDone = Done +actionConfirmAction = Confirm action activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -248,10 +248,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows=Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups=Expired -aggregateReportNoAgeGroup=No age group -aggregateReportShowOnlyDuplicateReports=Display only duplicate reports +aggregateReportShowZeroRows = Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups = Expired +aggregateReportNoAgeGroup = No age group +aggregateReportShowOnlyDuplicateReports = Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -275,7 +275,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend=Send emails +bulkEmailSend = Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -434,7 +434,6 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name -CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1134,6 +1133,7 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: + # Environment Environment=Environment Environment.uuid=Environment ID @@ -1152,51 +1152,54 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location + environmentActiveEnvironments=Active environments -environmentArchivedEnvironments=Archived environments -environmentAllActiveAndArchivedEnvironments=All active and archived environments -environmentDeletedEnvironments=Deleted environments -environmentNewEnvironment=New environment +environmentArchivedEnvironments = Archived environments +environmentAllActiveAndArchivedEnvironments = All active and archived environments +environmentDeletedEnvironments = Deleted environments +environmentNewEnvironment= New environment environmentEnvironmentsList=Environments list + # EnvironmentSample -EnvironmentSample=Environment Sample -EnvironmentSample.uuid=Sample ID -EnvironmentSample.environment=Environment -EnvironmentSample.sampleDateTime=Date of sampling -EnvironmentSample.sampleMaterial=Sample material -EnvironmentSample.otherSampleMaterial=Specify sample material -EnvironmentSample.sampleVolume=Volume (in mL) -EnvironmentSample.fieldSampleId=Field sample ID -EnvironmentSample.turbidity=Turbidity (in NTU) -EnvironmentSample.phValue=pH of sample -EnvironmentSample.sampleTemperature=Temperature (in °C) -EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) -EnvironmentSample.laboratory=Laboratory -EnvironmentSample.laboratoryDetails=Laboratory details -EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested -EnvironmentSample.reportingUser=Reporting user -EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested -EnvironmentSample.weatherConditions=Weather conditions at time of sampling -EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched=Sent/dispatched -EnvironmentSample.dispatchDate=Dispatchment date -EnvironmentSample.dispatchDetails=Dispatchment details -EnvironmentSample.received=Received -EnvironmentSample.receivalDate=Receival date -EnvironmentSample.labSampleId=Lab sample ID -EnvironmentSample.specimenCondition=Specimen condition -EnvironmentSample.location=Location of sampling site -EnvironmentSample.generalComment=General comment -EnvironmentSample.positivePathogenTests=Positive pathogen tests -EnvironmentSample.latestPathogenTest=Latest pathogen test -EnvironmentSample.numberOfTests=Number of tests +EnvironmentSample = Environment Sample +EnvironmentSample.uuid = Sample ID +EnvironmentSample.environment = Environment +EnvironmentSample.sampleDateTime = Date of sampling +EnvironmentSample.sampleMaterial = Sample material +EnvironmentSample.otherSampleMaterial = Specify sample material +EnvironmentSample.sampleVolume = Volume (in mL) +EnvironmentSample.fieldSampleId = Field sample ID +EnvironmentSample.turbidity = Turbidity (in NTU) +EnvironmentSample.phValue = pH of sample +EnvironmentSample.sampleTemperature = Temperature (in °C) +EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) +EnvironmentSample.laboratory = Laboratory +EnvironmentSample.laboratoryDetails = Laboratory details +EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested +EnvironmentSample.reportingUser = Reporting user +EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested +EnvironmentSample.weatherConditions = Weather conditions at time of sampling +EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched = Sent/dispatched +EnvironmentSample.dispatchDate = Dispatchment date +EnvironmentSample.dispatchDetails = Dispatchment details +EnvironmentSample.received = Received +EnvironmentSample.receivalDate = Receival date +EnvironmentSample.labSampleId = Lab sample ID +EnvironmentSample.specimenCondition = Specimen condition +EnvironmentSample.location = Location of sampling site +EnvironmentSample.generalComment = General comment +EnvironmentSample.positivePathogenTests = Positive pathogen tests +EnvironmentSample.latestPathogenTest = Latest pathogen test +EnvironmentSample.numberOfTests = Number of tests + # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents=Deleted events +eventDeletedEvents = Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1340,7 +1343,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants=Deleted event participants +eventParticipantDeletedEventParticipants = Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1353,7 +1356,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser=Reporting user +EventParticipant.reportingUser = Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1390,9 +1393,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink=Event participant ID -EventParticipantSelection.eventUuidLink=Event ID -EventParticipantSelection.resultingCaseUuidLink=Resulting case ID +EventParticipantSelection.eventParticipantUuidLink = Event participant ID +EventParticipantSelection.eventUuidLink = Event ID +EventParticipantSelection.resultingCaseUuidLink = Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1612,6 +1615,7 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message + #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1622,7 +1626,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList=List of new event participants +lineListingNewEventParticipantsList = List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1796,10 +1800,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples=See samples for this person -caseLinkToSamples=See samples for this case -contactLinkToSamples=See samples for this contact -eventParticipantLinkToSamples=See samples for this event participant +personLinkToSamples = See samples for this person +caseLinkToSamples = See samples for this case +contactLinkToSamples = See samples for this contact +eventParticipantLinkToSamples = See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2107,9 +2111,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity=Community of event participant -SampleExport.eventParticipantDistrict=District of event participant -SampleExport.eventParticipantRegion=Region of event participant +SampleExport.eventParticipantCommunity = Community of event participant +SampleExport.eventParticipantDistrict = District of event participant +SampleExport.eventParticipantRegion = Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2168,7 +2172,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser=Reporting user +Immunization.reportingUser = Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2211,10 +2215,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations=Active immunizations -immunizationArchivedImmunizations=Archived immunizations -immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations -immunizationDeletedImmunizations=Deleted immunizations +immunizationActiveImmunizations = Active immunizations +immunizationArchivedImmunizations = Archived immunizations +immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations +immunizationDeletedImmunizations = Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2457,7 +2461,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment=Associated environment +Task.environment = Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2510,7 +2514,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser=Reporting user +TravelEntry.reportingUser = Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -2877,15 +2881,17 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms=SMS -userRoleNotificationTypeEmail=EMAIL +userRoleNotificationTypeSms = SMS +userRoleNotificationTypeEmail = EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template + notificationType=Notification type -notificationType.group=Group -notificationType.caption=Caption -notificationType.description=Description +notificationType.group = Group +notificationType.caption = Caption +notificationType.description = Description + SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -2920,10 +2926,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails=Person contact details -environmentSampleNotShipped=Not shipped -environmentSampleShipped=Shipped -environmentSampleReceived=Received +TaskExport.personOtherContactDetails = Person contact details +environmentSampleNotShipped = Not shipped +environmentSampleShipped = Shipped +environmentSampleReceived = Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -2940,34 +2946,37 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents + # SpecialCaseAccess SpecialCaseAccess=Special case access -caze=Case -assignedTo=Assigned to -assignedBy=Assigned by -endDateTime=Access until -assignmentDate=Date assigned +caze = Case +assignedTo = Assigned to +assignedBy = Assigned by +endDateTime = Access until +assignmentDate = Date assigned + specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case + # SelfReport -SelfReport.type=Type -SelfReport.reportDate=Report date -SelfReport.disease=Disease -SelfReport.diseaseVariant=Disease variant -SelfReport.firstName=First name -SelfReport.lastName=Last name -SelfReport.sex=Sex -SelfReport.birthdateDD=Day of birth -SelfReport.birthdateMM=Month of birth -SelfReport.birthdateYYYY=Year of birth -SelfReport.nationalHealthId=National health ID -SelfReport.email=Email -SelfReport.phoneNumber=Phone number -SelfReport.address=Address -SelfReport.comment=Comment -SelfReport.responsibleUser=Responsible user -SelfReport.investigationStatus=Investigation status -SelfReport.processingStatus=Processing status +SelfReport.type = Type +SelfReport.reportDate = Report date +SelfReport.disease = Disease +SelfReport.diseaseVariant = Disease variant +SelfReport.firstName = First name +SelfReport.lastName = Last name +SelfReport.sex = Sex +SelfReport.birthdateDD = Day of birth +SelfReport.birthdateMM = Month of birth +SelfReport.birthdateYYYY = Year of birth +SelfReport.nationalHealthId = National health ID +SelfReport.email = Email +SelfReport.phoneNumber = Phone number +SelfReport.address = Address +SelfReport.comment = Comment +SelfReport.responsibleUser = Responsible user +SelfReport.investigationStatus = Investigation status +SelfReport.processingStatus = Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_fj-FJ.properties b/sormas-api/src/main/resources/captions_fj-FJ.properties index 1e611b51ccf..7ca0f1f4687 100644 --- a/sormas-api/src/main/resources/captions_fj-FJ.properties +++ b/sormas-api/src/main/resources/captions_fj-FJ.properties @@ -188,13 +188,13 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge=Okay, and continue to merge overview -actionOkAndGoToContactDirectory=Okay, and continue to contact directory -actionOkAndGoToContactDetails=Okay, and continue to contact -actionOkAndGoToPersonDirectory=Okay, and continue to person directory -actionExecuteAutomaticDeletion=Execute automatic deletion -actionDone=Done -actionConfirmAction=Confirm action +actionOkAndGoToMerge = Okay, and continue to merge overview +actionOkAndGoToContactDirectory = Okay, and continue to contact directory +actionOkAndGoToContactDetails = Okay, and continue to contact +actionOkAndGoToPersonDirectory = Okay, and continue to person directory +actionExecuteAutomaticDeletion = Execute automatic deletion +actionDone = Done +actionConfirmAction = Confirm action activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -248,10 +248,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows=Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups=Expired -aggregateReportNoAgeGroup=No age group -aggregateReportShowOnlyDuplicateReports=Display only duplicate reports +aggregateReportShowZeroRows = Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups = Expired +aggregateReportNoAgeGroup = No age group +aggregateReportShowOnlyDuplicateReports = Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -275,7 +275,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend=Send emails +bulkEmailSend = Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -434,7 +434,6 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name -CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1134,6 +1133,7 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: + # Environment Environment=Environment Environment.uuid=Environment ID @@ -1152,51 +1152,54 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location + environmentActiveEnvironments=Active environments -environmentArchivedEnvironments=Archived environments -environmentAllActiveAndArchivedEnvironments=All active and archived environments -environmentDeletedEnvironments=Deleted environments -environmentNewEnvironment=New environment +environmentArchivedEnvironments = Archived environments +environmentAllActiveAndArchivedEnvironments = All active and archived environments +environmentDeletedEnvironments = Deleted environments +environmentNewEnvironment= New environment environmentEnvironmentsList=Environments list + # EnvironmentSample -EnvironmentSample=Environment Sample -EnvironmentSample.uuid=Sample ID -EnvironmentSample.environment=Environment -EnvironmentSample.sampleDateTime=Date of sampling -EnvironmentSample.sampleMaterial=Sample material -EnvironmentSample.otherSampleMaterial=Specify sample material -EnvironmentSample.sampleVolume=Volume (in mL) -EnvironmentSample.fieldSampleId=Field sample ID -EnvironmentSample.turbidity=Turbidity (in NTU) -EnvironmentSample.phValue=pH of sample -EnvironmentSample.sampleTemperature=Temperature (in °C) -EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) -EnvironmentSample.laboratory=Laboratory -EnvironmentSample.laboratoryDetails=Laboratory details -EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested -EnvironmentSample.reportingUser=Reporting user -EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested -EnvironmentSample.weatherConditions=Weather conditions at time of sampling -EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched=Sent/dispatched -EnvironmentSample.dispatchDate=Dispatchment date -EnvironmentSample.dispatchDetails=Dispatchment details -EnvironmentSample.received=Received -EnvironmentSample.receivalDate=Receival date -EnvironmentSample.labSampleId=Lab sample ID -EnvironmentSample.specimenCondition=Specimen condition -EnvironmentSample.location=Location of sampling site -EnvironmentSample.generalComment=General comment -EnvironmentSample.positivePathogenTests=Positive pathogen tests -EnvironmentSample.latestPathogenTest=Latest pathogen test -EnvironmentSample.numberOfTests=Number of tests +EnvironmentSample = Environment Sample +EnvironmentSample.uuid = Sample ID +EnvironmentSample.environment = Environment +EnvironmentSample.sampleDateTime = Date of sampling +EnvironmentSample.sampleMaterial = Sample material +EnvironmentSample.otherSampleMaterial = Specify sample material +EnvironmentSample.sampleVolume = Volume (in mL) +EnvironmentSample.fieldSampleId = Field sample ID +EnvironmentSample.turbidity = Turbidity (in NTU) +EnvironmentSample.phValue = pH of sample +EnvironmentSample.sampleTemperature = Temperature (in °C) +EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) +EnvironmentSample.laboratory = Laboratory +EnvironmentSample.laboratoryDetails = Laboratory details +EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested +EnvironmentSample.reportingUser = Reporting user +EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested +EnvironmentSample.weatherConditions = Weather conditions at time of sampling +EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched = Sent/dispatched +EnvironmentSample.dispatchDate = Dispatchment date +EnvironmentSample.dispatchDetails = Dispatchment details +EnvironmentSample.received = Received +EnvironmentSample.receivalDate = Receival date +EnvironmentSample.labSampleId = Lab sample ID +EnvironmentSample.specimenCondition = Specimen condition +EnvironmentSample.location = Location of sampling site +EnvironmentSample.generalComment = General comment +EnvironmentSample.positivePathogenTests = Positive pathogen tests +EnvironmentSample.latestPathogenTest = Latest pathogen test +EnvironmentSample.numberOfTests = Number of tests + # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents=Deleted events +eventDeletedEvents = Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1340,7 +1343,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants=Deleted event participants +eventParticipantDeletedEventParticipants = Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1353,7 +1356,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser=Reporting user +EventParticipant.reportingUser = Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1390,9 +1393,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink=Event participant ID -EventParticipantSelection.eventUuidLink=Event ID -EventParticipantSelection.resultingCaseUuidLink=Resulting case ID +EventParticipantSelection.eventParticipantUuidLink = Event participant ID +EventParticipantSelection.eventUuidLink = Event ID +EventParticipantSelection.resultingCaseUuidLink = Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1612,6 +1615,7 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message + #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1622,7 +1626,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList=List of new event participants +lineListingNewEventParticipantsList = List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1796,10 +1800,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples=See samples for this person -caseLinkToSamples=See samples for this case -contactLinkToSamples=See samples for this contact -eventParticipantLinkToSamples=See samples for this event participant +personLinkToSamples = See samples for this person +caseLinkToSamples = See samples for this case +contactLinkToSamples = See samples for this contact +eventParticipantLinkToSamples = See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2107,9 +2111,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity=Community of event participant -SampleExport.eventParticipantDistrict=District of event participant -SampleExport.eventParticipantRegion=Region of event participant +SampleExport.eventParticipantCommunity = Community of event participant +SampleExport.eventParticipantDistrict = District of event participant +SampleExport.eventParticipantRegion = Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2168,7 +2172,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser=Reporting user +Immunization.reportingUser = Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2211,10 +2215,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations=Active immunizations -immunizationArchivedImmunizations=Archived immunizations -immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations -immunizationDeletedImmunizations=Deleted immunizations +immunizationActiveImmunizations = Active immunizations +immunizationArchivedImmunizations = Archived immunizations +immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations +immunizationDeletedImmunizations = Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2457,7 +2461,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment=Associated environment +Task.environment = Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2510,7 +2514,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser=Reporting user +TravelEntry.reportingUser = Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -2877,15 +2881,17 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms=SMS -userRoleNotificationTypeEmail=EMAIL +userRoleNotificationTypeSms = SMS +userRoleNotificationTypeEmail = EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template + notificationType=Notification type -notificationType.group=Group -notificationType.caption=Caption -notificationType.description=Description +notificationType.group = Group +notificationType.caption = Caption +notificationType.description = Description + SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -2920,10 +2926,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails=Person contact details -environmentSampleNotShipped=Not shipped -environmentSampleShipped=Shipped -environmentSampleReceived=Received +TaskExport.personOtherContactDetails = Person contact details +environmentSampleNotShipped = Not shipped +environmentSampleShipped = Shipped +environmentSampleReceived = Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -2940,34 +2946,37 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents + # SpecialCaseAccess SpecialCaseAccess=Special case access -caze=Case -assignedTo=Assigned to -assignedBy=Assigned by -endDateTime=Access until -assignmentDate=Date assigned +caze = Case +assignedTo = Assigned to +assignedBy = Assigned by +endDateTime = Access until +assignmentDate = Date assigned + specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case + # SelfReport -SelfReport.type=Type -SelfReport.reportDate=Report date -SelfReport.disease=Disease -SelfReport.diseaseVariant=Disease variant -SelfReport.firstName=First name -SelfReport.lastName=Last name -SelfReport.sex=Sex -SelfReport.birthdateDD=Day of birth -SelfReport.birthdateMM=Month of birth -SelfReport.birthdateYYYY=Year of birth -SelfReport.nationalHealthId=National health ID -SelfReport.email=Email -SelfReport.phoneNumber=Phone number -SelfReport.address=Address -SelfReport.comment=Comment -SelfReport.responsibleUser=Responsible user -SelfReport.investigationStatus=Investigation status -SelfReport.processingStatus=Processing status +SelfReport.type = Type +SelfReport.reportDate = Report date +SelfReport.disease = Disease +SelfReport.diseaseVariant = Disease variant +SelfReport.firstName = First name +SelfReport.lastName = Last name +SelfReport.sex = Sex +SelfReport.birthdateDD = Day of birth +SelfReport.birthdateMM = Month of birth +SelfReport.birthdateYYYY = Year of birth +SelfReport.nationalHealthId = National health ID +SelfReport.email = Email +SelfReport.phoneNumber = Phone number +SelfReport.address = Address +SelfReport.comment = Comment +SelfReport.responsibleUser = Responsible user +SelfReport.investigationStatus = Investigation status +SelfReport.processingStatus = Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_fr-CD.properties b/sormas-api/src/main/resources/captions_fr-CD.properties index b89fbc27426..e0ad26ef407 100644 --- a/sormas-api/src/main/resources/captions_fr-CD.properties +++ b/sormas-api/src/main/resources/captions_fr-CD.properties @@ -188,13 +188,13 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge=Okay, and continue to merge overview -actionOkAndGoToContactDirectory=Okay, and continue to contact directory -actionOkAndGoToContactDetails=Okay, and continue to contact -actionOkAndGoToPersonDirectory=Okay, and continue to person directory -actionExecuteAutomaticDeletion=Execute automatic deletion -actionDone=Done -actionConfirmAction=Confirm action +actionOkAndGoToMerge = Okay, and continue to merge overview +actionOkAndGoToContactDirectory = Okay, and continue to contact directory +actionOkAndGoToContactDetails = Okay, and continue to contact +actionOkAndGoToPersonDirectory = Okay, and continue to person directory +actionExecuteAutomaticDeletion = Execute automatic deletion +actionDone = Done +actionConfirmAction = Confirm action activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -248,10 +248,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows=Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups=Expired -aggregateReportNoAgeGroup=No age group -aggregateReportShowOnlyDuplicateReports=Display only duplicate reports +aggregateReportShowZeroRows = Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups = Expired +aggregateReportNoAgeGroup = No age group +aggregateReportShowOnlyDuplicateReports = Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -275,7 +275,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend=Send emails +bulkEmailSend = Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -434,7 +434,6 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name -CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1134,6 +1133,7 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: + # Environment Environment=Environment Environment.uuid=Environment ID @@ -1152,51 +1152,54 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location + environmentActiveEnvironments=Active environments -environmentArchivedEnvironments=Archived environments -environmentAllActiveAndArchivedEnvironments=All active and archived environments -environmentDeletedEnvironments=Deleted environments -environmentNewEnvironment=New environment +environmentArchivedEnvironments = Archived environments +environmentAllActiveAndArchivedEnvironments = All active and archived environments +environmentDeletedEnvironments = Deleted environments +environmentNewEnvironment= New environment environmentEnvironmentsList=Environments list + # EnvironmentSample -EnvironmentSample=Environment Sample -EnvironmentSample.uuid=Sample ID -EnvironmentSample.environment=Environment -EnvironmentSample.sampleDateTime=Date of sampling -EnvironmentSample.sampleMaterial=Sample material -EnvironmentSample.otherSampleMaterial=Specify sample material -EnvironmentSample.sampleVolume=Volume (in mL) -EnvironmentSample.fieldSampleId=Field sample ID -EnvironmentSample.turbidity=Turbidity (in NTU) -EnvironmentSample.phValue=pH of sample -EnvironmentSample.sampleTemperature=Temperature (in °C) -EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) -EnvironmentSample.laboratory=Laboratory -EnvironmentSample.laboratoryDetails=Laboratory details -EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested -EnvironmentSample.reportingUser=Reporting user -EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested -EnvironmentSample.weatherConditions=Weather conditions at time of sampling -EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched=Sent/dispatched -EnvironmentSample.dispatchDate=Dispatchment date -EnvironmentSample.dispatchDetails=Dispatchment details -EnvironmentSample.received=Received -EnvironmentSample.receivalDate=Receival date -EnvironmentSample.labSampleId=Lab sample ID -EnvironmentSample.specimenCondition=Specimen condition -EnvironmentSample.location=Location of sampling site -EnvironmentSample.generalComment=General comment -EnvironmentSample.positivePathogenTests=Positive pathogen tests -EnvironmentSample.latestPathogenTest=Latest pathogen test -EnvironmentSample.numberOfTests=Number of tests +EnvironmentSample = Environment Sample +EnvironmentSample.uuid = Sample ID +EnvironmentSample.environment = Environment +EnvironmentSample.sampleDateTime = Date of sampling +EnvironmentSample.sampleMaterial = Sample material +EnvironmentSample.otherSampleMaterial = Specify sample material +EnvironmentSample.sampleVolume = Volume (in mL) +EnvironmentSample.fieldSampleId = Field sample ID +EnvironmentSample.turbidity = Turbidity (in NTU) +EnvironmentSample.phValue = pH of sample +EnvironmentSample.sampleTemperature = Temperature (in °C) +EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) +EnvironmentSample.laboratory = Laboratory +EnvironmentSample.laboratoryDetails = Laboratory details +EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested +EnvironmentSample.reportingUser = Reporting user +EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested +EnvironmentSample.weatherConditions = Weather conditions at time of sampling +EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched = Sent/dispatched +EnvironmentSample.dispatchDate = Dispatchment date +EnvironmentSample.dispatchDetails = Dispatchment details +EnvironmentSample.received = Received +EnvironmentSample.receivalDate = Receival date +EnvironmentSample.labSampleId = Lab sample ID +EnvironmentSample.specimenCondition = Specimen condition +EnvironmentSample.location = Location of sampling site +EnvironmentSample.generalComment = General comment +EnvironmentSample.positivePathogenTests = Positive pathogen tests +EnvironmentSample.latestPathogenTest = Latest pathogen test +EnvironmentSample.numberOfTests = Number of tests + # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents=Deleted events +eventDeletedEvents = Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1340,7 +1343,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants=Deleted event participants +eventParticipantDeletedEventParticipants = Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1353,7 +1356,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser=Reporting user +EventParticipant.reportingUser = Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1390,9 +1393,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink=Event participant ID -EventParticipantSelection.eventUuidLink=Event ID -EventParticipantSelection.resultingCaseUuidLink=Resulting case ID +EventParticipantSelection.eventParticipantUuidLink = Event participant ID +EventParticipantSelection.eventUuidLink = Event ID +EventParticipantSelection.resultingCaseUuidLink = Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1612,6 +1615,7 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message + #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1622,7 +1626,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList=List of new event participants +lineListingNewEventParticipantsList = List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1796,10 +1800,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples=See samples for this person -caseLinkToSamples=See samples for this case -contactLinkToSamples=See samples for this contact -eventParticipantLinkToSamples=See samples for this event participant +personLinkToSamples = See samples for this person +caseLinkToSamples = See samples for this case +contactLinkToSamples = See samples for this contact +eventParticipantLinkToSamples = See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2107,9 +2111,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity=Community of event participant -SampleExport.eventParticipantDistrict=District of event participant -SampleExport.eventParticipantRegion=Region of event participant +SampleExport.eventParticipantCommunity = Community of event participant +SampleExport.eventParticipantDistrict = District of event participant +SampleExport.eventParticipantRegion = Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2168,7 +2172,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser=Reporting user +Immunization.reportingUser = Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2211,10 +2215,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations=Active immunizations -immunizationArchivedImmunizations=Archived immunizations -immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations -immunizationDeletedImmunizations=Deleted immunizations +immunizationActiveImmunizations = Active immunizations +immunizationArchivedImmunizations = Archived immunizations +immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations +immunizationDeletedImmunizations = Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2457,7 +2461,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment=Associated environment +Task.environment = Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2510,7 +2514,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser=Reporting user +TravelEntry.reportingUser = Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -2877,15 +2881,17 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms=SMS -userRoleNotificationTypeEmail=EMAIL +userRoleNotificationTypeSms = SMS +userRoleNotificationTypeEmail = EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template + notificationType=Notification type -notificationType.group=Group -notificationType.caption=Caption -notificationType.description=Description +notificationType.group = Group +notificationType.caption = Caption +notificationType.description = Description + SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -2920,10 +2926,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails=Person contact details -environmentSampleNotShipped=Not shipped -environmentSampleShipped=Shipped -environmentSampleReceived=Received +TaskExport.personOtherContactDetails = Person contact details +environmentSampleNotShipped = Not shipped +environmentSampleShipped = Shipped +environmentSampleReceived = Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -2940,34 +2946,37 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents + # SpecialCaseAccess SpecialCaseAccess=Special case access -caze=Case -assignedTo=Assigned to -assignedBy=Assigned by -endDateTime=Access until -assignmentDate=Date assigned +caze = Case +assignedTo = Assigned to +assignedBy = Assigned by +endDateTime = Access until +assignmentDate = Date assigned + specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case + # SelfReport -SelfReport.type=Type -SelfReport.reportDate=Report date -SelfReport.disease=Disease -SelfReport.diseaseVariant=Disease variant -SelfReport.firstName=First name -SelfReport.lastName=Last name -SelfReport.sex=Sex -SelfReport.birthdateDD=Day of birth -SelfReport.birthdateMM=Month of birth -SelfReport.birthdateYYYY=Year of birth -SelfReport.nationalHealthId=National health ID -SelfReport.email=Email -SelfReport.phoneNumber=Phone number -SelfReport.address=Address -SelfReport.comment=Comment -SelfReport.responsibleUser=Responsible user -SelfReport.investigationStatus=Investigation status -SelfReport.processingStatus=Processing status +SelfReport.type = Type +SelfReport.reportDate = Report date +SelfReport.disease = Disease +SelfReport.diseaseVariant = Disease variant +SelfReport.firstName = First name +SelfReport.lastName = Last name +SelfReport.sex = Sex +SelfReport.birthdateDD = Day of birth +SelfReport.birthdateMM = Month of birth +SelfReport.birthdateYYYY = Year of birth +SelfReport.nationalHealthId = National health ID +SelfReport.email = Email +SelfReport.phoneNumber = Phone number +SelfReport.address = Address +SelfReport.comment = Comment +SelfReport.responsibleUser = Responsible user +SelfReport.investigationStatus = Investigation status +SelfReport.processingStatus = Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_haw-US.properties b/sormas-api/src/main/resources/captions_haw-US.properties index d52e7461ff0..111a929df1f 100644 --- a/sormas-api/src/main/resources/captions_haw-US.properties +++ b/sormas-api/src/main/resources/captions_haw-US.properties @@ -14,6 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . ############################################################################### + # General Captions all=All city=City @@ -55,6 +56,7 @@ facility=Facility pointOfEntry=Point of entry remove=Remove reportingUser=Reporting user + # About about=About aboutDocuments=Documents @@ -66,12 +68,14 @@ aboutDataDictionary=Data Dictionary (XLSX) aboutSormasWebsite=Official SORMAS Website aboutTechnicalManual=Technical Manual (PDF) aboutWhatsNew=What's New? + # Action actionNewAction=New action actionNoActions=There are no actions for this %s actionCreatingLabel=Created at %s by %s actionLastModifiedByLabel=Updated at %s by %s actionStatusChangeDate=updated at %s + Action=Action Action.title=Title Action.description=Description @@ -84,12 +88,13 @@ Action.actionContext=Action context Action.actionStatus=Action status Action.lastModifiedBy=Last modified by Action.actionMeasure=Measure + # Actions actionApplyDateFilter=Apply date filter actionArchive=Archive actionAssignNewEpidNumber=Assign new epid number actionBack=Back -actionSend=Send +actionSend = Send actionCancel=Cancel actionClear=Clear actionClearAll=Clear all @@ -128,8 +133,10 @@ actionBackToNationOverview=Back to Nation Overview actionSettings=User Settings actionNewForm=New Form actionOverwrite=Overwrite + # AdditionalTest additionalTestNewTest=New test result + AdditionalTest=Additional test AdditionalTest.altSgpt=ALT/SGPT (U/L) AdditionalTest.arterialVenousBloodGas=Arterial/venous blood gas @@ -153,6 +160,7 @@ AdditionalTest.testDateTime=Date and time of result AdditionalTest.totalBilirubin=Total bilirubin (umol/L) AdditionalTest.urea=Urea (mmol/L) AdditionalTest.wbcCount=WBC count (x10^9/L) + aggregateReportDeathsShort=D aggregateReportLabConfirmationsShort=L aggregateReportLastWeek=Last Week @@ -169,11 +177,13 @@ AggregateReport.labConfirmations=Lab confirmations AggregateReport.deaths=Deaths AggregateReport.healthFacility=Facility AggregateReport.pointOfEntry=Point of Entry -areaActiveAreas=Active areas -areaArchivedAreas=Archived areas -areaAllAreas=All areas -Area.archived=Archived -Area.externalId=External ID + +areaActiveAreas = Active areas +areaArchivedAreas = Archived areas +areaAllAreas = All areas +Area.archived = Archived +Area.externalId = External ID + # Bulk actions bulkActions=Bulk Actions bulkCancelFollowUp=Cancel follow-up @@ -191,6 +201,7 @@ bulkFacility=Change facility bulkInvestigationStatus=Change investigation status bulkLostToFollowUp=Set to lost to follow-up bulkSurveillanceOfficer=Change surveillance officer + # Campaign campaignActiveCampaigns=Active campaigns campaignAllCampaigns=All campaigns @@ -210,6 +221,7 @@ campaignDashboardChartHeight=Height in % campaignDashboardOrder=Order campaignSearch=Search Campaign campaignDiagramGroupBy=Group by + Campaign=Campaign Campaign.name=Name Campaign.description=Description @@ -222,11 +234,13 @@ Campaign.area=Area Campaign.region=Region Campaign.district=District Campaign.community=Community -CampaignFormData.campaign=Campaign -CampaignFormData.campaignFormMeta=Form -CampaignFormData.formDate=Form date -CampaignFormData.area=Area + +CampaignFormData.campaign = Campaign +CampaignFormData.campaignFormMeta = Form +CampaignFormData.formDate = Form date +CampaignFormData.area = Area CampaignFormData.edit=Edit + # CaseData caseCasesList=Cases list caseInfrastructureDataChanged=Infrastructure data has changed @@ -276,8 +290,9 @@ convertEventParticipantToCase=Create case from event participant with positive t convertContactToCase=Create case from contact with positive test result? caseSearchSpecificCase=Search specific case caseSearchCase=Search case -caseSelect=Select case +caseSelect= Select case caseCreateNew=Create new case + CaseData=Case CaseData.additionalDetails=General comment CaseData.caseClassification=Case classification @@ -300,7 +315,6 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name -CaseData.disease=Disease CaseData.district=Responsible district CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -421,6 +435,7 @@ CaseData.notACaseReasonPhysicianInformation=Information provided by physician CaseData.notACaseReasonDifferentPathogen=Verification of different pathogen CaseData.notACaseReasonOther=Other CaseData.notACaseReasonDetails=Reason details + # CaseExport CaseExport.address=Address CaseExport.addressRegion=Address Region @@ -466,6 +481,7 @@ CaseExport.lastCooperativeVisitSymptomatic=Symptomatic at last cooperative visit CaseExport.lastCooperativeVisitSymptoms=Symptoms at last cooperative visit CaseExport.traveled=Traveled outside of district CaseExport.burialAttended=Visited a burial + # CaseHospitalization CaseHospitalization=Hospitalization CaseHospitalization.admissionDate=Date of visit or admission @@ -480,9 +496,12 @@ CaseHospitalization.previousHospitalizations=Previous hospitalizations CaseHospitalization.intensiveCareUnit=Stay in the intensive care unit CaseHospitalization.intensiveCareUnitStart=Start of the stay CaseHospitalization.intensiveCareUnitEnd=End of the stay + + # CaseImport caseImportErrorDescription=Error description caseImportMergeCase=Override existing case with changes from the imported case? + # CasePreviousHospitalization CasePreviousHospitalization=Previous hospitalization CasePreviousHospitalization.admissionAndDischargeDate=Date of admission & discharge @@ -494,8 +513,10 @@ CasePreviousHospitalization.healthFacility=Hospital CasePreviousHospitalization.healthFacilityDetails=Hospital name & description CasePreviousHospitalization.isolated=Isolation CasePreviousHospitalization.prevHospPeriod=Period of hospitalization + # ClinicalVisit clinicalVisitNewClinicalVisit=New clinical assessment + ClinicalVisit=Clinical assessment ClinicalVisit.bloodPressure=Blood pressure ClinicalVisit.heartRate=Heart rate @@ -503,22 +524,28 @@ ClinicalVisit.temperature=Temperature ClinicalVisit.visitDateTime=Date and time of visit ClinicalVisit.visitingPerson=Attending clinician ClinicalVisit.visitRemarks=Clinician remarks + ClinicalVisitExport.caseUuid=Case ID ClinicalVisitExport.caseName=Case name + columnAdditionalTests=Additional tests columnDiseaseShort=Disease columnNumberOfPendingTasks=Pending tasks + # Community Community.archived=Archived Community.externalID=External ID + communityActiveCommunities=Active communities communityArchivedCommunities=Archived communities communityAllCommunities=All communities + # Configuration Configuration.Facilities=Facilities Configuration.Outbreaks=Outbreaks Configuration.PointsOfEntry=Points of Entry Configuration.LineListing=Line Listing + # Contact contactCancelFollowUp=Cancel follow-up contactCaseContacts=Case contacts @@ -555,9 +582,10 @@ contactOnlyWithSharedEventWithSourceCase=Only contacts with source case linked t contactOnlyWithSourceCaseInGivenEvent=Only contacts whose source case is linked to this event contactFollowUpDay=Day contactQuarantineNotOrdered=No quarantine ordered -contactCreatePIAAccount=PIA -contactPersonPhoneNumber=Contact Person's Phone Number -contactSourceCase=Source case +contactCreatePIAAccount = PIA +contactPersonPhoneNumber = Contact Person's Phone Number +contactSourceCase = Source case + Contact=Contact Contact.additionalDetails=General comment Contact.caseClassification=Classification of the source case @@ -574,10 +602,10 @@ Contact.community=Responsible community Contact.contactClassification=Contact classification Contact.contactOfficer=Responsible contact officer Contact.contactOfficerUuid=Responsible contact officer -Contact.contactIdentificationSource=Contact identification source -Contact.contactIdentificationSourceDetails=Contact identification source details -Contact.tracingApp=Tracing app -Contact.tracingAppDetails=Tracing app details, e.g. name +Contact.contactIdentificationSource = Contact identification source +Contact.contactIdentificationSourceDetails = Contact identification source details +Contact.tracingApp = Tracing app +Contact.tracingAppDetails = Tracing app details, e.g. name Contact.contactProximity=Type of contact - if multiple pick the closest contact proximity Contact.contactStatus=Contact status Contact.description=Description of how contact took place @@ -648,6 +676,7 @@ Contact.prohibitionToWork=Prohibition to work Contact.prohibitionToWorkFrom=Prohibition to work from Contact.prohibitionToWorkUntil=Prohibition to work until Contact.reportingDistrict=Reporting district + # ContactExport ContactExport.address=Address ContactExport.addressDistrict=Address District @@ -666,6 +695,7 @@ ContactExport.sourceCaseUuid=Source case ID ContactExport.traveled=Traveled outside of district ContactExport.travelHistory=Travel history ContactExport.quarantineInformation=Quarantine information + # Dashboard dashboardAlive=Alive dashboardApplyCustomFilter=Apply custom filter @@ -789,12 +819,14 @@ dashboardAggregatedNumber=Count dashboardProportion=Proportion (%) dashboardViewAsColumnChart=View as Column Chart dashboardViewAsBarChart=View as Bar Chart + defaultRegion=Default Region defaultDistrict=Default District defaultCommunity=Default Community defaultFacility=Default Facility defaultLaboratory=Default Laboratory defaultPointOfEntry=Default Point Of Entry + devModeCaseCount=Number of generated cases devModeCaseDisease=Disease of the cases devModeCaseDistrict=District of the cases @@ -825,6 +857,7 @@ devModeEventStartDate=Earliest event start date devModeGenerateCases=Generate Cases devModeGenerateContacts=Generate Contacts devModeGenerateEvents=Generate Events + DiseaseBurden.caseCount=New cases DiseaseBurden.caseDeathCount=Fatalities DiseaseBurden.casesDifference=Dynamic @@ -832,16 +865,20 @@ DiseaseBurden.caseFatalityRate=CFR DiseaseBurden.eventCount=Number of events DiseaseBurden.outbreakDistrictCount=Outbreak districts DiseaseBurden.previousCaseCount=Previous cases + # District districtActiveDistricts=Active districts districtArchivedDistricts=Archived districts districtAllDistricts=All districts + District.archived=Archived District.epidCode=Epid code District.growthRate=Growth rate District.population=Population District.externalID=External ID + epiDataNoSourceContacts=No source contacts have been created for this case + EpiData=Epidemiological data EpiData.areaInfectedAnimals=Residing, working or travelling to an area where infected animals have been confirmed EpiData.exposureDetailsKnown=Exposure details known @@ -849,9 +886,11 @@ EpiData.exposures=Exposures EpiData.highTransmissionRiskArea=Residing or working in an area with high risk of transmission of the disease, e.g. closed residential and camp-like settings EpiData.largeOutbreaksArea=Residing or travelling to countries/territories/areas experiencing larger outbreaks of local transmission EpiData.contactWithSourceCaseKnown=Contacts with source case known + # Documents documentUploadDocument=New document documentNoDocuments=There are no documents for this %s + # DocumentTemplate DocumentTemplate=Document Template DocumentTemplate.buttonUploadTemplate=Upload Template @@ -868,6 +907,7 @@ DocumentTemplate.exampleTemplateCases=Example Template Cases DocumentTemplate.exampleTemplateContacts=Example Template Contacts DocumentTemplate.exampleTemplateEventHandout=Example Template Event Handout DocumentTemplate.exampleTemplateEventParticipants=Example Template Event Participants + # Event eventActiveEvents=Active events eventArchivedEvents=Archived events @@ -895,6 +935,7 @@ eventUnlinkEvent=Unlink event eventOpenSuperordinateEvent=Open event eventEditEvent=Edit event eventLinkToEventsWithinTheSameFacility=See events within the same facility + Event=Event Event.caseCount=Cases Event.contactCount=Contacts @@ -951,6 +992,7 @@ Event.typeOfPlaceText=Specify other event place Event.uuid=Event ID Event.transregionalOutbreak=Transregional outbreak Event.diseaseTransmissionMode=Primary mode of transmission + # Event action EventAction.eventUuid=Event id EventAction.eventTitle=Event title @@ -967,14 +1009,18 @@ EventAction.actionChangeDate=Action change date EventAction.actionStatus=Action status EventAction.actionPriority=Action priority EventAction.actionLastModifiedBy=Action last modified by + # Event action export EventActionExport.eventDate=Date of event + #Event export + # EventParticipant eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant + EventParticipant=Event participant EventParticipant.contactCount=Contact count EventParticipant.event=Event @@ -988,6 +1034,7 @@ EventParticipant.person=Person EventParticipant.uuid=Event participant ID EventParticipant.region=Responsible region EventParticipant.district=Responsible district + #EventParticipant export EventParticipantExport.eventParticipantU=Event disease EventParticipantExport.eventDisease=Event disease @@ -1012,6 +1059,7 @@ EventParticipantExport.sampleInformation=Sample information EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID + # Expo export=Export exportBasic=Basic Export @@ -1026,13 +1074,16 @@ exportCaseManagement=Case Management Export exportCaseCustom=Custom Case Export exportNewExportConfiguration=New Export Configuration exportEditExportConfiguration=Edit Export Configuration + ExportConfiguration.NAME=Configuration name ExportConfiguration.myExports=My exports ExportConfiguration.sharedExports=Shared exports ExportConfiguration.sharedToPublic=Shared to public + exposureFlightNumber=Flight number exposureTimePeriod=Time period exposureSourceCaseName=Name of source case + Exposure.startDate=Start of exposure Exposure.endDate=End of exposure Exposure.exposureType=Type of activity @@ -1083,13 +1134,16 @@ Exposure.prophylaxisDate=Date of prophylaxis Exposure.riskArea=Risk area as defined by public health institution Exposure.exposureDate=Exposure date Exposure.exposureRole=Role + # Facility facilityActiveFacilities=Active facilities facilityArchivedFacilities=Archived facilities facilityAllFacilities=All facilities + Facility.CONFIGURED_FACILITY=Configured facility Facility.NO_FACILITY=Home or other place Facility.OTHER_FACILITY=Other facility + Facility.archived=Archived Facility.city=City Facility.community=Community @@ -1102,18 +1156,22 @@ Facility.publicOwnership=Public ownership Facility.region=Region Facility.type=Facility type Facility.typeGroup=Facility category + FeatureConfiguration.districtName=District FeatureConfiguration.enabled=Line listing enabled? FeatureConfiguration.endDate=End date + # Formats formatNumberOfVisitsFormat=%d (%d missed) formatNumberOfVisitsLongFormat=%d visits (%d missed) formatSimpleNumberFormat=%d + # FollowUp FollowUp.uuid=Follow-up ID FollowUp.person=Follow-up person FollowUp.reportDate=Date of report FollowUp.followUpUntil=Follow-up until + # HealthConditions HealthConditions=Health conditions HealthConditions.tuberculosis=Tuberculosis @@ -1139,6 +1197,7 @@ HealthConditions.formerSmoker=Former smoker\t\t HealthConditions.asthma=Asthma HealthConditions.sickleCellDisease=Sickle cell disease\t HealthConditions.immunodeficiencyIncludingHiv=Immunodeficiency including HIV + # Import importDetailed=Detailed Import importDownloadCaseImportTemplate=Download Case Import Template @@ -1155,6 +1214,7 @@ importLineListing=Line Listing Import importProcessed=%d/%d Processed importSkips=%d Skipped importCancelImport=Cancel import + #Lab Message LabMessage=Lab Message LabMessage.labMessageDetails=Lab message details @@ -1176,10 +1236,12 @@ LabMessage.sampleMaterial=Type of sample LabMessage.sampleReceivedDate=Sample received LabMessage.specimenCondition=Specimen condition LabMessage.testedDisease=Tested disease -labMessageFetch=Fetch lab messages + +labMessageFetch= Fetch lab messages labMessageProcess=Process labMessageProcessed=Processed labMessageUnprocessed=Unprocessed + #Line listing lineListingAddLine=Add line lineListingInfrastructureData=Take over infrastructure data from last line @@ -1192,6 +1254,7 @@ lineListingEnableAll=Enable all lineListingDisableAllShort=Disable all lineListingEndDate=End date lineListingSetEndDateForAll=Set end date for all + # Location Location=Location Location.additionalInformation=Additional information @@ -1209,27 +1272,31 @@ Location.latLonAccuracy=GPS accuracy in m Location.longitude=GPS longitude Location.postalCode=Postal code Location.street=Street + # Login Login.doLogIn=Log in Login.login=Login Login.password=password Login.username=username + #LoginSidebar LoginSidebar.diseaseDetection=Disease Detection LoginSidebar.diseasePrevention=Disease Prevention LoginSidebar.outbreakResponse=Outbreak Response LoginSidebar.poweredBy=Powered By + # Messaging messagesSendSMS=Send SMS messagesSentBy=Sent by messagesNoSmsSentForCase=No SMS sent to case person messagesNoPhoneNumberForCasePerson=Case person has no phone number -messagesSms=SMS -messagesEmail=Email -messagesSendingSms=Send new SMS -messagesNumberOfMissingPhoneNumbers=Number of selected cases without phone number\: %s -messagesCharacters=Characters\: %d / 160 -messagesNumberOfMessages=Nr. of messages\: %d +messagesSms = SMS +messagesEmail = Email +messagesSendingSms = Send new SMS +messagesNumberOfMissingPhoneNumbers = Number of selected cases without phone number\: %s +messagesCharacters = Characters\: %d / 160 +messagesNumberOfMessages = Nr. of messages\: %d + # Main Menu mainMenuAbout=About mainMenuCampaigns=Campaigns @@ -1245,6 +1312,7 @@ mainMenuStatistics=Statistics mainMenuTasks=Tasks mainMenuUsers=Users mainMenuAggregateReports=mSERS + MaternalHistory.childrenNumber=Total number of children MaternalHistory.ageAtBirth=Mother's age at birth of infant patient MaternalHistory.conjunctivitis=Conjunctivitis @@ -1271,16 +1339,19 @@ MaternalHistory.otherComplications=Other complications MaternalHistory.otherComplicationsOnset=Date of onset MaternalHistory.otherComplicationsMonth=Month of pregnancy MaternalHistory.otherComplicationsDetails=Complication details + # Outbreak outbreakAffectedDistricts=Affected districts outbreakNoOutbreak=No outbreak outbreakNormal=Normal outbreakOutbreak=Outbreak + # PathogenTest pathogenTestCreateNew=Create new pathogen test pathogenTestNewResult=New result pathogenTestNewTest=New test result pathogenTestSelect=Select pathogen test + PathogenTest=Pathogen test PathogenTests=Pathogen tests PathogenTest.fourFoldIncreaseAntibodyTiter=4 fold increase of antibody titer @@ -1297,6 +1368,7 @@ PathogenTest.testedDiseaseDetails=Tested disease name PathogenTest.typingId=Typing ID PathogenTest.serotype=Serotype PathogenTest.cqValue=CQ/CT Value + # Person personPersonsList=Person list personCreateNew=Create a new person @@ -1309,6 +1381,7 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person + Person=Person Person.address=Home address Person.addresses=Addresses @@ -1380,9 +1453,11 @@ Person.otherSalutation=Other salutation Person.birthName=Birth name Person.birthCountry=Country of birth Person.citizenship=Citizenship + pointOfEntryActivePointsOfEntry=Active points of entry pointOfEntryArchivedPointsOfEntry=Archived points of entry pointOfEntryAllPointsOfEntry=All points of entry + PointOfEntry.OTHER_AIRPORT=Other airport PointOfEntry.OTHER_SEAPORT=Other seaport PointOfEntry.OTHER_GROUND_CROSSING=Other ground crossing @@ -1392,8 +1467,10 @@ PointOfEntry.active=Active? PointOfEntry.latitude=Latitude PointOfEntry.longitude=Longitude PointOfEntry.externalID=External ID + populationDataMaleTotal=Male total populationDataFemaleTotal=Female total + PortHealthInfo=Port health information PortHealthInfo.airlineName=Airline name PortHealthInfo.flightNumber=Flight number @@ -1417,8 +1494,10 @@ PortHealthInfo.conveyanceTypeDetails=Specify the conveyance type PortHealthInfo.departureLocation=Start location of travel PortHealthInfo.finalDestination=Final destination PortHealthInfo.details=Point of entry details + # Prescription prescriptionNewPrescription=New prescription + Prescription.additionalNotes=Additional notes Prescription.dose=Dose Prescription.drugIntakeDetails=Drug name @@ -1434,27 +1513,33 @@ Prescription.prescriptionType=Prescription type Prescription.route=Route Prescription.routeDetails=Route specification Prescription.typeOfDrug=Type of drug + PrescriptionExport.caseUuid=Case ID PrescriptionExport.caseName=Case name + # Country countryActiveCountries=Active countries countryArchivedCountries=Archived countries countryAllCountries=All countries + Country.archived=Archived Country.externalId=External ID Country.defaultName=Default name Country.displayName=Name Country.isoCode=ISO code Country.unoCode=UNO code + # Region regionActiveRegions=Active regions regionArchivedRegions=Archived regions regionAllRegions=All regions + Region.archived=Archived Region.epidCode=Epid code Region.growthRate=Growth rate Region.population=Population Region.externalID=External ID + # Sample sampleCreateNew=Create new sample sampleIncludeTestOnCreation=Create test result for this sample now @@ -1481,6 +1566,7 @@ sampleActiveSamples=Active samples sampleArchivedSamples=Archived samples sampleAllSamples=All samples sampleAssociationType=Sample type + Sample=Sample Sample.additionalTestingRequested=Request additional tests to be performed? Sample.additionalTestingStatus=Additional testing status @@ -1530,22 +1616,23 @@ Sample.testType=Type of test Sample.typeOfTest=Type of test Sample.uuid=Sample ID Sample.samplePurpose=Purpose of the Sample + SampleExport.additionalTestingRequested=Have additional tests been requested? SampleExport.personAddressCaption=Address of case/contact/event participant person SampleExport.personAge=Age of case/contact/event participant person SampleExport.caseDistrict=District of case SampleExport.caseCommunity=Community of case SampleExport.caseFacility=Facility of case -SampleExport.contactRegion=Region of contact -SampleExport.contactDistrict=District of contact -SampleExport.contactCommunity=Community of contact +SampleExport.contactRegion = Region of contact +SampleExport.contactDistrict = District of contact +SampleExport.contactCommunity = Community of contact SampleExport.caseOutcome=Outcome of case SampleExport.caseRegion=Region of case SampleExport.caseReportDate=Case report date SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID -SampleExport.contactUuid=Contact UUID -SampleExport.contactReportDate=Contact report date +SampleExport.contactUuid = Contact UUID +SampleExport.contactReportDate = Contact report date SampleExport.id=Sample SN SampleExport.sampleReportDate=Sample report date SampleExport.noTestPossibleReason=No test possible reason @@ -1597,6 +1684,7 @@ SampleExport.testDateTime=Date and time of latest additional test SampleExport.totalBilirubin=Total bilirubin of latest additional test SampleExport.urea=Urea of latest additional test SampleExport.wbcCount=WBC count of latest additional test + # Statistics statisticsAddFilter=Add filter statisticsAttribute=Attribute @@ -1619,11 +1707,13 @@ statisticsStatistics=Statistics statisticsVisualizationType=Type statisticsIncidenceDivisor=Incidence divisor statisticsDataDisplayed=Data displayed + # Symptoms symptomsLesionsLocations=Localization of the lesions symptomsMaxTemperature=Maximum body temperature in ° C symptomsSetClearedToNo=Set cleared to No symptomsSetClearedToUnknown=Set cleared to Unknown + Symptoms=Symptoms Symptoms.abdominalPain=Abdominal pain Symptoms.alteredConsciousness=Altered level of consciousness @@ -1811,6 +1901,7 @@ Symptoms.palpitations=Palpitations Symptoms.dizzinessStandingUp=Dizziness (when standing up from a sitting or lying position) Symptoms.highOrLowBloodPressure=Blood pressure too high or too low (measured) Symptoms.urinaryRetention=Urinary retention + # Task taskMyTasks=My tasks taskNewTask=New task @@ -1819,6 +1910,7 @@ taskOfficerTasks=Officer tasks taskActiveTasks=Active tasks taskArchivedTasks=Archived tasks taskAllTasks=All tasks + Task=Task Task.assigneeReply=Comments on execution Task.assigneeUser=Assigned to @@ -1836,7 +1928,9 @@ Task.suggestedStart=Suggested start Task.taskContext=Task context Task.taskStatus=Task status Task.taskType=Task type + # TestReport + TestReport.testDateTime=Date and time of result TestReport.testLabCity=Lab city TestReport.testLabExternalId=Lab external ID @@ -1844,10 +1938,12 @@ TestReport.testLabName=Lab name TestReport.testLabPostalCode=Lab postal code TestReport.testResult=Test result TestReport.testType=Type of test + # Treatment treatmentCreateTreatment=Create treatment treatmentNewTreatment=New treatment treatmentOpenPrescription=Open prescription + Treatment.additionalNotes=Additional notes Treatment.dose=Dose Treatment.drugIntakeDetails=Drug name @@ -1861,8 +1957,10 @@ Treatment.treatmentDetails=Treatment details Treatment.treatmentType=Treatment type Treatment.typeOfDrug=Type of drug Treatment.treatmentRoute=Treatment route + TreatmentExport.caseUuid=Case ID TreatmentExport.caseName=Case name + # User userNewUser=New user userResetPassword=Create new password @@ -1872,6 +1970,7 @@ syncUsers=Sync Users syncErrors=%d Error(s) syncSuccessful=%d Synced syncProcessed=%d/%d Processed + User=User User.active=Active? User.associatedOfficer=Associated officer @@ -1886,16 +1985,20 @@ User.userName=User name User.userRoles=User roles User.address=Address User.uuid=UUID + # Views View.actions=Action Directory + View.aggregatereports=Aggregate Reporting (mSERS) View.aggregatereports.sub= + View.campaign.campaigns=Campaign Directory View.campaign.campaigns.short=Campaigns View.campaign.campaigndata=Campaign Data View.campaign.campaigndata.short=Campaign Data View.campaign.campaigndata.dataform=Campaign Data Form View.campaign.campaigndata.dataform.short=Data Form + View.cases=Case Directory View.cases.merge=Merge Duplicate Cases View.cases.archive=Case Archive @@ -1911,8 +2014,10 @@ View.cases.clinicalcourse=Clinical Course View.cases.maternalhistory=Maternal History View.cases.porthealthinfo=Port Health Information View.cases.visits=Case Visits + View.persons=Person Directory View.persons.data=Person Information + View.configuration.communities=Communities Configuration View.configuration.communities.short=Communities View.configuration.districts=Districts Configuration @@ -1943,6 +2048,7 @@ View.configuration.populationdata=Population Data View.configuration.populationdata.short=Population View.configuration.linelisting=Line Listing Configuration View.configuration.linelisting.short=Line Listing + View.contacts=Contact Directory View.contacts.archive=Contact Archive View.contacts.epidata=Contact Epidemiological Data @@ -1950,9 +2056,11 @@ View.contacts.data=Contact Information View.contacts.person=Contact Person View.contacts.sub= View.contacts.visits=Contact Visits + View.dashboard.contacts=Contacts Dashboard View.dashboard.surveillance=Surveillance Dashboard View.dashboard.campaigns=Campaigns Dashboard + View.events=Event Directory View.events.archive=Event Archive View.events.data=Event Information @@ -1960,22 +2068,30 @@ View.events.eventactions=Event Actions View.events.eventparticipants=Event Participants View.events.sub= View.events.eventparticipants.data=Event Participant Information + View.samples.labMessages=Lab Message Directory + View.reports=Weekly Reports View.reports.sub= + View.samples=Sample Directory View.samples.archive=Sample Archive View.samples.data=Sample Information View.samples.sub= + View.statistics=Statistics View.statistics.database-export=Database export + View.tasks=Task Management View.tasks.archive=Task Archive View.tasks.sub= + View.users=User Management View.users.sub= + # Visit visitNewVisit=New visit + Visit=Visit Visit.person=Visited person Visit.symptoms=Symptoms @@ -1987,19 +2103,24 @@ Visit.visitUser=Visiting officer Visit.disease=Disease Visit.reportLat=Report latitude Visit.reportLon=Report longitude + # WeeklyReport weeklyReportNoReport=Missing report weeklyReportOfficerInformants=Informants weeklyReportsInDistrict=Weekly Reports in %s weeklyReportRegionOfficers=Officers weeklyReportRegionInformants=Informants + WeeklyReport.epiWeek=Epi Week WeeklyReport.year=Year + # WeeklyReportEntry WeeklyReportEntry.numberOfCases=Cases reported + # WeeklyReportInformantSummary WeeklyReportInformantSummary.informantReportDate=Informant report submission WeeklyReportInformantSummary.totalCaseCount=Cases reported by informant + # WeeklyReportOfficerSummary WeeklyReportOfficerSummary.informants=Number of informants WeeklyReportOfficerSummary.informantReports=Number of informant reports @@ -2008,6 +2129,7 @@ WeeklyReportOfficerSummary.informantZeroReports=Number of informant zero reports WeeklyReportOfficerSummary.officer=Officer WeeklyReportOfficerSummary.officerReportDate=Officer report submission WeeklyReportOfficerSummary.totalCaseCount=Cases reported by officer + # WeeklyReportRegionSummary WeeklyReportRegionSummary.informants=Number of informants WeeklyReportRegionSummary.informantReports=Number of informant reports @@ -2017,6 +2139,7 @@ WeeklyReportRegionSummary.officers=Number of officers WeeklyReportRegionSummary.officerReports=Number of officers reports WeeklyReportRegionSummary.officerReportPercentage=Percentage WeeklyReportRegionSummary.officerZeroReports=Number of officer zero reports + # SORMAS to SORMAS SormasToSormasOptions.organization=Orgainzation SormasToSormasOptions.withAssociatedContacts=Share associated contacts @@ -2037,17 +2160,23 @@ sormasToSormasSharedWith=Shared with sormasToSormasSharedBy=By sormasToSormasSharedDate=On sormasToSormasSentFrom=Sent from + BAGExport=BAG Export + # Survnet Gateway SurvnetGateway.title=SurvNet SurvnetGateway.send=send to own SurvNet instance SurvnetGateway.unableToSend=Unable to send SurvnetGateway.confirmSend=Confirm sending SurvnetGateway.sendShort=Send to SurvNet + patientDiaryRegistrationError=Could not register person in the patient diary. patientDiaryPersonNotExportable=Cannot export the person to the patient diary. The person needs a valid birthdate and either a valid phone number or email address. + showPlacesOnMap=Show + changeUserEmail=Change user email + VaccinationInfo.vaccination=Vaccination status for this disease VaccinationInfo.firstVaccinationDate=Date of first vaccination VaccinationInfo.lastVaccinationDate=Date of last vaccination diff --git a/sormas-api/src/main/resources/captions_hi-IN.properties b/sormas-api/src/main/resources/captions_hi-IN.properties index 09d72562fce..d3542225c7c 100644 --- a/sormas-api/src/main/resources/captions_hi-IN.properties +++ b/sormas-api/src/main/resources/captions_hi-IN.properties @@ -188,13 +188,13 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge=Okay, and continue to merge overview -actionOkAndGoToContactDirectory=Okay, and continue to contact directory -actionOkAndGoToContactDetails=Okay, and continue to contact -actionOkAndGoToPersonDirectory=Okay, and continue to person directory -actionExecuteAutomaticDeletion=Execute automatic deletion -actionDone=Done -actionConfirmAction=Confirm action +actionOkAndGoToMerge = Okay, and continue to merge overview +actionOkAndGoToContactDirectory = Okay, and continue to contact directory +actionOkAndGoToContactDetails = Okay, and continue to contact +actionOkAndGoToPersonDirectory = Okay, and continue to person directory +actionExecuteAutomaticDeletion = Execute automatic deletion +actionDone = Done +actionConfirmAction = Confirm action activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -248,10 +248,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows=Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups=Expired -aggregateReportNoAgeGroup=No age group -aggregateReportShowOnlyDuplicateReports=Display only duplicate reports +aggregateReportShowZeroRows = Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups = Expired +aggregateReportNoAgeGroup = No age group +aggregateReportShowOnlyDuplicateReports = Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -275,7 +275,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend=Send emails +bulkEmailSend = Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -434,7 +434,6 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name -CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1134,6 +1133,7 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: + # Environment Environment=Environment Environment.uuid=Environment ID @@ -1152,51 +1152,54 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location + environmentActiveEnvironments=Active environments -environmentArchivedEnvironments=Archived environments -environmentAllActiveAndArchivedEnvironments=All active and archived environments -environmentDeletedEnvironments=Deleted environments -environmentNewEnvironment=New environment +environmentArchivedEnvironments = Archived environments +environmentAllActiveAndArchivedEnvironments = All active and archived environments +environmentDeletedEnvironments = Deleted environments +environmentNewEnvironment= New environment environmentEnvironmentsList=Environments list + # EnvironmentSample -EnvironmentSample=Environment Sample -EnvironmentSample.uuid=Sample ID -EnvironmentSample.environment=Environment -EnvironmentSample.sampleDateTime=Date of sampling -EnvironmentSample.sampleMaterial=Sample material -EnvironmentSample.otherSampleMaterial=Specify sample material -EnvironmentSample.sampleVolume=Volume (in mL) -EnvironmentSample.fieldSampleId=Field sample ID -EnvironmentSample.turbidity=Turbidity (in NTU) -EnvironmentSample.phValue=pH of sample -EnvironmentSample.sampleTemperature=Temperature (in °C) -EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) -EnvironmentSample.laboratory=Laboratory -EnvironmentSample.laboratoryDetails=Laboratory details -EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested -EnvironmentSample.reportingUser=Reporting user -EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested -EnvironmentSample.weatherConditions=Weather conditions at time of sampling -EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched=Sent/dispatched -EnvironmentSample.dispatchDate=Dispatchment date -EnvironmentSample.dispatchDetails=Dispatchment details -EnvironmentSample.received=Received -EnvironmentSample.receivalDate=Receival date -EnvironmentSample.labSampleId=Lab sample ID -EnvironmentSample.specimenCondition=Specimen condition -EnvironmentSample.location=Location of sampling site -EnvironmentSample.generalComment=General comment -EnvironmentSample.positivePathogenTests=Positive pathogen tests -EnvironmentSample.latestPathogenTest=Latest pathogen test -EnvironmentSample.numberOfTests=Number of tests +EnvironmentSample = Environment Sample +EnvironmentSample.uuid = Sample ID +EnvironmentSample.environment = Environment +EnvironmentSample.sampleDateTime = Date of sampling +EnvironmentSample.sampleMaterial = Sample material +EnvironmentSample.otherSampleMaterial = Specify sample material +EnvironmentSample.sampleVolume = Volume (in mL) +EnvironmentSample.fieldSampleId = Field sample ID +EnvironmentSample.turbidity = Turbidity (in NTU) +EnvironmentSample.phValue = pH of sample +EnvironmentSample.sampleTemperature = Temperature (in °C) +EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) +EnvironmentSample.laboratory = Laboratory +EnvironmentSample.laboratoryDetails = Laboratory details +EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested +EnvironmentSample.reportingUser = Reporting user +EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested +EnvironmentSample.weatherConditions = Weather conditions at time of sampling +EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched = Sent/dispatched +EnvironmentSample.dispatchDate = Dispatchment date +EnvironmentSample.dispatchDetails = Dispatchment details +EnvironmentSample.received = Received +EnvironmentSample.receivalDate = Receival date +EnvironmentSample.labSampleId = Lab sample ID +EnvironmentSample.specimenCondition = Specimen condition +EnvironmentSample.location = Location of sampling site +EnvironmentSample.generalComment = General comment +EnvironmentSample.positivePathogenTests = Positive pathogen tests +EnvironmentSample.latestPathogenTest = Latest pathogen test +EnvironmentSample.numberOfTests = Number of tests + # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents=Deleted events +eventDeletedEvents = Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1340,7 +1343,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants=Deleted event participants +eventParticipantDeletedEventParticipants = Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1353,7 +1356,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser=Reporting user +EventParticipant.reportingUser = Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1390,9 +1393,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink=Event participant ID -EventParticipantSelection.eventUuidLink=Event ID -EventParticipantSelection.resultingCaseUuidLink=Resulting case ID +EventParticipantSelection.eventParticipantUuidLink = Event participant ID +EventParticipantSelection.eventUuidLink = Event ID +EventParticipantSelection.resultingCaseUuidLink = Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1612,6 +1615,7 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message + #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1622,7 +1626,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList=List of new event participants +lineListingNewEventParticipantsList = List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1796,10 +1800,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples=See samples for this person -caseLinkToSamples=See samples for this case -contactLinkToSamples=See samples for this contact -eventParticipantLinkToSamples=See samples for this event participant +personLinkToSamples = See samples for this person +caseLinkToSamples = See samples for this case +contactLinkToSamples = See samples for this contact +eventParticipantLinkToSamples = See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2107,9 +2111,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity=Community of event participant -SampleExport.eventParticipantDistrict=District of event participant -SampleExport.eventParticipantRegion=Region of event participant +SampleExport.eventParticipantCommunity = Community of event participant +SampleExport.eventParticipantDistrict = District of event participant +SampleExport.eventParticipantRegion = Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2168,7 +2172,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser=Reporting user +Immunization.reportingUser = Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2211,10 +2215,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations=Active immunizations -immunizationArchivedImmunizations=Archived immunizations -immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations -immunizationDeletedImmunizations=Deleted immunizations +immunizationActiveImmunizations = Active immunizations +immunizationArchivedImmunizations = Archived immunizations +immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations +immunizationDeletedImmunizations = Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2457,7 +2461,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment=Associated environment +Task.environment = Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2510,7 +2514,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser=Reporting user +TravelEntry.reportingUser = Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -2877,15 +2881,17 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms=SMS -userRoleNotificationTypeEmail=EMAIL +userRoleNotificationTypeSms = SMS +userRoleNotificationTypeEmail = EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template + notificationType=Notification type -notificationType.group=Group -notificationType.caption=Caption -notificationType.description=Description +notificationType.group = Group +notificationType.caption = Caption +notificationType.description = Description + SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -2920,10 +2926,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails=Person contact details -environmentSampleNotShipped=Not shipped -environmentSampleShipped=Shipped -environmentSampleReceived=Received +TaskExport.personOtherContactDetails = Person contact details +environmentSampleNotShipped = Not shipped +environmentSampleShipped = Shipped +environmentSampleReceived = Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -2940,34 +2946,37 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents + # SpecialCaseAccess SpecialCaseAccess=Special case access -caze=Case -assignedTo=Assigned to -assignedBy=Assigned by -endDateTime=Access until -assignmentDate=Date assigned +caze = Case +assignedTo = Assigned to +assignedBy = Assigned by +endDateTime = Access until +assignmentDate = Date assigned + specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case + # SelfReport -SelfReport.type=Type -SelfReport.reportDate=Report date -SelfReport.disease=Disease -SelfReport.diseaseVariant=Disease variant -SelfReport.firstName=First name -SelfReport.lastName=Last name -SelfReport.sex=Sex -SelfReport.birthdateDD=Day of birth -SelfReport.birthdateMM=Month of birth -SelfReport.birthdateYYYY=Year of birth -SelfReport.nationalHealthId=National health ID -SelfReport.email=Email -SelfReport.phoneNumber=Phone number -SelfReport.address=Address -SelfReport.comment=Comment -SelfReport.responsibleUser=Responsible user -SelfReport.investigationStatus=Investigation status -SelfReport.processingStatus=Processing status +SelfReport.type = Type +SelfReport.reportDate = Report date +SelfReport.disease = Disease +SelfReport.diseaseVariant = Disease variant +SelfReport.firstName = First name +SelfReport.lastName = Last name +SelfReport.sex = Sex +SelfReport.birthdateDD = Day of birth +SelfReport.birthdateMM = Month of birth +SelfReport.birthdateYYYY = Year of birth +SelfReport.nationalHealthId = National health ID +SelfReport.email = Email +SelfReport.phoneNumber = Phone number +SelfReport.address = Address +SelfReport.comment = Comment +SelfReport.responsibleUser = Responsible user +SelfReport.investigationStatus = Investigation status +SelfReport.processingStatus = Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_hr-HR.properties b/sormas-api/src/main/resources/captions_hr-HR.properties index 1e611b51ccf..7ca0f1f4687 100644 --- a/sormas-api/src/main/resources/captions_hr-HR.properties +++ b/sormas-api/src/main/resources/captions_hr-HR.properties @@ -188,13 +188,13 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge=Okay, and continue to merge overview -actionOkAndGoToContactDirectory=Okay, and continue to contact directory -actionOkAndGoToContactDetails=Okay, and continue to contact -actionOkAndGoToPersonDirectory=Okay, and continue to person directory -actionExecuteAutomaticDeletion=Execute automatic deletion -actionDone=Done -actionConfirmAction=Confirm action +actionOkAndGoToMerge = Okay, and continue to merge overview +actionOkAndGoToContactDirectory = Okay, and continue to contact directory +actionOkAndGoToContactDetails = Okay, and continue to contact +actionOkAndGoToPersonDirectory = Okay, and continue to person directory +actionExecuteAutomaticDeletion = Execute automatic deletion +actionDone = Done +actionConfirmAction = Confirm action activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -248,10 +248,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows=Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups=Expired -aggregateReportNoAgeGroup=No age group -aggregateReportShowOnlyDuplicateReports=Display only duplicate reports +aggregateReportShowZeroRows = Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups = Expired +aggregateReportNoAgeGroup = No age group +aggregateReportShowOnlyDuplicateReports = Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -275,7 +275,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend=Send emails +bulkEmailSend = Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -434,7 +434,6 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name -CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1134,6 +1133,7 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: + # Environment Environment=Environment Environment.uuid=Environment ID @@ -1152,51 +1152,54 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location + environmentActiveEnvironments=Active environments -environmentArchivedEnvironments=Archived environments -environmentAllActiveAndArchivedEnvironments=All active and archived environments -environmentDeletedEnvironments=Deleted environments -environmentNewEnvironment=New environment +environmentArchivedEnvironments = Archived environments +environmentAllActiveAndArchivedEnvironments = All active and archived environments +environmentDeletedEnvironments = Deleted environments +environmentNewEnvironment= New environment environmentEnvironmentsList=Environments list + # EnvironmentSample -EnvironmentSample=Environment Sample -EnvironmentSample.uuid=Sample ID -EnvironmentSample.environment=Environment -EnvironmentSample.sampleDateTime=Date of sampling -EnvironmentSample.sampleMaterial=Sample material -EnvironmentSample.otherSampleMaterial=Specify sample material -EnvironmentSample.sampleVolume=Volume (in mL) -EnvironmentSample.fieldSampleId=Field sample ID -EnvironmentSample.turbidity=Turbidity (in NTU) -EnvironmentSample.phValue=pH of sample -EnvironmentSample.sampleTemperature=Temperature (in °C) -EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) -EnvironmentSample.laboratory=Laboratory -EnvironmentSample.laboratoryDetails=Laboratory details -EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested -EnvironmentSample.reportingUser=Reporting user -EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested -EnvironmentSample.weatherConditions=Weather conditions at time of sampling -EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched=Sent/dispatched -EnvironmentSample.dispatchDate=Dispatchment date -EnvironmentSample.dispatchDetails=Dispatchment details -EnvironmentSample.received=Received -EnvironmentSample.receivalDate=Receival date -EnvironmentSample.labSampleId=Lab sample ID -EnvironmentSample.specimenCondition=Specimen condition -EnvironmentSample.location=Location of sampling site -EnvironmentSample.generalComment=General comment -EnvironmentSample.positivePathogenTests=Positive pathogen tests -EnvironmentSample.latestPathogenTest=Latest pathogen test -EnvironmentSample.numberOfTests=Number of tests +EnvironmentSample = Environment Sample +EnvironmentSample.uuid = Sample ID +EnvironmentSample.environment = Environment +EnvironmentSample.sampleDateTime = Date of sampling +EnvironmentSample.sampleMaterial = Sample material +EnvironmentSample.otherSampleMaterial = Specify sample material +EnvironmentSample.sampleVolume = Volume (in mL) +EnvironmentSample.fieldSampleId = Field sample ID +EnvironmentSample.turbidity = Turbidity (in NTU) +EnvironmentSample.phValue = pH of sample +EnvironmentSample.sampleTemperature = Temperature (in °C) +EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) +EnvironmentSample.laboratory = Laboratory +EnvironmentSample.laboratoryDetails = Laboratory details +EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested +EnvironmentSample.reportingUser = Reporting user +EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested +EnvironmentSample.weatherConditions = Weather conditions at time of sampling +EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched = Sent/dispatched +EnvironmentSample.dispatchDate = Dispatchment date +EnvironmentSample.dispatchDetails = Dispatchment details +EnvironmentSample.received = Received +EnvironmentSample.receivalDate = Receival date +EnvironmentSample.labSampleId = Lab sample ID +EnvironmentSample.specimenCondition = Specimen condition +EnvironmentSample.location = Location of sampling site +EnvironmentSample.generalComment = General comment +EnvironmentSample.positivePathogenTests = Positive pathogen tests +EnvironmentSample.latestPathogenTest = Latest pathogen test +EnvironmentSample.numberOfTests = Number of tests + # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents=Deleted events +eventDeletedEvents = Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1340,7 +1343,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants=Deleted event participants +eventParticipantDeletedEventParticipants = Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1353,7 +1356,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser=Reporting user +EventParticipant.reportingUser = Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1390,9 +1393,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink=Event participant ID -EventParticipantSelection.eventUuidLink=Event ID -EventParticipantSelection.resultingCaseUuidLink=Resulting case ID +EventParticipantSelection.eventParticipantUuidLink = Event participant ID +EventParticipantSelection.eventUuidLink = Event ID +EventParticipantSelection.resultingCaseUuidLink = Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1612,6 +1615,7 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message + #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1622,7 +1626,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList=List of new event participants +lineListingNewEventParticipantsList = List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1796,10 +1800,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples=See samples for this person -caseLinkToSamples=See samples for this case -contactLinkToSamples=See samples for this contact -eventParticipantLinkToSamples=See samples for this event participant +personLinkToSamples = See samples for this person +caseLinkToSamples = See samples for this case +contactLinkToSamples = See samples for this contact +eventParticipantLinkToSamples = See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2107,9 +2111,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity=Community of event participant -SampleExport.eventParticipantDistrict=District of event participant -SampleExport.eventParticipantRegion=Region of event participant +SampleExport.eventParticipantCommunity = Community of event participant +SampleExport.eventParticipantDistrict = District of event participant +SampleExport.eventParticipantRegion = Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2168,7 +2172,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser=Reporting user +Immunization.reportingUser = Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2211,10 +2215,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations=Active immunizations -immunizationArchivedImmunizations=Archived immunizations -immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations -immunizationDeletedImmunizations=Deleted immunizations +immunizationActiveImmunizations = Active immunizations +immunizationArchivedImmunizations = Archived immunizations +immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations +immunizationDeletedImmunizations = Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2457,7 +2461,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment=Associated environment +Task.environment = Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2510,7 +2514,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser=Reporting user +TravelEntry.reportingUser = Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -2877,15 +2881,17 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms=SMS -userRoleNotificationTypeEmail=EMAIL +userRoleNotificationTypeSms = SMS +userRoleNotificationTypeEmail = EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template + notificationType=Notification type -notificationType.group=Group -notificationType.caption=Caption -notificationType.description=Description +notificationType.group = Group +notificationType.caption = Caption +notificationType.description = Description + SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -2920,10 +2926,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails=Person contact details -environmentSampleNotShipped=Not shipped -environmentSampleShipped=Shipped -environmentSampleReceived=Received +TaskExport.personOtherContactDetails = Person contact details +environmentSampleNotShipped = Not shipped +environmentSampleShipped = Shipped +environmentSampleReceived = Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -2940,34 +2946,37 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents + # SpecialCaseAccess SpecialCaseAccess=Special case access -caze=Case -assignedTo=Assigned to -assignedBy=Assigned by -endDateTime=Access until -assignmentDate=Date assigned +caze = Case +assignedTo = Assigned to +assignedBy = Assigned by +endDateTime = Access until +assignmentDate = Date assigned + specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case + # SelfReport -SelfReport.type=Type -SelfReport.reportDate=Report date -SelfReport.disease=Disease -SelfReport.diseaseVariant=Disease variant -SelfReport.firstName=First name -SelfReport.lastName=Last name -SelfReport.sex=Sex -SelfReport.birthdateDD=Day of birth -SelfReport.birthdateMM=Month of birth -SelfReport.birthdateYYYY=Year of birth -SelfReport.nationalHealthId=National health ID -SelfReport.email=Email -SelfReport.phoneNumber=Phone number -SelfReport.address=Address -SelfReport.comment=Comment -SelfReport.responsibleUser=Responsible user -SelfReport.investigationStatus=Investigation status -SelfReport.processingStatus=Processing status +SelfReport.type = Type +SelfReport.reportDate = Report date +SelfReport.disease = Disease +SelfReport.diseaseVariant = Disease variant +SelfReport.firstName = First name +SelfReport.lastName = Last name +SelfReport.sex = Sex +SelfReport.birthdateDD = Day of birth +SelfReport.birthdateMM = Month of birth +SelfReport.birthdateYYYY = Year of birth +SelfReport.nationalHealthId = National health ID +SelfReport.email = Email +SelfReport.phoneNumber = Phone number +SelfReport.address = Address +SelfReport.comment = Comment +SelfReport.responsibleUser = Responsible user +SelfReport.investigationStatus = Investigation status +SelfReport.processingStatus = Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_ja-JP.properties b/sormas-api/src/main/resources/captions_ja-JP.properties index 1e611b51ccf..7ca0f1f4687 100644 --- a/sormas-api/src/main/resources/captions_ja-JP.properties +++ b/sormas-api/src/main/resources/captions_ja-JP.properties @@ -188,13 +188,13 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge=Okay, and continue to merge overview -actionOkAndGoToContactDirectory=Okay, and continue to contact directory -actionOkAndGoToContactDetails=Okay, and continue to contact -actionOkAndGoToPersonDirectory=Okay, and continue to person directory -actionExecuteAutomaticDeletion=Execute automatic deletion -actionDone=Done -actionConfirmAction=Confirm action +actionOkAndGoToMerge = Okay, and continue to merge overview +actionOkAndGoToContactDirectory = Okay, and continue to contact directory +actionOkAndGoToContactDetails = Okay, and continue to contact +actionOkAndGoToPersonDirectory = Okay, and continue to person directory +actionExecuteAutomaticDeletion = Execute automatic deletion +actionDone = Done +actionConfirmAction = Confirm action activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -248,10 +248,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows=Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups=Expired -aggregateReportNoAgeGroup=No age group -aggregateReportShowOnlyDuplicateReports=Display only duplicate reports +aggregateReportShowZeroRows = Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups = Expired +aggregateReportNoAgeGroup = No age group +aggregateReportShowOnlyDuplicateReports = Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -275,7 +275,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend=Send emails +bulkEmailSend = Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -434,7 +434,6 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name -CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1134,6 +1133,7 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: + # Environment Environment=Environment Environment.uuid=Environment ID @@ -1152,51 +1152,54 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location + environmentActiveEnvironments=Active environments -environmentArchivedEnvironments=Archived environments -environmentAllActiveAndArchivedEnvironments=All active and archived environments -environmentDeletedEnvironments=Deleted environments -environmentNewEnvironment=New environment +environmentArchivedEnvironments = Archived environments +environmentAllActiveAndArchivedEnvironments = All active and archived environments +environmentDeletedEnvironments = Deleted environments +environmentNewEnvironment= New environment environmentEnvironmentsList=Environments list + # EnvironmentSample -EnvironmentSample=Environment Sample -EnvironmentSample.uuid=Sample ID -EnvironmentSample.environment=Environment -EnvironmentSample.sampleDateTime=Date of sampling -EnvironmentSample.sampleMaterial=Sample material -EnvironmentSample.otherSampleMaterial=Specify sample material -EnvironmentSample.sampleVolume=Volume (in mL) -EnvironmentSample.fieldSampleId=Field sample ID -EnvironmentSample.turbidity=Turbidity (in NTU) -EnvironmentSample.phValue=pH of sample -EnvironmentSample.sampleTemperature=Temperature (in °C) -EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) -EnvironmentSample.laboratory=Laboratory -EnvironmentSample.laboratoryDetails=Laboratory details -EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested -EnvironmentSample.reportingUser=Reporting user -EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested -EnvironmentSample.weatherConditions=Weather conditions at time of sampling -EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched=Sent/dispatched -EnvironmentSample.dispatchDate=Dispatchment date -EnvironmentSample.dispatchDetails=Dispatchment details -EnvironmentSample.received=Received -EnvironmentSample.receivalDate=Receival date -EnvironmentSample.labSampleId=Lab sample ID -EnvironmentSample.specimenCondition=Specimen condition -EnvironmentSample.location=Location of sampling site -EnvironmentSample.generalComment=General comment -EnvironmentSample.positivePathogenTests=Positive pathogen tests -EnvironmentSample.latestPathogenTest=Latest pathogen test -EnvironmentSample.numberOfTests=Number of tests +EnvironmentSample = Environment Sample +EnvironmentSample.uuid = Sample ID +EnvironmentSample.environment = Environment +EnvironmentSample.sampleDateTime = Date of sampling +EnvironmentSample.sampleMaterial = Sample material +EnvironmentSample.otherSampleMaterial = Specify sample material +EnvironmentSample.sampleVolume = Volume (in mL) +EnvironmentSample.fieldSampleId = Field sample ID +EnvironmentSample.turbidity = Turbidity (in NTU) +EnvironmentSample.phValue = pH of sample +EnvironmentSample.sampleTemperature = Temperature (in °C) +EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) +EnvironmentSample.laboratory = Laboratory +EnvironmentSample.laboratoryDetails = Laboratory details +EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested +EnvironmentSample.reportingUser = Reporting user +EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested +EnvironmentSample.weatherConditions = Weather conditions at time of sampling +EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched = Sent/dispatched +EnvironmentSample.dispatchDate = Dispatchment date +EnvironmentSample.dispatchDetails = Dispatchment details +EnvironmentSample.received = Received +EnvironmentSample.receivalDate = Receival date +EnvironmentSample.labSampleId = Lab sample ID +EnvironmentSample.specimenCondition = Specimen condition +EnvironmentSample.location = Location of sampling site +EnvironmentSample.generalComment = General comment +EnvironmentSample.positivePathogenTests = Positive pathogen tests +EnvironmentSample.latestPathogenTest = Latest pathogen test +EnvironmentSample.numberOfTests = Number of tests + # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents=Deleted events +eventDeletedEvents = Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1340,7 +1343,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants=Deleted event participants +eventParticipantDeletedEventParticipants = Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1353,7 +1356,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser=Reporting user +EventParticipant.reportingUser = Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1390,9 +1393,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink=Event participant ID -EventParticipantSelection.eventUuidLink=Event ID -EventParticipantSelection.resultingCaseUuidLink=Resulting case ID +EventParticipantSelection.eventParticipantUuidLink = Event participant ID +EventParticipantSelection.eventUuidLink = Event ID +EventParticipantSelection.resultingCaseUuidLink = Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1612,6 +1615,7 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message + #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1622,7 +1626,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList=List of new event participants +lineListingNewEventParticipantsList = List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1796,10 +1800,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples=See samples for this person -caseLinkToSamples=See samples for this case -contactLinkToSamples=See samples for this contact -eventParticipantLinkToSamples=See samples for this event participant +personLinkToSamples = See samples for this person +caseLinkToSamples = See samples for this case +contactLinkToSamples = See samples for this contact +eventParticipantLinkToSamples = See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2107,9 +2111,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity=Community of event participant -SampleExport.eventParticipantDistrict=District of event participant -SampleExport.eventParticipantRegion=Region of event participant +SampleExport.eventParticipantCommunity = Community of event participant +SampleExport.eventParticipantDistrict = District of event participant +SampleExport.eventParticipantRegion = Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2168,7 +2172,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser=Reporting user +Immunization.reportingUser = Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2211,10 +2215,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations=Active immunizations -immunizationArchivedImmunizations=Archived immunizations -immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations -immunizationDeletedImmunizations=Deleted immunizations +immunizationActiveImmunizations = Active immunizations +immunizationArchivedImmunizations = Archived immunizations +immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations +immunizationDeletedImmunizations = Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2457,7 +2461,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment=Associated environment +Task.environment = Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2510,7 +2514,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser=Reporting user +TravelEntry.reportingUser = Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -2877,15 +2881,17 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms=SMS -userRoleNotificationTypeEmail=EMAIL +userRoleNotificationTypeSms = SMS +userRoleNotificationTypeEmail = EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template + notificationType=Notification type -notificationType.group=Group -notificationType.caption=Caption -notificationType.description=Description +notificationType.group = Group +notificationType.caption = Caption +notificationType.description = Description + SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -2920,10 +2926,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails=Person contact details -environmentSampleNotShipped=Not shipped -environmentSampleShipped=Shipped -environmentSampleReceived=Received +TaskExport.personOtherContactDetails = Person contact details +environmentSampleNotShipped = Not shipped +environmentSampleShipped = Shipped +environmentSampleReceived = Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -2940,34 +2946,37 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents + # SpecialCaseAccess SpecialCaseAccess=Special case access -caze=Case -assignedTo=Assigned to -assignedBy=Assigned by -endDateTime=Access until -assignmentDate=Date assigned +caze = Case +assignedTo = Assigned to +assignedBy = Assigned by +endDateTime = Access until +assignmentDate = Date assigned + specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case + # SelfReport -SelfReport.type=Type -SelfReport.reportDate=Report date -SelfReport.disease=Disease -SelfReport.diseaseVariant=Disease variant -SelfReport.firstName=First name -SelfReport.lastName=Last name -SelfReport.sex=Sex -SelfReport.birthdateDD=Day of birth -SelfReport.birthdateMM=Month of birth -SelfReport.birthdateYYYY=Year of birth -SelfReport.nationalHealthId=National health ID -SelfReport.email=Email -SelfReport.phoneNumber=Phone number -SelfReport.address=Address -SelfReport.comment=Comment -SelfReport.responsibleUser=Responsible user -SelfReport.investigationStatus=Investigation status -SelfReport.processingStatus=Processing status +SelfReport.type = Type +SelfReport.reportDate = Report date +SelfReport.disease = Disease +SelfReport.diseaseVariant = Disease variant +SelfReport.firstName = First name +SelfReport.lastName = Last name +SelfReport.sex = Sex +SelfReport.birthdateDD = Day of birth +SelfReport.birthdateMM = Month of birth +SelfReport.birthdateYYYY = Year of birth +SelfReport.nationalHealthId = National health ID +SelfReport.email = Email +SelfReport.phoneNumber = Phone number +SelfReport.address = Address +SelfReport.comment = Comment +SelfReport.responsibleUser = Responsible user +SelfReport.investigationStatus = Investigation status +SelfReport.processingStatus = Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_ks-PK.properties b/sormas-api/src/main/resources/captions_ks-PK.properties index d52e7461ff0..111a929df1f 100644 --- a/sormas-api/src/main/resources/captions_ks-PK.properties +++ b/sormas-api/src/main/resources/captions_ks-PK.properties @@ -14,6 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . ############################################################################### + # General Captions all=All city=City @@ -55,6 +56,7 @@ facility=Facility pointOfEntry=Point of entry remove=Remove reportingUser=Reporting user + # About about=About aboutDocuments=Documents @@ -66,12 +68,14 @@ aboutDataDictionary=Data Dictionary (XLSX) aboutSormasWebsite=Official SORMAS Website aboutTechnicalManual=Technical Manual (PDF) aboutWhatsNew=What's New? + # Action actionNewAction=New action actionNoActions=There are no actions for this %s actionCreatingLabel=Created at %s by %s actionLastModifiedByLabel=Updated at %s by %s actionStatusChangeDate=updated at %s + Action=Action Action.title=Title Action.description=Description @@ -84,12 +88,13 @@ Action.actionContext=Action context Action.actionStatus=Action status Action.lastModifiedBy=Last modified by Action.actionMeasure=Measure + # Actions actionApplyDateFilter=Apply date filter actionArchive=Archive actionAssignNewEpidNumber=Assign new epid number actionBack=Back -actionSend=Send +actionSend = Send actionCancel=Cancel actionClear=Clear actionClearAll=Clear all @@ -128,8 +133,10 @@ actionBackToNationOverview=Back to Nation Overview actionSettings=User Settings actionNewForm=New Form actionOverwrite=Overwrite + # AdditionalTest additionalTestNewTest=New test result + AdditionalTest=Additional test AdditionalTest.altSgpt=ALT/SGPT (U/L) AdditionalTest.arterialVenousBloodGas=Arterial/venous blood gas @@ -153,6 +160,7 @@ AdditionalTest.testDateTime=Date and time of result AdditionalTest.totalBilirubin=Total bilirubin (umol/L) AdditionalTest.urea=Urea (mmol/L) AdditionalTest.wbcCount=WBC count (x10^9/L) + aggregateReportDeathsShort=D aggregateReportLabConfirmationsShort=L aggregateReportLastWeek=Last Week @@ -169,11 +177,13 @@ AggregateReport.labConfirmations=Lab confirmations AggregateReport.deaths=Deaths AggregateReport.healthFacility=Facility AggregateReport.pointOfEntry=Point of Entry -areaActiveAreas=Active areas -areaArchivedAreas=Archived areas -areaAllAreas=All areas -Area.archived=Archived -Area.externalId=External ID + +areaActiveAreas = Active areas +areaArchivedAreas = Archived areas +areaAllAreas = All areas +Area.archived = Archived +Area.externalId = External ID + # Bulk actions bulkActions=Bulk Actions bulkCancelFollowUp=Cancel follow-up @@ -191,6 +201,7 @@ bulkFacility=Change facility bulkInvestigationStatus=Change investigation status bulkLostToFollowUp=Set to lost to follow-up bulkSurveillanceOfficer=Change surveillance officer + # Campaign campaignActiveCampaigns=Active campaigns campaignAllCampaigns=All campaigns @@ -210,6 +221,7 @@ campaignDashboardChartHeight=Height in % campaignDashboardOrder=Order campaignSearch=Search Campaign campaignDiagramGroupBy=Group by + Campaign=Campaign Campaign.name=Name Campaign.description=Description @@ -222,11 +234,13 @@ Campaign.area=Area Campaign.region=Region Campaign.district=District Campaign.community=Community -CampaignFormData.campaign=Campaign -CampaignFormData.campaignFormMeta=Form -CampaignFormData.formDate=Form date -CampaignFormData.area=Area + +CampaignFormData.campaign = Campaign +CampaignFormData.campaignFormMeta = Form +CampaignFormData.formDate = Form date +CampaignFormData.area = Area CampaignFormData.edit=Edit + # CaseData caseCasesList=Cases list caseInfrastructureDataChanged=Infrastructure data has changed @@ -276,8 +290,9 @@ convertEventParticipantToCase=Create case from event participant with positive t convertContactToCase=Create case from contact with positive test result? caseSearchSpecificCase=Search specific case caseSearchCase=Search case -caseSelect=Select case +caseSelect= Select case caseCreateNew=Create new case + CaseData=Case CaseData.additionalDetails=General comment CaseData.caseClassification=Case classification @@ -300,7 +315,6 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name -CaseData.disease=Disease CaseData.district=Responsible district CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -421,6 +435,7 @@ CaseData.notACaseReasonPhysicianInformation=Information provided by physician CaseData.notACaseReasonDifferentPathogen=Verification of different pathogen CaseData.notACaseReasonOther=Other CaseData.notACaseReasonDetails=Reason details + # CaseExport CaseExport.address=Address CaseExport.addressRegion=Address Region @@ -466,6 +481,7 @@ CaseExport.lastCooperativeVisitSymptomatic=Symptomatic at last cooperative visit CaseExport.lastCooperativeVisitSymptoms=Symptoms at last cooperative visit CaseExport.traveled=Traveled outside of district CaseExport.burialAttended=Visited a burial + # CaseHospitalization CaseHospitalization=Hospitalization CaseHospitalization.admissionDate=Date of visit or admission @@ -480,9 +496,12 @@ CaseHospitalization.previousHospitalizations=Previous hospitalizations CaseHospitalization.intensiveCareUnit=Stay in the intensive care unit CaseHospitalization.intensiveCareUnitStart=Start of the stay CaseHospitalization.intensiveCareUnitEnd=End of the stay + + # CaseImport caseImportErrorDescription=Error description caseImportMergeCase=Override existing case with changes from the imported case? + # CasePreviousHospitalization CasePreviousHospitalization=Previous hospitalization CasePreviousHospitalization.admissionAndDischargeDate=Date of admission & discharge @@ -494,8 +513,10 @@ CasePreviousHospitalization.healthFacility=Hospital CasePreviousHospitalization.healthFacilityDetails=Hospital name & description CasePreviousHospitalization.isolated=Isolation CasePreviousHospitalization.prevHospPeriod=Period of hospitalization + # ClinicalVisit clinicalVisitNewClinicalVisit=New clinical assessment + ClinicalVisit=Clinical assessment ClinicalVisit.bloodPressure=Blood pressure ClinicalVisit.heartRate=Heart rate @@ -503,22 +524,28 @@ ClinicalVisit.temperature=Temperature ClinicalVisit.visitDateTime=Date and time of visit ClinicalVisit.visitingPerson=Attending clinician ClinicalVisit.visitRemarks=Clinician remarks + ClinicalVisitExport.caseUuid=Case ID ClinicalVisitExport.caseName=Case name + columnAdditionalTests=Additional tests columnDiseaseShort=Disease columnNumberOfPendingTasks=Pending tasks + # Community Community.archived=Archived Community.externalID=External ID + communityActiveCommunities=Active communities communityArchivedCommunities=Archived communities communityAllCommunities=All communities + # Configuration Configuration.Facilities=Facilities Configuration.Outbreaks=Outbreaks Configuration.PointsOfEntry=Points of Entry Configuration.LineListing=Line Listing + # Contact contactCancelFollowUp=Cancel follow-up contactCaseContacts=Case contacts @@ -555,9 +582,10 @@ contactOnlyWithSharedEventWithSourceCase=Only contacts with source case linked t contactOnlyWithSourceCaseInGivenEvent=Only contacts whose source case is linked to this event contactFollowUpDay=Day contactQuarantineNotOrdered=No quarantine ordered -contactCreatePIAAccount=PIA -contactPersonPhoneNumber=Contact Person's Phone Number -contactSourceCase=Source case +contactCreatePIAAccount = PIA +contactPersonPhoneNumber = Contact Person's Phone Number +contactSourceCase = Source case + Contact=Contact Contact.additionalDetails=General comment Contact.caseClassification=Classification of the source case @@ -574,10 +602,10 @@ Contact.community=Responsible community Contact.contactClassification=Contact classification Contact.contactOfficer=Responsible contact officer Contact.contactOfficerUuid=Responsible contact officer -Contact.contactIdentificationSource=Contact identification source -Contact.contactIdentificationSourceDetails=Contact identification source details -Contact.tracingApp=Tracing app -Contact.tracingAppDetails=Tracing app details, e.g. name +Contact.contactIdentificationSource = Contact identification source +Contact.contactIdentificationSourceDetails = Contact identification source details +Contact.tracingApp = Tracing app +Contact.tracingAppDetails = Tracing app details, e.g. name Contact.contactProximity=Type of contact - if multiple pick the closest contact proximity Contact.contactStatus=Contact status Contact.description=Description of how contact took place @@ -648,6 +676,7 @@ Contact.prohibitionToWork=Prohibition to work Contact.prohibitionToWorkFrom=Prohibition to work from Contact.prohibitionToWorkUntil=Prohibition to work until Contact.reportingDistrict=Reporting district + # ContactExport ContactExport.address=Address ContactExport.addressDistrict=Address District @@ -666,6 +695,7 @@ ContactExport.sourceCaseUuid=Source case ID ContactExport.traveled=Traveled outside of district ContactExport.travelHistory=Travel history ContactExport.quarantineInformation=Quarantine information + # Dashboard dashboardAlive=Alive dashboardApplyCustomFilter=Apply custom filter @@ -789,12 +819,14 @@ dashboardAggregatedNumber=Count dashboardProportion=Proportion (%) dashboardViewAsColumnChart=View as Column Chart dashboardViewAsBarChart=View as Bar Chart + defaultRegion=Default Region defaultDistrict=Default District defaultCommunity=Default Community defaultFacility=Default Facility defaultLaboratory=Default Laboratory defaultPointOfEntry=Default Point Of Entry + devModeCaseCount=Number of generated cases devModeCaseDisease=Disease of the cases devModeCaseDistrict=District of the cases @@ -825,6 +857,7 @@ devModeEventStartDate=Earliest event start date devModeGenerateCases=Generate Cases devModeGenerateContacts=Generate Contacts devModeGenerateEvents=Generate Events + DiseaseBurden.caseCount=New cases DiseaseBurden.caseDeathCount=Fatalities DiseaseBurden.casesDifference=Dynamic @@ -832,16 +865,20 @@ DiseaseBurden.caseFatalityRate=CFR DiseaseBurden.eventCount=Number of events DiseaseBurden.outbreakDistrictCount=Outbreak districts DiseaseBurden.previousCaseCount=Previous cases + # District districtActiveDistricts=Active districts districtArchivedDistricts=Archived districts districtAllDistricts=All districts + District.archived=Archived District.epidCode=Epid code District.growthRate=Growth rate District.population=Population District.externalID=External ID + epiDataNoSourceContacts=No source contacts have been created for this case + EpiData=Epidemiological data EpiData.areaInfectedAnimals=Residing, working or travelling to an area where infected animals have been confirmed EpiData.exposureDetailsKnown=Exposure details known @@ -849,9 +886,11 @@ EpiData.exposures=Exposures EpiData.highTransmissionRiskArea=Residing or working in an area with high risk of transmission of the disease, e.g. closed residential and camp-like settings EpiData.largeOutbreaksArea=Residing or travelling to countries/territories/areas experiencing larger outbreaks of local transmission EpiData.contactWithSourceCaseKnown=Contacts with source case known + # Documents documentUploadDocument=New document documentNoDocuments=There are no documents for this %s + # DocumentTemplate DocumentTemplate=Document Template DocumentTemplate.buttonUploadTemplate=Upload Template @@ -868,6 +907,7 @@ DocumentTemplate.exampleTemplateCases=Example Template Cases DocumentTemplate.exampleTemplateContacts=Example Template Contacts DocumentTemplate.exampleTemplateEventHandout=Example Template Event Handout DocumentTemplate.exampleTemplateEventParticipants=Example Template Event Participants + # Event eventActiveEvents=Active events eventArchivedEvents=Archived events @@ -895,6 +935,7 @@ eventUnlinkEvent=Unlink event eventOpenSuperordinateEvent=Open event eventEditEvent=Edit event eventLinkToEventsWithinTheSameFacility=See events within the same facility + Event=Event Event.caseCount=Cases Event.contactCount=Contacts @@ -951,6 +992,7 @@ Event.typeOfPlaceText=Specify other event place Event.uuid=Event ID Event.transregionalOutbreak=Transregional outbreak Event.diseaseTransmissionMode=Primary mode of transmission + # Event action EventAction.eventUuid=Event id EventAction.eventTitle=Event title @@ -967,14 +1009,18 @@ EventAction.actionChangeDate=Action change date EventAction.actionStatus=Action status EventAction.actionPriority=Action priority EventAction.actionLastModifiedBy=Action last modified by + # Event action export EventActionExport.eventDate=Date of event + #Event export + # EventParticipant eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant + EventParticipant=Event participant EventParticipant.contactCount=Contact count EventParticipant.event=Event @@ -988,6 +1034,7 @@ EventParticipant.person=Person EventParticipant.uuid=Event participant ID EventParticipant.region=Responsible region EventParticipant.district=Responsible district + #EventParticipant export EventParticipantExport.eventParticipantU=Event disease EventParticipantExport.eventDisease=Event disease @@ -1012,6 +1059,7 @@ EventParticipantExport.sampleInformation=Sample information EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID + # Expo export=Export exportBasic=Basic Export @@ -1026,13 +1074,16 @@ exportCaseManagement=Case Management Export exportCaseCustom=Custom Case Export exportNewExportConfiguration=New Export Configuration exportEditExportConfiguration=Edit Export Configuration + ExportConfiguration.NAME=Configuration name ExportConfiguration.myExports=My exports ExportConfiguration.sharedExports=Shared exports ExportConfiguration.sharedToPublic=Shared to public + exposureFlightNumber=Flight number exposureTimePeriod=Time period exposureSourceCaseName=Name of source case + Exposure.startDate=Start of exposure Exposure.endDate=End of exposure Exposure.exposureType=Type of activity @@ -1083,13 +1134,16 @@ Exposure.prophylaxisDate=Date of prophylaxis Exposure.riskArea=Risk area as defined by public health institution Exposure.exposureDate=Exposure date Exposure.exposureRole=Role + # Facility facilityActiveFacilities=Active facilities facilityArchivedFacilities=Archived facilities facilityAllFacilities=All facilities + Facility.CONFIGURED_FACILITY=Configured facility Facility.NO_FACILITY=Home or other place Facility.OTHER_FACILITY=Other facility + Facility.archived=Archived Facility.city=City Facility.community=Community @@ -1102,18 +1156,22 @@ Facility.publicOwnership=Public ownership Facility.region=Region Facility.type=Facility type Facility.typeGroup=Facility category + FeatureConfiguration.districtName=District FeatureConfiguration.enabled=Line listing enabled? FeatureConfiguration.endDate=End date + # Formats formatNumberOfVisitsFormat=%d (%d missed) formatNumberOfVisitsLongFormat=%d visits (%d missed) formatSimpleNumberFormat=%d + # FollowUp FollowUp.uuid=Follow-up ID FollowUp.person=Follow-up person FollowUp.reportDate=Date of report FollowUp.followUpUntil=Follow-up until + # HealthConditions HealthConditions=Health conditions HealthConditions.tuberculosis=Tuberculosis @@ -1139,6 +1197,7 @@ HealthConditions.formerSmoker=Former smoker\t\t HealthConditions.asthma=Asthma HealthConditions.sickleCellDisease=Sickle cell disease\t HealthConditions.immunodeficiencyIncludingHiv=Immunodeficiency including HIV + # Import importDetailed=Detailed Import importDownloadCaseImportTemplate=Download Case Import Template @@ -1155,6 +1214,7 @@ importLineListing=Line Listing Import importProcessed=%d/%d Processed importSkips=%d Skipped importCancelImport=Cancel import + #Lab Message LabMessage=Lab Message LabMessage.labMessageDetails=Lab message details @@ -1176,10 +1236,12 @@ LabMessage.sampleMaterial=Type of sample LabMessage.sampleReceivedDate=Sample received LabMessage.specimenCondition=Specimen condition LabMessage.testedDisease=Tested disease -labMessageFetch=Fetch lab messages + +labMessageFetch= Fetch lab messages labMessageProcess=Process labMessageProcessed=Processed labMessageUnprocessed=Unprocessed + #Line listing lineListingAddLine=Add line lineListingInfrastructureData=Take over infrastructure data from last line @@ -1192,6 +1254,7 @@ lineListingEnableAll=Enable all lineListingDisableAllShort=Disable all lineListingEndDate=End date lineListingSetEndDateForAll=Set end date for all + # Location Location=Location Location.additionalInformation=Additional information @@ -1209,27 +1272,31 @@ Location.latLonAccuracy=GPS accuracy in m Location.longitude=GPS longitude Location.postalCode=Postal code Location.street=Street + # Login Login.doLogIn=Log in Login.login=Login Login.password=password Login.username=username + #LoginSidebar LoginSidebar.diseaseDetection=Disease Detection LoginSidebar.diseasePrevention=Disease Prevention LoginSidebar.outbreakResponse=Outbreak Response LoginSidebar.poweredBy=Powered By + # Messaging messagesSendSMS=Send SMS messagesSentBy=Sent by messagesNoSmsSentForCase=No SMS sent to case person messagesNoPhoneNumberForCasePerson=Case person has no phone number -messagesSms=SMS -messagesEmail=Email -messagesSendingSms=Send new SMS -messagesNumberOfMissingPhoneNumbers=Number of selected cases without phone number\: %s -messagesCharacters=Characters\: %d / 160 -messagesNumberOfMessages=Nr. of messages\: %d +messagesSms = SMS +messagesEmail = Email +messagesSendingSms = Send new SMS +messagesNumberOfMissingPhoneNumbers = Number of selected cases without phone number\: %s +messagesCharacters = Characters\: %d / 160 +messagesNumberOfMessages = Nr. of messages\: %d + # Main Menu mainMenuAbout=About mainMenuCampaigns=Campaigns @@ -1245,6 +1312,7 @@ mainMenuStatistics=Statistics mainMenuTasks=Tasks mainMenuUsers=Users mainMenuAggregateReports=mSERS + MaternalHistory.childrenNumber=Total number of children MaternalHistory.ageAtBirth=Mother's age at birth of infant patient MaternalHistory.conjunctivitis=Conjunctivitis @@ -1271,16 +1339,19 @@ MaternalHistory.otherComplications=Other complications MaternalHistory.otherComplicationsOnset=Date of onset MaternalHistory.otherComplicationsMonth=Month of pregnancy MaternalHistory.otherComplicationsDetails=Complication details + # Outbreak outbreakAffectedDistricts=Affected districts outbreakNoOutbreak=No outbreak outbreakNormal=Normal outbreakOutbreak=Outbreak + # PathogenTest pathogenTestCreateNew=Create new pathogen test pathogenTestNewResult=New result pathogenTestNewTest=New test result pathogenTestSelect=Select pathogen test + PathogenTest=Pathogen test PathogenTests=Pathogen tests PathogenTest.fourFoldIncreaseAntibodyTiter=4 fold increase of antibody titer @@ -1297,6 +1368,7 @@ PathogenTest.testedDiseaseDetails=Tested disease name PathogenTest.typingId=Typing ID PathogenTest.serotype=Serotype PathogenTest.cqValue=CQ/CT Value + # Person personPersonsList=Person list personCreateNew=Create a new person @@ -1309,6 +1381,7 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person + Person=Person Person.address=Home address Person.addresses=Addresses @@ -1380,9 +1453,11 @@ Person.otherSalutation=Other salutation Person.birthName=Birth name Person.birthCountry=Country of birth Person.citizenship=Citizenship + pointOfEntryActivePointsOfEntry=Active points of entry pointOfEntryArchivedPointsOfEntry=Archived points of entry pointOfEntryAllPointsOfEntry=All points of entry + PointOfEntry.OTHER_AIRPORT=Other airport PointOfEntry.OTHER_SEAPORT=Other seaport PointOfEntry.OTHER_GROUND_CROSSING=Other ground crossing @@ -1392,8 +1467,10 @@ PointOfEntry.active=Active? PointOfEntry.latitude=Latitude PointOfEntry.longitude=Longitude PointOfEntry.externalID=External ID + populationDataMaleTotal=Male total populationDataFemaleTotal=Female total + PortHealthInfo=Port health information PortHealthInfo.airlineName=Airline name PortHealthInfo.flightNumber=Flight number @@ -1417,8 +1494,10 @@ PortHealthInfo.conveyanceTypeDetails=Specify the conveyance type PortHealthInfo.departureLocation=Start location of travel PortHealthInfo.finalDestination=Final destination PortHealthInfo.details=Point of entry details + # Prescription prescriptionNewPrescription=New prescription + Prescription.additionalNotes=Additional notes Prescription.dose=Dose Prescription.drugIntakeDetails=Drug name @@ -1434,27 +1513,33 @@ Prescription.prescriptionType=Prescription type Prescription.route=Route Prescription.routeDetails=Route specification Prescription.typeOfDrug=Type of drug + PrescriptionExport.caseUuid=Case ID PrescriptionExport.caseName=Case name + # Country countryActiveCountries=Active countries countryArchivedCountries=Archived countries countryAllCountries=All countries + Country.archived=Archived Country.externalId=External ID Country.defaultName=Default name Country.displayName=Name Country.isoCode=ISO code Country.unoCode=UNO code + # Region regionActiveRegions=Active regions regionArchivedRegions=Archived regions regionAllRegions=All regions + Region.archived=Archived Region.epidCode=Epid code Region.growthRate=Growth rate Region.population=Population Region.externalID=External ID + # Sample sampleCreateNew=Create new sample sampleIncludeTestOnCreation=Create test result for this sample now @@ -1481,6 +1566,7 @@ sampleActiveSamples=Active samples sampleArchivedSamples=Archived samples sampleAllSamples=All samples sampleAssociationType=Sample type + Sample=Sample Sample.additionalTestingRequested=Request additional tests to be performed? Sample.additionalTestingStatus=Additional testing status @@ -1530,22 +1616,23 @@ Sample.testType=Type of test Sample.typeOfTest=Type of test Sample.uuid=Sample ID Sample.samplePurpose=Purpose of the Sample + SampleExport.additionalTestingRequested=Have additional tests been requested? SampleExport.personAddressCaption=Address of case/contact/event participant person SampleExport.personAge=Age of case/contact/event participant person SampleExport.caseDistrict=District of case SampleExport.caseCommunity=Community of case SampleExport.caseFacility=Facility of case -SampleExport.contactRegion=Region of contact -SampleExport.contactDistrict=District of contact -SampleExport.contactCommunity=Community of contact +SampleExport.contactRegion = Region of contact +SampleExport.contactDistrict = District of contact +SampleExport.contactCommunity = Community of contact SampleExport.caseOutcome=Outcome of case SampleExport.caseRegion=Region of case SampleExport.caseReportDate=Case report date SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID -SampleExport.contactUuid=Contact UUID -SampleExport.contactReportDate=Contact report date +SampleExport.contactUuid = Contact UUID +SampleExport.contactReportDate = Contact report date SampleExport.id=Sample SN SampleExport.sampleReportDate=Sample report date SampleExport.noTestPossibleReason=No test possible reason @@ -1597,6 +1684,7 @@ SampleExport.testDateTime=Date and time of latest additional test SampleExport.totalBilirubin=Total bilirubin of latest additional test SampleExport.urea=Urea of latest additional test SampleExport.wbcCount=WBC count of latest additional test + # Statistics statisticsAddFilter=Add filter statisticsAttribute=Attribute @@ -1619,11 +1707,13 @@ statisticsStatistics=Statistics statisticsVisualizationType=Type statisticsIncidenceDivisor=Incidence divisor statisticsDataDisplayed=Data displayed + # Symptoms symptomsLesionsLocations=Localization of the lesions symptomsMaxTemperature=Maximum body temperature in ° C symptomsSetClearedToNo=Set cleared to No symptomsSetClearedToUnknown=Set cleared to Unknown + Symptoms=Symptoms Symptoms.abdominalPain=Abdominal pain Symptoms.alteredConsciousness=Altered level of consciousness @@ -1811,6 +1901,7 @@ Symptoms.palpitations=Palpitations Symptoms.dizzinessStandingUp=Dizziness (when standing up from a sitting or lying position) Symptoms.highOrLowBloodPressure=Blood pressure too high or too low (measured) Symptoms.urinaryRetention=Urinary retention + # Task taskMyTasks=My tasks taskNewTask=New task @@ -1819,6 +1910,7 @@ taskOfficerTasks=Officer tasks taskActiveTasks=Active tasks taskArchivedTasks=Archived tasks taskAllTasks=All tasks + Task=Task Task.assigneeReply=Comments on execution Task.assigneeUser=Assigned to @@ -1836,7 +1928,9 @@ Task.suggestedStart=Suggested start Task.taskContext=Task context Task.taskStatus=Task status Task.taskType=Task type + # TestReport + TestReport.testDateTime=Date and time of result TestReport.testLabCity=Lab city TestReport.testLabExternalId=Lab external ID @@ -1844,10 +1938,12 @@ TestReport.testLabName=Lab name TestReport.testLabPostalCode=Lab postal code TestReport.testResult=Test result TestReport.testType=Type of test + # Treatment treatmentCreateTreatment=Create treatment treatmentNewTreatment=New treatment treatmentOpenPrescription=Open prescription + Treatment.additionalNotes=Additional notes Treatment.dose=Dose Treatment.drugIntakeDetails=Drug name @@ -1861,8 +1957,10 @@ Treatment.treatmentDetails=Treatment details Treatment.treatmentType=Treatment type Treatment.typeOfDrug=Type of drug Treatment.treatmentRoute=Treatment route + TreatmentExport.caseUuid=Case ID TreatmentExport.caseName=Case name + # User userNewUser=New user userResetPassword=Create new password @@ -1872,6 +1970,7 @@ syncUsers=Sync Users syncErrors=%d Error(s) syncSuccessful=%d Synced syncProcessed=%d/%d Processed + User=User User.active=Active? User.associatedOfficer=Associated officer @@ -1886,16 +1985,20 @@ User.userName=User name User.userRoles=User roles User.address=Address User.uuid=UUID + # Views View.actions=Action Directory + View.aggregatereports=Aggregate Reporting (mSERS) View.aggregatereports.sub= + View.campaign.campaigns=Campaign Directory View.campaign.campaigns.short=Campaigns View.campaign.campaigndata=Campaign Data View.campaign.campaigndata.short=Campaign Data View.campaign.campaigndata.dataform=Campaign Data Form View.campaign.campaigndata.dataform.short=Data Form + View.cases=Case Directory View.cases.merge=Merge Duplicate Cases View.cases.archive=Case Archive @@ -1911,8 +2014,10 @@ View.cases.clinicalcourse=Clinical Course View.cases.maternalhistory=Maternal History View.cases.porthealthinfo=Port Health Information View.cases.visits=Case Visits + View.persons=Person Directory View.persons.data=Person Information + View.configuration.communities=Communities Configuration View.configuration.communities.short=Communities View.configuration.districts=Districts Configuration @@ -1943,6 +2048,7 @@ View.configuration.populationdata=Population Data View.configuration.populationdata.short=Population View.configuration.linelisting=Line Listing Configuration View.configuration.linelisting.short=Line Listing + View.contacts=Contact Directory View.contacts.archive=Contact Archive View.contacts.epidata=Contact Epidemiological Data @@ -1950,9 +2056,11 @@ View.contacts.data=Contact Information View.contacts.person=Contact Person View.contacts.sub= View.contacts.visits=Contact Visits + View.dashboard.contacts=Contacts Dashboard View.dashboard.surveillance=Surveillance Dashboard View.dashboard.campaigns=Campaigns Dashboard + View.events=Event Directory View.events.archive=Event Archive View.events.data=Event Information @@ -1960,22 +2068,30 @@ View.events.eventactions=Event Actions View.events.eventparticipants=Event Participants View.events.sub= View.events.eventparticipants.data=Event Participant Information + View.samples.labMessages=Lab Message Directory + View.reports=Weekly Reports View.reports.sub= + View.samples=Sample Directory View.samples.archive=Sample Archive View.samples.data=Sample Information View.samples.sub= + View.statistics=Statistics View.statistics.database-export=Database export + View.tasks=Task Management View.tasks.archive=Task Archive View.tasks.sub= + View.users=User Management View.users.sub= + # Visit visitNewVisit=New visit + Visit=Visit Visit.person=Visited person Visit.symptoms=Symptoms @@ -1987,19 +2103,24 @@ Visit.visitUser=Visiting officer Visit.disease=Disease Visit.reportLat=Report latitude Visit.reportLon=Report longitude + # WeeklyReport weeklyReportNoReport=Missing report weeklyReportOfficerInformants=Informants weeklyReportsInDistrict=Weekly Reports in %s weeklyReportRegionOfficers=Officers weeklyReportRegionInformants=Informants + WeeklyReport.epiWeek=Epi Week WeeklyReport.year=Year + # WeeklyReportEntry WeeklyReportEntry.numberOfCases=Cases reported + # WeeklyReportInformantSummary WeeklyReportInformantSummary.informantReportDate=Informant report submission WeeklyReportInformantSummary.totalCaseCount=Cases reported by informant + # WeeklyReportOfficerSummary WeeklyReportOfficerSummary.informants=Number of informants WeeklyReportOfficerSummary.informantReports=Number of informant reports @@ -2008,6 +2129,7 @@ WeeklyReportOfficerSummary.informantZeroReports=Number of informant zero reports WeeklyReportOfficerSummary.officer=Officer WeeklyReportOfficerSummary.officerReportDate=Officer report submission WeeklyReportOfficerSummary.totalCaseCount=Cases reported by officer + # WeeklyReportRegionSummary WeeklyReportRegionSummary.informants=Number of informants WeeklyReportRegionSummary.informantReports=Number of informant reports @@ -2017,6 +2139,7 @@ WeeklyReportRegionSummary.officers=Number of officers WeeklyReportRegionSummary.officerReports=Number of officers reports WeeklyReportRegionSummary.officerReportPercentage=Percentage WeeklyReportRegionSummary.officerZeroReports=Number of officer zero reports + # SORMAS to SORMAS SormasToSormasOptions.organization=Orgainzation SormasToSormasOptions.withAssociatedContacts=Share associated contacts @@ -2037,17 +2160,23 @@ sormasToSormasSharedWith=Shared with sormasToSormasSharedBy=By sormasToSormasSharedDate=On sormasToSormasSentFrom=Sent from + BAGExport=BAG Export + # Survnet Gateway SurvnetGateway.title=SurvNet SurvnetGateway.send=send to own SurvNet instance SurvnetGateway.unableToSend=Unable to send SurvnetGateway.confirmSend=Confirm sending SurvnetGateway.sendShort=Send to SurvNet + patientDiaryRegistrationError=Could not register person in the patient diary. patientDiaryPersonNotExportable=Cannot export the person to the patient diary. The person needs a valid birthdate and either a valid phone number or email address. + showPlacesOnMap=Show + changeUserEmail=Change user email + VaccinationInfo.vaccination=Vaccination status for this disease VaccinationInfo.firstVaccinationDate=Date of first vaccination VaccinationInfo.lastVaccinationDate=Date of last vaccination diff --git a/sormas-api/src/main/resources/captions_ku-TR.properties b/sormas-api/src/main/resources/captions_ku-TR.properties index 8f7bd72f939..af730baa12a 100644 --- a/sormas-api/src/main/resources/captions_ku-TR.properties +++ b/sormas-api/src/main/resources/captions_ku-TR.properties @@ -14,6 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . ############################################################################### + # General Captions all=All area=Area @@ -60,6 +61,7 @@ pointOfEntry=Point of entry remove=Remove reportingUser=Reporting user notTestedYet=Not tested yet + # About about=About aboutDocuments=Documents @@ -71,12 +73,14 @@ aboutDataDictionary=Data Dictionary (XLSX) aboutSormasWebsite=Official SORMAS Website aboutTechnicalManual=Technical Manual (PDF) aboutWhatsNew=What's New? + # Action actionNewAction=New action actionNoActions=There are no actions for this %s actionCreatingLabel=Created at %s by %s actionLastModifiedByLabel=Updated at %s by %s actionStatusChangeDate=updated at %s + Action=Action Action.title=Title Action.description=Description @@ -89,12 +93,13 @@ Action.actionContext=Action context Action.actionStatus=Action status Action.lastModifiedBy=Last modified by Action.actionMeasure=Measure + # Actions actionApplyDateFilter=Apply date filter actionArchive=Archive actionAssignNewEpidNumber=Assign new epid number actionBack=Back -actionSend=Send +actionSend = Send actionCancel=Cancel actionClear=Clear actionClearAll=Clear all @@ -141,7 +146,9 @@ actionRemindMeLater=Remind me later actionGroupEvent=Group actionUnclearLabMessage=Mark as unclear actionManualForwardLabMessage=Mark as forwarded + activityAsCaseFlightNumber=Flight number + ActivityAsCase.startDate=Start of activity ActivityAsCase.endDate=End of activity ActivityAsCase.activityAsCaseDate=Activity date @@ -161,8 +168,10 @@ ActivityAsCase.gatheringDetails=Type of gathering details ActivityAsCase.habitationType=Type of habitation ActivityAsCase.habitationDetails=Type of habitation details ActivityAsCase.role=Role + # AdditionalTest additionalTestNewTest=New test result + AdditionalTest=Additional test AdditionalTest.altSgpt=ALT/SGPT (U/L) AdditionalTest.arterialVenousBloodGas=Arterial/venous blood gas @@ -186,6 +195,7 @@ AdditionalTest.testDateTime=Date and time of result AdditionalTest.totalBilirubin=Total bilirubin (umol/L) AdditionalTest.urea=Urea (mmol/L) AdditionalTest.wbcCount=WBC count (x10^9/L) + aggregateReportDeathsShort=D aggregateReportLabConfirmationsShort=L aggregateReportLastWeek=Last Week @@ -202,11 +212,13 @@ AggregateReport.labConfirmations=Lab confirmations AggregateReport.deaths=Deaths AggregateReport.healthFacility=Facility AggregateReport.pointOfEntry=Point of Entry -areaActiveAreas=Active areas -areaArchivedAreas=Archived areas -areaAllAreas=All areas -Area.archived=Archived -Area.externalId=External ID + +areaActiveAreas = Active areas +areaArchivedAreas = Archived areas +areaAllAreas = All areas +Area.archived = Archived +Area.externalId = External ID + # Bulk actions bulkActions=Bulk Actions bulkCancelFollowUp=Cancel follow-up @@ -224,6 +236,7 @@ bulkFacility=Change facility bulkInvestigationStatus=Change investigation status bulkLostToFollowUp=Set to lost to follow-up bulkSurveillanceOfficer=Change surveillance officer + # Campaign campaignActiveCampaigns=Active campaigns campaignAllCampaigns=All campaigns @@ -243,6 +256,7 @@ campaignDashboardChartHeight=Height in % campaignDashboardOrder=Order campaignSearch=Search Campaign campaignDiagramGroupBy=Group by + Campaign=Campaign Campaign.name=Name Campaign.description=Description @@ -256,11 +270,13 @@ Campaign.region=Region Campaign.district=District Campaign.community=Community Campaign.grouping=Grouping -CampaignFormData.campaign=Campaign -CampaignFormData.campaignFormMeta=Form -CampaignFormData.formDate=Form date -CampaignFormData.area=Area + +CampaignFormData.campaign = Campaign +CampaignFormData.campaignFormMeta = Form +CampaignFormData.formDate = Form date +CampaignFormData.area = Area CampaignFormData.edit=Edit + # CaseData caseCasesList=Cases list caseInfrastructureDataChanged=Infrastructure data has changed @@ -285,6 +301,7 @@ caseFilterCasesWithReinfection=Only cases with reinfection caseFilterOnlyCasesNotSharedWithExternalSurvTool=Only cases not yet shared with reporting tool caseFilterOnlyCasesSharedWithExternalSurvToo=Only cases already shared with reporting tool caseFilterOnlyCasesChangedSinceLastSharedWithExternalSurvTool=Only cases changed since last shared with reporting tool + caseFacilityDetailsShort=Facility name caseLineListing=Line listing caseNewCase=New case @@ -314,8 +331,9 @@ convertEventParticipantToCase=Create case from event participant with positive t convertContactToCase=Create case from contact with positive test result? caseSearchSpecificCase=Search specific case caseSearchCase=Search case -caseSelect=Select case +caseSelect= Select case caseCreateNew=Create new case + CaseData=Case CaseData.additionalDetails=General comment CaseData.caseClassification=Case classification @@ -340,7 +358,6 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name -CaseData.disease=Disease CaseData.district=Responsible district CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -464,6 +481,7 @@ CaseData.expectedFollowUpUntil=Expected follow-up until CaseData.surveillanceToolLastShareDate=Last shared with reporting tool CaseData.surveillanceToolShareCount=Reporting tool share count CaseData.surveillanceToolStatus=Reporting tool status + # CaseExport CaseExport.address=Address CaseExport.addressRegion=Address Region @@ -509,6 +527,7 @@ CaseExport.lastCooperativeVisitSymptomatic=Symptomatic at last cooperative visit CaseExport.lastCooperativeVisitSymptoms=Symptoms at last cooperative visit CaseExport.traveled=Traveled outside of district CaseExport.burialAttended=Visited a burial + # CaseHospitalization CaseHospitalization=Hospitalization CaseHospitalization.admissionDate=Date of visit or admission @@ -525,9 +544,12 @@ CaseHospitalization.intensiveCareUnitStart=Start of the stay CaseHospitalization.intensiveCareUnitEnd=End of the stay CaseHospitalization.hospitalizationReason=Reason for hospitalization CaseHospitalization.otherHospitalizationReason=Specify reason + + # CaseImport caseImportErrorDescription=Error description caseImportMergeCase=Override existing case with changes from the imported case? + # CasePreviousHospitalization CasePreviousHospitalization=Previous hospitalization CasePreviousHospitalization.admissionAndDischargeDate=Date of admission & discharge @@ -544,8 +566,10 @@ CasePreviousHospitalization.otherHospitalizationReason=Specify reason CasePreviousHospitalization.intensiveCareUnit=Stay in the intensive care unit CasePreviousHospitalization.intensiveCareUnitStart=Start of the stay CasePreviousHospitalization.intensiveCareUnitEnd=End of the stay + # ClinicalVisit clinicalVisitNewClinicalVisit=New clinical assessment + ClinicalVisit=Clinical assessment ClinicalVisit.bloodPressure=Blood pressure ClinicalVisit.heartRate=Heart rate @@ -553,22 +577,28 @@ ClinicalVisit.temperature=Temperature ClinicalVisit.visitDateTime=Date and time of visit ClinicalVisit.visitingPerson=Attending clinician ClinicalVisit.visitRemarks=Clinician remarks + ClinicalVisitExport.caseUuid=Case ID ClinicalVisitExport.caseName=Case name + columnAdditionalTests=Additional tests columnDiseaseShort=Disease columnNumberOfPendingTasks=Pending tasks + # Community Community.archived=Archived Community.externalID=External ID + communityActiveCommunities=Active communities communityArchivedCommunities=Archived communities communityAllCommunities=All communities + # Configuration Configuration.Facilities=Facilities Configuration.Outbreaks=Outbreaks Configuration.PointsOfEntry=Points of Entry Configuration.LineListing=Line Listing + # Contact contactCancelFollowUp=Cancel follow-up contactCaseContacts=Case contacts @@ -605,8 +635,9 @@ contactOnlyWithSharedEventWithSourceCase=Only contacts with source case linked t contactOnlyWithSourceCaseInGivenEvent=Only contacts whose source case is linked to this event contactFollowUpDay=Day contactQuarantineNotOrdered=No quarantine ordered -contactPersonPhoneNumber=Contact Person's Phone Number -contactSourceCase=Source case +contactPersonPhoneNumber = Contact Person's Phone Number +contactSourceCase = Source case + Contact=Contact Contact.additionalDetails=General comment Contact.caseClassification=Classification of the source case @@ -622,10 +653,10 @@ Contact.community=Responsible community Contact.contactClassification=Contact classification Contact.contactOfficer=Responsible contact officer Contact.contactOfficerUuid=Responsible contact officer -Contact.contactIdentificationSource=Contact identification source -Contact.contactIdentificationSourceDetails=Contact identification source details -Contact.tracingApp=Tracing app -Contact.tracingAppDetails=Tracing app details, e.g. name +Contact.contactIdentificationSource = Contact identification source +Contact.contactIdentificationSourceDetails = Contact identification source details +Contact.tracingApp = Tracing app +Contact.tracingAppDetails = Tracing app details, e.g. name Contact.contactProximity=Type of contact - if multiple pick the closest contact proximity Contact.contactStatus=Contact status Contact.description=Description of how contact took place @@ -699,6 +730,7 @@ Contact.reportingDistrict=Reporting district Contact.followUpStatusChangeDate=Date of follow-up status change Contact.followUpStatusChangeUser=Responsible user Contact.expectedFollowUpUntil=Expected follow-up until + # ContactExport ContactExport.address=Address ContactExport.addressDistrict=Address District @@ -717,6 +749,7 @@ ContactExport.sourceCaseUuid=Source case ID ContactExport.traveled=Traveled outside of district ContactExport.travelHistory=Travel history ContactExport.quarantineInformation=Quarantine information + # Dashboard dashboardAlive=Alive dashboardApplyCustomFilter=Apply custom filter @@ -840,12 +873,14 @@ dashboardAggregatedNumber=Count dashboardProportion=Proportion (%) dashboardViewAsColumnChart=View as Column Chart dashboardViewAsBarChart=View as Bar Chart + defaultRegion=Default Region defaultDistrict=Default District defaultCommunity=Default Community defaultFacility=Default Facility defaultLaboratory=Default Laboratory defaultPointOfEntry=Default Point Of Entry + devModeCaseCount=Number of generated cases devModeCaseDisease=Disease of the cases devModeCaseDistrict=District of the cases @@ -895,6 +930,7 @@ devModeGeneratorSeed=Generator Seed devModeLoadDefaultConfig=Load default config devModeLoadPerformanceTestConfig=Load performance testing config devModeUseSeed=Use Seed + DiseaseBurden.caseCount=New cases DiseaseBurden.caseDeathCount=Fatalities DiseaseBurden.casesDifference=Dynamic @@ -902,29 +938,35 @@ DiseaseBurden.caseFatalityRate=CFR DiseaseBurden.eventCount=Number of events DiseaseBurden.outbreakDistrictCount=Outbreak districts DiseaseBurden.previousCaseCount=Previous cases + # District districtActiveDistricts=Active districts districtArchivedDistricts=Archived districts districtAllDistricts=All districts + District.archived=Archived District.epidCode=Epid code District.growthRate=Growth rate District.population=Population District.externalID=External ID + epiDataNoSourceContacts=No source contacts have been created for this case + EpiData=Epidemiological data EpiData.areaInfectedAnimals=Residing, working or travelling to an area where infected animals have been confirmed EpiData.exposureDetailsKnown=Exposure details known EpiData.exposures=Exposures -EpiData.activityAsCaseDetailsKnown=Activity details known -EpiData.activitiesAsCase=Activities as case +EpiData.activityAsCaseDetailsKnown = Activity details known +EpiData.activitiesAsCase = Activities as case EpiData.highTransmissionRiskArea=Residing or working in an area with high risk of transmission of the disease, e.g. closed residential and camp-like settings EpiData.largeOutbreaksArea=Residing or travelling to countries/territories/areas experiencing larger outbreaks of local transmission EpiData.contactWithSourceCaseKnown=Contacts with source case known + # Documents documentUploadDocument=New document documentNoDocuments=There are no documents for this %s bulkActionCreatDocuments=Create quarantine order documents + # DocumentTemplate DocumentTemplate=Document Template DocumentTemplate.buttonUploadTemplate=Upload Template @@ -941,6 +983,7 @@ DocumentTemplate.exampleTemplateCases=Example Template Cases DocumentTemplate.exampleTemplateContacts=Example Template Contacts DocumentTemplate.exampleTemplateEventHandout=Example Template Event Handout DocumentTemplate.exampleTemplateEventParticipants=Example Template Event Participants + # Event eventActiveEvents=Active events eventArchivedEvents=Archived events @@ -982,6 +1025,7 @@ eventLinkToEventsWithinTheSameFacility=See events within the same facility eventNoDisease=No disease eventGroups=Event groups eventGroupsMultiple=This event is related to %s event groups + Event=Event Event.caseCount=Cases Event.contactCount=Contacts @@ -1047,6 +1091,7 @@ Event.internalId=Internal ID Event.eventGroups=Groups Event.latestEventGroup=Latest Event Group Event.eventGroupCount=Event Group Count + # Event action EventAction.eventUuid=Event id EventAction.eventTitle=Event title @@ -1063,14 +1108,18 @@ EventAction.actionChangeDate=Action change date EventAction.actionStatus=Action status EventAction.actionPriority=Action priority EventAction.actionLastModifiedBy=Action last modified by + # Event action export EventActionExport.eventDate=Date of event + #Event export + # EventParticipant eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant + EventParticipant=Event participant EventParticipant.contactCount=Contact count EventParticipant.event=Event @@ -1084,6 +1133,7 @@ EventParticipant.person=Person EventParticipant.uuid=Event participant ID EventParticipant.region=Responsible region EventParticipant.district=Responsible district + #EventParticipant export EventParticipantExport.eventParticipantU=Event disease EventParticipantExport.eventDisease=Event disease @@ -1108,11 +1158,13 @@ EventParticipantExport.sampleInformation=Sample information EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID + # Event Group EventGroup=Event group EventGroup.uuid=Group id EventGroup.name=Group name EventGroup.eventCount=Event count + # Expo export=Export exportBasic=Basic Export @@ -1127,14 +1179,17 @@ exportCaseManagement=Case Management Export exportCaseCustom=Custom Case Export exportNewExportConfiguration=New Export Configuration exportEditExportConfiguration=Edit Export Configuration + ExportConfiguration.NAME=Configuration name ExportConfiguration.myExports=My exports ExportConfiguration.sharedExports=Shared exports ExportConfiguration.sharedToPublic=Shared to public + exposureFlightNumber=Flight number exposureTimePeriod=Time period exposureSourceCaseName=Name of source case -Exposure.probableInfectionEnvironment=Probable infection environment + +Exposure.probableInfectionEnvironment= Probable infection environment Exposure.startDate=Start of exposure Exposure.endDate=End of exposure Exposure.exposureType=Type of activity @@ -1186,13 +1241,16 @@ Exposure.riskArea=Risk area as defined by public health institution Exposure.exposureDate=Exposure date Exposure.exposureRole=Role Exposure.largeAttendanceNumber=More than 300 attendees + # Facility facilityActiveFacilities=Active facilities facilityArchivedFacilities=Archived facilities facilityAllFacilities=All facilities + Facility.CONFIGURED_FACILITY=Configured facility Facility.NO_FACILITY=Home or other place Facility.OTHER_FACILITY=Other facility + Facility.additionalInformation=Additional information Facility.archived=Archived Facility.areaType=Area type (urban/rural) @@ -1210,22 +1268,26 @@ Facility.publicOwnership=Public ownership Facility.region=Region Facility.type=Facility type Facility.typeGroup=Facility category -Facility.contactPersonFirstName=Contact person first name -Facility.contactPersonLastName=Contact person last name -Facility.contactPersonPhone=Contact person phone number -Facility.contactPersonEmail=Contact person email address +Facility.contactPersonFirstName = Contact person first name +Facility.contactPersonLastName = Contact person last name +Facility.contactPersonPhone = Contact person phone number +Facility.contactPersonEmail = Contact person email address + FeatureConfiguration.districtName=District FeatureConfiguration.enabled=Line listing enabled? FeatureConfiguration.endDate=End date + # Formats formatNumberOfVisitsFormat=%d (%d missed) formatNumberOfVisitsLongFormat=%d visits (%d missed) formatSimpleNumberFormat=%d + # FollowUp FollowUp.uuid=Follow-up ID FollowUp.person=Follow-up person FollowUp.reportDate=Date of report FollowUp.followUpUntil=Follow-up until + # HealthConditions HealthConditions=Health conditions HealthConditions.tuberculosis=Tuberculosis @@ -1251,6 +1313,7 @@ HealthConditions.formerSmoker=Former smoker\t\t HealthConditions.asthma=Asthma HealthConditions.sickleCellDisease=Sickle cell disease\t HealthConditions.immunodeficiencyIncludingHiv=Immunodeficiency including HIV + # Import importDetailed=Detailed Import importDownloadCaseImportTemplate=Download Case Import Template @@ -1268,6 +1331,7 @@ importProcessed=%d/%d Processed importSkips=%d Skipped importCancelImport=Cancel import infrastructureImportAllowOverwrite=Overwrite existing entries with imported data + #Lab Message LabMessage=Lab Message LabMessage.labMessageDetails=Lab message details @@ -1292,9 +1356,11 @@ LabMessage.testedDisease=Tested disease labMessage.deleteNewlyCreatedCase=Delete new case you just created labMessage.deleteNewlyCreatedContact=Delete new contact you just created labMessage.deleteNewlyCreatedEventParticipant=Delete new event participant you just created -labMessageFetch=Fetch lab messages + +labMessageFetch= Fetch lab messages labMessageProcess=Process labMessageNoNewMessages=No new messages available + #Line listing lineListingAddLine=Add line lineListingInfrastructureData=Take over infrastructure data from last line @@ -1307,6 +1373,7 @@ lineListingEnableAll=Enable all lineListingDisableAllShort=Disable all lineListingEndDate=End date lineListingSetEndDateForAll=Set end date for all + # Location Location=Location Location.additionalInformation=Additional information @@ -1324,31 +1391,35 @@ Location.latLonAccuracy=GPS accuracy in m Location.longitude=GPS longitude Location.postalCode=Postal code Location.street=Street -Location.contactPersonFirstName=Contact person first name -Location.contactPersonLastName=Contact person last name -Location.contactPersonPhone=Contact person phone number -Location.contactPersonEmail=Contact person email address +Location.contactPersonFirstName = Contact person first name +Location.contactPersonLastName = Contact person last name +Location.contactPersonPhone = Contact person phone number +Location.contactPersonEmail = Contact person email address + # Login Login.doLogIn=Log in Login.login=Login Login.password=password Login.username=username + #LoginSidebar LoginSidebar.diseaseDetection=Disease Detection LoginSidebar.diseasePrevention=Disease Prevention LoginSidebar.outbreakResponse=Outbreak Response LoginSidebar.poweredBy=Powered By + # Messaging messagesSendSMS=Send SMS messagesSentBy=Sent by messagesNoSmsSentForCase=No SMS sent to case person messagesNoPhoneNumberForCasePerson=Case person has no phone number -messagesSms=SMS -messagesEmail=Email -messagesSendingSms=Send new SMS -messagesNumberOfMissingPhoneNumbers=Number of selected cases without phone number\: %s -messagesCharacters=Characters\: %d / 160 -messagesNumberOfMessages=Nr. of messages\: %d +messagesSms = SMS +messagesEmail = Email +messagesSendingSms = Send new SMS +messagesNumberOfMissingPhoneNumbers = Number of selected cases without phone number\: %s +messagesCharacters = Characters\: %d / 160 +messagesNumberOfMessages = Nr. of messages\: %d + # Main Menu mainMenuAbout=About mainMenuCampaigns=Campaigns @@ -1364,6 +1435,7 @@ mainMenuStatistics=Statistics mainMenuTasks=Tasks mainMenuUsers=Users mainMenuAggregateReports=mSERS + MaternalHistory.childrenNumber=Total number of children MaternalHistory.ageAtBirth=Mother's age at birth of infant patient MaternalHistory.conjunctivitis=Conjunctivitis @@ -1390,16 +1462,19 @@ MaternalHistory.otherComplications=Other complications MaternalHistory.otherComplicationsOnset=Date of onset MaternalHistory.otherComplicationsMonth=Month of pregnancy MaternalHistory.otherComplicationsDetails=Complication details + # Outbreak outbreakAffectedDistricts=Affected districts outbreakNoOutbreak=No outbreak outbreakNormal=Normal outbreakOutbreak=Outbreak + # PathogenTest pathogenTestCreateNew=Create new pathogen test pathogenTestNewResult=New result pathogenTestNewTest=New test result pathogenTestSelect=Select pathogen test + PathogenTest=Pathogen test PathogenTests=Pathogen tests PathogenTest.fourFoldIncreaseAntibodyTiter=4 fold increase of antibody titer @@ -1418,6 +1493,7 @@ PathogenTest.serotype=Serotype PathogenTest.cqValue=CQ/CT Value PathogenTest.reportDate=Report date PathogenTest.viaLims=Via LIMS + # Person personPersonsList=Person list personCreateNew=Create a new person @@ -1433,6 +1509,7 @@ personLinkToContacts=See contacts for this person personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated + Person=Person Person.address=Home address Person.addresses=Addresses @@ -1505,23 +1582,27 @@ Person.otherSalutation=Other salutation Person.birthName=Birth name Person.birthCountry=Country of birth Person.citizenship=Citizenship -personContactDetailOwner=Owner -personContactDetailOwnerName=Owner name -personContactDetailThisPerson=This person -personContactDetailThirdParty=Collect contact details of another person or facility -PersonContactDetail.person=Person -PersonContactDetail.primaryContact=Primary contact details -PersonContactDetail.personContactDetailType=Type of contact details -PersonContactDetail.phoneNumberType=Phone number type -PersonContactDetail.details=Details -PersonContactDetail.contactInformation=Contact information -PersonContactDetail.additionalInformation=Additional information -PersonContactDetail.thirdParty=Third party -PersonContactDetail.thirdPartyRole=Third party role -PersonContactDetail.thirdPartyName=Third party name + +personContactDetailOwner = Owner +personContactDetailOwnerName = Owner name +personContactDetailThisPerson = This person +personContactDetailThirdParty = Collect contact details of another person or facility + +PersonContactDetail.person = Person +PersonContactDetail.primaryContact = Primary contact details +PersonContactDetail.personContactDetailType = Type of contact details +PersonContactDetail.phoneNumberType = Phone number type +PersonContactDetail.details = Details +PersonContactDetail.contactInformation = Contact information +PersonContactDetail.additionalInformation = Additional information +PersonContactDetail.thirdParty = Third party +PersonContactDetail.thirdPartyRole = Third party role +PersonContactDetail.thirdPartyName = Third party name + pointOfEntryActivePointsOfEntry=Active points of entry pointOfEntryArchivedPointsOfEntry=Archived points of entry pointOfEntryAllPointsOfEntry=All points of entry + PointOfEntry.OTHER_AIRPORT=Other airport PointOfEntry.OTHER_SEAPORT=Other seaport PointOfEntry.OTHER_GROUND_CROSSING=Other ground crossing @@ -1531,8 +1612,10 @@ PointOfEntry.active=Active? PointOfEntry.latitude=Latitude PointOfEntry.longitude=Longitude PointOfEntry.externalID=External ID + populationDataMaleTotal=Male total populationDataFemaleTotal=Female total + PortHealthInfo=Port health information PortHealthInfo.airlineName=Airline name PortHealthInfo.flightNumber=Flight number @@ -1556,8 +1639,10 @@ PortHealthInfo.conveyanceTypeDetails=Specify the conveyance type PortHealthInfo.departureLocation=Start location of travel PortHealthInfo.finalDestination=Final destination PortHealthInfo.details=Point of entry details + # Prescription prescriptionNewPrescription=New prescription + Prescription.additionalNotes=Additional notes Prescription.dose=Dose Prescription.drugIntakeDetails=Drug name @@ -1573,29 +1658,36 @@ Prescription.prescriptionType=Prescription type Prescription.route=Route Prescription.routeDetails=Route specification Prescription.typeOfDrug=Type of drug + PrescriptionExport.caseUuid=Case ID PrescriptionExport.caseName=Case name + # Continent continentActiveContinents=Active continents continentArchivedContinents=Archived continents continentAllContinents=All continents + Continent.archived=Archived Continent.externalId=External ID Continent.defaultName=Default name Continent.displayName=Name + # Subcontinent subcontinentActiveSubcontinents=Active subcontinents subcontinentArchivedSubcontinents=Archived subcontinents subcontinentAllSubcontinents=All subcontinents + Subcontinent.archived=Archived Subcontinent.externalId=External ID Subcontinent.defaultName=Default name Subcontinent.displayName=Name Subcontinent.continent=Continent name + # Country countryActiveCountries=Active countries countryArchivedCountries=Archived countries countryAllCountries=All countries + Country.archived=Archived Country.externalId=External ID Country.defaultName=Default name @@ -1603,16 +1695,19 @@ Country.displayName=Name Country.isoCode=ISO code Country.unoCode=UNO code Country.subcontinent=Subcontinent + # Region regionActiveRegions=Active regions regionArchivedRegions=Archived regions regionAllRegions=All regions + Region.archived=Archived Region.epidCode=Epid code Region.growthRate=Growth rate Region.population=Population Region.externalID=External ID Region.country=Country + # Sample sampleCreateNew=Create new sample sampleIncludeTestOnCreation=Create test result for this sample now @@ -1639,6 +1734,7 @@ sampleActiveSamples=Active samples sampleArchivedSamples=Archived samples sampleAllSamples=All samples sampleAssociationType=Sample type + Sample=Sample Sample.additionalTestingRequested=Request additional tests to be performed? Sample.additionalTestingStatus=Additional testing status @@ -1690,22 +1786,23 @@ Sample.uuid=Sample ID Sample.samplePurpose=Purpose of the Sample Sample.samplingReason=Reason for sampling/testing Sample.samplingReasonDetails=Sampling reason details + SampleExport.additionalTestingRequested=Have additional tests been requested? SampleExport.personAddressCaption=Address of case/contact/event participant person SampleExport.personAge=Age of case/contact/event participant person SampleExport.caseDistrict=District of case SampleExport.caseCommunity=Community of case SampleExport.caseFacility=Facility of case -SampleExport.contactRegion=Region of contact -SampleExport.contactDistrict=District of contact -SampleExport.contactCommunity=Community of contact +SampleExport.contactRegion = Region of contact +SampleExport.contactDistrict = District of contact +SampleExport.contactCommunity = Community of contact SampleExport.caseOutcome=Outcome of case SampleExport.caseRegion=Region of case SampleExport.caseReportDate=Case report date SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID -SampleExport.contactUuid=Contact UUID -SampleExport.contactReportDate=Contact report date +SampleExport.contactUuid = Contact UUID +SampleExport.contactReportDate = Contact report date SampleExport.id=Sample SN SampleExport.sampleReportDate=Sample report date SampleExport.noTestPossibleReason=No test possible reason @@ -1757,6 +1854,7 @@ SampleExport.testDateTime=Date and time of latest additional test SampleExport.totalBilirubin=Total bilirubin of latest additional test SampleExport.urea=Urea of latest additional test SampleExport.wbcCount=WBC count of latest additional test + # Statistics statisticsAddFilter=Add filter statisticsAttribute=Attribute @@ -1779,11 +1877,13 @@ statisticsStatistics=Statistics statisticsVisualizationType=Type statisticsIncidenceDivisor=Incidence divisor statisticsDataDisplayed=Data displayed + # Symptoms symptomsLesionsLocations=Localization of the lesions symptomsMaxTemperature=Maximum body temperature in ° C symptomsSetClearedToNo=Set cleared to No symptomsSetClearedToUnknown=Set cleared to Unknown + Symptoms=Symptoms Symptoms.abdominalPain=Abdominal pain Symptoms.alteredConsciousness=Altered level of consciousness @@ -1971,6 +2071,7 @@ Symptoms.palpitations=Palpitations Symptoms.dizzinessStandingUp=Dizziness (when standing up from a sitting or lying position) Symptoms.highOrLowBloodPressure=Blood pressure too high or too low (measured) Symptoms.urinaryRetention=Urinary retention + # Task taskMyTasks=My tasks taskNewTask=New task @@ -1979,6 +2080,7 @@ taskOfficerTasks=Officer tasks taskActiveTasks=Active tasks taskArchivedTasks=Archived tasks taskAllTasks=All tasks + Task=Task Task.assigneeReply=Comments on execution Task.assigneeUser=Assigned to @@ -1996,7 +2098,9 @@ Task.suggestedStart=Suggested start Task.taskContext=Task context Task.taskStatus=Task status Task.taskType=Task type + # TestReport + TestReport.testDateTime=Date and time of result TestReport.testLabCity=Lab city TestReport.testLabExternalId=Lab external ID @@ -2004,10 +2108,12 @@ TestReport.testLabName=Lab name TestReport.testLabPostalCode=Lab postal code TestReport.testResult=Test result TestReport.testType=Type of test + # Treatment treatmentCreateTreatment=Create treatment treatmentNewTreatment=New treatment treatmentOpenPrescription=Open prescription + Treatment.additionalNotes=Additional notes Treatment.dose=Dose Treatment.drugIntakeDetails=Drug name @@ -2021,8 +2127,10 @@ Treatment.treatmentDetails=Treatment details Treatment.treatmentType=Treatment type Treatment.typeOfDrug=Type of drug Treatment.treatmentRoute=Treatment route + TreatmentExport.caseUuid=Case ID TreatmentExport.caseName=Case name + # User userNewUser=New user userResetPassword=Create new password @@ -2032,6 +2140,7 @@ syncUsers=Sync Users syncErrors=%d Error(s) syncSuccessful=%d Synced syncProcessed=%d/%d Processed + User=User User.active=Active? User.associatedOfficer=Associated officer @@ -2046,11 +2155,14 @@ User.userName=User name User.userRoles=User roles User.address=Address User.uuid=UUID + # Views View.actions=Action Directory View.groups=Group Directory + View.aggregatereports=Aggregate Reporting (mSERS) View.aggregatereports.sub= + View.campaign.campaigns=Campaign Directory View.campaign.campaigns.short=Campaigns View.campaign.campaigndata=Campaign Data @@ -2059,6 +2171,7 @@ View.campaign.campaigndata.dataform=Campaign Data Form View.campaign.campaigndata.dataform.short=Data Form View.campaign.campaignstatistics=Campaign statistics View.campaign.campaignstatistics.short=Campaign statistics + View.cases=Case Directory View.cases.merge=Merge Duplicate Cases View.cases.archive=Case Archive @@ -2074,8 +2187,10 @@ View.cases.clinicalcourse=Clinical Course View.cases.maternalhistory=Maternal History View.cases.porthealthinfo=Port Health Information View.cases.visits=Case Visits + View.persons=Person Directory View.persons.data=Person Information + View.configuration.communities=Communities Configuration View.configuration.communities.short=Communities View.configuration.districts=Districts Configuration @@ -2110,6 +2225,7 @@ View.configuration.populationdata=Population Data View.configuration.populationdata.short=Population View.configuration.linelisting=Line Listing Configuration View.configuration.linelisting.short=Line Listing + View.contacts=Contact Directory View.contacts.archive=Contact Archive View.contacts.epidata=Contact Epidemiological Data @@ -2117,9 +2233,11 @@ View.contacts.data=Contact Information View.contacts.person=Contact Person View.contacts.sub= View.contacts.visits=Contact Visits + View.dashboard.contacts=Contacts Dashboard View.dashboard.surveillance=Surveillance Dashboard View.dashboard.campaigns=Campaigns Dashboard + View.events=Event Directory View.events.archive=Event Archive View.events.data=Event Information @@ -2127,22 +2245,30 @@ View.events.eventactions=Event Actions View.events.eventparticipants=Event Participants View.events.sub= View.events.eventparticipants.data=Event Participant Information + View.samples.labMessages=Lab Message Directory + View.reports=Weekly Reports View.reports.sub= + View.samples=Sample Directory View.samples.archive=Sample Archive View.samples.data=Sample Information View.samples.sub= + View.statistics=Statistics View.statistics.database-export=Database export + View.tasks=Task Management View.tasks.archive=Task Archive View.tasks.sub= + View.users=User Management View.users.sub= + # Visit visitNewVisit=New visit + Visit=Visit Visit.person=Visited person Visit.symptoms=Symptoms @@ -2154,19 +2280,24 @@ Visit.visitUser=Visiting officer Visit.disease=Disease Visit.reportLat=Report latitude Visit.reportLon=Report longitude + # WeeklyReport weeklyReportNoReport=Missing report weeklyReportOfficerInformants=Informants weeklyReportsInDistrict=Weekly Reports in %s weeklyReportRegionOfficers=Officers weeklyReportRegionInformants=Informants + WeeklyReport.epiWeek=Epi Week WeeklyReport.year=Year + # WeeklyReportEntry WeeklyReportEntry.numberOfCases=Cases reported + # WeeklyReportInformantSummary WeeklyReportInformantSummary.informantReportDate=Informant report submission WeeklyReportInformantSummary.totalCaseCount=Cases reported by informant + # WeeklyReportOfficerSummary WeeklyReportOfficerSummary.informants=Number of informants WeeklyReportOfficerSummary.informantReports=Number of informant reports @@ -2175,6 +2306,7 @@ WeeklyReportOfficerSummary.informantZeroReports=Number of informant zero reports WeeklyReportOfficerSummary.officer=Officer WeeklyReportOfficerSummary.officerReportDate=Officer report submission WeeklyReportOfficerSummary.totalCaseCount=Cases reported by officer + # WeeklyReportRegionSummary WeeklyReportRegionSummary.informants=Number of informants WeeklyReportRegionSummary.informantReports=Number of informant reports @@ -2184,6 +2316,7 @@ WeeklyReportRegionSummary.officers=Number of officers WeeklyReportRegionSummary.officerReports=Number of officers reports WeeklyReportRegionSummary.officerReportPercentage=Percentage WeeklyReportRegionSummary.officerZeroReports=Number of officer zero reports + # SORMAS to SORMAS SormasToSormasOptions.organization=Orgainzation SormasToSormasOptions.withAssociatedContacts=Share associated contacts @@ -2209,7 +2342,9 @@ sormasToSormasSharedBy=By sormasToSormasSharedDate=On sormasToSormasSentFrom=Sent from sormasToSormasSendLabMessage=Send to another organization + BAGExport=BAG Export + # Survnet Gateway ExternalSurveillanceToolGateway.title=Reporting Tool ExternalSurveillanceToolGateway.send=Send to reporting tool @@ -2217,11 +2352,15 @@ ExternalSurveillanceToolGateway.unableToSend=Unable to send ExternalSurveillanceToolGateway.confirmSend=Confirm sending ExternalSurveillanceToolGateway.notTransferred=Not yet sent to reporting tool ExternalSurveillanceToolGateway.confirmDelete=Confirm delete + patientDiaryRegistrationError=Could not register person in the patient diary. patientDiaryCancelError=Could not cancel external journal follow-up patientDiaryPersonNotExportable=Cannot export the person to the patient diary. The person needs a valid birthdate and either a valid phone number or email address. + showPlacesOnMap=Show + changeUserEmail=Change user email + VaccinationInfo.vaccination=Vaccination status for this disease VaccinationInfo.firstVaccinationDate=Date of first vaccination VaccinationInfo.lastVaccinationDate=Date of last vaccination @@ -2235,6 +2374,7 @@ VaccinationInfo.vaccineInn=INN VaccinationInfo.vaccineBatchNumber=Batch number VaccinationInfo.vaccineUniiCode=UNII code VaccinationInfo.vaccineAtcCode=ATC code + SurveillanceReport=Report SurveillanceReport.reportingType=Type of reporting SurveillanceReport.creatingUser=Creating user @@ -2248,6 +2388,7 @@ SurveillanceReport.facilityDetails=Facility details SurveillanceReport.notificationDetails=Details surveillanceReportNewReport=New report surveillanceReportNoReportsForCase=There are no reports for this case + cancelExternalFollowUpButton=Cancel external follow-up createSymptomJournalAccountButton=Create PIA Account registerInPatientDiaryButton=Register in CLIMEDO eDiary @@ -2256,6 +2397,7 @@ patientDiaryOptionsButton=CLIMEDO eDiary openInSymptomJournalButton=Open in PIA openInPatientDiaryButton=Open in CLIMEDO cancelExternalFollowUpPopupTitle=Cancel External Follow-Up + # User role/right exportUserRoles=Export user roles userRights=User Rights diff --git a/sormas-api/src/main/resources/captions_la-LA.properties b/sormas-api/src/main/resources/captions_la-LA.properties index d52e7461ff0..111a929df1f 100644 --- a/sormas-api/src/main/resources/captions_la-LA.properties +++ b/sormas-api/src/main/resources/captions_la-LA.properties @@ -14,6 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . ############################################################################### + # General Captions all=All city=City @@ -55,6 +56,7 @@ facility=Facility pointOfEntry=Point of entry remove=Remove reportingUser=Reporting user + # About about=About aboutDocuments=Documents @@ -66,12 +68,14 @@ aboutDataDictionary=Data Dictionary (XLSX) aboutSormasWebsite=Official SORMAS Website aboutTechnicalManual=Technical Manual (PDF) aboutWhatsNew=What's New? + # Action actionNewAction=New action actionNoActions=There are no actions for this %s actionCreatingLabel=Created at %s by %s actionLastModifiedByLabel=Updated at %s by %s actionStatusChangeDate=updated at %s + Action=Action Action.title=Title Action.description=Description @@ -84,12 +88,13 @@ Action.actionContext=Action context Action.actionStatus=Action status Action.lastModifiedBy=Last modified by Action.actionMeasure=Measure + # Actions actionApplyDateFilter=Apply date filter actionArchive=Archive actionAssignNewEpidNumber=Assign new epid number actionBack=Back -actionSend=Send +actionSend = Send actionCancel=Cancel actionClear=Clear actionClearAll=Clear all @@ -128,8 +133,10 @@ actionBackToNationOverview=Back to Nation Overview actionSettings=User Settings actionNewForm=New Form actionOverwrite=Overwrite + # AdditionalTest additionalTestNewTest=New test result + AdditionalTest=Additional test AdditionalTest.altSgpt=ALT/SGPT (U/L) AdditionalTest.arterialVenousBloodGas=Arterial/venous blood gas @@ -153,6 +160,7 @@ AdditionalTest.testDateTime=Date and time of result AdditionalTest.totalBilirubin=Total bilirubin (umol/L) AdditionalTest.urea=Urea (mmol/L) AdditionalTest.wbcCount=WBC count (x10^9/L) + aggregateReportDeathsShort=D aggregateReportLabConfirmationsShort=L aggregateReportLastWeek=Last Week @@ -169,11 +177,13 @@ AggregateReport.labConfirmations=Lab confirmations AggregateReport.deaths=Deaths AggregateReport.healthFacility=Facility AggregateReport.pointOfEntry=Point of Entry -areaActiveAreas=Active areas -areaArchivedAreas=Archived areas -areaAllAreas=All areas -Area.archived=Archived -Area.externalId=External ID + +areaActiveAreas = Active areas +areaArchivedAreas = Archived areas +areaAllAreas = All areas +Area.archived = Archived +Area.externalId = External ID + # Bulk actions bulkActions=Bulk Actions bulkCancelFollowUp=Cancel follow-up @@ -191,6 +201,7 @@ bulkFacility=Change facility bulkInvestigationStatus=Change investigation status bulkLostToFollowUp=Set to lost to follow-up bulkSurveillanceOfficer=Change surveillance officer + # Campaign campaignActiveCampaigns=Active campaigns campaignAllCampaigns=All campaigns @@ -210,6 +221,7 @@ campaignDashboardChartHeight=Height in % campaignDashboardOrder=Order campaignSearch=Search Campaign campaignDiagramGroupBy=Group by + Campaign=Campaign Campaign.name=Name Campaign.description=Description @@ -222,11 +234,13 @@ Campaign.area=Area Campaign.region=Region Campaign.district=District Campaign.community=Community -CampaignFormData.campaign=Campaign -CampaignFormData.campaignFormMeta=Form -CampaignFormData.formDate=Form date -CampaignFormData.area=Area + +CampaignFormData.campaign = Campaign +CampaignFormData.campaignFormMeta = Form +CampaignFormData.formDate = Form date +CampaignFormData.area = Area CampaignFormData.edit=Edit + # CaseData caseCasesList=Cases list caseInfrastructureDataChanged=Infrastructure data has changed @@ -276,8 +290,9 @@ convertEventParticipantToCase=Create case from event participant with positive t convertContactToCase=Create case from contact with positive test result? caseSearchSpecificCase=Search specific case caseSearchCase=Search case -caseSelect=Select case +caseSelect= Select case caseCreateNew=Create new case + CaseData=Case CaseData.additionalDetails=General comment CaseData.caseClassification=Case classification @@ -300,7 +315,6 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name -CaseData.disease=Disease CaseData.district=Responsible district CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -421,6 +435,7 @@ CaseData.notACaseReasonPhysicianInformation=Information provided by physician CaseData.notACaseReasonDifferentPathogen=Verification of different pathogen CaseData.notACaseReasonOther=Other CaseData.notACaseReasonDetails=Reason details + # CaseExport CaseExport.address=Address CaseExport.addressRegion=Address Region @@ -466,6 +481,7 @@ CaseExport.lastCooperativeVisitSymptomatic=Symptomatic at last cooperative visit CaseExport.lastCooperativeVisitSymptoms=Symptoms at last cooperative visit CaseExport.traveled=Traveled outside of district CaseExport.burialAttended=Visited a burial + # CaseHospitalization CaseHospitalization=Hospitalization CaseHospitalization.admissionDate=Date of visit or admission @@ -480,9 +496,12 @@ CaseHospitalization.previousHospitalizations=Previous hospitalizations CaseHospitalization.intensiveCareUnit=Stay in the intensive care unit CaseHospitalization.intensiveCareUnitStart=Start of the stay CaseHospitalization.intensiveCareUnitEnd=End of the stay + + # CaseImport caseImportErrorDescription=Error description caseImportMergeCase=Override existing case with changes from the imported case? + # CasePreviousHospitalization CasePreviousHospitalization=Previous hospitalization CasePreviousHospitalization.admissionAndDischargeDate=Date of admission & discharge @@ -494,8 +513,10 @@ CasePreviousHospitalization.healthFacility=Hospital CasePreviousHospitalization.healthFacilityDetails=Hospital name & description CasePreviousHospitalization.isolated=Isolation CasePreviousHospitalization.prevHospPeriod=Period of hospitalization + # ClinicalVisit clinicalVisitNewClinicalVisit=New clinical assessment + ClinicalVisit=Clinical assessment ClinicalVisit.bloodPressure=Blood pressure ClinicalVisit.heartRate=Heart rate @@ -503,22 +524,28 @@ ClinicalVisit.temperature=Temperature ClinicalVisit.visitDateTime=Date and time of visit ClinicalVisit.visitingPerson=Attending clinician ClinicalVisit.visitRemarks=Clinician remarks + ClinicalVisitExport.caseUuid=Case ID ClinicalVisitExport.caseName=Case name + columnAdditionalTests=Additional tests columnDiseaseShort=Disease columnNumberOfPendingTasks=Pending tasks + # Community Community.archived=Archived Community.externalID=External ID + communityActiveCommunities=Active communities communityArchivedCommunities=Archived communities communityAllCommunities=All communities + # Configuration Configuration.Facilities=Facilities Configuration.Outbreaks=Outbreaks Configuration.PointsOfEntry=Points of Entry Configuration.LineListing=Line Listing + # Contact contactCancelFollowUp=Cancel follow-up contactCaseContacts=Case contacts @@ -555,9 +582,10 @@ contactOnlyWithSharedEventWithSourceCase=Only contacts with source case linked t contactOnlyWithSourceCaseInGivenEvent=Only contacts whose source case is linked to this event contactFollowUpDay=Day contactQuarantineNotOrdered=No quarantine ordered -contactCreatePIAAccount=PIA -contactPersonPhoneNumber=Contact Person's Phone Number -contactSourceCase=Source case +contactCreatePIAAccount = PIA +contactPersonPhoneNumber = Contact Person's Phone Number +contactSourceCase = Source case + Contact=Contact Contact.additionalDetails=General comment Contact.caseClassification=Classification of the source case @@ -574,10 +602,10 @@ Contact.community=Responsible community Contact.contactClassification=Contact classification Contact.contactOfficer=Responsible contact officer Contact.contactOfficerUuid=Responsible contact officer -Contact.contactIdentificationSource=Contact identification source -Contact.contactIdentificationSourceDetails=Contact identification source details -Contact.tracingApp=Tracing app -Contact.tracingAppDetails=Tracing app details, e.g. name +Contact.contactIdentificationSource = Contact identification source +Contact.contactIdentificationSourceDetails = Contact identification source details +Contact.tracingApp = Tracing app +Contact.tracingAppDetails = Tracing app details, e.g. name Contact.contactProximity=Type of contact - if multiple pick the closest contact proximity Contact.contactStatus=Contact status Contact.description=Description of how contact took place @@ -648,6 +676,7 @@ Contact.prohibitionToWork=Prohibition to work Contact.prohibitionToWorkFrom=Prohibition to work from Contact.prohibitionToWorkUntil=Prohibition to work until Contact.reportingDistrict=Reporting district + # ContactExport ContactExport.address=Address ContactExport.addressDistrict=Address District @@ -666,6 +695,7 @@ ContactExport.sourceCaseUuid=Source case ID ContactExport.traveled=Traveled outside of district ContactExport.travelHistory=Travel history ContactExport.quarantineInformation=Quarantine information + # Dashboard dashboardAlive=Alive dashboardApplyCustomFilter=Apply custom filter @@ -789,12 +819,14 @@ dashboardAggregatedNumber=Count dashboardProportion=Proportion (%) dashboardViewAsColumnChart=View as Column Chart dashboardViewAsBarChart=View as Bar Chart + defaultRegion=Default Region defaultDistrict=Default District defaultCommunity=Default Community defaultFacility=Default Facility defaultLaboratory=Default Laboratory defaultPointOfEntry=Default Point Of Entry + devModeCaseCount=Number of generated cases devModeCaseDisease=Disease of the cases devModeCaseDistrict=District of the cases @@ -825,6 +857,7 @@ devModeEventStartDate=Earliest event start date devModeGenerateCases=Generate Cases devModeGenerateContacts=Generate Contacts devModeGenerateEvents=Generate Events + DiseaseBurden.caseCount=New cases DiseaseBurden.caseDeathCount=Fatalities DiseaseBurden.casesDifference=Dynamic @@ -832,16 +865,20 @@ DiseaseBurden.caseFatalityRate=CFR DiseaseBurden.eventCount=Number of events DiseaseBurden.outbreakDistrictCount=Outbreak districts DiseaseBurden.previousCaseCount=Previous cases + # District districtActiveDistricts=Active districts districtArchivedDistricts=Archived districts districtAllDistricts=All districts + District.archived=Archived District.epidCode=Epid code District.growthRate=Growth rate District.population=Population District.externalID=External ID + epiDataNoSourceContacts=No source contacts have been created for this case + EpiData=Epidemiological data EpiData.areaInfectedAnimals=Residing, working or travelling to an area where infected animals have been confirmed EpiData.exposureDetailsKnown=Exposure details known @@ -849,9 +886,11 @@ EpiData.exposures=Exposures EpiData.highTransmissionRiskArea=Residing or working in an area with high risk of transmission of the disease, e.g. closed residential and camp-like settings EpiData.largeOutbreaksArea=Residing or travelling to countries/territories/areas experiencing larger outbreaks of local transmission EpiData.contactWithSourceCaseKnown=Contacts with source case known + # Documents documentUploadDocument=New document documentNoDocuments=There are no documents for this %s + # DocumentTemplate DocumentTemplate=Document Template DocumentTemplate.buttonUploadTemplate=Upload Template @@ -868,6 +907,7 @@ DocumentTemplate.exampleTemplateCases=Example Template Cases DocumentTemplate.exampleTemplateContacts=Example Template Contacts DocumentTemplate.exampleTemplateEventHandout=Example Template Event Handout DocumentTemplate.exampleTemplateEventParticipants=Example Template Event Participants + # Event eventActiveEvents=Active events eventArchivedEvents=Archived events @@ -895,6 +935,7 @@ eventUnlinkEvent=Unlink event eventOpenSuperordinateEvent=Open event eventEditEvent=Edit event eventLinkToEventsWithinTheSameFacility=See events within the same facility + Event=Event Event.caseCount=Cases Event.contactCount=Contacts @@ -951,6 +992,7 @@ Event.typeOfPlaceText=Specify other event place Event.uuid=Event ID Event.transregionalOutbreak=Transregional outbreak Event.diseaseTransmissionMode=Primary mode of transmission + # Event action EventAction.eventUuid=Event id EventAction.eventTitle=Event title @@ -967,14 +1009,18 @@ EventAction.actionChangeDate=Action change date EventAction.actionStatus=Action status EventAction.actionPriority=Action priority EventAction.actionLastModifiedBy=Action last modified by + # Event action export EventActionExport.eventDate=Date of event + #Event export + # EventParticipant eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant + EventParticipant=Event participant EventParticipant.contactCount=Contact count EventParticipant.event=Event @@ -988,6 +1034,7 @@ EventParticipant.person=Person EventParticipant.uuid=Event participant ID EventParticipant.region=Responsible region EventParticipant.district=Responsible district + #EventParticipant export EventParticipantExport.eventParticipantU=Event disease EventParticipantExport.eventDisease=Event disease @@ -1012,6 +1059,7 @@ EventParticipantExport.sampleInformation=Sample information EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID + # Expo export=Export exportBasic=Basic Export @@ -1026,13 +1074,16 @@ exportCaseManagement=Case Management Export exportCaseCustom=Custom Case Export exportNewExportConfiguration=New Export Configuration exportEditExportConfiguration=Edit Export Configuration + ExportConfiguration.NAME=Configuration name ExportConfiguration.myExports=My exports ExportConfiguration.sharedExports=Shared exports ExportConfiguration.sharedToPublic=Shared to public + exposureFlightNumber=Flight number exposureTimePeriod=Time period exposureSourceCaseName=Name of source case + Exposure.startDate=Start of exposure Exposure.endDate=End of exposure Exposure.exposureType=Type of activity @@ -1083,13 +1134,16 @@ Exposure.prophylaxisDate=Date of prophylaxis Exposure.riskArea=Risk area as defined by public health institution Exposure.exposureDate=Exposure date Exposure.exposureRole=Role + # Facility facilityActiveFacilities=Active facilities facilityArchivedFacilities=Archived facilities facilityAllFacilities=All facilities + Facility.CONFIGURED_FACILITY=Configured facility Facility.NO_FACILITY=Home or other place Facility.OTHER_FACILITY=Other facility + Facility.archived=Archived Facility.city=City Facility.community=Community @@ -1102,18 +1156,22 @@ Facility.publicOwnership=Public ownership Facility.region=Region Facility.type=Facility type Facility.typeGroup=Facility category + FeatureConfiguration.districtName=District FeatureConfiguration.enabled=Line listing enabled? FeatureConfiguration.endDate=End date + # Formats formatNumberOfVisitsFormat=%d (%d missed) formatNumberOfVisitsLongFormat=%d visits (%d missed) formatSimpleNumberFormat=%d + # FollowUp FollowUp.uuid=Follow-up ID FollowUp.person=Follow-up person FollowUp.reportDate=Date of report FollowUp.followUpUntil=Follow-up until + # HealthConditions HealthConditions=Health conditions HealthConditions.tuberculosis=Tuberculosis @@ -1139,6 +1197,7 @@ HealthConditions.formerSmoker=Former smoker\t\t HealthConditions.asthma=Asthma HealthConditions.sickleCellDisease=Sickle cell disease\t HealthConditions.immunodeficiencyIncludingHiv=Immunodeficiency including HIV + # Import importDetailed=Detailed Import importDownloadCaseImportTemplate=Download Case Import Template @@ -1155,6 +1214,7 @@ importLineListing=Line Listing Import importProcessed=%d/%d Processed importSkips=%d Skipped importCancelImport=Cancel import + #Lab Message LabMessage=Lab Message LabMessage.labMessageDetails=Lab message details @@ -1176,10 +1236,12 @@ LabMessage.sampleMaterial=Type of sample LabMessage.sampleReceivedDate=Sample received LabMessage.specimenCondition=Specimen condition LabMessage.testedDisease=Tested disease -labMessageFetch=Fetch lab messages + +labMessageFetch= Fetch lab messages labMessageProcess=Process labMessageProcessed=Processed labMessageUnprocessed=Unprocessed + #Line listing lineListingAddLine=Add line lineListingInfrastructureData=Take over infrastructure data from last line @@ -1192,6 +1254,7 @@ lineListingEnableAll=Enable all lineListingDisableAllShort=Disable all lineListingEndDate=End date lineListingSetEndDateForAll=Set end date for all + # Location Location=Location Location.additionalInformation=Additional information @@ -1209,27 +1272,31 @@ Location.latLonAccuracy=GPS accuracy in m Location.longitude=GPS longitude Location.postalCode=Postal code Location.street=Street + # Login Login.doLogIn=Log in Login.login=Login Login.password=password Login.username=username + #LoginSidebar LoginSidebar.diseaseDetection=Disease Detection LoginSidebar.diseasePrevention=Disease Prevention LoginSidebar.outbreakResponse=Outbreak Response LoginSidebar.poweredBy=Powered By + # Messaging messagesSendSMS=Send SMS messagesSentBy=Sent by messagesNoSmsSentForCase=No SMS sent to case person messagesNoPhoneNumberForCasePerson=Case person has no phone number -messagesSms=SMS -messagesEmail=Email -messagesSendingSms=Send new SMS -messagesNumberOfMissingPhoneNumbers=Number of selected cases without phone number\: %s -messagesCharacters=Characters\: %d / 160 -messagesNumberOfMessages=Nr. of messages\: %d +messagesSms = SMS +messagesEmail = Email +messagesSendingSms = Send new SMS +messagesNumberOfMissingPhoneNumbers = Number of selected cases without phone number\: %s +messagesCharacters = Characters\: %d / 160 +messagesNumberOfMessages = Nr. of messages\: %d + # Main Menu mainMenuAbout=About mainMenuCampaigns=Campaigns @@ -1245,6 +1312,7 @@ mainMenuStatistics=Statistics mainMenuTasks=Tasks mainMenuUsers=Users mainMenuAggregateReports=mSERS + MaternalHistory.childrenNumber=Total number of children MaternalHistory.ageAtBirth=Mother's age at birth of infant patient MaternalHistory.conjunctivitis=Conjunctivitis @@ -1271,16 +1339,19 @@ MaternalHistory.otherComplications=Other complications MaternalHistory.otherComplicationsOnset=Date of onset MaternalHistory.otherComplicationsMonth=Month of pregnancy MaternalHistory.otherComplicationsDetails=Complication details + # Outbreak outbreakAffectedDistricts=Affected districts outbreakNoOutbreak=No outbreak outbreakNormal=Normal outbreakOutbreak=Outbreak + # PathogenTest pathogenTestCreateNew=Create new pathogen test pathogenTestNewResult=New result pathogenTestNewTest=New test result pathogenTestSelect=Select pathogen test + PathogenTest=Pathogen test PathogenTests=Pathogen tests PathogenTest.fourFoldIncreaseAntibodyTiter=4 fold increase of antibody titer @@ -1297,6 +1368,7 @@ PathogenTest.testedDiseaseDetails=Tested disease name PathogenTest.typingId=Typing ID PathogenTest.serotype=Serotype PathogenTest.cqValue=CQ/CT Value + # Person personPersonsList=Person list personCreateNew=Create a new person @@ -1309,6 +1381,7 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person + Person=Person Person.address=Home address Person.addresses=Addresses @@ -1380,9 +1453,11 @@ Person.otherSalutation=Other salutation Person.birthName=Birth name Person.birthCountry=Country of birth Person.citizenship=Citizenship + pointOfEntryActivePointsOfEntry=Active points of entry pointOfEntryArchivedPointsOfEntry=Archived points of entry pointOfEntryAllPointsOfEntry=All points of entry + PointOfEntry.OTHER_AIRPORT=Other airport PointOfEntry.OTHER_SEAPORT=Other seaport PointOfEntry.OTHER_GROUND_CROSSING=Other ground crossing @@ -1392,8 +1467,10 @@ PointOfEntry.active=Active? PointOfEntry.latitude=Latitude PointOfEntry.longitude=Longitude PointOfEntry.externalID=External ID + populationDataMaleTotal=Male total populationDataFemaleTotal=Female total + PortHealthInfo=Port health information PortHealthInfo.airlineName=Airline name PortHealthInfo.flightNumber=Flight number @@ -1417,8 +1494,10 @@ PortHealthInfo.conveyanceTypeDetails=Specify the conveyance type PortHealthInfo.departureLocation=Start location of travel PortHealthInfo.finalDestination=Final destination PortHealthInfo.details=Point of entry details + # Prescription prescriptionNewPrescription=New prescription + Prescription.additionalNotes=Additional notes Prescription.dose=Dose Prescription.drugIntakeDetails=Drug name @@ -1434,27 +1513,33 @@ Prescription.prescriptionType=Prescription type Prescription.route=Route Prescription.routeDetails=Route specification Prescription.typeOfDrug=Type of drug + PrescriptionExport.caseUuid=Case ID PrescriptionExport.caseName=Case name + # Country countryActiveCountries=Active countries countryArchivedCountries=Archived countries countryAllCountries=All countries + Country.archived=Archived Country.externalId=External ID Country.defaultName=Default name Country.displayName=Name Country.isoCode=ISO code Country.unoCode=UNO code + # Region regionActiveRegions=Active regions regionArchivedRegions=Archived regions regionAllRegions=All regions + Region.archived=Archived Region.epidCode=Epid code Region.growthRate=Growth rate Region.population=Population Region.externalID=External ID + # Sample sampleCreateNew=Create new sample sampleIncludeTestOnCreation=Create test result for this sample now @@ -1481,6 +1566,7 @@ sampleActiveSamples=Active samples sampleArchivedSamples=Archived samples sampleAllSamples=All samples sampleAssociationType=Sample type + Sample=Sample Sample.additionalTestingRequested=Request additional tests to be performed? Sample.additionalTestingStatus=Additional testing status @@ -1530,22 +1616,23 @@ Sample.testType=Type of test Sample.typeOfTest=Type of test Sample.uuid=Sample ID Sample.samplePurpose=Purpose of the Sample + SampleExport.additionalTestingRequested=Have additional tests been requested? SampleExport.personAddressCaption=Address of case/contact/event participant person SampleExport.personAge=Age of case/contact/event participant person SampleExport.caseDistrict=District of case SampleExport.caseCommunity=Community of case SampleExport.caseFacility=Facility of case -SampleExport.contactRegion=Region of contact -SampleExport.contactDistrict=District of contact -SampleExport.contactCommunity=Community of contact +SampleExport.contactRegion = Region of contact +SampleExport.contactDistrict = District of contact +SampleExport.contactCommunity = Community of contact SampleExport.caseOutcome=Outcome of case SampleExport.caseRegion=Region of case SampleExport.caseReportDate=Case report date SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID -SampleExport.contactUuid=Contact UUID -SampleExport.contactReportDate=Contact report date +SampleExport.contactUuid = Contact UUID +SampleExport.contactReportDate = Contact report date SampleExport.id=Sample SN SampleExport.sampleReportDate=Sample report date SampleExport.noTestPossibleReason=No test possible reason @@ -1597,6 +1684,7 @@ SampleExport.testDateTime=Date and time of latest additional test SampleExport.totalBilirubin=Total bilirubin of latest additional test SampleExport.urea=Urea of latest additional test SampleExport.wbcCount=WBC count of latest additional test + # Statistics statisticsAddFilter=Add filter statisticsAttribute=Attribute @@ -1619,11 +1707,13 @@ statisticsStatistics=Statistics statisticsVisualizationType=Type statisticsIncidenceDivisor=Incidence divisor statisticsDataDisplayed=Data displayed + # Symptoms symptomsLesionsLocations=Localization of the lesions symptomsMaxTemperature=Maximum body temperature in ° C symptomsSetClearedToNo=Set cleared to No symptomsSetClearedToUnknown=Set cleared to Unknown + Symptoms=Symptoms Symptoms.abdominalPain=Abdominal pain Symptoms.alteredConsciousness=Altered level of consciousness @@ -1811,6 +1901,7 @@ Symptoms.palpitations=Palpitations Symptoms.dizzinessStandingUp=Dizziness (when standing up from a sitting or lying position) Symptoms.highOrLowBloodPressure=Blood pressure too high or too low (measured) Symptoms.urinaryRetention=Urinary retention + # Task taskMyTasks=My tasks taskNewTask=New task @@ -1819,6 +1910,7 @@ taskOfficerTasks=Officer tasks taskActiveTasks=Active tasks taskArchivedTasks=Archived tasks taskAllTasks=All tasks + Task=Task Task.assigneeReply=Comments on execution Task.assigneeUser=Assigned to @@ -1836,7 +1928,9 @@ Task.suggestedStart=Suggested start Task.taskContext=Task context Task.taskStatus=Task status Task.taskType=Task type + # TestReport + TestReport.testDateTime=Date and time of result TestReport.testLabCity=Lab city TestReport.testLabExternalId=Lab external ID @@ -1844,10 +1938,12 @@ TestReport.testLabName=Lab name TestReport.testLabPostalCode=Lab postal code TestReport.testResult=Test result TestReport.testType=Type of test + # Treatment treatmentCreateTreatment=Create treatment treatmentNewTreatment=New treatment treatmentOpenPrescription=Open prescription + Treatment.additionalNotes=Additional notes Treatment.dose=Dose Treatment.drugIntakeDetails=Drug name @@ -1861,8 +1957,10 @@ Treatment.treatmentDetails=Treatment details Treatment.treatmentType=Treatment type Treatment.typeOfDrug=Type of drug Treatment.treatmentRoute=Treatment route + TreatmentExport.caseUuid=Case ID TreatmentExport.caseName=Case name + # User userNewUser=New user userResetPassword=Create new password @@ -1872,6 +1970,7 @@ syncUsers=Sync Users syncErrors=%d Error(s) syncSuccessful=%d Synced syncProcessed=%d/%d Processed + User=User User.active=Active? User.associatedOfficer=Associated officer @@ -1886,16 +1985,20 @@ User.userName=User name User.userRoles=User roles User.address=Address User.uuid=UUID + # Views View.actions=Action Directory + View.aggregatereports=Aggregate Reporting (mSERS) View.aggregatereports.sub= + View.campaign.campaigns=Campaign Directory View.campaign.campaigns.short=Campaigns View.campaign.campaigndata=Campaign Data View.campaign.campaigndata.short=Campaign Data View.campaign.campaigndata.dataform=Campaign Data Form View.campaign.campaigndata.dataform.short=Data Form + View.cases=Case Directory View.cases.merge=Merge Duplicate Cases View.cases.archive=Case Archive @@ -1911,8 +2014,10 @@ View.cases.clinicalcourse=Clinical Course View.cases.maternalhistory=Maternal History View.cases.porthealthinfo=Port Health Information View.cases.visits=Case Visits + View.persons=Person Directory View.persons.data=Person Information + View.configuration.communities=Communities Configuration View.configuration.communities.short=Communities View.configuration.districts=Districts Configuration @@ -1943,6 +2048,7 @@ View.configuration.populationdata=Population Data View.configuration.populationdata.short=Population View.configuration.linelisting=Line Listing Configuration View.configuration.linelisting.short=Line Listing + View.contacts=Contact Directory View.contacts.archive=Contact Archive View.contacts.epidata=Contact Epidemiological Data @@ -1950,9 +2056,11 @@ View.contacts.data=Contact Information View.contacts.person=Contact Person View.contacts.sub= View.contacts.visits=Contact Visits + View.dashboard.contacts=Contacts Dashboard View.dashboard.surveillance=Surveillance Dashboard View.dashboard.campaigns=Campaigns Dashboard + View.events=Event Directory View.events.archive=Event Archive View.events.data=Event Information @@ -1960,22 +2068,30 @@ View.events.eventactions=Event Actions View.events.eventparticipants=Event Participants View.events.sub= View.events.eventparticipants.data=Event Participant Information + View.samples.labMessages=Lab Message Directory + View.reports=Weekly Reports View.reports.sub= + View.samples=Sample Directory View.samples.archive=Sample Archive View.samples.data=Sample Information View.samples.sub= + View.statistics=Statistics View.statistics.database-export=Database export + View.tasks=Task Management View.tasks.archive=Task Archive View.tasks.sub= + View.users=User Management View.users.sub= + # Visit visitNewVisit=New visit + Visit=Visit Visit.person=Visited person Visit.symptoms=Symptoms @@ -1987,19 +2103,24 @@ Visit.visitUser=Visiting officer Visit.disease=Disease Visit.reportLat=Report latitude Visit.reportLon=Report longitude + # WeeklyReport weeklyReportNoReport=Missing report weeklyReportOfficerInformants=Informants weeklyReportsInDistrict=Weekly Reports in %s weeklyReportRegionOfficers=Officers weeklyReportRegionInformants=Informants + WeeklyReport.epiWeek=Epi Week WeeklyReport.year=Year + # WeeklyReportEntry WeeklyReportEntry.numberOfCases=Cases reported + # WeeklyReportInformantSummary WeeklyReportInformantSummary.informantReportDate=Informant report submission WeeklyReportInformantSummary.totalCaseCount=Cases reported by informant + # WeeklyReportOfficerSummary WeeklyReportOfficerSummary.informants=Number of informants WeeklyReportOfficerSummary.informantReports=Number of informant reports @@ -2008,6 +2129,7 @@ WeeklyReportOfficerSummary.informantZeroReports=Number of informant zero reports WeeklyReportOfficerSummary.officer=Officer WeeklyReportOfficerSummary.officerReportDate=Officer report submission WeeklyReportOfficerSummary.totalCaseCount=Cases reported by officer + # WeeklyReportRegionSummary WeeklyReportRegionSummary.informants=Number of informants WeeklyReportRegionSummary.informantReports=Number of informant reports @@ -2017,6 +2139,7 @@ WeeklyReportRegionSummary.officers=Number of officers WeeklyReportRegionSummary.officerReports=Number of officers reports WeeklyReportRegionSummary.officerReportPercentage=Percentage WeeklyReportRegionSummary.officerZeroReports=Number of officer zero reports + # SORMAS to SORMAS SormasToSormasOptions.organization=Orgainzation SormasToSormasOptions.withAssociatedContacts=Share associated contacts @@ -2037,17 +2160,23 @@ sormasToSormasSharedWith=Shared with sormasToSormasSharedBy=By sormasToSormasSharedDate=On sormasToSormasSentFrom=Sent from + BAGExport=BAG Export + # Survnet Gateway SurvnetGateway.title=SurvNet SurvnetGateway.send=send to own SurvNet instance SurvnetGateway.unableToSend=Unable to send SurvnetGateway.confirmSend=Confirm sending SurvnetGateway.sendShort=Send to SurvNet + patientDiaryRegistrationError=Could not register person in the patient diary. patientDiaryPersonNotExportable=Cannot export the person to the patient diary. The person needs a valid birthdate and either a valid phone number or email address. + showPlacesOnMap=Show + changeUserEmail=Change user email + VaccinationInfo.vaccination=Vaccination status for this disease VaccinationInfo.firstVaccinationDate=Date of first vaccination VaccinationInfo.lastVaccinationDate=Date of last vaccination diff --git a/sormas-api/src/main/resources/captions_lv-LV.properties b/sormas-api/src/main/resources/captions_lv-LV.properties index df716e5b8a3..46dd9b76fc1 100644 --- a/sormas-api/src/main/resources/captions_lv-LV.properties +++ b/sormas-api/src/main/resources/captions_lv-LV.properties @@ -188,13 +188,13 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge=Okay, and continue to merge overview -actionOkAndGoToContactDirectory=Okay, and continue to contact directory -actionOkAndGoToContactDetails=Okay, and continue to contact -actionOkAndGoToPersonDirectory=Okay, and continue to person directory -actionExecuteAutomaticDeletion=Execute automatic deletion -actionDone=Done -actionConfirmAction=Confirm action +actionOkAndGoToMerge = Okay, and continue to merge overview +actionOkAndGoToContactDirectory = Okay, and continue to contact directory +actionOkAndGoToContactDetails = Okay, and continue to contact +actionOkAndGoToPersonDirectory = Okay, and continue to person directory +actionExecuteAutomaticDeletion = Execute automatic deletion +actionDone = Done +actionConfirmAction = Confirm action activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -248,10 +248,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows=Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups=Expired -aggregateReportNoAgeGroup=No age group -aggregateReportShowOnlyDuplicateReports=Display only duplicate reports +aggregateReportShowZeroRows = Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups = Expired +aggregateReportNoAgeGroup = No age group +aggregateReportShowOnlyDuplicateReports = Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -275,7 +275,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend=Send emails +bulkEmailSend = Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -434,7 +434,6 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name -CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1134,6 +1133,7 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: + # Environment Environment=Environment Environment.uuid=Environment ID @@ -1152,51 +1152,54 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location + environmentActiveEnvironments=Active environments -environmentArchivedEnvironments=Archived environments -environmentAllActiveAndArchivedEnvironments=All active and archived environments -environmentDeletedEnvironments=Deleted environments -environmentNewEnvironment=New environment +environmentArchivedEnvironments = Archived environments +environmentAllActiveAndArchivedEnvironments = All active and archived environments +environmentDeletedEnvironments = Deleted environments +environmentNewEnvironment= New environment environmentEnvironmentsList=Environments list + # EnvironmentSample -EnvironmentSample=Environment Sample -EnvironmentSample.uuid=Sample ID -EnvironmentSample.environment=Environment -EnvironmentSample.sampleDateTime=Date of sampling -EnvironmentSample.sampleMaterial=Sample material -EnvironmentSample.otherSampleMaterial=Specify sample material -EnvironmentSample.sampleVolume=Volume (in mL) -EnvironmentSample.fieldSampleId=Field sample ID -EnvironmentSample.turbidity=Turbidity (in NTU) -EnvironmentSample.phValue=pH of sample -EnvironmentSample.sampleTemperature=Temperature (in °C) -EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) -EnvironmentSample.laboratory=Laboratory -EnvironmentSample.laboratoryDetails=Laboratory details -EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested -EnvironmentSample.reportingUser=Reporting user -EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested -EnvironmentSample.weatherConditions=Weather conditions at time of sampling -EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched=Sent/dispatched -EnvironmentSample.dispatchDate=Dispatchment date -EnvironmentSample.dispatchDetails=Dispatchment details -EnvironmentSample.received=Received -EnvironmentSample.receivalDate=Receival date -EnvironmentSample.labSampleId=Lab sample ID -EnvironmentSample.specimenCondition=Specimen condition -EnvironmentSample.location=Location of sampling site -EnvironmentSample.generalComment=General comment -EnvironmentSample.positivePathogenTests=Positive pathogen tests -EnvironmentSample.latestPathogenTest=Latest pathogen test -EnvironmentSample.numberOfTests=Number of tests +EnvironmentSample = Environment Sample +EnvironmentSample.uuid = Sample ID +EnvironmentSample.environment = Environment +EnvironmentSample.sampleDateTime = Date of sampling +EnvironmentSample.sampleMaterial = Sample material +EnvironmentSample.otherSampleMaterial = Specify sample material +EnvironmentSample.sampleVolume = Volume (in mL) +EnvironmentSample.fieldSampleId = Field sample ID +EnvironmentSample.turbidity = Turbidity (in NTU) +EnvironmentSample.phValue = pH of sample +EnvironmentSample.sampleTemperature = Temperature (in °C) +EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) +EnvironmentSample.laboratory = Laboratory +EnvironmentSample.laboratoryDetails = Laboratory details +EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested +EnvironmentSample.reportingUser = Reporting user +EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested +EnvironmentSample.weatherConditions = Weather conditions at time of sampling +EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched = Sent/dispatched +EnvironmentSample.dispatchDate = Dispatchment date +EnvironmentSample.dispatchDetails = Dispatchment details +EnvironmentSample.received = Received +EnvironmentSample.receivalDate = Receival date +EnvironmentSample.labSampleId = Lab sample ID +EnvironmentSample.specimenCondition = Specimen condition +EnvironmentSample.location = Location of sampling site +EnvironmentSample.generalComment = General comment +EnvironmentSample.positivePathogenTests = Positive pathogen tests +EnvironmentSample.latestPathogenTest = Latest pathogen test +EnvironmentSample.numberOfTests = Number of tests + # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents=Deleted events +eventDeletedEvents = Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1340,7 +1343,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants=Deleted event participants +eventParticipantDeletedEventParticipants = Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1353,7 +1356,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser=Reporting user +EventParticipant.reportingUser = Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1390,9 +1393,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink=Event participant ID -EventParticipantSelection.eventUuidLink=Event ID -EventParticipantSelection.resultingCaseUuidLink=Resulting case ID +EventParticipantSelection.eventParticipantUuidLink = Event participant ID +EventParticipantSelection.eventUuidLink = Event ID +EventParticipantSelection.resultingCaseUuidLink = Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1612,6 +1615,7 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message + #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1622,7 +1626,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList=List of new event participants +lineListingNewEventParticipantsList = List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1796,10 +1800,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples=See samples for this person -caseLinkToSamples=See samples for this case -contactLinkToSamples=See samples for this contact -eventParticipantLinkToSamples=See samples for this event participant +personLinkToSamples = See samples for this person +caseLinkToSamples = See samples for this case +contactLinkToSamples = See samples for this contact +eventParticipantLinkToSamples = See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2107,9 +2111,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity=Community of event participant -SampleExport.eventParticipantDistrict=District of event participant -SampleExport.eventParticipantRegion=Region of event participant +SampleExport.eventParticipantCommunity = Community of event participant +SampleExport.eventParticipantDistrict = District of event participant +SampleExport.eventParticipantRegion = Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2168,7 +2172,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser=Reporting user +Immunization.reportingUser = Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2211,10 +2215,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations=Active immunizations -immunizationArchivedImmunizations=Archived immunizations -immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations -immunizationDeletedImmunizations=Deleted immunizations +immunizationActiveImmunizations = Active immunizations +immunizationArchivedImmunizations = Archived immunizations +immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations +immunizationDeletedImmunizations = Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2457,7 +2461,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment=Associated environment +Task.environment = Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2510,7 +2514,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser=Reporting user +TravelEntry.reportingUser = Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -2877,15 +2881,17 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms=SMS -userRoleNotificationTypeEmail=EMAIL +userRoleNotificationTypeSms = SMS +userRoleNotificationTypeEmail = EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template + notificationType=Notification type -notificationType.group=Group -notificationType.caption=Caption -notificationType.description=Description +notificationType.group = Group +notificationType.caption = Caption +notificationType.description = Description + SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -2920,10 +2926,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails=Person contact details -environmentSampleNotShipped=Not shipped -environmentSampleShipped=Shipped -environmentSampleReceived=Received +TaskExport.personOtherContactDetails = Person contact details +environmentSampleNotShipped = Not shipped +environmentSampleShipped = Shipped +environmentSampleReceived = Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -2940,34 +2946,37 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents + # SpecialCaseAccess SpecialCaseAccess=Special case access -caze=Case -assignedTo=Assigned to -assignedBy=Assigned by -endDateTime=Access until -assignmentDate=Date assigned +caze = Case +assignedTo = Assigned to +assignedBy = Assigned by +endDateTime = Access until +assignmentDate = Date assigned + specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case + # SelfReport -SelfReport.type=Type -SelfReport.reportDate=Report date -SelfReport.disease=Disease -SelfReport.diseaseVariant=Disease variant -SelfReport.firstName=First name -SelfReport.lastName=Last name -SelfReport.sex=Sex -SelfReport.birthdateDD=Day of birth -SelfReport.birthdateMM=Month of birth -SelfReport.birthdateYYYY=Year of birth -SelfReport.nationalHealthId=National health ID -SelfReport.email=Email -SelfReport.phoneNumber=Phone number -SelfReport.address=Address -SelfReport.comment=Comment -SelfReport.responsibleUser=Responsible user -SelfReport.investigationStatus=Investigation status -SelfReport.processingStatus=Processing status +SelfReport.type = Type +SelfReport.reportDate = Report date +SelfReport.disease = Disease +SelfReport.diseaseVariant = Disease variant +SelfReport.firstName = First name +SelfReport.lastName = Last name +SelfReport.sex = Sex +SelfReport.birthdateDD = Day of birth +SelfReport.birthdateMM = Month of birth +SelfReport.birthdateYYYY = Year of birth +SelfReport.nationalHealthId = National health ID +SelfReport.email = Email +SelfReport.phoneNumber = Phone number +SelfReport.address = Address +SelfReport.comment = Comment +SelfReport.responsibleUser = Responsible user +SelfReport.investigationStatus = Investigation status +SelfReport.processingStatus = Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_mt-MT.properties b/sormas-api/src/main/resources/captions_mt-MT.properties index d52e7461ff0..111a929df1f 100644 --- a/sormas-api/src/main/resources/captions_mt-MT.properties +++ b/sormas-api/src/main/resources/captions_mt-MT.properties @@ -14,6 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . ############################################################################### + # General Captions all=All city=City @@ -55,6 +56,7 @@ facility=Facility pointOfEntry=Point of entry remove=Remove reportingUser=Reporting user + # About about=About aboutDocuments=Documents @@ -66,12 +68,14 @@ aboutDataDictionary=Data Dictionary (XLSX) aboutSormasWebsite=Official SORMAS Website aboutTechnicalManual=Technical Manual (PDF) aboutWhatsNew=What's New? + # Action actionNewAction=New action actionNoActions=There are no actions for this %s actionCreatingLabel=Created at %s by %s actionLastModifiedByLabel=Updated at %s by %s actionStatusChangeDate=updated at %s + Action=Action Action.title=Title Action.description=Description @@ -84,12 +88,13 @@ Action.actionContext=Action context Action.actionStatus=Action status Action.lastModifiedBy=Last modified by Action.actionMeasure=Measure + # Actions actionApplyDateFilter=Apply date filter actionArchive=Archive actionAssignNewEpidNumber=Assign new epid number actionBack=Back -actionSend=Send +actionSend = Send actionCancel=Cancel actionClear=Clear actionClearAll=Clear all @@ -128,8 +133,10 @@ actionBackToNationOverview=Back to Nation Overview actionSettings=User Settings actionNewForm=New Form actionOverwrite=Overwrite + # AdditionalTest additionalTestNewTest=New test result + AdditionalTest=Additional test AdditionalTest.altSgpt=ALT/SGPT (U/L) AdditionalTest.arterialVenousBloodGas=Arterial/venous blood gas @@ -153,6 +160,7 @@ AdditionalTest.testDateTime=Date and time of result AdditionalTest.totalBilirubin=Total bilirubin (umol/L) AdditionalTest.urea=Urea (mmol/L) AdditionalTest.wbcCount=WBC count (x10^9/L) + aggregateReportDeathsShort=D aggregateReportLabConfirmationsShort=L aggregateReportLastWeek=Last Week @@ -169,11 +177,13 @@ AggregateReport.labConfirmations=Lab confirmations AggregateReport.deaths=Deaths AggregateReport.healthFacility=Facility AggregateReport.pointOfEntry=Point of Entry -areaActiveAreas=Active areas -areaArchivedAreas=Archived areas -areaAllAreas=All areas -Area.archived=Archived -Area.externalId=External ID + +areaActiveAreas = Active areas +areaArchivedAreas = Archived areas +areaAllAreas = All areas +Area.archived = Archived +Area.externalId = External ID + # Bulk actions bulkActions=Bulk Actions bulkCancelFollowUp=Cancel follow-up @@ -191,6 +201,7 @@ bulkFacility=Change facility bulkInvestigationStatus=Change investigation status bulkLostToFollowUp=Set to lost to follow-up bulkSurveillanceOfficer=Change surveillance officer + # Campaign campaignActiveCampaigns=Active campaigns campaignAllCampaigns=All campaigns @@ -210,6 +221,7 @@ campaignDashboardChartHeight=Height in % campaignDashboardOrder=Order campaignSearch=Search Campaign campaignDiagramGroupBy=Group by + Campaign=Campaign Campaign.name=Name Campaign.description=Description @@ -222,11 +234,13 @@ Campaign.area=Area Campaign.region=Region Campaign.district=District Campaign.community=Community -CampaignFormData.campaign=Campaign -CampaignFormData.campaignFormMeta=Form -CampaignFormData.formDate=Form date -CampaignFormData.area=Area + +CampaignFormData.campaign = Campaign +CampaignFormData.campaignFormMeta = Form +CampaignFormData.formDate = Form date +CampaignFormData.area = Area CampaignFormData.edit=Edit + # CaseData caseCasesList=Cases list caseInfrastructureDataChanged=Infrastructure data has changed @@ -276,8 +290,9 @@ convertEventParticipantToCase=Create case from event participant with positive t convertContactToCase=Create case from contact with positive test result? caseSearchSpecificCase=Search specific case caseSearchCase=Search case -caseSelect=Select case +caseSelect= Select case caseCreateNew=Create new case + CaseData=Case CaseData.additionalDetails=General comment CaseData.caseClassification=Case classification @@ -300,7 +315,6 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name -CaseData.disease=Disease CaseData.district=Responsible district CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -421,6 +435,7 @@ CaseData.notACaseReasonPhysicianInformation=Information provided by physician CaseData.notACaseReasonDifferentPathogen=Verification of different pathogen CaseData.notACaseReasonOther=Other CaseData.notACaseReasonDetails=Reason details + # CaseExport CaseExport.address=Address CaseExport.addressRegion=Address Region @@ -466,6 +481,7 @@ CaseExport.lastCooperativeVisitSymptomatic=Symptomatic at last cooperative visit CaseExport.lastCooperativeVisitSymptoms=Symptoms at last cooperative visit CaseExport.traveled=Traveled outside of district CaseExport.burialAttended=Visited a burial + # CaseHospitalization CaseHospitalization=Hospitalization CaseHospitalization.admissionDate=Date of visit or admission @@ -480,9 +496,12 @@ CaseHospitalization.previousHospitalizations=Previous hospitalizations CaseHospitalization.intensiveCareUnit=Stay in the intensive care unit CaseHospitalization.intensiveCareUnitStart=Start of the stay CaseHospitalization.intensiveCareUnitEnd=End of the stay + + # CaseImport caseImportErrorDescription=Error description caseImportMergeCase=Override existing case with changes from the imported case? + # CasePreviousHospitalization CasePreviousHospitalization=Previous hospitalization CasePreviousHospitalization.admissionAndDischargeDate=Date of admission & discharge @@ -494,8 +513,10 @@ CasePreviousHospitalization.healthFacility=Hospital CasePreviousHospitalization.healthFacilityDetails=Hospital name & description CasePreviousHospitalization.isolated=Isolation CasePreviousHospitalization.prevHospPeriod=Period of hospitalization + # ClinicalVisit clinicalVisitNewClinicalVisit=New clinical assessment + ClinicalVisit=Clinical assessment ClinicalVisit.bloodPressure=Blood pressure ClinicalVisit.heartRate=Heart rate @@ -503,22 +524,28 @@ ClinicalVisit.temperature=Temperature ClinicalVisit.visitDateTime=Date and time of visit ClinicalVisit.visitingPerson=Attending clinician ClinicalVisit.visitRemarks=Clinician remarks + ClinicalVisitExport.caseUuid=Case ID ClinicalVisitExport.caseName=Case name + columnAdditionalTests=Additional tests columnDiseaseShort=Disease columnNumberOfPendingTasks=Pending tasks + # Community Community.archived=Archived Community.externalID=External ID + communityActiveCommunities=Active communities communityArchivedCommunities=Archived communities communityAllCommunities=All communities + # Configuration Configuration.Facilities=Facilities Configuration.Outbreaks=Outbreaks Configuration.PointsOfEntry=Points of Entry Configuration.LineListing=Line Listing + # Contact contactCancelFollowUp=Cancel follow-up contactCaseContacts=Case contacts @@ -555,9 +582,10 @@ contactOnlyWithSharedEventWithSourceCase=Only contacts with source case linked t contactOnlyWithSourceCaseInGivenEvent=Only contacts whose source case is linked to this event contactFollowUpDay=Day contactQuarantineNotOrdered=No quarantine ordered -contactCreatePIAAccount=PIA -contactPersonPhoneNumber=Contact Person's Phone Number -contactSourceCase=Source case +contactCreatePIAAccount = PIA +contactPersonPhoneNumber = Contact Person's Phone Number +contactSourceCase = Source case + Contact=Contact Contact.additionalDetails=General comment Contact.caseClassification=Classification of the source case @@ -574,10 +602,10 @@ Contact.community=Responsible community Contact.contactClassification=Contact classification Contact.contactOfficer=Responsible contact officer Contact.contactOfficerUuid=Responsible contact officer -Contact.contactIdentificationSource=Contact identification source -Contact.contactIdentificationSourceDetails=Contact identification source details -Contact.tracingApp=Tracing app -Contact.tracingAppDetails=Tracing app details, e.g. name +Contact.contactIdentificationSource = Contact identification source +Contact.contactIdentificationSourceDetails = Contact identification source details +Contact.tracingApp = Tracing app +Contact.tracingAppDetails = Tracing app details, e.g. name Contact.contactProximity=Type of contact - if multiple pick the closest contact proximity Contact.contactStatus=Contact status Contact.description=Description of how contact took place @@ -648,6 +676,7 @@ Contact.prohibitionToWork=Prohibition to work Contact.prohibitionToWorkFrom=Prohibition to work from Contact.prohibitionToWorkUntil=Prohibition to work until Contact.reportingDistrict=Reporting district + # ContactExport ContactExport.address=Address ContactExport.addressDistrict=Address District @@ -666,6 +695,7 @@ ContactExport.sourceCaseUuid=Source case ID ContactExport.traveled=Traveled outside of district ContactExport.travelHistory=Travel history ContactExport.quarantineInformation=Quarantine information + # Dashboard dashboardAlive=Alive dashboardApplyCustomFilter=Apply custom filter @@ -789,12 +819,14 @@ dashboardAggregatedNumber=Count dashboardProportion=Proportion (%) dashboardViewAsColumnChart=View as Column Chart dashboardViewAsBarChart=View as Bar Chart + defaultRegion=Default Region defaultDistrict=Default District defaultCommunity=Default Community defaultFacility=Default Facility defaultLaboratory=Default Laboratory defaultPointOfEntry=Default Point Of Entry + devModeCaseCount=Number of generated cases devModeCaseDisease=Disease of the cases devModeCaseDistrict=District of the cases @@ -825,6 +857,7 @@ devModeEventStartDate=Earliest event start date devModeGenerateCases=Generate Cases devModeGenerateContacts=Generate Contacts devModeGenerateEvents=Generate Events + DiseaseBurden.caseCount=New cases DiseaseBurden.caseDeathCount=Fatalities DiseaseBurden.casesDifference=Dynamic @@ -832,16 +865,20 @@ DiseaseBurden.caseFatalityRate=CFR DiseaseBurden.eventCount=Number of events DiseaseBurden.outbreakDistrictCount=Outbreak districts DiseaseBurden.previousCaseCount=Previous cases + # District districtActiveDistricts=Active districts districtArchivedDistricts=Archived districts districtAllDistricts=All districts + District.archived=Archived District.epidCode=Epid code District.growthRate=Growth rate District.population=Population District.externalID=External ID + epiDataNoSourceContacts=No source contacts have been created for this case + EpiData=Epidemiological data EpiData.areaInfectedAnimals=Residing, working or travelling to an area where infected animals have been confirmed EpiData.exposureDetailsKnown=Exposure details known @@ -849,9 +886,11 @@ EpiData.exposures=Exposures EpiData.highTransmissionRiskArea=Residing or working in an area with high risk of transmission of the disease, e.g. closed residential and camp-like settings EpiData.largeOutbreaksArea=Residing or travelling to countries/territories/areas experiencing larger outbreaks of local transmission EpiData.contactWithSourceCaseKnown=Contacts with source case known + # Documents documentUploadDocument=New document documentNoDocuments=There are no documents for this %s + # DocumentTemplate DocumentTemplate=Document Template DocumentTemplate.buttonUploadTemplate=Upload Template @@ -868,6 +907,7 @@ DocumentTemplate.exampleTemplateCases=Example Template Cases DocumentTemplate.exampleTemplateContacts=Example Template Contacts DocumentTemplate.exampleTemplateEventHandout=Example Template Event Handout DocumentTemplate.exampleTemplateEventParticipants=Example Template Event Participants + # Event eventActiveEvents=Active events eventArchivedEvents=Archived events @@ -895,6 +935,7 @@ eventUnlinkEvent=Unlink event eventOpenSuperordinateEvent=Open event eventEditEvent=Edit event eventLinkToEventsWithinTheSameFacility=See events within the same facility + Event=Event Event.caseCount=Cases Event.contactCount=Contacts @@ -951,6 +992,7 @@ Event.typeOfPlaceText=Specify other event place Event.uuid=Event ID Event.transregionalOutbreak=Transregional outbreak Event.diseaseTransmissionMode=Primary mode of transmission + # Event action EventAction.eventUuid=Event id EventAction.eventTitle=Event title @@ -967,14 +1009,18 @@ EventAction.actionChangeDate=Action change date EventAction.actionStatus=Action status EventAction.actionPriority=Action priority EventAction.actionLastModifiedBy=Action last modified by + # Event action export EventActionExport.eventDate=Date of event + #Event export + # EventParticipant eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant + EventParticipant=Event participant EventParticipant.contactCount=Contact count EventParticipant.event=Event @@ -988,6 +1034,7 @@ EventParticipant.person=Person EventParticipant.uuid=Event participant ID EventParticipant.region=Responsible region EventParticipant.district=Responsible district + #EventParticipant export EventParticipantExport.eventParticipantU=Event disease EventParticipantExport.eventDisease=Event disease @@ -1012,6 +1059,7 @@ EventParticipantExport.sampleInformation=Sample information EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID + # Expo export=Export exportBasic=Basic Export @@ -1026,13 +1074,16 @@ exportCaseManagement=Case Management Export exportCaseCustom=Custom Case Export exportNewExportConfiguration=New Export Configuration exportEditExportConfiguration=Edit Export Configuration + ExportConfiguration.NAME=Configuration name ExportConfiguration.myExports=My exports ExportConfiguration.sharedExports=Shared exports ExportConfiguration.sharedToPublic=Shared to public + exposureFlightNumber=Flight number exposureTimePeriod=Time period exposureSourceCaseName=Name of source case + Exposure.startDate=Start of exposure Exposure.endDate=End of exposure Exposure.exposureType=Type of activity @@ -1083,13 +1134,16 @@ Exposure.prophylaxisDate=Date of prophylaxis Exposure.riskArea=Risk area as defined by public health institution Exposure.exposureDate=Exposure date Exposure.exposureRole=Role + # Facility facilityActiveFacilities=Active facilities facilityArchivedFacilities=Archived facilities facilityAllFacilities=All facilities + Facility.CONFIGURED_FACILITY=Configured facility Facility.NO_FACILITY=Home or other place Facility.OTHER_FACILITY=Other facility + Facility.archived=Archived Facility.city=City Facility.community=Community @@ -1102,18 +1156,22 @@ Facility.publicOwnership=Public ownership Facility.region=Region Facility.type=Facility type Facility.typeGroup=Facility category + FeatureConfiguration.districtName=District FeatureConfiguration.enabled=Line listing enabled? FeatureConfiguration.endDate=End date + # Formats formatNumberOfVisitsFormat=%d (%d missed) formatNumberOfVisitsLongFormat=%d visits (%d missed) formatSimpleNumberFormat=%d + # FollowUp FollowUp.uuid=Follow-up ID FollowUp.person=Follow-up person FollowUp.reportDate=Date of report FollowUp.followUpUntil=Follow-up until + # HealthConditions HealthConditions=Health conditions HealthConditions.tuberculosis=Tuberculosis @@ -1139,6 +1197,7 @@ HealthConditions.formerSmoker=Former smoker\t\t HealthConditions.asthma=Asthma HealthConditions.sickleCellDisease=Sickle cell disease\t HealthConditions.immunodeficiencyIncludingHiv=Immunodeficiency including HIV + # Import importDetailed=Detailed Import importDownloadCaseImportTemplate=Download Case Import Template @@ -1155,6 +1214,7 @@ importLineListing=Line Listing Import importProcessed=%d/%d Processed importSkips=%d Skipped importCancelImport=Cancel import + #Lab Message LabMessage=Lab Message LabMessage.labMessageDetails=Lab message details @@ -1176,10 +1236,12 @@ LabMessage.sampleMaterial=Type of sample LabMessage.sampleReceivedDate=Sample received LabMessage.specimenCondition=Specimen condition LabMessage.testedDisease=Tested disease -labMessageFetch=Fetch lab messages + +labMessageFetch= Fetch lab messages labMessageProcess=Process labMessageProcessed=Processed labMessageUnprocessed=Unprocessed + #Line listing lineListingAddLine=Add line lineListingInfrastructureData=Take over infrastructure data from last line @@ -1192,6 +1254,7 @@ lineListingEnableAll=Enable all lineListingDisableAllShort=Disable all lineListingEndDate=End date lineListingSetEndDateForAll=Set end date for all + # Location Location=Location Location.additionalInformation=Additional information @@ -1209,27 +1272,31 @@ Location.latLonAccuracy=GPS accuracy in m Location.longitude=GPS longitude Location.postalCode=Postal code Location.street=Street + # Login Login.doLogIn=Log in Login.login=Login Login.password=password Login.username=username + #LoginSidebar LoginSidebar.diseaseDetection=Disease Detection LoginSidebar.diseasePrevention=Disease Prevention LoginSidebar.outbreakResponse=Outbreak Response LoginSidebar.poweredBy=Powered By + # Messaging messagesSendSMS=Send SMS messagesSentBy=Sent by messagesNoSmsSentForCase=No SMS sent to case person messagesNoPhoneNumberForCasePerson=Case person has no phone number -messagesSms=SMS -messagesEmail=Email -messagesSendingSms=Send new SMS -messagesNumberOfMissingPhoneNumbers=Number of selected cases without phone number\: %s -messagesCharacters=Characters\: %d / 160 -messagesNumberOfMessages=Nr. of messages\: %d +messagesSms = SMS +messagesEmail = Email +messagesSendingSms = Send new SMS +messagesNumberOfMissingPhoneNumbers = Number of selected cases without phone number\: %s +messagesCharacters = Characters\: %d / 160 +messagesNumberOfMessages = Nr. of messages\: %d + # Main Menu mainMenuAbout=About mainMenuCampaigns=Campaigns @@ -1245,6 +1312,7 @@ mainMenuStatistics=Statistics mainMenuTasks=Tasks mainMenuUsers=Users mainMenuAggregateReports=mSERS + MaternalHistory.childrenNumber=Total number of children MaternalHistory.ageAtBirth=Mother's age at birth of infant patient MaternalHistory.conjunctivitis=Conjunctivitis @@ -1271,16 +1339,19 @@ MaternalHistory.otherComplications=Other complications MaternalHistory.otherComplicationsOnset=Date of onset MaternalHistory.otherComplicationsMonth=Month of pregnancy MaternalHistory.otherComplicationsDetails=Complication details + # Outbreak outbreakAffectedDistricts=Affected districts outbreakNoOutbreak=No outbreak outbreakNormal=Normal outbreakOutbreak=Outbreak + # PathogenTest pathogenTestCreateNew=Create new pathogen test pathogenTestNewResult=New result pathogenTestNewTest=New test result pathogenTestSelect=Select pathogen test + PathogenTest=Pathogen test PathogenTests=Pathogen tests PathogenTest.fourFoldIncreaseAntibodyTiter=4 fold increase of antibody titer @@ -1297,6 +1368,7 @@ PathogenTest.testedDiseaseDetails=Tested disease name PathogenTest.typingId=Typing ID PathogenTest.serotype=Serotype PathogenTest.cqValue=CQ/CT Value + # Person personPersonsList=Person list personCreateNew=Create a new person @@ -1309,6 +1381,7 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person + Person=Person Person.address=Home address Person.addresses=Addresses @@ -1380,9 +1453,11 @@ Person.otherSalutation=Other salutation Person.birthName=Birth name Person.birthCountry=Country of birth Person.citizenship=Citizenship + pointOfEntryActivePointsOfEntry=Active points of entry pointOfEntryArchivedPointsOfEntry=Archived points of entry pointOfEntryAllPointsOfEntry=All points of entry + PointOfEntry.OTHER_AIRPORT=Other airport PointOfEntry.OTHER_SEAPORT=Other seaport PointOfEntry.OTHER_GROUND_CROSSING=Other ground crossing @@ -1392,8 +1467,10 @@ PointOfEntry.active=Active? PointOfEntry.latitude=Latitude PointOfEntry.longitude=Longitude PointOfEntry.externalID=External ID + populationDataMaleTotal=Male total populationDataFemaleTotal=Female total + PortHealthInfo=Port health information PortHealthInfo.airlineName=Airline name PortHealthInfo.flightNumber=Flight number @@ -1417,8 +1494,10 @@ PortHealthInfo.conveyanceTypeDetails=Specify the conveyance type PortHealthInfo.departureLocation=Start location of travel PortHealthInfo.finalDestination=Final destination PortHealthInfo.details=Point of entry details + # Prescription prescriptionNewPrescription=New prescription + Prescription.additionalNotes=Additional notes Prescription.dose=Dose Prescription.drugIntakeDetails=Drug name @@ -1434,27 +1513,33 @@ Prescription.prescriptionType=Prescription type Prescription.route=Route Prescription.routeDetails=Route specification Prescription.typeOfDrug=Type of drug + PrescriptionExport.caseUuid=Case ID PrescriptionExport.caseName=Case name + # Country countryActiveCountries=Active countries countryArchivedCountries=Archived countries countryAllCountries=All countries + Country.archived=Archived Country.externalId=External ID Country.defaultName=Default name Country.displayName=Name Country.isoCode=ISO code Country.unoCode=UNO code + # Region regionActiveRegions=Active regions regionArchivedRegions=Archived regions regionAllRegions=All regions + Region.archived=Archived Region.epidCode=Epid code Region.growthRate=Growth rate Region.population=Population Region.externalID=External ID + # Sample sampleCreateNew=Create new sample sampleIncludeTestOnCreation=Create test result for this sample now @@ -1481,6 +1566,7 @@ sampleActiveSamples=Active samples sampleArchivedSamples=Archived samples sampleAllSamples=All samples sampleAssociationType=Sample type + Sample=Sample Sample.additionalTestingRequested=Request additional tests to be performed? Sample.additionalTestingStatus=Additional testing status @@ -1530,22 +1616,23 @@ Sample.testType=Type of test Sample.typeOfTest=Type of test Sample.uuid=Sample ID Sample.samplePurpose=Purpose of the Sample + SampleExport.additionalTestingRequested=Have additional tests been requested? SampleExport.personAddressCaption=Address of case/contact/event participant person SampleExport.personAge=Age of case/contact/event participant person SampleExport.caseDistrict=District of case SampleExport.caseCommunity=Community of case SampleExport.caseFacility=Facility of case -SampleExport.contactRegion=Region of contact -SampleExport.contactDistrict=District of contact -SampleExport.contactCommunity=Community of contact +SampleExport.contactRegion = Region of contact +SampleExport.contactDistrict = District of contact +SampleExport.contactCommunity = Community of contact SampleExport.caseOutcome=Outcome of case SampleExport.caseRegion=Region of case SampleExport.caseReportDate=Case report date SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID -SampleExport.contactUuid=Contact UUID -SampleExport.contactReportDate=Contact report date +SampleExport.contactUuid = Contact UUID +SampleExport.contactReportDate = Contact report date SampleExport.id=Sample SN SampleExport.sampleReportDate=Sample report date SampleExport.noTestPossibleReason=No test possible reason @@ -1597,6 +1684,7 @@ SampleExport.testDateTime=Date and time of latest additional test SampleExport.totalBilirubin=Total bilirubin of latest additional test SampleExport.urea=Urea of latest additional test SampleExport.wbcCount=WBC count of latest additional test + # Statistics statisticsAddFilter=Add filter statisticsAttribute=Attribute @@ -1619,11 +1707,13 @@ statisticsStatistics=Statistics statisticsVisualizationType=Type statisticsIncidenceDivisor=Incidence divisor statisticsDataDisplayed=Data displayed + # Symptoms symptomsLesionsLocations=Localization of the lesions symptomsMaxTemperature=Maximum body temperature in ° C symptomsSetClearedToNo=Set cleared to No symptomsSetClearedToUnknown=Set cleared to Unknown + Symptoms=Symptoms Symptoms.abdominalPain=Abdominal pain Symptoms.alteredConsciousness=Altered level of consciousness @@ -1811,6 +1901,7 @@ Symptoms.palpitations=Palpitations Symptoms.dizzinessStandingUp=Dizziness (when standing up from a sitting or lying position) Symptoms.highOrLowBloodPressure=Blood pressure too high or too low (measured) Symptoms.urinaryRetention=Urinary retention + # Task taskMyTasks=My tasks taskNewTask=New task @@ -1819,6 +1910,7 @@ taskOfficerTasks=Officer tasks taskActiveTasks=Active tasks taskArchivedTasks=Archived tasks taskAllTasks=All tasks + Task=Task Task.assigneeReply=Comments on execution Task.assigneeUser=Assigned to @@ -1836,7 +1928,9 @@ Task.suggestedStart=Suggested start Task.taskContext=Task context Task.taskStatus=Task status Task.taskType=Task type + # TestReport + TestReport.testDateTime=Date and time of result TestReport.testLabCity=Lab city TestReport.testLabExternalId=Lab external ID @@ -1844,10 +1938,12 @@ TestReport.testLabName=Lab name TestReport.testLabPostalCode=Lab postal code TestReport.testResult=Test result TestReport.testType=Type of test + # Treatment treatmentCreateTreatment=Create treatment treatmentNewTreatment=New treatment treatmentOpenPrescription=Open prescription + Treatment.additionalNotes=Additional notes Treatment.dose=Dose Treatment.drugIntakeDetails=Drug name @@ -1861,8 +1957,10 @@ Treatment.treatmentDetails=Treatment details Treatment.treatmentType=Treatment type Treatment.typeOfDrug=Type of drug Treatment.treatmentRoute=Treatment route + TreatmentExport.caseUuid=Case ID TreatmentExport.caseName=Case name + # User userNewUser=New user userResetPassword=Create new password @@ -1872,6 +1970,7 @@ syncUsers=Sync Users syncErrors=%d Error(s) syncSuccessful=%d Synced syncProcessed=%d/%d Processed + User=User User.active=Active? User.associatedOfficer=Associated officer @@ -1886,16 +1985,20 @@ User.userName=User name User.userRoles=User roles User.address=Address User.uuid=UUID + # Views View.actions=Action Directory + View.aggregatereports=Aggregate Reporting (mSERS) View.aggregatereports.sub= + View.campaign.campaigns=Campaign Directory View.campaign.campaigns.short=Campaigns View.campaign.campaigndata=Campaign Data View.campaign.campaigndata.short=Campaign Data View.campaign.campaigndata.dataform=Campaign Data Form View.campaign.campaigndata.dataform.short=Data Form + View.cases=Case Directory View.cases.merge=Merge Duplicate Cases View.cases.archive=Case Archive @@ -1911,8 +2014,10 @@ View.cases.clinicalcourse=Clinical Course View.cases.maternalhistory=Maternal History View.cases.porthealthinfo=Port Health Information View.cases.visits=Case Visits + View.persons=Person Directory View.persons.data=Person Information + View.configuration.communities=Communities Configuration View.configuration.communities.short=Communities View.configuration.districts=Districts Configuration @@ -1943,6 +2048,7 @@ View.configuration.populationdata=Population Data View.configuration.populationdata.short=Population View.configuration.linelisting=Line Listing Configuration View.configuration.linelisting.short=Line Listing + View.contacts=Contact Directory View.contacts.archive=Contact Archive View.contacts.epidata=Contact Epidemiological Data @@ -1950,9 +2056,11 @@ View.contacts.data=Contact Information View.contacts.person=Contact Person View.contacts.sub= View.contacts.visits=Contact Visits + View.dashboard.contacts=Contacts Dashboard View.dashboard.surveillance=Surveillance Dashboard View.dashboard.campaigns=Campaigns Dashboard + View.events=Event Directory View.events.archive=Event Archive View.events.data=Event Information @@ -1960,22 +2068,30 @@ View.events.eventactions=Event Actions View.events.eventparticipants=Event Participants View.events.sub= View.events.eventparticipants.data=Event Participant Information + View.samples.labMessages=Lab Message Directory + View.reports=Weekly Reports View.reports.sub= + View.samples=Sample Directory View.samples.archive=Sample Archive View.samples.data=Sample Information View.samples.sub= + View.statistics=Statistics View.statistics.database-export=Database export + View.tasks=Task Management View.tasks.archive=Task Archive View.tasks.sub= + View.users=User Management View.users.sub= + # Visit visitNewVisit=New visit + Visit=Visit Visit.person=Visited person Visit.symptoms=Symptoms @@ -1987,19 +2103,24 @@ Visit.visitUser=Visiting officer Visit.disease=Disease Visit.reportLat=Report latitude Visit.reportLon=Report longitude + # WeeklyReport weeklyReportNoReport=Missing report weeklyReportOfficerInformants=Informants weeklyReportsInDistrict=Weekly Reports in %s weeklyReportRegionOfficers=Officers weeklyReportRegionInformants=Informants + WeeklyReport.epiWeek=Epi Week WeeklyReport.year=Year + # WeeklyReportEntry WeeklyReportEntry.numberOfCases=Cases reported + # WeeklyReportInformantSummary WeeklyReportInformantSummary.informantReportDate=Informant report submission WeeklyReportInformantSummary.totalCaseCount=Cases reported by informant + # WeeklyReportOfficerSummary WeeklyReportOfficerSummary.informants=Number of informants WeeklyReportOfficerSummary.informantReports=Number of informant reports @@ -2008,6 +2129,7 @@ WeeklyReportOfficerSummary.informantZeroReports=Number of informant zero reports WeeklyReportOfficerSummary.officer=Officer WeeklyReportOfficerSummary.officerReportDate=Officer report submission WeeklyReportOfficerSummary.totalCaseCount=Cases reported by officer + # WeeklyReportRegionSummary WeeklyReportRegionSummary.informants=Number of informants WeeklyReportRegionSummary.informantReports=Number of informant reports @@ -2017,6 +2139,7 @@ WeeklyReportRegionSummary.officers=Number of officers WeeklyReportRegionSummary.officerReports=Number of officers reports WeeklyReportRegionSummary.officerReportPercentage=Percentage WeeklyReportRegionSummary.officerZeroReports=Number of officer zero reports + # SORMAS to SORMAS SormasToSormasOptions.organization=Orgainzation SormasToSormasOptions.withAssociatedContacts=Share associated contacts @@ -2037,17 +2160,23 @@ sormasToSormasSharedWith=Shared with sormasToSormasSharedBy=By sormasToSormasSharedDate=On sormasToSormasSentFrom=Sent from + BAGExport=BAG Export + # Survnet Gateway SurvnetGateway.title=SurvNet SurvnetGateway.send=send to own SurvNet instance SurvnetGateway.unableToSend=Unable to send SurvnetGateway.confirmSend=Confirm sending SurvnetGateway.sendShort=Send to SurvNet + patientDiaryRegistrationError=Could not register person in the patient diary. patientDiaryPersonNotExportable=Cannot export the person to the patient diary. The person needs a valid birthdate and either a valid phone number or email address. + showPlacesOnMap=Show + changeUserEmail=Change user email + VaccinationInfo.vaccination=Vaccination status for this disease VaccinationInfo.firstVaccinationDate=Date of first vaccination VaccinationInfo.lastVaccinationDate=Date of last vaccination diff --git a/sormas-api/src/main/resources/captions_ne-NP.properties b/sormas-api/src/main/resources/captions_ne-NP.properties index 932cab54c47..42f5c2bc105 100644 --- a/sormas-api/src/main/resources/captions_ne-NP.properties +++ b/sormas-api/src/main/resources/captions_ne-NP.properties @@ -188,13 +188,13 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge=Okay, and continue to merge overview -actionOkAndGoToContactDirectory=Okay, and continue to contact directory -actionOkAndGoToContactDetails=Okay, and continue to contact -actionOkAndGoToPersonDirectory=Okay, and continue to person directory -actionExecuteAutomaticDeletion=Execute automatic deletion -actionDone=Done -actionConfirmAction=Confirm action +actionOkAndGoToMerge = Okay, and continue to merge overview +actionOkAndGoToContactDirectory = Okay, and continue to contact directory +actionOkAndGoToContactDetails = Okay, and continue to contact +actionOkAndGoToPersonDirectory = Okay, and continue to person directory +actionExecuteAutomaticDeletion = Execute automatic deletion +actionDone = Done +actionConfirmAction = Confirm action activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -248,10 +248,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows=Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups=Expired -aggregateReportNoAgeGroup=No age group -aggregateReportShowOnlyDuplicateReports=Display only duplicate reports +aggregateReportShowZeroRows = Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups = Expired +aggregateReportNoAgeGroup = No age group +aggregateReportShowOnlyDuplicateReports = Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -275,7 +275,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend=Send emails +bulkEmailSend = Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -434,7 +434,6 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name -CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1134,6 +1133,7 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: + # Environment Environment=Environment Environment.uuid=Environment ID @@ -1152,51 +1152,54 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location + environmentActiveEnvironments=Active environments -environmentArchivedEnvironments=Archived environments -environmentAllActiveAndArchivedEnvironments=All active and archived environments -environmentDeletedEnvironments=Deleted environments -environmentNewEnvironment=New environment +environmentArchivedEnvironments = Archived environments +environmentAllActiveAndArchivedEnvironments = All active and archived environments +environmentDeletedEnvironments = Deleted environments +environmentNewEnvironment= New environment environmentEnvironmentsList=Environments list + # EnvironmentSample -EnvironmentSample=Environment Sample -EnvironmentSample.uuid=Sample ID -EnvironmentSample.environment=Environment -EnvironmentSample.sampleDateTime=Date of sampling -EnvironmentSample.sampleMaterial=Sample material -EnvironmentSample.otherSampleMaterial=Specify sample material -EnvironmentSample.sampleVolume=Volume (in mL) -EnvironmentSample.fieldSampleId=Field sample ID -EnvironmentSample.turbidity=Turbidity (in NTU) -EnvironmentSample.phValue=pH of sample -EnvironmentSample.sampleTemperature=Temperature (in °C) -EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) -EnvironmentSample.laboratory=Laboratory -EnvironmentSample.laboratoryDetails=Laboratory details -EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested -EnvironmentSample.reportingUser=Reporting user -EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested -EnvironmentSample.weatherConditions=Weather conditions at time of sampling -EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched=Sent/dispatched -EnvironmentSample.dispatchDate=Dispatchment date -EnvironmentSample.dispatchDetails=Dispatchment details -EnvironmentSample.received=Received -EnvironmentSample.receivalDate=Receival date -EnvironmentSample.labSampleId=Lab sample ID -EnvironmentSample.specimenCondition=Specimen condition -EnvironmentSample.location=Location of sampling site -EnvironmentSample.generalComment=General comment -EnvironmentSample.positivePathogenTests=Positive pathogen tests -EnvironmentSample.latestPathogenTest=Latest pathogen test -EnvironmentSample.numberOfTests=Number of tests +EnvironmentSample = Environment Sample +EnvironmentSample.uuid = Sample ID +EnvironmentSample.environment = Environment +EnvironmentSample.sampleDateTime = Date of sampling +EnvironmentSample.sampleMaterial = Sample material +EnvironmentSample.otherSampleMaterial = Specify sample material +EnvironmentSample.sampleVolume = Volume (in mL) +EnvironmentSample.fieldSampleId = Field sample ID +EnvironmentSample.turbidity = Turbidity (in NTU) +EnvironmentSample.phValue = pH of sample +EnvironmentSample.sampleTemperature = Temperature (in °C) +EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) +EnvironmentSample.laboratory = Laboratory +EnvironmentSample.laboratoryDetails = Laboratory details +EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested +EnvironmentSample.reportingUser = Reporting user +EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested +EnvironmentSample.weatherConditions = Weather conditions at time of sampling +EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched = Sent/dispatched +EnvironmentSample.dispatchDate = Dispatchment date +EnvironmentSample.dispatchDetails = Dispatchment details +EnvironmentSample.received = Received +EnvironmentSample.receivalDate = Receival date +EnvironmentSample.labSampleId = Lab sample ID +EnvironmentSample.specimenCondition = Specimen condition +EnvironmentSample.location = Location of sampling site +EnvironmentSample.generalComment = General comment +EnvironmentSample.positivePathogenTests = Positive pathogen tests +EnvironmentSample.latestPathogenTest = Latest pathogen test +EnvironmentSample.numberOfTests = Number of tests + # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents=Deleted events +eventDeletedEvents = Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1340,7 +1343,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants=Deleted event participants +eventParticipantDeletedEventParticipants = Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1353,7 +1356,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser=Reporting user +EventParticipant.reportingUser = Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1390,9 +1393,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink=Event participant ID -EventParticipantSelection.eventUuidLink=Event ID -EventParticipantSelection.resultingCaseUuidLink=Resulting case ID +EventParticipantSelection.eventParticipantUuidLink = Event participant ID +EventParticipantSelection.eventUuidLink = Event ID +EventParticipantSelection.resultingCaseUuidLink = Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1612,6 +1615,7 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message + #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1622,7 +1626,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList=List of new event participants +lineListingNewEventParticipantsList = List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1796,10 +1800,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples=See samples for this person -caseLinkToSamples=See samples for this case -contactLinkToSamples=See samples for this contact -eventParticipantLinkToSamples=See samples for this event participant +personLinkToSamples = See samples for this person +caseLinkToSamples = See samples for this case +contactLinkToSamples = See samples for this contact +eventParticipantLinkToSamples = See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2107,9 +2111,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity=Community of event participant -SampleExport.eventParticipantDistrict=District of event participant -SampleExport.eventParticipantRegion=Region of event participant +SampleExport.eventParticipantCommunity = Community of event participant +SampleExport.eventParticipantDistrict = District of event participant +SampleExport.eventParticipantRegion = Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2168,7 +2172,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser=Reporting user +Immunization.reportingUser = Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2211,10 +2215,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations=Active immunizations -immunizationArchivedImmunizations=Archived immunizations -immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations -immunizationDeletedImmunizations=Deleted immunizations +immunizationActiveImmunizations = Active immunizations +immunizationArchivedImmunizations = Archived immunizations +immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations +immunizationDeletedImmunizations = Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2457,7 +2461,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment=Associated environment +Task.environment = Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2510,7 +2514,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser=Reporting user +TravelEntry.reportingUser = Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -2877,15 +2881,17 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms=SMS -userRoleNotificationTypeEmail=EMAIL +userRoleNotificationTypeSms = SMS +userRoleNotificationTypeEmail = EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template + notificationType=Notification type -notificationType.group=Group -notificationType.caption=Caption -notificationType.description=Description +notificationType.group = Group +notificationType.caption = Caption +notificationType.description = Description + SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -2920,10 +2926,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails=Person contact details -environmentSampleNotShipped=Not shipped -environmentSampleShipped=Shipped -environmentSampleReceived=Received +TaskExport.personOtherContactDetails = Person contact details +environmentSampleNotShipped = Not shipped +environmentSampleShipped = Shipped +environmentSampleReceived = Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -2940,34 +2946,37 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents + # SpecialCaseAccess SpecialCaseAccess=Special case access -caze=Case -assignedTo=Assigned to -assignedBy=Assigned by -endDateTime=Access until -assignmentDate=Date assigned +caze = Case +assignedTo = Assigned to +assignedBy = Assigned by +endDateTime = Access until +assignmentDate = Date assigned + specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case + # SelfReport -SelfReport.type=Type -SelfReport.reportDate=Report date -SelfReport.disease=Disease -SelfReport.diseaseVariant=Disease variant -SelfReport.firstName=First name -SelfReport.lastName=Last name -SelfReport.sex=Sex -SelfReport.birthdateDD=Day of birth -SelfReport.birthdateMM=Month of birth -SelfReport.birthdateYYYY=Year of birth -SelfReport.nationalHealthId=National health ID -SelfReport.email=Email -SelfReport.phoneNumber=Phone number -SelfReport.address=Address -SelfReport.comment=Comment -SelfReport.responsibleUser=Responsible user -SelfReport.investigationStatus=Investigation status -SelfReport.processingStatus=Processing status +SelfReport.type = Type +SelfReport.reportDate = Report date +SelfReport.disease = Disease +SelfReport.diseaseVariant = Disease variant +SelfReport.firstName = First name +SelfReport.lastName = Last name +SelfReport.sex = Sex +SelfReport.birthdateDD = Day of birth +SelfReport.birthdateMM = Month of birth +SelfReport.birthdateYYYY = Year of birth +SelfReport.nationalHealthId = National health ID +SelfReport.email = Email +SelfReport.phoneNumber = Phone number +SelfReport.address = Address +SelfReport.comment = Comment +SelfReport.responsibleUser = Responsible user +SelfReport.investigationStatus = Investigation status +SelfReport.processingStatus = Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_nl-NL.properties b/sormas-api/src/main/resources/captions_nl-NL.properties index 2c3589116cb..af2b546cf31 100644 --- a/sormas-api/src/main/resources/captions_nl-NL.properties +++ b/sormas-api/src/main/resources/captions_nl-NL.properties @@ -188,13 +188,13 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge=Okay, and continue to merge overview -actionOkAndGoToContactDirectory=Okay, and continue to contact directory -actionOkAndGoToContactDetails=Okay, and continue to contact -actionOkAndGoToPersonDirectory=Okay, and continue to person directory -actionExecuteAutomaticDeletion=Execute automatic deletion -actionDone=Done -actionConfirmAction=Confirm action +actionOkAndGoToMerge = Okay, and continue to merge overview +actionOkAndGoToContactDirectory = Okay, and continue to contact directory +actionOkAndGoToContactDetails = Okay, and continue to contact +actionOkAndGoToPersonDirectory = Okay, and continue to person directory +actionExecuteAutomaticDeletion = Execute automatic deletion +actionDone = Done +actionConfirmAction = Confirm action activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -248,10 +248,10 @@ aggregateReportDiscardSelection=Selectie verwijderen aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows=Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups=Expired -aggregateReportNoAgeGroup=No age group -aggregateReportShowOnlyDuplicateReports=Display only duplicate reports +aggregateReportShowZeroRows = Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups = Expired +aggregateReportNoAgeGroup = No age group +aggregateReportShowOnlyDuplicateReports = Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=Deze week @@ -275,7 +275,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend=Send emails +bulkEmailSend = Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -434,7 +434,6 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name -CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1134,6 +1133,7 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: + # Environment Environment=Environment Environment.uuid=Environment ID @@ -1152,51 +1152,54 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location + environmentActiveEnvironments=Active environments -environmentArchivedEnvironments=Archived environments -environmentAllActiveAndArchivedEnvironments=All active and archived environments -environmentDeletedEnvironments=Deleted environments -environmentNewEnvironment=New environment +environmentArchivedEnvironments = Archived environments +environmentAllActiveAndArchivedEnvironments = All active and archived environments +environmentDeletedEnvironments = Deleted environments +environmentNewEnvironment= New environment environmentEnvironmentsList=Environments list + # EnvironmentSample -EnvironmentSample=Environment Sample -EnvironmentSample.uuid=Sample ID -EnvironmentSample.environment=Environment -EnvironmentSample.sampleDateTime=Date of sampling -EnvironmentSample.sampleMaterial=Sample material -EnvironmentSample.otherSampleMaterial=Specify sample material -EnvironmentSample.sampleVolume=Volume (in mL) -EnvironmentSample.fieldSampleId=Field sample ID -EnvironmentSample.turbidity=Turbidity (in NTU) -EnvironmentSample.phValue=pH of sample -EnvironmentSample.sampleTemperature=Temperature (in °C) -EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) -EnvironmentSample.laboratory=Laboratory -EnvironmentSample.laboratoryDetails=Laboratory details -EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested -EnvironmentSample.reportingUser=Reporting user -EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested -EnvironmentSample.weatherConditions=Weather conditions at time of sampling -EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched=Sent/dispatched -EnvironmentSample.dispatchDate=Dispatchment date -EnvironmentSample.dispatchDetails=Dispatchment details -EnvironmentSample.received=Received -EnvironmentSample.receivalDate=Receival date -EnvironmentSample.labSampleId=Lab sample ID -EnvironmentSample.specimenCondition=Specimen condition -EnvironmentSample.location=Location of sampling site -EnvironmentSample.generalComment=General comment -EnvironmentSample.positivePathogenTests=Positive pathogen tests -EnvironmentSample.latestPathogenTest=Latest pathogen test -EnvironmentSample.numberOfTests=Number of tests +EnvironmentSample = Environment Sample +EnvironmentSample.uuid = Sample ID +EnvironmentSample.environment = Environment +EnvironmentSample.sampleDateTime = Date of sampling +EnvironmentSample.sampleMaterial = Sample material +EnvironmentSample.otherSampleMaterial = Specify sample material +EnvironmentSample.sampleVolume = Volume (in mL) +EnvironmentSample.fieldSampleId = Field sample ID +EnvironmentSample.turbidity = Turbidity (in NTU) +EnvironmentSample.phValue = pH of sample +EnvironmentSample.sampleTemperature = Temperature (in °C) +EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) +EnvironmentSample.laboratory = Laboratory +EnvironmentSample.laboratoryDetails = Laboratory details +EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested +EnvironmentSample.reportingUser = Reporting user +EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested +EnvironmentSample.weatherConditions = Weather conditions at time of sampling +EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched = Sent/dispatched +EnvironmentSample.dispatchDate = Dispatchment date +EnvironmentSample.dispatchDetails = Dispatchment details +EnvironmentSample.received = Received +EnvironmentSample.receivalDate = Receival date +EnvironmentSample.labSampleId = Lab sample ID +EnvironmentSample.specimenCondition = Specimen condition +EnvironmentSample.location = Location of sampling site +EnvironmentSample.generalComment = General comment +EnvironmentSample.positivePathogenTests = Positive pathogen tests +EnvironmentSample.latestPathogenTest = Latest pathogen test +EnvironmentSample.numberOfTests = Number of tests + # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents=Deleted events +eventDeletedEvents = Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1340,7 +1343,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants=Deleted event participants +eventParticipantDeletedEventParticipants = Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1353,7 +1356,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser=Reporting user +EventParticipant.reportingUser = Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1390,9 +1393,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink=Event participant ID -EventParticipantSelection.eventUuidLink=Event ID -EventParticipantSelection.resultingCaseUuidLink=Resulting case ID +EventParticipantSelection.eventParticipantUuidLink = Event participant ID +EventParticipantSelection.eventUuidLink = Event ID +EventParticipantSelection.resultingCaseUuidLink = Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1612,6 +1615,7 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message + #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1622,7 +1626,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList=List of new event participants +lineListingNewEventParticipantsList = List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1796,10 +1800,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples=See samples for this person -caseLinkToSamples=See samples for this case -contactLinkToSamples=See samples for this contact -eventParticipantLinkToSamples=See samples for this event participant +personLinkToSamples = See samples for this person +caseLinkToSamples = See samples for this case +contactLinkToSamples = See samples for this contact +eventParticipantLinkToSamples = See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2107,9 +2111,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity=Community of event participant -SampleExport.eventParticipantDistrict=District of event participant -SampleExport.eventParticipantRegion=Region of event participant +SampleExport.eventParticipantCommunity = Community of event participant +SampleExport.eventParticipantDistrict = District of event participant +SampleExport.eventParticipantRegion = Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2168,7 +2172,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser=Reporting user +Immunization.reportingUser = Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2211,10 +2215,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations=Active immunizations -immunizationArchivedImmunizations=Archived immunizations -immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations -immunizationDeletedImmunizations=Deleted immunizations +immunizationActiveImmunizations = Active immunizations +immunizationArchivedImmunizations = Archived immunizations +immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations +immunizationDeletedImmunizations = Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2457,7 +2461,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment=Associated environment +Task.environment = Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2510,7 +2514,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser=Reporting user +TravelEntry.reportingUser = Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -2877,15 +2881,17 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms=SMS -userRoleNotificationTypeEmail=EMAIL +userRoleNotificationTypeSms = SMS +userRoleNotificationTypeEmail = EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template + notificationType=Notification type -notificationType.group=Group -notificationType.caption=Caption -notificationType.description=Description +notificationType.group = Group +notificationType.caption = Caption +notificationType.description = Description + SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -2920,10 +2926,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails=Person contact details -environmentSampleNotShipped=Not shipped -environmentSampleShipped=Shipped -environmentSampleReceived=Received +TaskExport.personOtherContactDetails = Person contact details +environmentSampleNotShipped = Not shipped +environmentSampleShipped = Shipped +environmentSampleReceived = Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -2940,34 +2946,37 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents + # SpecialCaseAccess SpecialCaseAccess=Special case access -caze=Case -assignedTo=Assigned to -assignedBy=Assigned by -endDateTime=Access until -assignmentDate=Date assigned +caze = Case +assignedTo = Assigned to +assignedBy = Assigned by +endDateTime = Access until +assignmentDate = Date assigned + specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case + # SelfReport -SelfReport.type=Type -SelfReport.reportDate=Report date -SelfReport.disease=Disease -SelfReport.diseaseVariant=Disease variant -SelfReport.firstName=First name -SelfReport.lastName=Last name -SelfReport.sex=Sex -SelfReport.birthdateDD=Day of birth -SelfReport.birthdateMM=Month of birth -SelfReport.birthdateYYYY=Year of birth -SelfReport.nationalHealthId=National health ID -SelfReport.email=Email -SelfReport.phoneNumber=Phone number -SelfReport.address=Address -SelfReport.comment=Comment -SelfReport.responsibleUser=Responsible user -SelfReport.investigationStatus=Investigation status -SelfReport.processingStatus=Processing status +SelfReport.type = Type +SelfReport.reportDate = Report date +SelfReport.disease = Disease +SelfReport.diseaseVariant = Disease variant +SelfReport.firstName = First name +SelfReport.lastName = Last name +SelfReport.sex = Sex +SelfReport.birthdateDD = Day of birth +SelfReport.birthdateMM = Month of birth +SelfReport.birthdateYYYY = Year of birth +SelfReport.nationalHealthId = National health ID +SelfReport.email = Email +SelfReport.phoneNumber = Phone number +SelfReport.address = Address +SelfReport.comment = Comment +SelfReport.responsibleUser = Responsible user +SelfReport.investigationStatus = Investigation status +SelfReport.processingStatus = Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_no-NO.properties b/sormas-api/src/main/resources/captions_no-NO.properties index 1e611b51ccf..7ca0f1f4687 100644 --- a/sormas-api/src/main/resources/captions_no-NO.properties +++ b/sormas-api/src/main/resources/captions_no-NO.properties @@ -188,13 +188,13 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge=Okay, and continue to merge overview -actionOkAndGoToContactDirectory=Okay, and continue to contact directory -actionOkAndGoToContactDetails=Okay, and continue to contact -actionOkAndGoToPersonDirectory=Okay, and continue to person directory -actionExecuteAutomaticDeletion=Execute automatic deletion -actionDone=Done -actionConfirmAction=Confirm action +actionOkAndGoToMerge = Okay, and continue to merge overview +actionOkAndGoToContactDirectory = Okay, and continue to contact directory +actionOkAndGoToContactDetails = Okay, and continue to contact +actionOkAndGoToPersonDirectory = Okay, and continue to person directory +actionExecuteAutomaticDeletion = Execute automatic deletion +actionDone = Done +actionConfirmAction = Confirm action activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -248,10 +248,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows=Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups=Expired -aggregateReportNoAgeGroup=No age group -aggregateReportShowOnlyDuplicateReports=Display only duplicate reports +aggregateReportShowZeroRows = Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups = Expired +aggregateReportNoAgeGroup = No age group +aggregateReportShowOnlyDuplicateReports = Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -275,7 +275,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend=Send emails +bulkEmailSend = Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -434,7 +434,6 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name -CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1134,6 +1133,7 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: + # Environment Environment=Environment Environment.uuid=Environment ID @@ -1152,51 +1152,54 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location + environmentActiveEnvironments=Active environments -environmentArchivedEnvironments=Archived environments -environmentAllActiveAndArchivedEnvironments=All active and archived environments -environmentDeletedEnvironments=Deleted environments -environmentNewEnvironment=New environment +environmentArchivedEnvironments = Archived environments +environmentAllActiveAndArchivedEnvironments = All active and archived environments +environmentDeletedEnvironments = Deleted environments +environmentNewEnvironment= New environment environmentEnvironmentsList=Environments list + # EnvironmentSample -EnvironmentSample=Environment Sample -EnvironmentSample.uuid=Sample ID -EnvironmentSample.environment=Environment -EnvironmentSample.sampleDateTime=Date of sampling -EnvironmentSample.sampleMaterial=Sample material -EnvironmentSample.otherSampleMaterial=Specify sample material -EnvironmentSample.sampleVolume=Volume (in mL) -EnvironmentSample.fieldSampleId=Field sample ID -EnvironmentSample.turbidity=Turbidity (in NTU) -EnvironmentSample.phValue=pH of sample -EnvironmentSample.sampleTemperature=Temperature (in °C) -EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) -EnvironmentSample.laboratory=Laboratory -EnvironmentSample.laboratoryDetails=Laboratory details -EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested -EnvironmentSample.reportingUser=Reporting user -EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested -EnvironmentSample.weatherConditions=Weather conditions at time of sampling -EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched=Sent/dispatched -EnvironmentSample.dispatchDate=Dispatchment date -EnvironmentSample.dispatchDetails=Dispatchment details -EnvironmentSample.received=Received -EnvironmentSample.receivalDate=Receival date -EnvironmentSample.labSampleId=Lab sample ID -EnvironmentSample.specimenCondition=Specimen condition -EnvironmentSample.location=Location of sampling site -EnvironmentSample.generalComment=General comment -EnvironmentSample.positivePathogenTests=Positive pathogen tests -EnvironmentSample.latestPathogenTest=Latest pathogen test -EnvironmentSample.numberOfTests=Number of tests +EnvironmentSample = Environment Sample +EnvironmentSample.uuid = Sample ID +EnvironmentSample.environment = Environment +EnvironmentSample.sampleDateTime = Date of sampling +EnvironmentSample.sampleMaterial = Sample material +EnvironmentSample.otherSampleMaterial = Specify sample material +EnvironmentSample.sampleVolume = Volume (in mL) +EnvironmentSample.fieldSampleId = Field sample ID +EnvironmentSample.turbidity = Turbidity (in NTU) +EnvironmentSample.phValue = pH of sample +EnvironmentSample.sampleTemperature = Temperature (in °C) +EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) +EnvironmentSample.laboratory = Laboratory +EnvironmentSample.laboratoryDetails = Laboratory details +EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested +EnvironmentSample.reportingUser = Reporting user +EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested +EnvironmentSample.weatherConditions = Weather conditions at time of sampling +EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched = Sent/dispatched +EnvironmentSample.dispatchDate = Dispatchment date +EnvironmentSample.dispatchDetails = Dispatchment details +EnvironmentSample.received = Received +EnvironmentSample.receivalDate = Receival date +EnvironmentSample.labSampleId = Lab sample ID +EnvironmentSample.specimenCondition = Specimen condition +EnvironmentSample.location = Location of sampling site +EnvironmentSample.generalComment = General comment +EnvironmentSample.positivePathogenTests = Positive pathogen tests +EnvironmentSample.latestPathogenTest = Latest pathogen test +EnvironmentSample.numberOfTests = Number of tests + # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents=Deleted events +eventDeletedEvents = Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1340,7 +1343,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants=Deleted event participants +eventParticipantDeletedEventParticipants = Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1353,7 +1356,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser=Reporting user +EventParticipant.reportingUser = Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1390,9 +1393,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink=Event participant ID -EventParticipantSelection.eventUuidLink=Event ID -EventParticipantSelection.resultingCaseUuidLink=Resulting case ID +EventParticipantSelection.eventParticipantUuidLink = Event participant ID +EventParticipantSelection.eventUuidLink = Event ID +EventParticipantSelection.resultingCaseUuidLink = Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1612,6 +1615,7 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message + #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1622,7 +1626,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList=List of new event participants +lineListingNewEventParticipantsList = List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1796,10 +1800,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples=See samples for this person -caseLinkToSamples=See samples for this case -contactLinkToSamples=See samples for this contact -eventParticipantLinkToSamples=See samples for this event participant +personLinkToSamples = See samples for this person +caseLinkToSamples = See samples for this case +contactLinkToSamples = See samples for this contact +eventParticipantLinkToSamples = See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2107,9 +2111,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity=Community of event participant -SampleExport.eventParticipantDistrict=District of event participant -SampleExport.eventParticipantRegion=Region of event participant +SampleExport.eventParticipantCommunity = Community of event participant +SampleExport.eventParticipantDistrict = District of event participant +SampleExport.eventParticipantRegion = Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2168,7 +2172,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser=Reporting user +Immunization.reportingUser = Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2211,10 +2215,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations=Active immunizations -immunizationArchivedImmunizations=Archived immunizations -immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations -immunizationDeletedImmunizations=Deleted immunizations +immunizationActiveImmunizations = Active immunizations +immunizationArchivedImmunizations = Archived immunizations +immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations +immunizationDeletedImmunizations = Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2457,7 +2461,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment=Associated environment +Task.environment = Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2510,7 +2514,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser=Reporting user +TravelEntry.reportingUser = Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -2877,15 +2881,17 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms=SMS -userRoleNotificationTypeEmail=EMAIL +userRoleNotificationTypeSms = SMS +userRoleNotificationTypeEmail = EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template + notificationType=Notification type -notificationType.group=Group -notificationType.caption=Caption -notificationType.description=Description +notificationType.group = Group +notificationType.caption = Caption +notificationType.description = Description + SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -2920,10 +2926,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails=Person contact details -environmentSampleNotShipped=Not shipped -environmentSampleShipped=Shipped -environmentSampleReceived=Received +TaskExport.personOtherContactDetails = Person contact details +environmentSampleNotShipped = Not shipped +environmentSampleShipped = Shipped +environmentSampleReceived = Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -2940,34 +2946,37 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents + # SpecialCaseAccess SpecialCaseAccess=Special case access -caze=Case -assignedTo=Assigned to -assignedBy=Assigned by -endDateTime=Access until -assignmentDate=Date assigned +caze = Case +assignedTo = Assigned to +assignedBy = Assigned by +endDateTime = Access until +assignmentDate = Date assigned + specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case + # SelfReport -SelfReport.type=Type -SelfReport.reportDate=Report date -SelfReport.disease=Disease -SelfReport.diseaseVariant=Disease variant -SelfReport.firstName=First name -SelfReport.lastName=Last name -SelfReport.sex=Sex -SelfReport.birthdateDD=Day of birth -SelfReport.birthdateMM=Month of birth -SelfReport.birthdateYYYY=Year of birth -SelfReport.nationalHealthId=National health ID -SelfReport.email=Email -SelfReport.phoneNumber=Phone number -SelfReport.address=Address -SelfReport.comment=Comment -SelfReport.responsibleUser=Responsible user -SelfReport.investigationStatus=Investigation status -SelfReport.processingStatus=Processing status +SelfReport.type = Type +SelfReport.reportDate = Report date +SelfReport.disease = Disease +SelfReport.diseaseVariant = Disease variant +SelfReport.firstName = First name +SelfReport.lastName = Last name +SelfReport.sex = Sex +SelfReport.birthdateDD = Day of birth +SelfReport.birthdateMM = Month of birth +SelfReport.birthdateYYYY = Year of birth +SelfReport.nationalHealthId = National health ID +SelfReport.email = Email +SelfReport.phoneNumber = Phone number +SelfReport.address = Address +SelfReport.comment = Comment +SelfReport.responsibleUser = Responsible user +SelfReport.investigationStatus = Investigation status +SelfReport.processingStatus = Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_pt-BR.properties b/sormas-api/src/main/resources/captions_pt-BR.properties index b1a7411fd81..c47c0d603dc 100644 --- a/sormas-api/src/main/resources/captions_pt-BR.properties +++ b/sormas-api/src/main/resources/captions_pt-BR.properties @@ -52,7 +52,7 @@ creationDate=Creation date changeDate=Date of last change notAvailableShort=NA inaccessibleValue=Confidential -includePartialBirthdates=Include partial birthdates +includePartialBirthdates = Include partial birthdates numberOfCharacters=Number of characters\: %d / %d remove=Remove notTestedYet=Not tested yet @@ -189,15 +189,15 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge=Okay, and continue to merge overview -actionOkAndGoToContactDirectory=Okay, and continue to contact directory -actionOkAndGoToContactDetails=Okay, and continue to contact -actionOkAndGoToPersonDirectory=Okay, and continue to person directory -actionExecuteAutomaticDeletion=Execute automatic deletion -actionDone=Done -actionConfirmAction=Confirm action -actionAefiSelectPrimarySuspectVaccination=Select Suspect Vaccination -actionAefiAssignNewReportingIdNumber="Assign New AEFI ID" +actionOkAndGoToMerge = Okay, and continue to merge overview +actionOkAndGoToContactDirectory = Okay, and continue to contact directory +actionOkAndGoToContactDetails = Okay, and continue to contact +actionOkAndGoToPersonDirectory = Okay, and continue to person directory +actionExecuteAutomaticDeletion = Execute automatic deletion +actionDone = Done +actionConfirmAction = Confirm action +actionAefiSelectPrimarySuspectVaccination = Select Suspect Vaccination +actionAefiAssignNewReportingIdNumber = "Assign New AEFI ID" activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -251,10 +251,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows=Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups=Expired -aggregateReportNoAgeGroup=No age group -aggregateReportShowOnlyDuplicateReports=Display only duplicate reports +aggregateReportShowZeroRows = Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups = Expired +aggregateReportNoAgeGroup = No age group +aggregateReportShowOnlyDuplicateReports = Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -278,7 +278,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend=Send emails +bulkEmailSend = Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -437,7 +437,6 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name -CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1037,6 +1036,7 @@ aefiDashboardAefiInvestigationDiscarded=Investigation Discarded aefiDashboardAefiClassificationRelatedToVaccination=Related to vaccine or vaccination aefiDashboardAefiClassificationCoincidentalAdverseEvent=Coincidental adverse event aefiDashboardAefiClassificationUndetermined=Undetermined + captionDefault=Default defaultRegion=Default Region defaultDistrict=Default District @@ -1154,20 +1154,22 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: + # Entity columns -EntityColumn.ENTITY=Entity -EntityColumn.FIELD_ID=Field ID -EntityColumn.FIELD=Field -EntityColumn.TYPE=Type -EntityColumn.DATA_PROTECTION=Data protection -EntityColumn.CAPTION=Caption -EntityColumn.DESCRIPTION=Description -EntityColumn.REQUIRED=Required -EntityColumn.NEW_DISEASE=New disease -EntityColumn.DISEASES=Diseases -EntityColumn.OUTBREAKS=Outbreaks -EntityColumn.IGNORED_COUNTRIES=Ignored countries -EntityColumn.EXCLUSIVE_COUNTRIES=Exclusive countries +EntityColumn.ENTITY = Entity +EntityColumn.FIELD_ID = Field ID +EntityColumn.FIELD = Field +EntityColumn.TYPE = Type +EntityColumn.DATA_PROTECTION = Data protection +EntityColumn.CAPTION = Caption +EntityColumn.DESCRIPTION = Description +EntityColumn.REQUIRED = Required +EntityColumn.NEW_DISEASE = New disease +EntityColumn.DISEASES = Diseases +EntityColumn.OUTBREAKS = Outbreaks +EntityColumn.IGNORED_COUNTRIES = Ignored countries +EntityColumn.EXCLUSIVE_COUNTRIES = Exclusive countries + # Environment Environment=Environment Environment.uuid=Environment ID @@ -1186,51 +1188,54 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location + environmentActiveEnvironments=Active environments -environmentArchivedEnvironments=Archived environments -environmentAllActiveAndArchivedEnvironments=All active and archived environments -environmentDeletedEnvironments=Deleted environments -environmentNewEnvironment=New environment +environmentArchivedEnvironments = Archived environments +environmentAllActiveAndArchivedEnvironments = All active and archived environments +environmentDeletedEnvironments = Deleted environments +environmentNewEnvironment= New environment environmentEnvironmentsList=Environments list + # EnvironmentSample -EnvironmentSample=Environment Sample -EnvironmentSample.uuid=Sample ID -EnvironmentSample.environment=Environment -EnvironmentSample.sampleDateTime=Date of sampling -EnvironmentSample.sampleMaterial=Sample material -EnvironmentSample.otherSampleMaterial=Specify sample material -EnvironmentSample.sampleVolume=Volume (in mL) -EnvironmentSample.fieldSampleId=Field sample ID -EnvironmentSample.turbidity=Turbidity (in NTU) -EnvironmentSample.phValue=pH of sample -EnvironmentSample.sampleTemperature=Temperature (in °C) -EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) -EnvironmentSample.laboratory=Laboratory -EnvironmentSample.laboratoryDetails=Laboratory details -EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested -EnvironmentSample.reportingUser=Reporting user -EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested -EnvironmentSample.weatherConditions=Weather conditions at time of sampling -EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched=Sent/dispatched -EnvironmentSample.dispatchDate=Dispatchment date -EnvironmentSample.dispatchDetails=Dispatchment details -EnvironmentSample.received=Received -EnvironmentSample.receivalDate=Receival date -EnvironmentSample.labSampleId=Lab sample ID -EnvironmentSample.specimenCondition=Specimen condition -EnvironmentSample.location=Location of sampling site -EnvironmentSample.generalComment=General comment -EnvironmentSample.positivePathogenTests=Positive pathogen tests -EnvironmentSample.latestPathogenTest=Latest pathogen test -EnvironmentSample.numberOfTests=Number of tests +EnvironmentSample = Environment Sample +EnvironmentSample.uuid = Sample ID +EnvironmentSample.environment = Environment +EnvironmentSample.sampleDateTime = Date of sampling +EnvironmentSample.sampleMaterial = Sample material +EnvironmentSample.otherSampleMaterial = Specify sample material +EnvironmentSample.sampleVolume = Volume (in mL) +EnvironmentSample.fieldSampleId = Field sample ID +EnvironmentSample.turbidity = Turbidity (in NTU) +EnvironmentSample.phValue = pH of sample +EnvironmentSample.sampleTemperature = Temperature (in °C) +EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) +EnvironmentSample.laboratory = Laboratory +EnvironmentSample.laboratoryDetails = Laboratory details +EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested +EnvironmentSample.reportingUser = Reporting user +EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested +EnvironmentSample.weatherConditions = Weather conditions at time of sampling +EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched = Sent/dispatched +EnvironmentSample.dispatchDate = Dispatchment date +EnvironmentSample.dispatchDetails = Dispatchment details +EnvironmentSample.received = Received +EnvironmentSample.receivalDate = Receival date +EnvironmentSample.labSampleId = Lab sample ID +EnvironmentSample.specimenCondition = Specimen condition +EnvironmentSample.location = Location of sampling site +EnvironmentSample.generalComment = General comment +EnvironmentSample.positivePathogenTests = Positive pathogen tests +EnvironmentSample.latestPathogenTest = Latest pathogen test +EnvironmentSample.numberOfTests = Number of tests + # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents=Deleted events +eventDeletedEvents = Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1374,7 +1379,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants=Deleted event participants +eventParticipantDeletedEventParticipants = Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1387,7 +1392,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser=Reporting user +EventParticipant.reportingUser = Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1424,9 +1429,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink=Event participant ID -EventParticipantSelection.eventUuidLink=Event ID -EventParticipantSelection.resultingCaseUuidLink=Resulting case ID +EventParticipantSelection.eventParticipantUuidLink = Event participant ID +EventParticipantSelection.eventUuidLink = Event ID +EventParticipantSelection.resultingCaseUuidLink = Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1646,6 +1651,7 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message + #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1656,7 +1662,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList=List of new event participants +lineListingNewEventParticipantsList = List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1832,10 +1838,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples=See samples for this person -caseLinkToSamples=See samples for this case -contactLinkToSamples=See samples for this contact -eventParticipantLinkToSamples=See samples for this event participant +personLinkToSamples = See samples for this person +caseLinkToSamples = See samples for this case +contactLinkToSamples = See samples for this contact +eventParticipantLinkToSamples = See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2143,9 +2149,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity=Community of event participant -SampleExport.eventParticipantDistrict=District of event participant -SampleExport.eventParticipantRegion=Region of event participant +SampleExport.eventParticipantCommunity = Community of event participant +SampleExport.eventParticipantDistrict = District of event participant +SampleExport.eventParticipantRegion = Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2204,7 +2210,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser=Reporting user +Immunization.reportingUser = Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2247,10 +2253,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations=Active immunizations -immunizationArchivedImmunizations=Archived immunizations -immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations -immunizationDeletedImmunizations=Deleted immunizations +immunizationActiveImmunizations = Active immunizations +immunizationArchivedImmunizations = Archived immunizations +immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations +immunizationDeletedImmunizations = Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2315,10 +2321,10 @@ aefiVaccinationsDiluentInformation=Diluent Information aefiVaccinationsDiluentBatchLotNumber=Batch/Lot number aefiVaccinationsDiluentExpiryDate=Expiry date aefiVaccinationsDiluentTimeOfReconstitution=Reconstitution time -aefiActiveAdverseEvents=Active adverse events -aefiArchivedAdverseEvents=Archived adverse events -aefiAllActiveAndArchivedAdverseEvents=All active and archived adverse events -aefiDeletedAdverseEvents=Deleted adverse events +aefiActiveAdverseEvents = Active adverse events +aefiArchivedAdverseEvents = Archived adverse events +aefiAllActiveAndArchivedAdverseEvents = All active and archived adverse events +aefiDeletedAdverseEvents = Deleted adverse events # Adverse Events AdverseEvents.severeLocalReaction=Severe local reaction AdverseEvents.severeLocalReactionMoreThanThreeDays=>3 days @@ -2569,13 +2575,13 @@ aefiInvestigationMedicalCareDetailsInstruction=**Instructions ? Attach copies of aefiInvestigationReconstitutionProcedure=Reconstitution procedure aefiInvestigationOfThoseAffected=Of those effected, how many are aefiAefiInvestigationList=Adverse Event Investigations -aefiNewAefiInvestigation=New Investigation +aefiNewAefiInvestigation = New Investigation aefiAefiInvestigationDataView=Adverse Event Investigation aefiNewAefiInvestigationStageTitle=Investigation -aefiActiveInvestigations=Active AEFI investigations -aefiArchivedInvestigations=Archived AEFI investigations -aefiAllActiveAndArchivedInvestigations=All active and archived AEFI investigations -aefiDeletedInvestigations=Deleted AEFI investigations +aefiActiveInvestigations = Active AEFI investigations +aefiArchivedInvestigations = Archived AEFI investigations +aefiAllActiveAndArchivedInvestigations = All active and archived AEFI investigations +aefiDeletedInvestigations = Deleted AEFI investigations titleAefiInvestigationBasicDetails=Section A\: Basic details titleAefiInvestigationRelevantPatientInformation=Section B\: Relevant patient information prior to immunization titleAefiInvestigationFirstExaminationDetails=Section C\: Details of first examination** of serious AEFI case @@ -2848,7 +2854,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment=Associated environment +Task.environment = Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2901,7 +2907,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser=Reporting user +TravelEntry.reportingUser = Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -3272,15 +3278,17 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms=SMS -userRoleNotificationTypeEmail=EMAIL +userRoleNotificationTypeSms = SMS +userRoleNotificationTypeEmail = EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template + notificationType=Notification type -notificationType.group=Group -notificationType.caption=Caption -notificationType.description=Description +notificationType.group = Group +notificationType.caption = Caption +notificationType.description = Description + SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -3315,10 +3323,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails=Person contact details -environmentSampleNotShipped=Not shipped -environmentSampleShipped=Shipped -environmentSampleReceived=Received +TaskExport.personOtherContactDetails = Person contact details +environmentSampleNotShipped = Not shipped +environmentSampleShipped = Shipped +environmentSampleReceived = Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -3335,45 +3343,48 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents + # SpecialCaseAccess SpecialCaseAccess=Special case access -caze=Case -assignedTo=Assigned to -assignedBy=Assigned by -endDateTime=Access until -assignmentDate=Date assigned +caze = Case +assignedTo = Assigned to +assignedBy = Assigned by +endDateTime = Access until +assignmentDate = Date assigned + specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case + # SelfReport -SelfReport=Self report -SelfReport.type=Type -SelfReport.reportDate=Report date -SelfReport.caseReference=Case reference number -SelfReport.disease=Disease -SelfReport.diseaseDetails=Disease details -SelfReport.diseaseVariant=Disease variant -SelfReport.diseaseVariantDetails=Disease variant details -SelfReport.firstName=First name -SelfReport.lastName=Last name -SelfReport.sex=Sex -SelfReport.birthDate=Birth date -SelfReport.birthdateDD=Day of birth -SelfReport.birthdateMM=Month of birth -SelfReport.birthdateYYYY=Year of birth -SelfReport.nationalHealthId=National health ID -SelfReport.email=Email -SelfReport.phoneNumber=Phone number -SelfReport.address=Address -SelfReport.dateOfTest=Date of test -SelfReport.dateOfSymptoms=Date of symptoms -SelfReport.workplace=Workplace -SelfReport.dateWorkplace=Date workplace -SelfReport.isolationDate=Date of isolation -SelfReport.contactDate=Date of contact -SelfReport.comment=Comment -SelfReport.responsibleUser=Responsible user -SelfReport.investigationStatus=Investigation status -SelfReport.processingStatus=Processing status +SelfReport = Self report +SelfReport.type = Type +SelfReport.reportDate = Report date +SelfReport.caseReference = Case reference number +SelfReport.disease = Disease +SelfReport.diseaseDetails = Disease details +SelfReport.diseaseVariant = Disease variant +SelfReport.diseaseVariantDetails = Disease variant details +SelfReport.firstName = First name +SelfReport.lastName = Last name +SelfReport.sex = Sex +SelfReport.birthDate = Birth date +SelfReport.birthdateDD = Day of birth +SelfReport.birthdateMM = Month of birth +SelfReport.birthdateYYYY = Year of birth +SelfReport.nationalHealthId = National health ID +SelfReport.email = Email +SelfReport.phoneNumber = Phone number +SelfReport.address = Address +SelfReport.dateOfTest = Date of test +SelfReport.dateOfSymptoms = Date of symptoms +SelfReport.workplace = Workplace +SelfReport.dateWorkplace = Date workplace +SelfReport.isolationDate = Date of isolation +SelfReport.contactDate = Date of contact +SelfReport.comment = Comment +SelfReport.responsibleUser = Responsible user +SelfReport.investigationStatus = Investigation status +SelfReport.processingStatus = Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_pt-CV.properties b/sormas-api/src/main/resources/captions_pt-CV.properties index 18dcee62e0c..af425ed745a 100644 --- a/sormas-api/src/main/resources/captions_pt-CV.properties +++ b/sormas-api/src/main/resources/captions_pt-CV.properties @@ -52,7 +52,7 @@ creationDate=Creation date changeDate=Date of last change notAvailableShort=NA inaccessibleValue=Confidential -includePartialBirthdates=Include partial birthdates +includePartialBirthdates = Include partial birthdates numberOfCharacters=Number of characters\: %d / %d remove=Remove notTestedYet=Not tested yet @@ -189,15 +189,15 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge=Okay, and continue to merge overview -actionOkAndGoToContactDirectory=Okay, and continue to contact directory -actionOkAndGoToContactDetails=Okay, and continue to contact -actionOkAndGoToPersonDirectory=Okay, and continue to person directory -actionExecuteAutomaticDeletion=Execute automatic deletion -actionDone=Done -actionConfirmAction=Confirm action -actionAefiSelectPrimarySuspectVaccination=Select Suspect Vaccination -actionAefiAssignNewReportingIdNumber="Assign New AEFI ID" +actionOkAndGoToMerge = Okay, and continue to merge overview +actionOkAndGoToContactDirectory = Okay, and continue to contact directory +actionOkAndGoToContactDetails = Okay, and continue to contact +actionOkAndGoToPersonDirectory = Okay, and continue to person directory +actionExecuteAutomaticDeletion = Execute automatic deletion +actionDone = Done +actionConfirmAction = Confirm action +actionAefiSelectPrimarySuspectVaccination = Select Suspect Vaccination +actionAefiAssignNewReportingIdNumber = "Assign New AEFI ID" activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -251,10 +251,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows=Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups=Expired -aggregateReportNoAgeGroup=No age group -aggregateReportShowOnlyDuplicateReports=Display only duplicate reports +aggregateReportShowZeroRows = Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups = Expired +aggregateReportNoAgeGroup = No age group +aggregateReportShowOnlyDuplicateReports = Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -278,7 +278,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend=Send emails +bulkEmailSend = Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -437,7 +437,6 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name -CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1037,6 +1036,7 @@ aefiDashboardAefiInvestigationDiscarded=Investigation Discarded aefiDashboardAefiClassificationRelatedToVaccination=Related to vaccine or vaccination aefiDashboardAefiClassificationCoincidentalAdverseEvent=Coincidental adverse event aefiDashboardAefiClassificationUndetermined=Undetermined + captionDefault=Default defaultRegion=Default Region defaultDistrict=Default District @@ -1154,20 +1154,22 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: + # Entity columns -EntityColumn.ENTITY=Entity -EntityColumn.FIELD_ID=Field ID -EntityColumn.FIELD=Field -EntityColumn.TYPE=Type -EntityColumn.DATA_PROTECTION=Data protection -EntityColumn.CAPTION=Caption -EntityColumn.DESCRIPTION=Description -EntityColumn.REQUIRED=Required -EntityColumn.NEW_DISEASE=New disease -EntityColumn.DISEASES=Diseases -EntityColumn.OUTBREAKS=Outbreaks -EntityColumn.IGNORED_COUNTRIES=Ignored countries -EntityColumn.EXCLUSIVE_COUNTRIES=Exclusive countries +EntityColumn.ENTITY = Entity +EntityColumn.FIELD_ID = Field ID +EntityColumn.FIELD = Field +EntityColumn.TYPE = Type +EntityColumn.DATA_PROTECTION = Data protection +EntityColumn.CAPTION = Caption +EntityColumn.DESCRIPTION = Description +EntityColumn.REQUIRED = Required +EntityColumn.NEW_DISEASE = New disease +EntityColumn.DISEASES = Diseases +EntityColumn.OUTBREAKS = Outbreaks +EntityColumn.IGNORED_COUNTRIES = Ignored countries +EntityColumn.EXCLUSIVE_COUNTRIES = Exclusive countries + # Environment Environment=Environment Environment.uuid=Environment ID @@ -1186,51 +1188,54 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location + environmentActiveEnvironments=Active environments -environmentArchivedEnvironments=Archived environments -environmentAllActiveAndArchivedEnvironments=All active and archived environments -environmentDeletedEnvironments=Deleted environments -environmentNewEnvironment=New environment +environmentArchivedEnvironments = Archived environments +environmentAllActiveAndArchivedEnvironments = All active and archived environments +environmentDeletedEnvironments = Deleted environments +environmentNewEnvironment= New environment environmentEnvironmentsList=Environments list + # EnvironmentSample -EnvironmentSample=Environment Sample -EnvironmentSample.uuid=Sample ID -EnvironmentSample.environment=Environment -EnvironmentSample.sampleDateTime=Date of sampling -EnvironmentSample.sampleMaterial=Sample material -EnvironmentSample.otherSampleMaterial=Specify sample material -EnvironmentSample.sampleVolume=Volume (in mL) -EnvironmentSample.fieldSampleId=Field sample ID -EnvironmentSample.turbidity=Turbidity (in NTU) -EnvironmentSample.phValue=pH of sample -EnvironmentSample.sampleTemperature=Temperature (in °C) -EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) -EnvironmentSample.laboratory=Laboratory -EnvironmentSample.laboratoryDetails=Laboratory details -EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested -EnvironmentSample.reportingUser=Reporting user -EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested -EnvironmentSample.weatherConditions=Weather conditions at time of sampling -EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched=Sent/dispatched -EnvironmentSample.dispatchDate=Dispatchment date -EnvironmentSample.dispatchDetails=Dispatchment details -EnvironmentSample.received=Received -EnvironmentSample.receivalDate=Receival date -EnvironmentSample.labSampleId=Lab sample ID -EnvironmentSample.specimenCondition=Specimen condition -EnvironmentSample.location=Location of sampling site -EnvironmentSample.generalComment=General comment -EnvironmentSample.positivePathogenTests=Positive pathogen tests -EnvironmentSample.latestPathogenTest=Latest pathogen test -EnvironmentSample.numberOfTests=Number of tests +EnvironmentSample = Environment Sample +EnvironmentSample.uuid = Sample ID +EnvironmentSample.environment = Environment +EnvironmentSample.sampleDateTime = Date of sampling +EnvironmentSample.sampleMaterial = Sample material +EnvironmentSample.otherSampleMaterial = Specify sample material +EnvironmentSample.sampleVolume = Volume (in mL) +EnvironmentSample.fieldSampleId = Field sample ID +EnvironmentSample.turbidity = Turbidity (in NTU) +EnvironmentSample.phValue = pH of sample +EnvironmentSample.sampleTemperature = Temperature (in °C) +EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) +EnvironmentSample.laboratory = Laboratory +EnvironmentSample.laboratoryDetails = Laboratory details +EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested +EnvironmentSample.reportingUser = Reporting user +EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested +EnvironmentSample.weatherConditions = Weather conditions at time of sampling +EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched = Sent/dispatched +EnvironmentSample.dispatchDate = Dispatchment date +EnvironmentSample.dispatchDetails = Dispatchment details +EnvironmentSample.received = Received +EnvironmentSample.receivalDate = Receival date +EnvironmentSample.labSampleId = Lab sample ID +EnvironmentSample.specimenCondition = Specimen condition +EnvironmentSample.location = Location of sampling site +EnvironmentSample.generalComment = General comment +EnvironmentSample.positivePathogenTests = Positive pathogen tests +EnvironmentSample.latestPathogenTest = Latest pathogen test +EnvironmentSample.numberOfTests = Number of tests + # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents=Deleted events +eventDeletedEvents = Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1374,7 +1379,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants=Deleted event participants +eventParticipantDeletedEventParticipants = Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1387,7 +1392,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser=Reporting user +EventParticipant.reportingUser = Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1424,9 +1429,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink=Event participant ID -EventParticipantSelection.eventUuidLink=Event ID -EventParticipantSelection.resultingCaseUuidLink=Resulting case ID +EventParticipantSelection.eventParticipantUuidLink = Event participant ID +EventParticipantSelection.eventUuidLink = Event ID +EventParticipantSelection.resultingCaseUuidLink = Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1646,6 +1651,7 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message + #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1656,7 +1662,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList=List of new event participants +lineListingNewEventParticipantsList = List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1832,10 +1838,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples=See samples for this person -caseLinkToSamples=See samples for this case -contactLinkToSamples=See samples for this contact -eventParticipantLinkToSamples=See samples for this event participant +personLinkToSamples = See samples for this person +caseLinkToSamples = See samples for this case +contactLinkToSamples = See samples for this contact +eventParticipantLinkToSamples = See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2143,9 +2149,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity=Community of event participant -SampleExport.eventParticipantDistrict=District of event participant -SampleExport.eventParticipantRegion=Region of event participant +SampleExport.eventParticipantCommunity = Community of event participant +SampleExport.eventParticipantDistrict = District of event participant +SampleExport.eventParticipantRegion = Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2204,7 +2210,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser=Reporting user +Immunization.reportingUser = Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2247,10 +2253,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations=Active immunizations -immunizationArchivedImmunizations=Archived immunizations -immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations -immunizationDeletedImmunizations=Deleted immunizations +immunizationActiveImmunizations = Active immunizations +immunizationArchivedImmunizations = Archived immunizations +immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations +immunizationDeletedImmunizations = Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2315,10 +2321,10 @@ aefiVaccinationsDiluentInformation=Diluent Information aefiVaccinationsDiluentBatchLotNumber=Batch/Lot number aefiVaccinationsDiluentExpiryDate=Expiry date aefiVaccinationsDiluentTimeOfReconstitution=Reconstitution time -aefiActiveAdverseEvents=Active adverse events -aefiArchivedAdverseEvents=Archived adverse events -aefiAllActiveAndArchivedAdverseEvents=All active and archived adverse events -aefiDeletedAdverseEvents=Deleted adverse events +aefiActiveAdverseEvents = Active adverse events +aefiArchivedAdverseEvents = Archived adverse events +aefiAllActiveAndArchivedAdverseEvents = All active and archived adverse events +aefiDeletedAdverseEvents = Deleted adverse events # Adverse Events AdverseEvents.severeLocalReaction=Severe local reaction AdverseEvents.severeLocalReactionMoreThanThreeDays=>3 days @@ -2569,13 +2575,13 @@ aefiInvestigationMedicalCareDetailsInstruction=**Instructions ? Attach copies of aefiInvestigationReconstitutionProcedure=Reconstitution procedure aefiInvestigationOfThoseAffected=Of those effected, how many are aefiAefiInvestigationList=Adverse Event Investigations -aefiNewAefiInvestigation=New Investigation +aefiNewAefiInvestigation = New Investigation aefiAefiInvestigationDataView=Adverse Event Investigation aefiNewAefiInvestigationStageTitle=Investigation -aefiActiveInvestigations=Active AEFI investigations -aefiArchivedInvestigations=Archived AEFI investigations -aefiAllActiveAndArchivedInvestigations=All active and archived AEFI investigations -aefiDeletedInvestigations=Deleted AEFI investigations +aefiActiveInvestigations = Active AEFI investigations +aefiArchivedInvestigations = Archived AEFI investigations +aefiAllActiveAndArchivedInvestigations = All active and archived AEFI investigations +aefiDeletedInvestigations = Deleted AEFI investigations titleAefiInvestigationBasicDetails=Section A\: Basic details titleAefiInvestigationRelevantPatientInformation=Section B\: Relevant patient information prior to immunization titleAefiInvestigationFirstExaminationDetails=Section C\: Details of first examination** of serious AEFI case @@ -2848,7 +2854,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment=Associated environment +Task.environment = Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2901,7 +2907,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser=Reporting user +TravelEntry.reportingUser = Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -3272,15 +3278,17 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms=SMS -userRoleNotificationTypeEmail=EMAIL +userRoleNotificationTypeSms = SMS +userRoleNotificationTypeEmail = EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template + notificationType=Notification type -notificationType.group=Group -notificationType.caption=Caption -notificationType.description=Description +notificationType.group = Group +notificationType.caption = Caption +notificationType.description = Description + SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -3315,10 +3323,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails=Person contact details -environmentSampleNotShipped=Not shipped -environmentSampleShipped=Shipped -environmentSampleReceived=Received +TaskExport.personOtherContactDetails = Person contact details +environmentSampleNotShipped = Not shipped +environmentSampleShipped = Shipped +environmentSampleReceived = Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -3335,45 +3343,48 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents + # SpecialCaseAccess SpecialCaseAccess=Special case access -caze=Case -assignedTo=Assigned to -assignedBy=Assigned by -endDateTime=Access until -assignmentDate=Date assigned +caze = Case +assignedTo = Assigned to +assignedBy = Assigned by +endDateTime = Access until +assignmentDate = Date assigned + specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case + # SelfReport -SelfReport=Self report -SelfReport.type=Type -SelfReport.reportDate=Report date -SelfReport.caseReference=Case reference number -SelfReport.disease=Disease -SelfReport.diseaseDetails=Disease details -SelfReport.diseaseVariant=Disease variant -SelfReport.diseaseVariantDetails=Disease variant details -SelfReport.firstName=First name -SelfReport.lastName=Last name -SelfReport.sex=Sex -SelfReport.birthDate=Birth date -SelfReport.birthdateDD=Day of birth -SelfReport.birthdateMM=Month of birth -SelfReport.birthdateYYYY=Year of birth -SelfReport.nationalHealthId=National health ID -SelfReport.email=Email -SelfReport.phoneNumber=Phone number -SelfReport.address=Address -SelfReport.dateOfTest=Date of test -SelfReport.dateOfSymptoms=Date of symptoms -SelfReport.workplace=Workplace -SelfReport.dateWorkplace=Date workplace -SelfReport.isolationDate=Date of isolation -SelfReport.contactDate=Date of contact -SelfReport.comment=Comment -SelfReport.responsibleUser=Responsible user -SelfReport.investigationStatus=Investigation status -SelfReport.processingStatus=Processing status +SelfReport = Self report +SelfReport.type = Type +SelfReport.reportDate = Report date +SelfReport.caseReference = Case reference number +SelfReport.disease = Disease +SelfReport.diseaseDetails = Disease details +SelfReport.diseaseVariant = Disease variant +SelfReport.diseaseVariantDetails = Disease variant details +SelfReport.firstName = First name +SelfReport.lastName = Last name +SelfReport.sex = Sex +SelfReport.birthDate = Birth date +SelfReport.birthdateDD = Day of birth +SelfReport.birthdateMM = Month of birth +SelfReport.birthdateYYYY = Year of birth +SelfReport.nationalHealthId = National health ID +SelfReport.email = Email +SelfReport.phoneNumber = Phone number +SelfReport.address = Address +SelfReport.dateOfTest = Date of test +SelfReport.dateOfSymptoms = Date of symptoms +SelfReport.workplace = Workplace +SelfReport.dateWorkplace = Date workplace +SelfReport.isolationDate = Date of isolation +SelfReport.contactDate = Date of contact +SelfReport.comment = Comment +SelfReport.responsibleUser = Responsible user +SelfReport.investigationStatus = Investigation status +SelfReport.processingStatus = Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_pt-PT.properties b/sormas-api/src/main/resources/captions_pt-PT.properties index a06254ea16f..8f71f66ae35 100644 --- a/sormas-api/src/main/resources/captions_pt-PT.properties +++ b/sormas-api/src/main/resources/captions_pt-PT.properties @@ -188,13 +188,13 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge=Okay, and continue to merge overview -actionOkAndGoToContactDirectory=Okay, and continue to contact directory -actionOkAndGoToContactDetails=Okay, and continue to contact -actionOkAndGoToPersonDirectory=Okay, and continue to person directory -actionExecuteAutomaticDeletion=Execute automatic deletion -actionDone=Done -actionConfirmAction=Confirm action +actionOkAndGoToMerge = Okay, and continue to merge overview +actionOkAndGoToContactDirectory = Okay, and continue to contact directory +actionOkAndGoToContactDetails = Okay, and continue to contact +actionOkAndGoToPersonDirectory = Okay, and continue to person directory +actionExecuteAutomaticDeletion = Execute automatic deletion +actionDone = Done +actionConfirmAction = Confirm action activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -248,10 +248,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows=Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups=Expired -aggregateReportNoAgeGroup=No age group -aggregateReportShowOnlyDuplicateReports=Display only duplicate reports +aggregateReportShowZeroRows = Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups = Expired +aggregateReportNoAgeGroup = No age group +aggregateReportShowOnlyDuplicateReports = Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -275,7 +275,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend=Send emails +bulkEmailSend = Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -434,7 +434,6 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name -CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1134,6 +1133,7 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: + # Environment Environment=Environment Environment.uuid=Environment ID @@ -1152,51 +1152,54 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location + environmentActiveEnvironments=Active environments -environmentArchivedEnvironments=Archived environments -environmentAllActiveAndArchivedEnvironments=All active and archived environments -environmentDeletedEnvironments=Deleted environments -environmentNewEnvironment=New environment +environmentArchivedEnvironments = Archived environments +environmentAllActiveAndArchivedEnvironments = All active and archived environments +environmentDeletedEnvironments = Deleted environments +environmentNewEnvironment= New environment environmentEnvironmentsList=Environments list + # EnvironmentSample -EnvironmentSample=Environment Sample -EnvironmentSample.uuid=Sample ID -EnvironmentSample.environment=Environment -EnvironmentSample.sampleDateTime=Date of sampling -EnvironmentSample.sampleMaterial=Sample material -EnvironmentSample.otherSampleMaterial=Specify sample material -EnvironmentSample.sampleVolume=Volume (in mL) -EnvironmentSample.fieldSampleId=Field sample ID -EnvironmentSample.turbidity=Turbidity (in NTU) -EnvironmentSample.phValue=pH of sample -EnvironmentSample.sampleTemperature=Temperature (in °C) -EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) -EnvironmentSample.laboratory=Laboratory -EnvironmentSample.laboratoryDetails=Laboratory details -EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested -EnvironmentSample.reportingUser=Reporting user -EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested -EnvironmentSample.weatherConditions=Weather conditions at time of sampling -EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched=Sent/dispatched -EnvironmentSample.dispatchDate=Dispatchment date -EnvironmentSample.dispatchDetails=Dispatchment details -EnvironmentSample.received=Received -EnvironmentSample.receivalDate=Receival date -EnvironmentSample.labSampleId=Lab sample ID -EnvironmentSample.specimenCondition=Specimen condition -EnvironmentSample.location=Location of sampling site -EnvironmentSample.generalComment=General comment -EnvironmentSample.positivePathogenTests=Positive pathogen tests -EnvironmentSample.latestPathogenTest=Latest pathogen test -EnvironmentSample.numberOfTests=Number of tests +EnvironmentSample = Environment Sample +EnvironmentSample.uuid = Sample ID +EnvironmentSample.environment = Environment +EnvironmentSample.sampleDateTime = Date of sampling +EnvironmentSample.sampleMaterial = Sample material +EnvironmentSample.otherSampleMaterial = Specify sample material +EnvironmentSample.sampleVolume = Volume (in mL) +EnvironmentSample.fieldSampleId = Field sample ID +EnvironmentSample.turbidity = Turbidity (in NTU) +EnvironmentSample.phValue = pH of sample +EnvironmentSample.sampleTemperature = Temperature (in °C) +EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) +EnvironmentSample.laboratory = Laboratory +EnvironmentSample.laboratoryDetails = Laboratory details +EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested +EnvironmentSample.reportingUser = Reporting user +EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested +EnvironmentSample.weatherConditions = Weather conditions at time of sampling +EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched = Sent/dispatched +EnvironmentSample.dispatchDate = Dispatchment date +EnvironmentSample.dispatchDetails = Dispatchment details +EnvironmentSample.received = Received +EnvironmentSample.receivalDate = Receival date +EnvironmentSample.labSampleId = Lab sample ID +EnvironmentSample.specimenCondition = Specimen condition +EnvironmentSample.location = Location of sampling site +EnvironmentSample.generalComment = General comment +EnvironmentSample.positivePathogenTests = Positive pathogen tests +EnvironmentSample.latestPathogenTest = Latest pathogen test +EnvironmentSample.numberOfTests = Number of tests + # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents=Deleted events +eventDeletedEvents = Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1340,7 +1343,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants=Deleted event participants +eventParticipantDeletedEventParticipants = Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1353,7 +1356,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser=Reporting user +EventParticipant.reportingUser = Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1390,9 +1393,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink=Event participant ID -EventParticipantSelection.eventUuidLink=Event ID -EventParticipantSelection.resultingCaseUuidLink=Resulting case ID +EventParticipantSelection.eventParticipantUuidLink = Event participant ID +EventParticipantSelection.eventUuidLink = Event ID +EventParticipantSelection.resultingCaseUuidLink = Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1612,6 +1615,7 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message + #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1622,7 +1626,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList=List of new event participants +lineListingNewEventParticipantsList = List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1796,10 +1800,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples=See samples for this person -caseLinkToSamples=See samples for this case -contactLinkToSamples=See samples for this contact -eventParticipantLinkToSamples=See samples for this event participant +personLinkToSamples = See samples for this person +caseLinkToSamples = See samples for this case +contactLinkToSamples = See samples for this contact +eventParticipantLinkToSamples = See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2107,9 +2111,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity=Community of event participant -SampleExport.eventParticipantDistrict=District of event participant -SampleExport.eventParticipantRegion=Region of event participant +SampleExport.eventParticipantCommunity = Community of event participant +SampleExport.eventParticipantDistrict = District of event participant +SampleExport.eventParticipantRegion = Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2168,7 +2172,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser=Reporting user +Immunization.reportingUser = Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2211,10 +2215,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations=Active immunizations -immunizationArchivedImmunizations=Archived immunizations -immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations -immunizationDeletedImmunizations=Deleted immunizations +immunizationActiveImmunizations = Active immunizations +immunizationArchivedImmunizations = Archived immunizations +immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations +immunizationDeletedImmunizations = Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2457,7 +2461,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment=Associated environment +Task.environment = Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2510,7 +2514,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser=Reporting user +TravelEntry.reportingUser = Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -2877,15 +2881,17 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms=SMS -userRoleNotificationTypeEmail=EMAIL +userRoleNotificationTypeSms = SMS +userRoleNotificationTypeEmail = EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template + notificationType=Notification type -notificationType.group=Group -notificationType.caption=Caption -notificationType.description=Description +notificationType.group = Group +notificationType.caption = Caption +notificationType.description = Description + SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -2920,10 +2926,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails=Person contact details -environmentSampleNotShipped=Not shipped -environmentSampleShipped=Shipped -environmentSampleReceived=Received +TaskExport.personOtherContactDetails = Person contact details +environmentSampleNotShipped = Not shipped +environmentSampleShipped = Shipped +environmentSampleReceived = Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -2940,34 +2946,37 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents + # SpecialCaseAccess SpecialCaseAccess=Special case access -caze=Case -assignedTo=Assigned to -assignedBy=Assigned by -endDateTime=Access until -assignmentDate=Date assigned +caze = Case +assignedTo = Assigned to +assignedBy = Assigned by +endDateTime = Access until +assignmentDate = Date assigned + specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case + # SelfReport -SelfReport.type=Type -SelfReport.reportDate=Report date -SelfReport.disease=Disease -SelfReport.diseaseVariant=Disease variant -SelfReport.firstName=First name -SelfReport.lastName=Last name -SelfReport.sex=Sex -SelfReport.birthdateDD=Day of birth -SelfReport.birthdateMM=Month of birth -SelfReport.birthdateYYYY=Year of birth -SelfReport.nationalHealthId=National health ID -SelfReport.email=Email -SelfReport.phoneNumber=Phone number -SelfReport.address=Address -SelfReport.comment=Comment -SelfReport.responsibleUser=Responsible user -SelfReport.investigationStatus=Investigation status -SelfReport.processingStatus=Processing status +SelfReport.type = Type +SelfReport.reportDate = Report date +SelfReport.disease = Disease +SelfReport.diseaseVariant = Disease variant +SelfReport.firstName = First name +SelfReport.lastName = Last name +SelfReport.sex = Sex +SelfReport.birthdateDD = Day of birth +SelfReport.birthdateMM = Month of birth +SelfReport.birthdateYYYY = Year of birth +SelfReport.nationalHealthId = National health ID +SelfReport.email = Email +SelfReport.phoneNumber = Phone number +SelfReport.address = Address +SelfReport.comment = Comment +SelfReport.responsibleUser = Responsible user +SelfReport.investigationStatus = Investigation status +SelfReport.processingStatus = Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_ro-RO.properties b/sormas-api/src/main/resources/captions_ro-RO.properties index 1e611b51ccf..7ca0f1f4687 100644 --- a/sormas-api/src/main/resources/captions_ro-RO.properties +++ b/sormas-api/src/main/resources/captions_ro-RO.properties @@ -188,13 +188,13 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge=Okay, and continue to merge overview -actionOkAndGoToContactDirectory=Okay, and continue to contact directory -actionOkAndGoToContactDetails=Okay, and continue to contact -actionOkAndGoToPersonDirectory=Okay, and continue to person directory -actionExecuteAutomaticDeletion=Execute automatic deletion -actionDone=Done -actionConfirmAction=Confirm action +actionOkAndGoToMerge = Okay, and continue to merge overview +actionOkAndGoToContactDirectory = Okay, and continue to contact directory +actionOkAndGoToContactDetails = Okay, and continue to contact +actionOkAndGoToPersonDirectory = Okay, and continue to person directory +actionExecuteAutomaticDeletion = Execute automatic deletion +actionDone = Done +actionConfirmAction = Confirm action activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -248,10 +248,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows=Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups=Expired -aggregateReportNoAgeGroup=No age group -aggregateReportShowOnlyDuplicateReports=Display only duplicate reports +aggregateReportShowZeroRows = Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups = Expired +aggregateReportNoAgeGroup = No age group +aggregateReportShowOnlyDuplicateReports = Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -275,7 +275,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend=Send emails +bulkEmailSend = Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -434,7 +434,6 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name -CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1134,6 +1133,7 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: + # Environment Environment=Environment Environment.uuid=Environment ID @@ -1152,51 +1152,54 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location + environmentActiveEnvironments=Active environments -environmentArchivedEnvironments=Archived environments -environmentAllActiveAndArchivedEnvironments=All active and archived environments -environmentDeletedEnvironments=Deleted environments -environmentNewEnvironment=New environment +environmentArchivedEnvironments = Archived environments +environmentAllActiveAndArchivedEnvironments = All active and archived environments +environmentDeletedEnvironments = Deleted environments +environmentNewEnvironment= New environment environmentEnvironmentsList=Environments list + # EnvironmentSample -EnvironmentSample=Environment Sample -EnvironmentSample.uuid=Sample ID -EnvironmentSample.environment=Environment -EnvironmentSample.sampleDateTime=Date of sampling -EnvironmentSample.sampleMaterial=Sample material -EnvironmentSample.otherSampleMaterial=Specify sample material -EnvironmentSample.sampleVolume=Volume (in mL) -EnvironmentSample.fieldSampleId=Field sample ID -EnvironmentSample.turbidity=Turbidity (in NTU) -EnvironmentSample.phValue=pH of sample -EnvironmentSample.sampleTemperature=Temperature (in °C) -EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) -EnvironmentSample.laboratory=Laboratory -EnvironmentSample.laboratoryDetails=Laboratory details -EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested -EnvironmentSample.reportingUser=Reporting user -EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested -EnvironmentSample.weatherConditions=Weather conditions at time of sampling -EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched=Sent/dispatched -EnvironmentSample.dispatchDate=Dispatchment date -EnvironmentSample.dispatchDetails=Dispatchment details -EnvironmentSample.received=Received -EnvironmentSample.receivalDate=Receival date -EnvironmentSample.labSampleId=Lab sample ID -EnvironmentSample.specimenCondition=Specimen condition -EnvironmentSample.location=Location of sampling site -EnvironmentSample.generalComment=General comment -EnvironmentSample.positivePathogenTests=Positive pathogen tests -EnvironmentSample.latestPathogenTest=Latest pathogen test -EnvironmentSample.numberOfTests=Number of tests +EnvironmentSample = Environment Sample +EnvironmentSample.uuid = Sample ID +EnvironmentSample.environment = Environment +EnvironmentSample.sampleDateTime = Date of sampling +EnvironmentSample.sampleMaterial = Sample material +EnvironmentSample.otherSampleMaterial = Specify sample material +EnvironmentSample.sampleVolume = Volume (in mL) +EnvironmentSample.fieldSampleId = Field sample ID +EnvironmentSample.turbidity = Turbidity (in NTU) +EnvironmentSample.phValue = pH of sample +EnvironmentSample.sampleTemperature = Temperature (in °C) +EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) +EnvironmentSample.laboratory = Laboratory +EnvironmentSample.laboratoryDetails = Laboratory details +EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested +EnvironmentSample.reportingUser = Reporting user +EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested +EnvironmentSample.weatherConditions = Weather conditions at time of sampling +EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched = Sent/dispatched +EnvironmentSample.dispatchDate = Dispatchment date +EnvironmentSample.dispatchDetails = Dispatchment details +EnvironmentSample.received = Received +EnvironmentSample.receivalDate = Receival date +EnvironmentSample.labSampleId = Lab sample ID +EnvironmentSample.specimenCondition = Specimen condition +EnvironmentSample.location = Location of sampling site +EnvironmentSample.generalComment = General comment +EnvironmentSample.positivePathogenTests = Positive pathogen tests +EnvironmentSample.latestPathogenTest = Latest pathogen test +EnvironmentSample.numberOfTests = Number of tests + # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents=Deleted events +eventDeletedEvents = Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1340,7 +1343,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants=Deleted event participants +eventParticipantDeletedEventParticipants = Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1353,7 +1356,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser=Reporting user +EventParticipant.reportingUser = Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1390,9 +1393,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink=Event participant ID -EventParticipantSelection.eventUuidLink=Event ID -EventParticipantSelection.resultingCaseUuidLink=Resulting case ID +EventParticipantSelection.eventParticipantUuidLink = Event participant ID +EventParticipantSelection.eventUuidLink = Event ID +EventParticipantSelection.resultingCaseUuidLink = Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1612,6 +1615,7 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message + #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1622,7 +1626,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList=List of new event participants +lineListingNewEventParticipantsList = List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1796,10 +1800,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples=See samples for this person -caseLinkToSamples=See samples for this case -contactLinkToSamples=See samples for this contact -eventParticipantLinkToSamples=See samples for this event participant +personLinkToSamples = See samples for this person +caseLinkToSamples = See samples for this case +contactLinkToSamples = See samples for this contact +eventParticipantLinkToSamples = See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2107,9 +2111,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity=Community of event participant -SampleExport.eventParticipantDistrict=District of event participant -SampleExport.eventParticipantRegion=Region of event participant +SampleExport.eventParticipantCommunity = Community of event participant +SampleExport.eventParticipantDistrict = District of event participant +SampleExport.eventParticipantRegion = Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2168,7 +2172,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser=Reporting user +Immunization.reportingUser = Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2211,10 +2215,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations=Active immunizations -immunizationArchivedImmunizations=Archived immunizations -immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations -immunizationDeletedImmunizations=Deleted immunizations +immunizationActiveImmunizations = Active immunizations +immunizationArchivedImmunizations = Archived immunizations +immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations +immunizationDeletedImmunizations = Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2457,7 +2461,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment=Associated environment +Task.environment = Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2510,7 +2514,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser=Reporting user +TravelEntry.reportingUser = Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -2877,15 +2881,17 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms=SMS -userRoleNotificationTypeEmail=EMAIL +userRoleNotificationTypeSms = SMS +userRoleNotificationTypeEmail = EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template + notificationType=Notification type -notificationType.group=Group -notificationType.caption=Caption -notificationType.description=Description +notificationType.group = Group +notificationType.caption = Caption +notificationType.description = Description + SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -2920,10 +2926,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails=Person contact details -environmentSampleNotShipped=Not shipped -environmentSampleShipped=Shipped -environmentSampleReceived=Received +TaskExport.personOtherContactDetails = Person contact details +environmentSampleNotShipped = Not shipped +environmentSampleShipped = Shipped +environmentSampleReceived = Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -2940,34 +2946,37 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents + # SpecialCaseAccess SpecialCaseAccess=Special case access -caze=Case -assignedTo=Assigned to -assignedBy=Assigned by -endDateTime=Access until -assignmentDate=Date assigned +caze = Case +assignedTo = Assigned to +assignedBy = Assigned by +endDateTime = Access until +assignmentDate = Date assigned + specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case + # SelfReport -SelfReport.type=Type -SelfReport.reportDate=Report date -SelfReport.disease=Disease -SelfReport.diseaseVariant=Disease variant -SelfReport.firstName=First name -SelfReport.lastName=Last name -SelfReport.sex=Sex -SelfReport.birthdateDD=Day of birth -SelfReport.birthdateMM=Month of birth -SelfReport.birthdateYYYY=Year of birth -SelfReport.nationalHealthId=National health ID -SelfReport.email=Email -SelfReport.phoneNumber=Phone number -SelfReport.address=Address -SelfReport.comment=Comment -SelfReport.responsibleUser=Responsible user -SelfReport.investigationStatus=Investigation status -SelfReport.processingStatus=Processing status +SelfReport.type = Type +SelfReport.reportDate = Report date +SelfReport.disease = Disease +SelfReport.diseaseVariant = Disease variant +SelfReport.firstName = First name +SelfReport.lastName = Last name +SelfReport.sex = Sex +SelfReport.birthdateDD = Day of birth +SelfReport.birthdateMM = Month of birth +SelfReport.birthdateYYYY = Year of birth +SelfReport.nationalHealthId = National health ID +SelfReport.email = Email +SelfReport.phoneNumber = Phone number +SelfReport.address = Address +SelfReport.comment = Comment +SelfReport.responsibleUser = Responsible user +SelfReport.investigationStatus = Investigation status +SelfReport.processingStatus = Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_ru-RU.properties b/sormas-api/src/main/resources/captions_ru-RU.properties index 43c414f1e1d..bad31362c6e 100644 --- a/sormas-api/src/main/resources/captions_ru-RU.properties +++ b/sormas-api/src/main/resources/captions_ru-RU.properties @@ -52,7 +52,7 @@ creationDate=Дата создания changeDate=Date of last change notAvailableShort=не применимо inaccessibleValue=Конфиденциально -includePartialBirthdates=Include partial birthdates +includePartialBirthdates = Include partial birthdates numberOfCharacters=Количество символов\: %d / %d remove=Удалить notTestedYet=Тест пока не осуществлён @@ -189,15 +189,15 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge=Okay, and continue to merge overview -actionOkAndGoToContactDirectory=Okay, and continue to contact directory -actionOkAndGoToContactDetails=Okay, and continue to contact -actionOkAndGoToPersonDirectory=Okay, and continue to person directory -actionExecuteAutomaticDeletion=Execute automatic deletion -actionDone=Done -actionConfirmAction=Confirm action -actionAefiSelectPrimarySuspectVaccination=Select Suspect Vaccination -actionAefiAssignNewReportingIdNumber="Assign New AEFI ID" +actionOkAndGoToMerge = Okay, and continue to merge overview +actionOkAndGoToContactDirectory = Okay, and continue to contact directory +actionOkAndGoToContactDetails = Okay, and continue to contact +actionOkAndGoToPersonDirectory = Okay, and continue to person directory +actionExecuteAutomaticDeletion = Execute automatic deletion +actionDone = Done +actionConfirmAction = Confirm action +actionAefiSelectPrimarySuspectVaccination = Select Suspect Vaccination +actionAefiAssignNewReportingIdNumber = "Assign New AEFI ID" activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -251,10 +251,10 @@ aggregateReportDiscardSelection=Отменить выбор aggregateReportEditAggregateReport=Редактировать сводный отчет aggregateReportEditReport=Редактировать отчет aggregateReportReportFound=Найден сводный отчет -aggregateReportShowZeroRows=Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups=Expired -aggregateReportNoAgeGroup=No age group -aggregateReportShowOnlyDuplicateReports=Display only duplicate reports +aggregateReportShowZeroRows = Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups = Expired +aggregateReportNoAgeGroup = No age group +aggregateReportShowOnlyDuplicateReports = Display only duplicate reports aggregateReportNewAggregateReport=Новый сводный отчет aggregateReportNewCasesShort=C aggregateReportThisWeek=Эта неделя @@ -278,7 +278,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend=Send emails +bulkEmailSend = Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -437,7 +437,6 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name -CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1037,6 +1036,7 @@ aefiDashboardAefiInvestigationDiscarded=Investigation Discarded aefiDashboardAefiClassificationRelatedToVaccination=Related to vaccine or vaccination aefiDashboardAefiClassificationCoincidentalAdverseEvent=Coincidental adverse event aefiDashboardAefiClassificationUndetermined=Undetermined + captionDefault=Default defaultRegion=Default Region defaultDistrict=Default District @@ -1154,20 +1154,22 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: + # Entity columns -EntityColumn.ENTITY=Entity -EntityColumn.FIELD_ID=Field ID -EntityColumn.FIELD=Field -EntityColumn.TYPE=Type -EntityColumn.DATA_PROTECTION=Data protection -EntityColumn.CAPTION=Caption -EntityColumn.DESCRIPTION=Description -EntityColumn.REQUIRED=Required -EntityColumn.NEW_DISEASE=New disease -EntityColumn.DISEASES=Diseases -EntityColumn.OUTBREAKS=Outbreaks -EntityColumn.IGNORED_COUNTRIES=Ignored countries -EntityColumn.EXCLUSIVE_COUNTRIES=Exclusive countries +EntityColumn.ENTITY = Entity +EntityColumn.FIELD_ID = Field ID +EntityColumn.FIELD = Field +EntityColumn.TYPE = Type +EntityColumn.DATA_PROTECTION = Data protection +EntityColumn.CAPTION = Caption +EntityColumn.DESCRIPTION = Description +EntityColumn.REQUIRED = Required +EntityColumn.NEW_DISEASE = New disease +EntityColumn.DISEASES = Diseases +EntityColumn.OUTBREAKS = Outbreaks +EntityColumn.IGNORED_COUNTRIES = Ignored countries +EntityColumn.EXCLUSIVE_COUNTRIES = Exclusive countries + # Environment Environment=Environment Environment.uuid=Environment ID @@ -1186,51 +1188,54 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location + environmentActiveEnvironments=Active environments -environmentArchivedEnvironments=Archived environments -environmentAllActiveAndArchivedEnvironments=All active and archived environments -environmentDeletedEnvironments=Deleted environments -environmentNewEnvironment=New environment +environmentArchivedEnvironments = Archived environments +environmentAllActiveAndArchivedEnvironments = All active and archived environments +environmentDeletedEnvironments = Deleted environments +environmentNewEnvironment= New environment environmentEnvironmentsList=Environments list + # EnvironmentSample -EnvironmentSample=Environment Sample -EnvironmentSample.uuid=Sample ID -EnvironmentSample.environment=Environment -EnvironmentSample.sampleDateTime=Date of sampling -EnvironmentSample.sampleMaterial=Sample material -EnvironmentSample.otherSampleMaterial=Specify sample material -EnvironmentSample.sampleVolume=Volume (in mL) -EnvironmentSample.fieldSampleId=Field sample ID -EnvironmentSample.turbidity=Turbidity (in NTU) -EnvironmentSample.phValue=pH of sample -EnvironmentSample.sampleTemperature=Temperature (in °C) -EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) -EnvironmentSample.laboratory=Laboratory -EnvironmentSample.laboratoryDetails=Laboratory details -EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested -EnvironmentSample.reportingUser=Reporting user -EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested -EnvironmentSample.weatherConditions=Weather conditions at time of sampling -EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched=Sent/dispatched -EnvironmentSample.dispatchDate=Dispatchment date -EnvironmentSample.dispatchDetails=Dispatchment details -EnvironmentSample.received=Received -EnvironmentSample.receivalDate=Receival date -EnvironmentSample.labSampleId=Lab sample ID -EnvironmentSample.specimenCondition=Specimen condition -EnvironmentSample.location=Location of sampling site -EnvironmentSample.generalComment=General comment -EnvironmentSample.positivePathogenTests=Positive pathogen tests -EnvironmentSample.latestPathogenTest=Latest pathogen test -EnvironmentSample.numberOfTests=Number of tests +EnvironmentSample = Environment Sample +EnvironmentSample.uuid = Sample ID +EnvironmentSample.environment = Environment +EnvironmentSample.sampleDateTime = Date of sampling +EnvironmentSample.sampleMaterial = Sample material +EnvironmentSample.otherSampleMaterial = Specify sample material +EnvironmentSample.sampleVolume = Volume (in mL) +EnvironmentSample.fieldSampleId = Field sample ID +EnvironmentSample.turbidity = Turbidity (in NTU) +EnvironmentSample.phValue = pH of sample +EnvironmentSample.sampleTemperature = Temperature (in °C) +EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) +EnvironmentSample.laboratory = Laboratory +EnvironmentSample.laboratoryDetails = Laboratory details +EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested +EnvironmentSample.reportingUser = Reporting user +EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested +EnvironmentSample.weatherConditions = Weather conditions at time of sampling +EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched = Sent/dispatched +EnvironmentSample.dispatchDate = Dispatchment date +EnvironmentSample.dispatchDetails = Dispatchment details +EnvironmentSample.received = Received +EnvironmentSample.receivalDate = Receival date +EnvironmentSample.labSampleId = Lab sample ID +EnvironmentSample.specimenCondition = Specimen condition +EnvironmentSample.location = Location of sampling site +EnvironmentSample.generalComment = General comment +EnvironmentSample.positivePathogenTests = Positive pathogen tests +EnvironmentSample.latestPathogenTest = Latest pathogen test +EnvironmentSample.numberOfTests = Number of tests + # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents=Deleted events +eventDeletedEvents = Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1374,7 +1379,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants=Deleted event participants +eventParticipantDeletedEventParticipants = Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1387,7 +1392,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser=Reporting user +EventParticipant.reportingUser = Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1424,9 +1429,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink=Event participant ID -EventParticipantSelection.eventUuidLink=Event ID -EventParticipantSelection.resultingCaseUuidLink=Resulting case ID +EventParticipantSelection.eventParticipantUuidLink = Event participant ID +EventParticipantSelection.eventUuidLink = Event ID +EventParticipantSelection.resultingCaseUuidLink = Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1646,6 +1651,7 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message + #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1656,7 +1662,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList=List of new event participants +lineListingNewEventParticipantsList = List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1832,10 +1838,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples=See samples for this person -caseLinkToSamples=See samples for this case -contactLinkToSamples=See samples for this contact -eventParticipantLinkToSamples=See samples for this event participant +personLinkToSamples = See samples for this person +caseLinkToSamples = See samples for this case +contactLinkToSamples = See samples for this contact +eventParticipantLinkToSamples = See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2143,9 +2149,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity=Community of event participant -SampleExport.eventParticipantDistrict=District of event participant -SampleExport.eventParticipantRegion=Region of event participant +SampleExport.eventParticipantCommunity = Community of event participant +SampleExport.eventParticipantDistrict = District of event participant +SampleExport.eventParticipantRegion = Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2204,7 +2210,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser=Reporting user +Immunization.reportingUser = Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2247,10 +2253,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations=Active immunizations -immunizationArchivedImmunizations=Archived immunizations -immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations -immunizationDeletedImmunizations=Deleted immunizations +immunizationActiveImmunizations = Active immunizations +immunizationArchivedImmunizations = Archived immunizations +immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations +immunizationDeletedImmunizations = Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2315,10 +2321,10 @@ aefiVaccinationsDiluentInformation=Diluent Information aefiVaccinationsDiluentBatchLotNumber=Batch/Lot number aefiVaccinationsDiluentExpiryDate=Expiry date aefiVaccinationsDiluentTimeOfReconstitution=Reconstitution time -aefiActiveAdverseEvents=Active adverse events -aefiArchivedAdverseEvents=Archived adverse events -aefiAllActiveAndArchivedAdverseEvents=All active and archived adverse events -aefiDeletedAdverseEvents=Deleted adverse events +aefiActiveAdverseEvents = Active adverse events +aefiArchivedAdverseEvents = Archived adverse events +aefiAllActiveAndArchivedAdverseEvents = All active and archived adverse events +aefiDeletedAdverseEvents = Deleted adverse events # Adverse Events AdverseEvents.severeLocalReaction=Severe local reaction AdverseEvents.severeLocalReactionMoreThanThreeDays=>3 days @@ -2569,13 +2575,13 @@ aefiInvestigationMedicalCareDetailsInstruction=**Instructions ? Attach copies of aefiInvestigationReconstitutionProcedure=Reconstitution procedure aefiInvestigationOfThoseAffected=Of those effected, how many are aefiAefiInvestigationList=Adverse Event Investigations -aefiNewAefiInvestigation=New Investigation +aefiNewAefiInvestigation = New Investigation aefiAefiInvestigationDataView=Adverse Event Investigation aefiNewAefiInvestigationStageTitle=Investigation -aefiActiveInvestigations=Active AEFI investigations -aefiArchivedInvestigations=Archived AEFI investigations -aefiAllActiveAndArchivedInvestigations=All active and archived AEFI investigations -aefiDeletedInvestigations=Deleted AEFI investigations +aefiActiveInvestigations = Active AEFI investigations +aefiArchivedInvestigations = Archived AEFI investigations +aefiAllActiveAndArchivedInvestigations = All active and archived AEFI investigations +aefiDeletedInvestigations = Deleted AEFI investigations titleAefiInvestigationBasicDetails=Section A\: Basic details titleAefiInvestigationRelevantPatientInformation=Section B\: Relevant patient information prior to immunization titleAefiInvestigationFirstExaminationDetails=Section C\: Details of first examination** of serious AEFI case @@ -2848,7 +2854,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment=Associated environment +Task.environment = Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2901,7 +2907,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser=Reporting user +TravelEntry.reportingUser = Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -3272,15 +3278,17 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms=SMS -userRoleNotificationTypeEmail=EMAIL +userRoleNotificationTypeSms = SMS +userRoleNotificationTypeEmail = EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template + notificationType=Notification type -notificationType.group=Group -notificationType.caption=Caption -notificationType.description=Description +notificationType.group = Group +notificationType.caption = Caption +notificationType.description = Description + SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -3315,10 +3323,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails=Person contact details -environmentSampleNotShipped=Not shipped -environmentSampleShipped=Shipped -environmentSampleReceived=Received +TaskExport.personOtherContactDetails = Person contact details +environmentSampleNotShipped = Not shipped +environmentSampleShipped = Shipped +environmentSampleReceived = Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -3335,45 +3343,48 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents + # SpecialCaseAccess SpecialCaseAccess=Special case access -caze=Case -assignedTo=Assigned to -assignedBy=Assigned by -endDateTime=Access until -assignmentDate=Date assigned +caze = Case +assignedTo = Assigned to +assignedBy = Assigned by +endDateTime = Access until +assignmentDate = Date assigned + specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case + # SelfReport -SelfReport=Self report -SelfReport.type=Type -SelfReport.reportDate=Report date -SelfReport.caseReference=Case reference number -SelfReport.disease=Disease -SelfReport.diseaseDetails=Disease details -SelfReport.diseaseVariant=Disease variant -SelfReport.diseaseVariantDetails=Disease variant details -SelfReport.firstName=First name -SelfReport.lastName=Last name -SelfReport.sex=Sex -SelfReport.birthDate=Birth date -SelfReport.birthdateDD=Day of birth -SelfReport.birthdateMM=Month of birth -SelfReport.birthdateYYYY=Year of birth -SelfReport.nationalHealthId=National health ID -SelfReport.email=Email -SelfReport.phoneNumber=Phone number -SelfReport.address=Address -SelfReport.dateOfTest=Date of test -SelfReport.dateOfSymptoms=Date of symptoms -SelfReport.workplace=Workplace -SelfReport.dateWorkplace=Date workplace -SelfReport.isolationDate=Date of isolation -SelfReport.contactDate=Date of contact -SelfReport.comment=Comment -SelfReport.responsibleUser=Responsible user -SelfReport.investigationStatus=Investigation status -SelfReport.processingStatus=Processing status +SelfReport = Self report +SelfReport.type = Type +SelfReport.reportDate = Report date +SelfReport.caseReference = Case reference number +SelfReport.disease = Disease +SelfReport.diseaseDetails = Disease details +SelfReport.diseaseVariant = Disease variant +SelfReport.diseaseVariantDetails = Disease variant details +SelfReport.firstName = First name +SelfReport.lastName = Last name +SelfReport.sex = Sex +SelfReport.birthDate = Birth date +SelfReport.birthdateDD = Day of birth +SelfReport.birthdateMM = Month of birth +SelfReport.birthdateYYYY = Year of birth +SelfReport.nationalHealthId = National health ID +SelfReport.email = Email +SelfReport.phoneNumber = Phone number +SelfReport.address = Address +SelfReport.dateOfTest = Date of test +SelfReport.dateOfSymptoms = Date of symptoms +SelfReport.workplace = Workplace +SelfReport.dateWorkplace = Date workplace +SelfReport.isolationDate = Date of isolation +SelfReport.contactDate = Date of contact +SelfReport.comment = Comment +SelfReport.responsibleUser = Responsible user +SelfReport.investigationStatus = Investigation status +SelfReport.processingStatus = Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_sv-SE.properties b/sormas-api/src/main/resources/captions_sv-SE.properties index 1e611b51ccf..7ca0f1f4687 100644 --- a/sormas-api/src/main/resources/captions_sv-SE.properties +++ b/sormas-api/src/main/resources/captions_sv-SE.properties @@ -188,13 +188,13 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge=Okay, and continue to merge overview -actionOkAndGoToContactDirectory=Okay, and continue to contact directory -actionOkAndGoToContactDetails=Okay, and continue to contact -actionOkAndGoToPersonDirectory=Okay, and continue to person directory -actionExecuteAutomaticDeletion=Execute automatic deletion -actionDone=Done -actionConfirmAction=Confirm action +actionOkAndGoToMerge = Okay, and continue to merge overview +actionOkAndGoToContactDirectory = Okay, and continue to contact directory +actionOkAndGoToContactDetails = Okay, and continue to contact +actionOkAndGoToPersonDirectory = Okay, and continue to person directory +actionExecuteAutomaticDeletion = Execute automatic deletion +actionDone = Done +actionConfirmAction = Confirm action activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -248,10 +248,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows=Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups=Expired -aggregateReportNoAgeGroup=No age group -aggregateReportShowOnlyDuplicateReports=Display only duplicate reports +aggregateReportShowZeroRows = Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups = Expired +aggregateReportNoAgeGroup = No age group +aggregateReportShowOnlyDuplicateReports = Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -275,7 +275,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend=Send emails +bulkEmailSend = Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -434,7 +434,6 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name -CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1134,6 +1133,7 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: + # Environment Environment=Environment Environment.uuid=Environment ID @@ -1152,51 +1152,54 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location + environmentActiveEnvironments=Active environments -environmentArchivedEnvironments=Archived environments -environmentAllActiveAndArchivedEnvironments=All active and archived environments -environmentDeletedEnvironments=Deleted environments -environmentNewEnvironment=New environment +environmentArchivedEnvironments = Archived environments +environmentAllActiveAndArchivedEnvironments = All active and archived environments +environmentDeletedEnvironments = Deleted environments +environmentNewEnvironment= New environment environmentEnvironmentsList=Environments list + # EnvironmentSample -EnvironmentSample=Environment Sample -EnvironmentSample.uuid=Sample ID -EnvironmentSample.environment=Environment -EnvironmentSample.sampleDateTime=Date of sampling -EnvironmentSample.sampleMaterial=Sample material -EnvironmentSample.otherSampleMaterial=Specify sample material -EnvironmentSample.sampleVolume=Volume (in mL) -EnvironmentSample.fieldSampleId=Field sample ID -EnvironmentSample.turbidity=Turbidity (in NTU) -EnvironmentSample.phValue=pH of sample -EnvironmentSample.sampleTemperature=Temperature (in °C) -EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) -EnvironmentSample.laboratory=Laboratory -EnvironmentSample.laboratoryDetails=Laboratory details -EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested -EnvironmentSample.reportingUser=Reporting user -EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested -EnvironmentSample.weatherConditions=Weather conditions at time of sampling -EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched=Sent/dispatched -EnvironmentSample.dispatchDate=Dispatchment date -EnvironmentSample.dispatchDetails=Dispatchment details -EnvironmentSample.received=Received -EnvironmentSample.receivalDate=Receival date -EnvironmentSample.labSampleId=Lab sample ID -EnvironmentSample.specimenCondition=Specimen condition -EnvironmentSample.location=Location of sampling site -EnvironmentSample.generalComment=General comment -EnvironmentSample.positivePathogenTests=Positive pathogen tests -EnvironmentSample.latestPathogenTest=Latest pathogen test -EnvironmentSample.numberOfTests=Number of tests +EnvironmentSample = Environment Sample +EnvironmentSample.uuid = Sample ID +EnvironmentSample.environment = Environment +EnvironmentSample.sampleDateTime = Date of sampling +EnvironmentSample.sampleMaterial = Sample material +EnvironmentSample.otherSampleMaterial = Specify sample material +EnvironmentSample.sampleVolume = Volume (in mL) +EnvironmentSample.fieldSampleId = Field sample ID +EnvironmentSample.turbidity = Turbidity (in NTU) +EnvironmentSample.phValue = pH of sample +EnvironmentSample.sampleTemperature = Temperature (in °C) +EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) +EnvironmentSample.laboratory = Laboratory +EnvironmentSample.laboratoryDetails = Laboratory details +EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested +EnvironmentSample.reportingUser = Reporting user +EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested +EnvironmentSample.weatherConditions = Weather conditions at time of sampling +EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched = Sent/dispatched +EnvironmentSample.dispatchDate = Dispatchment date +EnvironmentSample.dispatchDetails = Dispatchment details +EnvironmentSample.received = Received +EnvironmentSample.receivalDate = Receival date +EnvironmentSample.labSampleId = Lab sample ID +EnvironmentSample.specimenCondition = Specimen condition +EnvironmentSample.location = Location of sampling site +EnvironmentSample.generalComment = General comment +EnvironmentSample.positivePathogenTests = Positive pathogen tests +EnvironmentSample.latestPathogenTest = Latest pathogen test +EnvironmentSample.numberOfTests = Number of tests + # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents=Deleted events +eventDeletedEvents = Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1340,7 +1343,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants=Deleted event participants +eventParticipantDeletedEventParticipants = Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1353,7 +1356,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser=Reporting user +EventParticipant.reportingUser = Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1390,9 +1393,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink=Event participant ID -EventParticipantSelection.eventUuidLink=Event ID -EventParticipantSelection.resultingCaseUuidLink=Resulting case ID +EventParticipantSelection.eventParticipantUuidLink = Event participant ID +EventParticipantSelection.eventUuidLink = Event ID +EventParticipantSelection.resultingCaseUuidLink = Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1612,6 +1615,7 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message + #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1622,7 +1626,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList=List of new event participants +lineListingNewEventParticipantsList = List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1796,10 +1800,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples=See samples for this person -caseLinkToSamples=See samples for this case -contactLinkToSamples=See samples for this contact -eventParticipantLinkToSamples=See samples for this event participant +personLinkToSamples = See samples for this person +caseLinkToSamples = See samples for this case +contactLinkToSamples = See samples for this contact +eventParticipantLinkToSamples = See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2107,9 +2111,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity=Community of event participant -SampleExport.eventParticipantDistrict=District of event participant -SampleExport.eventParticipantRegion=Region of event participant +SampleExport.eventParticipantCommunity = Community of event participant +SampleExport.eventParticipantDistrict = District of event participant +SampleExport.eventParticipantRegion = Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2168,7 +2172,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser=Reporting user +Immunization.reportingUser = Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2211,10 +2215,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations=Active immunizations -immunizationArchivedImmunizations=Archived immunizations -immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations -immunizationDeletedImmunizations=Deleted immunizations +immunizationActiveImmunizations = Active immunizations +immunizationArchivedImmunizations = Archived immunizations +immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations +immunizationDeletedImmunizations = Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2457,7 +2461,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment=Associated environment +Task.environment = Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2510,7 +2514,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser=Reporting user +TravelEntry.reportingUser = Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -2877,15 +2881,17 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms=SMS -userRoleNotificationTypeEmail=EMAIL +userRoleNotificationTypeSms = SMS +userRoleNotificationTypeEmail = EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template + notificationType=Notification type -notificationType.group=Group -notificationType.caption=Caption -notificationType.description=Description +notificationType.group = Group +notificationType.caption = Caption +notificationType.description = Description + SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -2920,10 +2926,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails=Person contact details -environmentSampleNotShipped=Not shipped -environmentSampleShipped=Shipped -environmentSampleReceived=Received +TaskExport.personOtherContactDetails = Person contact details +environmentSampleNotShipped = Not shipped +environmentSampleShipped = Shipped +environmentSampleReceived = Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -2940,34 +2946,37 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents + # SpecialCaseAccess SpecialCaseAccess=Special case access -caze=Case -assignedTo=Assigned to -assignedBy=Assigned by -endDateTime=Access until -assignmentDate=Date assigned +caze = Case +assignedTo = Assigned to +assignedBy = Assigned by +endDateTime = Access until +assignmentDate = Date assigned + specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case + # SelfReport -SelfReport.type=Type -SelfReport.reportDate=Report date -SelfReport.disease=Disease -SelfReport.diseaseVariant=Disease variant -SelfReport.firstName=First name -SelfReport.lastName=Last name -SelfReport.sex=Sex -SelfReport.birthdateDD=Day of birth -SelfReport.birthdateMM=Month of birth -SelfReport.birthdateYYYY=Year of birth -SelfReport.nationalHealthId=National health ID -SelfReport.email=Email -SelfReport.phoneNumber=Phone number -SelfReport.address=Address -SelfReport.comment=Comment -SelfReport.responsibleUser=Responsible user -SelfReport.investigationStatus=Investigation status -SelfReport.processingStatus=Processing status +SelfReport.type = Type +SelfReport.reportDate = Report date +SelfReport.disease = Disease +SelfReport.diseaseVariant = Disease variant +SelfReport.firstName = First name +SelfReport.lastName = Last name +SelfReport.sex = Sex +SelfReport.birthdateDD = Day of birth +SelfReport.birthdateMM = Month of birth +SelfReport.birthdateYYYY = Year of birth +SelfReport.nationalHealthId = National health ID +SelfReport.email = Email +SelfReport.phoneNumber = Phone number +SelfReport.address = Address +SelfReport.comment = Comment +SelfReport.responsibleUser = Responsible user +SelfReport.investigationStatus = Investigation status +SelfReport.processingStatus = Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_sw-KE.properties b/sormas-api/src/main/resources/captions_sw-KE.properties index 1e611b51ccf..7ca0f1f4687 100644 --- a/sormas-api/src/main/resources/captions_sw-KE.properties +++ b/sormas-api/src/main/resources/captions_sw-KE.properties @@ -188,13 +188,13 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge=Okay, and continue to merge overview -actionOkAndGoToContactDirectory=Okay, and continue to contact directory -actionOkAndGoToContactDetails=Okay, and continue to contact -actionOkAndGoToPersonDirectory=Okay, and continue to person directory -actionExecuteAutomaticDeletion=Execute automatic deletion -actionDone=Done -actionConfirmAction=Confirm action +actionOkAndGoToMerge = Okay, and continue to merge overview +actionOkAndGoToContactDirectory = Okay, and continue to contact directory +actionOkAndGoToContactDetails = Okay, and continue to contact +actionOkAndGoToPersonDirectory = Okay, and continue to person directory +actionExecuteAutomaticDeletion = Execute automatic deletion +actionDone = Done +actionConfirmAction = Confirm action activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -248,10 +248,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows=Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups=Expired -aggregateReportNoAgeGroup=No age group -aggregateReportShowOnlyDuplicateReports=Display only duplicate reports +aggregateReportShowZeroRows = Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups = Expired +aggregateReportNoAgeGroup = No age group +aggregateReportShowOnlyDuplicateReports = Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -275,7 +275,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend=Send emails +bulkEmailSend = Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -434,7 +434,6 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name -CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1134,6 +1133,7 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: + # Environment Environment=Environment Environment.uuid=Environment ID @@ -1152,51 +1152,54 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location + environmentActiveEnvironments=Active environments -environmentArchivedEnvironments=Archived environments -environmentAllActiveAndArchivedEnvironments=All active and archived environments -environmentDeletedEnvironments=Deleted environments -environmentNewEnvironment=New environment +environmentArchivedEnvironments = Archived environments +environmentAllActiveAndArchivedEnvironments = All active and archived environments +environmentDeletedEnvironments = Deleted environments +environmentNewEnvironment= New environment environmentEnvironmentsList=Environments list + # EnvironmentSample -EnvironmentSample=Environment Sample -EnvironmentSample.uuid=Sample ID -EnvironmentSample.environment=Environment -EnvironmentSample.sampleDateTime=Date of sampling -EnvironmentSample.sampleMaterial=Sample material -EnvironmentSample.otherSampleMaterial=Specify sample material -EnvironmentSample.sampleVolume=Volume (in mL) -EnvironmentSample.fieldSampleId=Field sample ID -EnvironmentSample.turbidity=Turbidity (in NTU) -EnvironmentSample.phValue=pH of sample -EnvironmentSample.sampleTemperature=Temperature (in °C) -EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) -EnvironmentSample.laboratory=Laboratory -EnvironmentSample.laboratoryDetails=Laboratory details -EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested -EnvironmentSample.reportingUser=Reporting user -EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested -EnvironmentSample.weatherConditions=Weather conditions at time of sampling -EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched=Sent/dispatched -EnvironmentSample.dispatchDate=Dispatchment date -EnvironmentSample.dispatchDetails=Dispatchment details -EnvironmentSample.received=Received -EnvironmentSample.receivalDate=Receival date -EnvironmentSample.labSampleId=Lab sample ID -EnvironmentSample.specimenCondition=Specimen condition -EnvironmentSample.location=Location of sampling site -EnvironmentSample.generalComment=General comment -EnvironmentSample.positivePathogenTests=Positive pathogen tests -EnvironmentSample.latestPathogenTest=Latest pathogen test -EnvironmentSample.numberOfTests=Number of tests +EnvironmentSample = Environment Sample +EnvironmentSample.uuid = Sample ID +EnvironmentSample.environment = Environment +EnvironmentSample.sampleDateTime = Date of sampling +EnvironmentSample.sampleMaterial = Sample material +EnvironmentSample.otherSampleMaterial = Specify sample material +EnvironmentSample.sampleVolume = Volume (in mL) +EnvironmentSample.fieldSampleId = Field sample ID +EnvironmentSample.turbidity = Turbidity (in NTU) +EnvironmentSample.phValue = pH of sample +EnvironmentSample.sampleTemperature = Temperature (in °C) +EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) +EnvironmentSample.laboratory = Laboratory +EnvironmentSample.laboratoryDetails = Laboratory details +EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested +EnvironmentSample.reportingUser = Reporting user +EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested +EnvironmentSample.weatherConditions = Weather conditions at time of sampling +EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched = Sent/dispatched +EnvironmentSample.dispatchDate = Dispatchment date +EnvironmentSample.dispatchDetails = Dispatchment details +EnvironmentSample.received = Received +EnvironmentSample.receivalDate = Receival date +EnvironmentSample.labSampleId = Lab sample ID +EnvironmentSample.specimenCondition = Specimen condition +EnvironmentSample.location = Location of sampling site +EnvironmentSample.generalComment = General comment +EnvironmentSample.positivePathogenTests = Positive pathogen tests +EnvironmentSample.latestPathogenTest = Latest pathogen test +EnvironmentSample.numberOfTests = Number of tests + # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents=Deleted events +eventDeletedEvents = Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1340,7 +1343,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants=Deleted event participants +eventParticipantDeletedEventParticipants = Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1353,7 +1356,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser=Reporting user +EventParticipant.reportingUser = Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1390,9 +1393,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink=Event participant ID -EventParticipantSelection.eventUuidLink=Event ID -EventParticipantSelection.resultingCaseUuidLink=Resulting case ID +EventParticipantSelection.eventParticipantUuidLink = Event participant ID +EventParticipantSelection.eventUuidLink = Event ID +EventParticipantSelection.resultingCaseUuidLink = Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1612,6 +1615,7 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message + #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1622,7 +1626,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList=List of new event participants +lineListingNewEventParticipantsList = List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1796,10 +1800,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples=See samples for this person -caseLinkToSamples=See samples for this case -contactLinkToSamples=See samples for this contact -eventParticipantLinkToSamples=See samples for this event participant +personLinkToSamples = See samples for this person +caseLinkToSamples = See samples for this case +contactLinkToSamples = See samples for this contact +eventParticipantLinkToSamples = See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2107,9 +2111,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity=Community of event participant -SampleExport.eventParticipantDistrict=District of event participant -SampleExport.eventParticipantRegion=Region of event participant +SampleExport.eventParticipantCommunity = Community of event participant +SampleExport.eventParticipantDistrict = District of event participant +SampleExport.eventParticipantRegion = Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2168,7 +2172,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser=Reporting user +Immunization.reportingUser = Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2211,10 +2215,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations=Active immunizations -immunizationArchivedImmunizations=Archived immunizations -immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations -immunizationDeletedImmunizations=Deleted immunizations +immunizationActiveImmunizations = Active immunizations +immunizationArchivedImmunizations = Archived immunizations +immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations +immunizationDeletedImmunizations = Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2457,7 +2461,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment=Associated environment +Task.environment = Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2510,7 +2514,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser=Reporting user +TravelEntry.reportingUser = Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -2877,15 +2881,17 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms=SMS -userRoleNotificationTypeEmail=EMAIL +userRoleNotificationTypeSms = SMS +userRoleNotificationTypeEmail = EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template + notificationType=Notification type -notificationType.group=Group -notificationType.caption=Caption -notificationType.description=Description +notificationType.group = Group +notificationType.caption = Caption +notificationType.description = Description + SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -2920,10 +2926,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails=Person contact details -environmentSampleNotShipped=Not shipped -environmentSampleShipped=Shipped -environmentSampleReceived=Received +TaskExport.personOtherContactDetails = Person contact details +environmentSampleNotShipped = Not shipped +environmentSampleShipped = Shipped +environmentSampleReceived = Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -2940,34 +2946,37 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents + # SpecialCaseAccess SpecialCaseAccess=Special case access -caze=Case -assignedTo=Assigned to -assignedBy=Assigned by -endDateTime=Access until -assignmentDate=Date assigned +caze = Case +assignedTo = Assigned to +assignedBy = Assigned by +endDateTime = Access until +assignmentDate = Date assigned + specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case + # SelfReport -SelfReport.type=Type -SelfReport.reportDate=Report date -SelfReport.disease=Disease -SelfReport.diseaseVariant=Disease variant -SelfReport.firstName=First name -SelfReport.lastName=Last name -SelfReport.sex=Sex -SelfReport.birthdateDD=Day of birth -SelfReport.birthdateMM=Month of birth -SelfReport.birthdateYYYY=Year of birth -SelfReport.nationalHealthId=National health ID -SelfReport.email=Email -SelfReport.phoneNumber=Phone number -SelfReport.address=Address -SelfReport.comment=Comment -SelfReport.responsibleUser=Responsible user -SelfReport.investigationStatus=Investigation status -SelfReport.processingStatus=Processing status +SelfReport.type = Type +SelfReport.reportDate = Report date +SelfReport.disease = Disease +SelfReport.diseaseVariant = Disease variant +SelfReport.firstName = First name +SelfReport.lastName = Last name +SelfReport.sex = Sex +SelfReport.birthdateDD = Day of birth +SelfReport.birthdateMM = Month of birth +SelfReport.birthdateYYYY = Year of birth +SelfReport.nationalHealthId = National health ID +SelfReport.email = Email +SelfReport.phoneNumber = Phone number +SelfReport.address = Address +SelfReport.comment = Comment +SelfReport.responsibleUser = Responsible user +SelfReport.investigationStatus = Investigation status +SelfReport.processingStatus = Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_tr-TR.properties b/sormas-api/src/main/resources/captions_tr-TR.properties index 1e611b51ccf..7ca0f1f4687 100644 --- a/sormas-api/src/main/resources/captions_tr-TR.properties +++ b/sormas-api/src/main/resources/captions_tr-TR.properties @@ -188,13 +188,13 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge=Okay, and continue to merge overview -actionOkAndGoToContactDirectory=Okay, and continue to contact directory -actionOkAndGoToContactDetails=Okay, and continue to contact -actionOkAndGoToPersonDirectory=Okay, and continue to person directory -actionExecuteAutomaticDeletion=Execute automatic deletion -actionDone=Done -actionConfirmAction=Confirm action +actionOkAndGoToMerge = Okay, and continue to merge overview +actionOkAndGoToContactDirectory = Okay, and continue to contact directory +actionOkAndGoToContactDetails = Okay, and continue to contact +actionOkAndGoToPersonDirectory = Okay, and continue to person directory +actionExecuteAutomaticDeletion = Execute automatic deletion +actionDone = Done +actionConfirmAction = Confirm action activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -248,10 +248,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows=Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups=Expired -aggregateReportNoAgeGroup=No age group -aggregateReportShowOnlyDuplicateReports=Display only duplicate reports +aggregateReportShowZeroRows = Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups = Expired +aggregateReportNoAgeGroup = No age group +aggregateReportShowOnlyDuplicateReports = Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -275,7 +275,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend=Send emails +bulkEmailSend = Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -434,7 +434,6 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name -CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1134,6 +1133,7 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: + # Environment Environment=Environment Environment.uuid=Environment ID @@ -1152,51 +1152,54 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location + environmentActiveEnvironments=Active environments -environmentArchivedEnvironments=Archived environments -environmentAllActiveAndArchivedEnvironments=All active and archived environments -environmentDeletedEnvironments=Deleted environments -environmentNewEnvironment=New environment +environmentArchivedEnvironments = Archived environments +environmentAllActiveAndArchivedEnvironments = All active and archived environments +environmentDeletedEnvironments = Deleted environments +environmentNewEnvironment= New environment environmentEnvironmentsList=Environments list + # EnvironmentSample -EnvironmentSample=Environment Sample -EnvironmentSample.uuid=Sample ID -EnvironmentSample.environment=Environment -EnvironmentSample.sampleDateTime=Date of sampling -EnvironmentSample.sampleMaterial=Sample material -EnvironmentSample.otherSampleMaterial=Specify sample material -EnvironmentSample.sampleVolume=Volume (in mL) -EnvironmentSample.fieldSampleId=Field sample ID -EnvironmentSample.turbidity=Turbidity (in NTU) -EnvironmentSample.phValue=pH of sample -EnvironmentSample.sampleTemperature=Temperature (in °C) -EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) -EnvironmentSample.laboratory=Laboratory -EnvironmentSample.laboratoryDetails=Laboratory details -EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested -EnvironmentSample.reportingUser=Reporting user -EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested -EnvironmentSample.weatherConditions=Weather conditions at time of sampling -EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched=Sent/dispatched -EnvironmentSample.dispatchDate=Dispatchment date -EnvironmentSample.dispatchDetails=Dispatchment details -EnvironmentSample.received=Received -EnvironmentSample.receivalDate=Receival date -EnvironmentSample.labSampleId=Lab sample ID -EnvironmentSample.specimenCondition=Specimen condition -EnvironmentSample.location=Location of sampling site -EnvironmentSample.generalComment=General comment -EnvironmentSample.positivePathogenTests=Positive pathogen tests -EnvironmentSample.latestPathogenTest=Latest pathogen test -EnvironmentSample.numberOfTests=Number of tests +EnvironmentSample = Environment Sample +EnvironmentSample.uuid = Sample ID +EnvironmentSample.environment = Environment +EnvironmentSample.sampleDateTime = Date of sampling +EnvironmentSample.sampleMaterial = Sample material +EnvironmentSample.otherSampleMaterial = Specify sample material +EnvironmentSample.sampleVolume = Volume (in mL) +EnvironmentSample.fieldSampleId = Field sample ID +EnvironmentSample.turbidity = Turbidity (in NTU) +EnvironmentSample.phValue = pH of sample +EnvironmentSample.sampleTemperature = Temperature (in °C) +EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) +EnvironmentSample.laboratory = Laboratory +EnvironmentSample.laboratoryDetails = Laboratory details +EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested +EnvironmentSample.reportingUser = Reporting user +EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested +EnvironmentSample.weatherConditions = Weather conditions at time of sampling +EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched = Sent/dispatched +EnvironmentSample.dispatchDate = Dispatchment date +EnvironmentSample.dispatchDetails = Dispatchment details +EnvironmentSample.received = Received +EnvironmentSample.receivalDate = Receival date +EnvironmentSample.labSampleId = Lab sample ID +EnvironmentSample.specimenCondition = Specimen condition +EnvironmentSample.location = Location of sampling site +EnvironmentSample.generalComment = General comment +EnvironmentSample.positivePathogenTests = Positive pathogen tests +EnvironmentSample.latestPathogenTest = Latest pathogen test +EnvironmentSample.numberOfTests = Number of tests + # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents=Deleted events +eventDeletedEvents = Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1340,7 +1343,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants=Deleted event participants +eventParticipantDeletedEventParticipants = Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1353,7 +1356,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser=Reporting user +EventParticipant.reportingUser = Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1390,9 +1393,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink=Event participant ID -EventParticipantSelection.eventUuidLink=Event ID -EventParticipantSelection.resultingCaseUuidLink=Resulting case ID +EventParticipantSelection.eventParticipantUuidLink = Event participant ID +EventParticipantSelection.eventUuidLink = Event ID +EventParticipantSelection.resultingCaseUuidLink = Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1612,6 +1615,7 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message + #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1622,7 +1626,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList=List of new event participants +lineListingNewEventParticipantsList = List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1796,10 +1800,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples=See samples for this person -caseLinkToSamples=See samples for this case -contactLinkToSamples=See samples for this contact -eventParticipantLinkToSamples=See samples for this event participant +personLinkToSamples = See samples for this person +caseLinkToSamples = See samples for this case +contactLinkToSamples = See samples for this contact +eventParticipantLinkToSamples = See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2107,9 +2111,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity=Community of event participant -SampleExport.eventParticipantDistrict=District of event participant -SampleExport.eventParticipantRegion=Region of event participant +SampleExport.eventParticipantCommunity = Community of event participant +SampleExport.eventParticipantDistrict = District of event participant +SampleExport.eventParticipantRegion = Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2168,7 +2172,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser=Reporting user +Immunization.reportingUser = Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2211,10 +2215,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations=Active immunizations -immunizationArchivedImmunizations=Archived immunizations -immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations -immunizationDeletedImmunizations=Deleted immunizations +immunizationActiveImmunizations = Active immunizations +immunizationArchivedImmunizations = Archived immunizations +immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations +immunizationDeletedImmunizations = Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2457,7 +2461,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment=Associated environment +Task.environment = Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2510,7 +2514,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser=Reporting user +TravelEntry.reportingUser = Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -2877,15 +2881,17 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms=SMS -userRoleNotificationTypeEmail=EMAIL +userRoleNotificationTypeSms = SMS +userRoleNotificationTypeEmail = EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template + notificationType=Notification type -notificationType.group=Group -notificationType.caption=Caption -notificationType.description=Description +notificationType.group = Group +notificationType.caption = Caption +notificationType.description = Description + SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -2920,10 +2926,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails=Person contact details -environmentSampleNotShipped=Not shipped -environmentSampleShipped=Shipped -environmentSampleReceived=Received +TaskExport.personOtherContactDetails = Person contact details +environmentSampleNotShipped = Not shipped +environmentSampleShipped = Shipped +environmentSampleReceived = Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -2940,34 +2946,37 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents + # SpecialCaseAccess SpecialCaseAccess=Special case access -caze=Case -assignedTo=Assigned to -assignedBy=Assigned by -endDateTime=Access until -assignmentDate=Date assigned +caze = Case +assignedTo = Assigned to +assignedBy = Assigned by +endDateTime = Access until +assignmentDate = Date assigned + specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case + # SelfReport -SelfReport.type=Type -SelfReport.reportDate=Report date -SelfReport.disease=Disease -SelfReport.diseaseVariant=Disease variant -SelfReport.firstName=First name -SelfReport.lastName=Last name -SelfReport.sex=Sex -SelfReport.birthdateDD=Day of birth -SelfReport.birthdateMM=Month of birth -SelfReport.birthdateYYYY=Year of birth -SelfReport.nationalHealthId=National health ID -SelfReport.email=Email -SelfReport.phoneNumber=Phone number -SelfReport.address=Address -SelfReport.comment=Comment -SelfReport.responsibleUser=Responsible user -SelfReport.investigationStatus=Investigation status -SelfReport.processingStatus=Processing status +SelfReport.type = Type +SelfReport.reportDate = Report date +SelfReport.disease = Disease +SelfReport.diseaseVariant = Disease variant +SelfReport.firstName = First name +SelfReport.lastName = Last name +SelfReport.sex = Sex +SelfReport.birthdateDD = Day of birth +SelfReport.birthdateMM = Month of birth +SelfReport.birthdateYYYY = Year of birth +SelfReport.nationalHealthId = National health ID +SelfReport.email = Email +SelfReport.phoneNumber = Phone number +SelfReport.address = Address +SelfReport.comment = Comment +SelfReport.responsibleUser = Responsible user +SelfReport.investigationStatus = Investigation status +SelfReport.processingStatus = Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_uk-UA.properties b/sormas-api/src/main/resources/captions_uk-UA.properties index 1e611b51ccf..7ca0f1f4687 100644 --- a/sormas-api/src/main/resources/captions_uk-UA.properties +++ b/sormas-api/src/main/resources/captions_uk-UA.properties @@ -188,13 +188,13 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge=Okay, and continue to merge overview -actionOkAndGoToContactDirectory=Okay, and continue to contact directory -actionOkAndGoToContactDetails=Okay, and continue to contact -actionOkAndGoToPersonDirectory=Okay, and continue to person directory -actionExecuteAutomaticDeletion=Execute automatic deletion -actionDone=Done -actionConfirmAction=Confirm action +actionOkAndGoToMerge = Okay, and continue to merge overview +actionOkAndGoToContactDirectory = Okay, and continue to contact directory +actionOkAndGoToContactDetails = Okay, and continue to contact +actionOkAndGoToPersonDirectory = Okay, and continue to person directory +actionExecuteAutomaticDeletion = Execute automatic deletion +actionDone = Done +actionConfirmAction = Confirm action activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -248,10 +248,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows=Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups=Expired -aggregateReportNoAgeGroup=No age group -aggregateReportShowOnlyDuplicateReports=Display only duplicate reports +aggregateReportShowZeroRows = Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups = Expired +aggregateReportNoAgeGroup = No age group +aggregateReportShowOnlyDuplicateReports = Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -275,7 +275,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend=Send emails +bulkEmailSend = Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -434,7 +434,6 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name -CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1134,6 +1133,7 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: + # Environment Environment=Environment Environment.uuid=Environment ID @@ -1152,51 +1152,54 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location + environmentActiveEnvironments=Active environments -environmentArchivedEnvironments=Archived environments -environmentAllActiveAndArchivedEnvironments=All active and archived environments -environmentDeletedEnvironments=Deleted environments -environmentNewEnvironment=New environment +environmentArchivedEnvironments = Archived environments +environmentAllActiveAndArchivedEnvironments = All active and archived environments +environmentDeletedEnvironments = Deleted environments +environmentNewEnvironment= New environment environmentEnvironmentsList=Environments list + # EnvironmentSample -EnvironmentSample=Environment Sample -EnvironmentSample.uuid=Sample ID -EnvironmentSample.environment=Environment -EnvironmentSample.sampleDateTime=Date of sampling -EnvironmentSample.sampleMaterial=Sample material -EnvironmentSample.otherSampleMaterial=Specify sample material -EnvironmentSample.sampleVolume=Volume (in mL) -EnvironmentSample.fieldSampleId=Field sample ID -EnvironmentSample.turbidity=Turbidity (in NTU) -EnvironmentSample.phValue=pH of sample -EnvironmentSample.sampleTemperature=Temperature (in °C) -EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) -EnvironmentSample.laboratory=Laboratory -EnvironmentSample.laboratoryDetails=Laboratory details -EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested -EnvironmentSample.reportingUser=Reporting user -EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested -EnvironmentSample.weatherConditions=Weather conditions at time of sampling -EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched=Sent/dispatched -EnvironmentSample.dispatchDate=Dispatchment date -EnvironmentSample.dispatchDetails=Dispatchment details -EnvironmentSample.received=Received -EnvironmentSample.receivalDate=Receival date -EnvironmentSample.labSampleId=Lab sample ID -EnvironmentSample.specimenCondition=Specimen condition -EnvironmentSample.location=Location of sampling site -EnvironmentSample.generalComment=General comment -EnvironmentSample.positivePathogenTests=Positive pathogen tests -EnvironmentSample.latestPathogenTest=Latest pathogen test -EnvironmentSample.numberOfTests=Number of tests +EnvironmentSample = Environment Sample +EnvironmentSample.uuid = Sample ID +EnvironmentSample.environment = Environment +EnvironmentSample.sampleDateTime = Date of sampling +EnvironmentSample.sampleMaterial = Sample material +EnvironmentSample.otherSampleMaterial = Specify sample material +EnvironmentSample.sampleVolume = Volume (in mL) +EnvironmentSample.fieldSampleId = Field sample ID +EnvironmentSample.turbidity = Turbidity (in NTU) +EnvironmentSample.phValue = pH of sample +EnvironmentSample.sampleTemperature = Temperature (in °C) +EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) +EnvironmentSample.laboratory = Laboratory +EnvironmentSample.laboratoryDetails = Laboratory details +EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested +EnvironmentSample.reportingUser = Reporting user +EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested +EnvironmentSample.weatherConditions = Weather conditions at time of sampling +EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched = Sent/dispatched +EnvironmentSample.dispatchDate = Dispatchment date +EnvironmentSample.dispatchDetails = Dispatchment details +EnvironmentSample.received = Received +EnvironmentSample.receivalDate = Receival date +EnvironmentSample.labSampleId = Lab sample ID +EnvironmentSample.specimenCondition = Specimen condition +EnvironmentSample.location = Location of sampling site +EnvironmentSample.generalComment = General comment +EnvironmentSample.positivePathogenTests = Positive pathogen tests +EnvironmentSample.latestPathogenTest = Latest pathogen test +EnvironmentSample.numberOfTests = Number of tests + # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents=Deleted events +eventDeletedEvents = Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1340,7 +1343,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants=Deleted event participants +eventParticipantDeletedEventParticipants = Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1353,7 +1356,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser=Reporting user +EventParticipant.reportingUser = Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1390,9 +1393,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink=Event participant ID -EventParticipantSelection.eventUuidLink=Event ID -EventParticipantSelection.resultingCaseUuidLink=Resulting case ID +EventParticipantSelection.eventParticipantUuidLink = Event participant ID +EventParticipantSelection.eventUuidLink = Event ID +EventParticipantSelection.resultingCaseUuidLink = Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1612,6 +1615,7 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message + #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1622,7 +1626,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList=List of new event participants +lineListingNewEventParticipantsList = List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1796,10 +1800,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples=See samples for this person -caseLinkToSamples=See samples for this case -contactLinkToSamples=See samples for this contact -eventParticipantLinkToSamples=See samples for this event participant +personLinkToSamples = See samples for this person +caseLinkToSamples = See samples for this case +contactLinkToSamples = See samples for this contact +eventParticipantLinkToSamples = See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2107,9 +2111,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity=Community of event participant -SampleExport.eventParticipantDistrict=District of event participant -SampleExport.eventParticipantRegion=Region of event participant +SampleExport.eventParticipantCommunity = Community of event participant +SampleExport.eventParticipantDistrict = District of event participant +SampleExport.eventParticipantRegion = Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2168,7 +2172,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser=Reporting user +Immunization.reportingUser = Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2211,10 +2215,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations=Active immunizations -immunizationArchivedImmunizations=Archived immunizations -immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations -immunizationDeletedImmunizations=Deleted immunizations +immunizationActiveImmunizations = Active immunizations +immunizationArchivedImmunizations = Archived immunizations +immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations +immunizationDeletedImmunizations = Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2457,7 +2461,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment=Associated environment +Task.environment = Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2510,7 +2514,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser=Reporting user +TravelEntry.reportingUser = Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -2877,15 +2881,17 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms=SMS -userRoleNotificationTypeEmail=EMAIL +userRoleNotificationTypeSms = SMS +userRoleNotificationTypeEmail = EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template + notificationType=Notification type -notificationType.group=Group -notificationType.caption=Caption -notificationType.description=Description +notificationType.group = Group +notificationType.caption = Caption +notificationType.description = Description + SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -2920,10 +2926,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails=Person contact details -environmentSampleNotShipped=Not shipped -environmentSampleShipped=Shipped -environmentSampleReceived=Received +TaskExport.personOtherContactDetails = Person contact details +environmentSampleNotShipped = Not shipped +environmentSampleShipped = Shipped +environmentSampleReceived = Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -2940,34 +2946,37 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents + # SpecialCaseAccess SpecialCaseAccess=Special case access -caze=Case -assignedTo=Assigned to -assignedBy=Assigned by -endDateTime=Access until -assignmentDate=Date assigned +caze = Case +assignedTo = Assigned to +assignedBy = Assigned by +endDateTime = Access until +assignmentDate = Date assigned + specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case + # SelfReport -SelfReport.type=Type -SelfReport.reportDate=Report date -SelfReport.disease=Disease -SelfReport.diseaseVariant=Disease variant -SelfReport.firstName=First name -SelfReport.lastName=Last name -SelfReport.sex=Sex -SelfReport.birthdateDD=Day of birth -SelfReport.birthdateMM=Month of birth -SelfReport.birthdateYYYY=Year of birth -SelfReport.nationalHealthId=National health ID -SelfReport.email=Email -SelfReport.phoneNumber=Phone number -SelfReport.address=Address -SelfReport.comment=Comment -SelfReport.responsibleUser=Responsible user -SelfReport.investigationStatus=Investigation status -SelfReport.processingStatus=Processing status +SelfReport.type = Type +SelfReport.reportDate = Report date +SelfReport.disease = Disease +SelfReport.diseaseVariant = Disease variant +SelfReport.firstName = First name +SelfReport.lastName = Last name +SelfReport.sex = Sex +SelfReport.birthdateDD = Day of birth +SelfReport.birthdateMM = Month of birth +SelfReport.birthdateYYYY = Year of birth +SelfReport.nationalHealthId = National health ID +SelfReport.email = Email +SelfReport.phoneNumber = Phone number +SelfReport.address = Address +SelfReport.comment = Comment +SelfReport.responsibleUser = Responsible user +SelfReport.investigationStatus = Investigation status +SelfReport.processingStatus = Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_zh-CN.properties b/sormas-api/src/main/resources/captions_zh-CN.properties index 62ad03f7aae..c8a23ea0a16 100644 --- a/sormas-api/src/main/resources/captions_zh-CN.properties +++ b/sormas-api/src/main/resources/captions_zh-CN.properties @@ -52,7 +52,7 @@ creationDate=创建日期 changeDate=Date of last change notAvailableShort=不可用 inaccessibleValue=保密 -includePartialBirthdates=Include partial birthdates +includePartialBirthdates = Include partial birthdates numberOfCharacters=字符数： %d / %d remove=移除 notTestedYet=尚未测试。 @@ -189,15 +189,15 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge=Okay, and continue to merge overview -actionOkAndGoToContactDirectory=Okay, and continue to contact directory -actionOkAndGoToContactDetails=Okay, and continue to contact -actionOkAndGoToPersonDirectory=Okay, and continue to person directory -actionExecuteAutomaticDeletion=Execute automatic deletion -actionDone=Done -actionConfirmAction=Confirm action -actionAefiSelectPrimarySuspectVaccination=Select Suspect Vaccination -actionAefiAssignNewReportingIdNumber="Assign New AEFI ID" +actionOkAndGoToMerge = Okay, and continue to merge overview +actionOkAndGoToContactDirectory = Okay, and continue to contact directory +actionOkAndGoToContactDetails = Okay, and continue to contact +actionOkAndGoToPersonDirectory = Okay, and continue to person directory +actionExecuteAutomaticDeletion = Execute automatic deletion +actionDone = Done +actionConfirmAction = Confirm action +actionAefiSelectPrimarySuspectVaccination = Select Suspect Vaccination +actionAefiAssignNewReportingIdNumber = "Assign New AEFI ID" activityAsCaseFlightNumber=航班号 ActivityAsCase=Activity as case ActivityAsCase.startDate=活动开始 @@ -251,10 +251,10 @@ aggregateReportDiscardSelection=放弃选择 aggregateReportEditAggregateReport=编辑汇总报表 aggregateReportEditReport=编辑报表 aggregateReportReportFound=找到聚合报告 -aggregateReportShowZeroRows=Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups=Expired -aggregateReportNoAgeGroup=No age group -aggregateReportShowOnlyDuplicateReports=Display only duplicate reports +aggregateReportShowZeroRows = Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups = Expired +aggregateReportNoAgeGroup = No age group +aggregateReportShowOnlyDuplicateReports = Display only duplicate reports aggregateReportNewAggregateReport=新的累计报告 aggregateReportNewCasesShort=C aggregateReportThisWeek=本周 @@ -278,7 +278,7 @@ days=days # Bulk actions bulkActions=批量操作 bulkEditAssignee=Edit assignee -bulkEmailSend=Send emails +bulkEmailSend = Send emails bulkCancelFollowUp=取消后续行动 bulkCaseClassification=更改案例分类 bulkCaseOutcome=更改案例结果 @@ -437,7 +437,6 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name -CaseData.disease=Disease CaseData.district=District CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -1037,6 +1036,7 @@ aefiDashboardAefiInvestigationDiscarded=Investigation Discarded aefiDashboardAefiClassificationRelatedToVaccination=Related to vaccine or vaccination aefiDashboardAefiClassificationCoincidentalAdverseEvent=Coincidental adverse event aefiDashboardAefiClassificationUndetermined=Undetermined + captionDefault=Default defaultRegion=Default Region defaultDistrict=Default District @@ -1154,20 +1154,22 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities\: + # Entity columns -EntityColumn.ENTITY=Entity -EntityColumn.FIELD_ID=Field ID -EntityColumn.FIELD=Field -EntityColumn.TYPE=Type -EntityColumn.DATA_PROTECTION=Data protection -EntityColumn.CAPTION=Caption -EntityColumn.DESCRIPTION=Description -EntityColumn.REQUIRED=Required -EntityColumn.NEW_DISEASE=New disease -EntityColumn.DISEASES=Diseases -EntityColumn.OUTBREAKS=Outbreaks -EntityColumn.IGNORED_COUNTRIES=Ignored countries -EntityColumn.EXCLUSIVE_COUNTRIES=Exclusive countries +EntityColumn.ENTITY = Entity +EntityColumn.FIELD_ID = Field ID +EntityColumn.FIELD = Field +EntityColumn.TYPE = Type +EntityColumn.DATA_PROTECTION = Data protection +EntityColumn.CAPTION = Caption +EntityColumn.DESCRIPTION = Description +EntityColumn.REQUIRED = Required +EntityColumn.NEW_DISEASE = New disease +EntityColumn.DISEASES = Diseases +EntityColumn.OUTBREAKS = Outbreaks +EntityColumn.IGNORED_COUNTRIES = Ignored countries +EntityColumn.EXCLUSIVE_COUNTRIES = Exclusive countries + # Environment Environment=Environment Environment.uuid=Environment ID @@ -1186,51 +1188,54 @@ Environment.otherInfrastructureDetails=Other infrastructure details Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location + environmentActiveEnvironments=Active environments -environmentArchivedEnvironments=Archived environments -environmentAllActiveAndArchivedEnvironments=All active and archived environments -environmentDeletedEnvironments=Deleted environments -environmentNewEnvironment=New environment +environmentArchivedEnvironments = Archived environments +environmentAllActiveAndArchivedEnvironments = All active and archived environments +environmentDeletedEnvironments = Deleted environments +environmentNewEnvironment= New environment environmentEnvironmentsList=Environments list + # EnvironmentSample -EnvironmentSample=Environment Sample -EnvironmentSample.uuid=Sample ID -EnvironmentSample.environment=Environment -EnvironmentSample.sampleDateTime=Date of sampling -EnvironmentSample.sampleMaterial=Sample material -EnvironmentSample.otherSampleMaterial=Specify sample material -EnvironmentSample.sampleVolume=Volume (in mL) -EnvironmentSample.fieldSampleId=Field sample ID -EnvironmentSample.turbidity=Turbidity (in NTU) -EnvironmentSample.phValue=pH of sample -EnvironmentSample.sampleTemperature=Temperature (in °C) -EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) -EnvironmentSample.laboratory=Laboratory -EnvironmentSample.laboratoryDetails=Laboratory details -EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested -EnvironmentSample.reportingUser=Reporting user -EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested -EnvironmentSample.weatherConditions=Weather conditions at time of sampling -EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched=Sent/dispatched -EnvironmentSample.dispatchDate=Dispatchment date -EnvironmentSample.dispatchDetails=Dispatchment details -EnvironmentSample.received=Received -EnvironmentSample.receivalDate=Receival date -EnvironmentSample.labSampleId=Lab sample ID -EnvironmentSample.specimenCondition=Specimen condition -EnvironmentSample.location=Location of sampling site -EnvironmentSample.generalComment=General comment -EnvironmentSample.positivePathogenTests=Positive pathogen tests -EnvironmentSample.latestPathogenTest=Latest pathogen test -EnvironmentSample.numberOfTests=Number of tests +EnvironmentSample = Environment Sample +EnvironmentSample.uuid = Sample ID +EnvironmentSample.environment = Environment +EnvironmentSample.sampleDateTime = Date of sampling +EnvironmentSample.sampleMaterial = Sample material +EnvironmentSample.otherSampleMaterial = Specify sample material +EnvironmentSample.sampleVolume = Volume (in mL) +EnvironmentSample.fieldSampleId = Field sample ID +EnvironmentSample.turbidity = Turbidity (in NTU) +EnvironmentSample.phValue = pH of sample +EnvironmentSample.sampleTemperature = Temperature (in °C) +EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) +EnvironmentSample.laboratory = Laboratory +EnvironmentSample.laboratoryDetails = Laboratory details +EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested +EnvironmentSample.reportingUser = Reporting user +EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested +EnvironmentSample.weatherConditions = Weather conditions at time of sampling +EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched = Sent/dispatched +EnvironmentSample.dispatchDate = Dispatchment date +EnvironmentSample.dispatchDetails = Dispatchment details +EnvironmentSample.received = Received +EnvironmentSample.receivalDate = Receival date +EnvironmentSample.labSampleId = Lab sample ID +EnvironmentSample.specimenCondition = Specimen condition +EnvironmentSample.location = Location of sampling site +EnvironmentSample.generalComment = General comment +EnvironmentSample.positivePathogenTests = Positive pathogen tests +EnvironmentSample.latestPathogenTest = Latest pathogen test +EnvironmentSample.numberOfTests = Number of tests + # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents=Deleted events +eventDeletedEvents = Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1374,7 +1379,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants=Deleted event participants +eventParticipantDeletedEventParticipants = Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1387,7 +1392,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser=Reporting user +EventParticipant.reportingUser = Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1424,9 +1429,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink=Event participant ID -EventParticipantSelection.eventUuidLink=Event ID -EventParticipantSelection.resultingCaseUuidLink=Resulting case ID +EventParticipantSelection.eventParticipantUuidLink = Event participant ID +EventParticipantSelection.eventUuidLink = Event ID +EventParticipantSelection.resultingCaseUuidLink = Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1646,6 +1651,7 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message + #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1656,7 +1662,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList=List of new event participants +lineListingNewEventParticipantsList = List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1832,10 +1838,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples=See samples for this person -caseLinkToSamples=See samples for this case -contactLinkToSamples=See samples for this contact -eventParticipantLinkToSamples=See samples for this event participant +personLinkToSamples = See samples for this person +caseLinkToSamples = See samples for this case +contactLinkToSamples = See samples for this contact +eventParticipantLinkToSamples = See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning\: This might replace coordinates which were intentionally set differently\! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2143,9 +2149,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity=Community of event participant -SampleExport.eventParticipantDistrict=District of event participant -SampleExport.eventParticipantRegion=Region of event participant +SampleExport.eventParticipantCommunity = Community of event participant +SampleExport.eventParticipantDistrict = District of event participant +SampleExport.eventParticipantRegion = Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2204,7 +2210,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=免疫 Immunization.reportDate=Date of report -Immunization.reportingUser=Reporting user +Immunization.reportingUser = Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2247,10 +2253,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations=Active immunizations -immunizationArchivedImmunizations=Archived immunizations -immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations -immunizationDeletedImmunizations=Deleted immunizations +immunizationActiveImmunizations = Active immunizations +immunizationArchivedImmunizations = Archived immunizations +immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations +immunizationDeletedImmunizations = Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2315,10 +2321,10 @@ aefiVaccinationsDiluentInformation=Diluent Information aefiVaccinationsDiluentBatchLotNumber=Batch/Lot number aefiVaccinationsDiluentExpiryDate=Expiry date aefiVaccinationsDiluentTimeOfReconstitution=Reconstitution time -aefiActiveAdverseEvents=Active adverse events -aefiArchivedAdverseEvents=Archived adverse events -aefiAllActiveAndArchivedAdverseEvents=All active and archived adverse events -aefiDeletedAdverseEvents=Deleted adverse events +aefiActiveAdverseEvents = Active adverse events +aefiArchivedAdverseEvents = Archived adverse events +aefiAllActiveAndArchivedAdverseEvents = All active and archived adverse events +aefiDeletedAdverseEvents = Deleted adverse events # Adverse Events AdverseEvents.severeLocalReaction=Severe local reaction AdverseEvents.severeLocalReactionMoreThanThreeDays=>3 days @@ -2569,13 +2575,13 @@ aefiInvestigationMedicalCareDetailsInstruction=**Instructions ? Attach copies of aefiInvestigationReconstitutionProcedure=Reconstitution procedure aefiInvestigationOfThoseAffected=Of those effected, how many are aefiAefiInvestigationList=Adverse Event Investigations -aefiNewAefiInvestigation=New Investigation +aefiNewAefiInvestigation = New Investigation aefiAefiInvestigationDataView=Adverse Event Investigation aefiNewAefiInvestigationStageTitle=Investigation -aefiActiveInvestigations=Active AEFI investigations -aefiArchivedInvestigations=Archived AEFI investigations -aefiAllActiveAndArchivedInvestigations=All active and archived AEFI investigations -aefiDeletedInvestigations=Deleted AEFI investigations +aefiActiveInvestigations = Active AEFI investigations +aefiArchivedInvestigations = Archived AEFI investigations +aefiAllActiveAndArchivedInvestigations = All active and archived AEFI investigations +aefiDeletedInvestigations = Deleted AEFI investigations titleAefiInvestigationBasicDetails=Section A\: Basic details titleAefiInvestigationRelevantPatientInformation=Section B\: Relevant patient information prior to immunization titleAefiInvestigationFirstExaminationDetails=Section C\: Details of first examination** of serious AEFI case @@ -2848,7 +2854,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment=Associated environment +Task.environment = Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -2901,7 +2907,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser=Reporting user +TravelEntry.reportingUser = Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -3272,15 +3278,17 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms=SMS -userRoleNotificationTypeEmail=EMAIL +userRoleNotificationTypeSms = SMS +userRoleNotificationTypeEmail = EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template + notificationType=Notification type -notificationType.group=Group -notificationType.caption=Caption -notificationType.description=Description +notificationType.group = Group +notificationType.caption = Caption +notificationType.description = Description + SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -3315,10 +3323,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails=Person contact details -environmentSampleNotShipped=Not shipped -environmentSampleShipped=Shipped -environmentSampleReceived=Received +TaskExport.personOtherContactDetails = Person contact details +environmentSampleNotShipped = Not shipped +environmentSampleShipped = Shipped +environmentSampleReceived = Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -3335,45 +3343,48 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents + # SpecialCaseAccess SpecialCaseAccess=Special case access -caze=Case -assignedTo=Assigned to -assignedBy=Assigned by -endDateTime=Access until -assignmentDate=Date assigned +caze = Case +assignedTo = Assigned to +assignedBy = Assigned by +endDateTime = Access until +assignmentDate = Date assigned + specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case + # SelfReport -SelfReport=Self report -SelfReport.type=Type -SelfReport.reportDate=Report date -SelfReport.caseReference=Case reference number -SelfReport.disease=Disease -SelfReport.diseaseDetails=Disease details -SelfReport.diseaseVariant=Disease variant -SelfReport.diseaseVariantDetails=Disease variant details -SelfReport.firstName=First name -SelfReport.lastName=Last name -SelfReport.sex=Sex -SelfReport.birthDate=Birth date -SelfReport.birthdateDD=Day of birth -SelfReport.birthdateMM=Month of birth -SelfReport.birthdateYYYY=Year of birth -SelfReport.nationalHealthId=National health ID -SelfReport.email=Email -SelfReport.phoneNumber=Phone number -SelfReport.address=Address -SelfReport.dateOfTest=Date of test -SelfReport.dateOfSymptoms=Date of symptoms -SelfReport.workplace=Workplace -SelfReport.dateWorkplace=Date workplace -SelfReport.isolationDate=Date of isolation -SelfReport.contactDate=Date of contact -SelfReport.comment=Comment -SelfReport.responsibleUser=Responsible user -SelfReport.investigationStatus=Investigation status -SelfReport.processingStatus=Processing status +SelfReport = Self report +SelfReport.type = Type +SelfReport.reportDate = Report date +SelfReport.caseReference = Case reference number +SelfReport.disease = Disease +SelfReport.diseaseDetails = Disease details +SelfReport.diseaseVariant = Disease variant +SelfReport.diseaseVariantDetails = Disease variant details +SelfReport.firstName = First name +SelfReport.lastName = Last name +SelfReport.sex = Sex +SelfReport.birthDate = Birth date +SelfReport.birthdateDD = Day of birth +SelfReport.birthdateMM = Month of birth +SelfReport.birthdateYYYY = Year of birth +SelfReport.nationalHealthId = National health ID +SelfReport.email = Email +SelfReport.phoneNumber = Phone number +SelfReport.address = Address +SelfReport.dateOfTest = Date of test +SelfReport.dateOfSymptoms = Date of symptoms +SelfReport.workplace = Workplace +SelfReport.dateWorkplace = Date workplace +SelfReport.isolationDate = Date of isolation +SelfReport.contactDate = Date of contact +SelfReport.comment = Comment +SelfReport.responsibleUser = Responsible user +SelfReport.investigationStatus = Investigation status +SelfReport.processingStatus = Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports diff --git a/sormas-api/src/main/resources/captions_zu-ZA.properties b/sormas-api/src/main/resources/captions_zu-ZA.properties index d52e7461ff0..111a929df1f 100644 --- a/sormas-api/src/main/resources/captions_zu-ZA.properties +++ b/sormas-api/src/main/resources/captions_zu-ZA.properties @@ -14,6 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . ############################################################################### + # General Captions all=All city=City @@ -55,6 +56,7 @@ facility=Facility pointOfEntry=Point of entry remove=Remove reportingUser=Reporting user + # About about=About aboutDocuments=Documents @@ -66,12 +68,14 @@ aboutDataDictionary=Data Dictionary (XLSX) aboutSormasWebsite=Official SORMAS Website aboutTechnicalManual=Technical Manual (PDF) aboutWhatsNew=What's New? + # Action actionNewAction=New action actionNoActions=There are no actions for this %s actionCreatingLabel=Created at %s by %s actionLastModifiedByLabel=Updated at %s by %s actionStatusChangeDate=updated at %s + Action=Action Action.title=Title Action.description=Description @@ -84,12 +88,13 @@ Action.actionContext=Action context Action.actionStatus=Action status Action.lastModifiedBy=Last modified by Action.actionMeasure=Measure + # Actions actionApplyDateFilter=Apply date filter actionArchive=Archive actionAssignNewEpidNumber=Assign new epid number actionBack=Back -actionSend=Send +actionSend = Send actionCancel=Cancel actionClear=Clear actionClearAll=Clear all @@ -128,8 +133,10 @@ actionBackToNationOverview=Back to Nation Overview actionSettings=User Settings actionNewForm=New Form actionOverwrite=Overwrite + # AdditionalTest additionalTestNewTest=New test result + AdditionalTest=Additional test AdditionalTest.altSgpt=ALT/SGPT (U/L) AdditionalTest.arterialVenousBloodGas=Arterial/venous blood gas @@ -153,6 +160,7 @@ AdditionalTest.testDateTime=Date and time of result AdditionalTest.totalBilirubin=Total bilirubin (umol/L) AdditionalTest.urea=Urea (mmol/L) AdditionalTest.wbcCount=WBC count (x10^9/L) + aggregateReportDeathsShort=D aggregateReportLabConfirmationsShort=L aggregateReportLastWeek=Last Week @@ -169,11 +177,13 @@ AggregateReport.labConfirmations=Lab confirmations AggregateReport.deaths=Deaths AggregateReport.healthFacility=Facility AggregateReport.pointOfEntry=Point of Entry -areaActiveAreas=Active areas -areaArchivedAreas=Archived areas -areaAllAreas=All areas -Area.archived=Archived -Area.externalId=External ID + +areaActiveAreas = Active areas +areaArchivedAreas = Archived areas +areaAllAreas = All areas +Area.archived = Archived +Area.externalId = External ID + # Bulk actions bulkActions=Bulk Actions bulkCancelFollowUp=Cancel follow-up @@ -191,6 +201,7 @@ bulkFacility=Change facility bulkInvestigationStatus=Change investigation status bulkLostToFollowUp=Set to lost to follow-up bulkSurveillanceOfficer=Change surveillance officer + # Campaign campaignActiveCampaigns=Active campaigns campaignAllCampaigns=All campaigns @@ -210,6 +221,7 @@ campaignDashboardChartHeight=Height in % campaignDashboardOrder=Order campaignSearch=Search Campaign campaignDiagramGroupBy=Group by + Campaign=Campaign Campaign.name=Name Campaign.description=Description @@ -222,11 +234,13 @@ Campaign.area=Area Campaign.region=Region Campaign.district=District Campaign.community=Community -CampaignFormData.campaign=Campaign -CampaignFormData.campaignFormMeta=Form -CampaignFormData.formDate=Form date -CampaignFormData.area=Area + +CampaignFormData.campaign = Campaign +CampaignFormData.campaignFormMeta = Form +CampaignFormData.formDate = Form date +CampaignFormData.area = Area CampaignFormData.edit=Edit + # CaseData caseCasesList=Cases list caseInfrastructureDataChanged=Infrastructure data has changed @@ -276,8 +290,9 @@ convertEventParticipantToCase=Create case from event participant with positive t convertContactToCase=Create case from contact with positive test result? caseSearchSpecificCase=Search specific case caseSearchCase=Search case -caseSelect=Select case +caseSelect= Select case caseCreateNew=Create new case + CaseData=Case CaseData.additionalDetails=General comment CaseData.caseClassification=Case classification @@ -300,7 +315,6 @@ CaseData.contactOfficer=Contact officer CaseData.dengueFeverType=Dengue fever type CaseData.diseaseVariant=Disease variant CaseData.diseaseDetails=Disease name -CaseData.disease=Disease CaseData.district=Responsible district CaseData.districtLevelDate=Date received at district level CaseData.doses=How many doses @@ -421,6 +435,7 @@ CaseData.notACaseReasonPhysicianInformation=Information provided by physician CaseData.notACaseReasonDifferentPathogen=Verification of different pathogen CaseData.notACaseReasonOther=Other CaseData.notACaseReasonDetails=Reason details + # CaseExport CaseExport.address=Address CaseExport.addressRegion=Address Region @@ -466,6 +481,7 @@ CaseExport.lastCooperativeVisitSymptomatic=Symptomatic at last cooperative visit CaseExport.lastCooperativeVisitSymptoms=Symptoms at last cooperative visit CaseExport.traveled=Traveled outside of district CaseExport.burialAttended=Visited a burial + # CaseHospitalization CaseHospitalization=Hospitalization CaseHospitalization.admissionDate=Date of visit or admission @@ -480,9 +496,12 @@ CaseHospitalization.previousHospitalizations=Previous hospitalizations CaseHospitalization.intensiveCareUnit=Stay in the intensive care unit CaseHospitalization.intensiveCareUnitStart=Start of the stay CaseHospitalization.intensiveCareUnitEnd=End of the stay + + # CaseImport caseImportErrorDescription=Error description caseImportMergeCase=Override existing case with changes from the imported case? + # CasePreviousHospitalization CasePreviousHospitalization=Previous hospitalization CasePreviousHospitalization.admissionAndDischargeDate=Date of admission & discharge @@ -494,8 +513,10 @@ CasePreviousHospitalization.healthFacility=Hospital CasePreviousHospitalization.healthFacilityDetails=Hospital name & description CasePreviousHospitalization.isolated=Isolation CasePreviousHospitalization.prevHospPeriod=Period of hospitalization + # ClinicalVisit clinicalVisitNewClinicalVisit=New clinical assessment + ClinicalVisit=Clinical assessment ClinicalVisit.bloodPressure=Blood pressure ClinicalVisit.heartRate=Heart rate @@ -503,22 +524,28 @@ ClinicalVisit.temperature=Temperature ClinicalVisit.visitDateTime=Date and time of visit ClinicalVisit.visitingPerson=Attending clinician ClinicalVisit.visitRemarks=Clinician remarks + ClinicalVisitExport.caseUuid=Case ID ClinicalVisitExport.caseName=Case name + columnAdditionalTests=Additional tests columnDiseaseShort=Disease columnNumberOfPendingTasks=Pending tasks + # Community Community.archived=Archived Community.externalID=External ID + communityActiveCommunities=Active communities communityArchivedCommunities=Archived communities communityAllCommunities=All communities + # Configuration Configuration.Facilities=Facilities Configuration.Outbreaks=Outbreaks Configuration.PointsOfEntry=Points of Entry Configuration.LineListing=Line Listing + # Contact contactCancelFollowUp=Cancel follow-up contactCaseContacts=Case contacts @@ -555,9 +582,10 @@ contactOnlyWithSharedEventWithSourceCase=Only contacts with source case linked t contactOnlyWithSourceCaseInGivenEvent=Only contacts whose source case is linked to this event contactFollowUpDay=Day contactQuarantineNotOrdered=No quarantine ordered -contactCreatePIAAccount=PIA -contactPersonPhoneNumber=Contact Person's Phone Number -contactSourceCase=Source case +contactCreatePIAAccount = PIA +contactPersonPhoneNumber = Contact Person's Phone Number +contactSourceCase = Source case + Contact=Contact Contact.additionalDetails=General comment Contact.caseClassification=Classification of the source case @@ -574,10 +602,10 @@ Contact.community=Responsible community Contact.contactClassification=Contact classification Contact.contactOfficer=Responsible contact officer Contact.contactOfficerUuid=Responsible contact officer -Contact.contactIdentificationSource=Contact identification source -Contact.contactIdentificationSourceDetails=Contact identification source details -Contact.tracingApp=Tracing app -Contact.tracingAppDetails=Tracing app details, e.g. name +Contact.contactIdentificationSource = Contact identification source +Contact.contactIdentificationSourceDetails = Contact identification source details +Contact.tracingApp = Tracing app +Contact.tracingAppDetails = Tracing app details, e.g. name Contact.contactProximity=Type of contact - if multiple pick the closest contact proximity Contact.contactStatus=Contact status Contact.description=Description of how contact took place @@ -648,6 +676,7 @@ Contact.prohibitionToWork=Prohibition to work Contact.prohibitionToWorkFrom=Prohibition to work from Contact.prohibitionToWorkUntil=Prohibition to work until Contact.reportingDistrict=Reporting district + # ContactExport ContactExport.address=Address ContactExport.addressDistrict=Address District @@ -666,6 +695,7 @@ ContactExport.sourceCaseUuid=Source case ID ContactExport.traveled=Traveled outside of district ContactExport.travelHistory=Travel history ContactExport.quarantineInformation=Quarantine information + # Dashboard dashboardAlive=Alive dashboardApplyCustomFilter=Apply custom filter @@ -789,12 +819,14 @@ dashboardAggregatedNumber=Count dashboardProportion=Proportion (%) dashboardViewAsColumnChart=View as Column Chart dashboardViewAsBarChart=View as Bar Chart + defaultRegion=Default Region defaultDistrict=Default District defaultCommunity=Default Community defaultFacility=Default Facility defaultLaboratory=Default Laboratory defaultPointOfEntry=Default Point Of Entry + devModeCaseCount=Number of generated cases devModeCaseDisease=Disease of the cases devModeCaseDistrict=District of the cases @@ -825,6 +857,7 @@ devModeEventStartDate=Earliest event start date devModeGenerateCases=Generate Cases devModeGenerateContacts=Generate Contacts devModeGenerateEvents=Generate Events + DiseaseBurden.caseCount=New cases DiseaseBurden.caseDeathCount=Fatalities DiseaseBurden.casesDifference=Dynamic @@ -832,16 +865,20 @@ DiseaseBurden.caseFatalityRate=CFR DiseaseBurden.eventCount=Number of events DiseaseBurden.outbreakDistrictCount=Outbreak districts DiseaseBurden.previousCaseCount=Previous cases + # District districtActiveDistricts=Active districts districtArchivedDistricts=Archived districts districtAllDistricts=All districts + District.archived=Archived District.epidCode=Epid code District.growthRate=Growth rate District.population=Population District.externalID=External ID + epiDataNoSourceContacts=No source contacts have been created for this case + EpiData=Epidemiological data EpiData.areaInfectedAnimals=Residing, working or travelling to an area where infected animals have been confirmed EpiData.exposureDetailsKnown=Exposure details known @@ -849,9 +886,11 @@ EpiData.exposures=Exposures EpiData.highTransmissionRiskArea=Residing or working in an area with high risk of transmission of the disease, e.g. closed residential and camp-like settings EpiData.largeOutbreaksArea=Residing or travelling to countries/territories/areas experiencing larger outbreaks of local transmission EpiData.contactWithSourceCaseKnown=Contacts with source case known + # Documents documentUploadDocument=New document documentNoDocuments=There are no documents for this %s + # DocumentTemplate DocumentTemplate=Document Template DocumentTemplate.buttonUploadTemplate=Upload Template @@ -868,6 +907,7 @@ DocumentTemplate.exampleTemplateCases=Example Template Cases DocumentTemplate.exampleTemplateContacts=Example Template Contacts DocumentTemplate.exampleTemplateEventHandout=Example Template Event Handout DocumentTemplate.exampleTemplateEventParticipants=Example Template Event Participants + # Event eventActiveEvents=Active events eventArchivedEvents=Archived events @@ -895,6 +935,7 @@ eventUnlinkEvent=Unlink event eventOpenSuperordinateEvent=Open event eventEditEvent=Edit event eventLinkToEventsWithinTheSameFacility=See events within the same facility + Event=Event Event.caseCount=Cases Event.contactCount=Contacts @@ -951,6 +992,7 @@ Event.typeOfPlaceText=Specify other event place Event.uuid=Event ID Event.transregionalOutbreak=Transregional outbreak Event.diseaseTransmissionMode=Primary mode of transmission + # Event action EventAction.eventUuid=Event id EventAction.eventTitle=Event title @@ -967,14 +1009,18 @@ EventAction.actionChangeDate=Action change date EventAction.actionStatus=Action status EventAction.actionPriority=Action priority EventAction.actionLastModifiedBy=Action last modified by + # Event action export EventActionExport.eventDate=Date of event + #Event export + # EventParticipant eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant + EventParticipant=Event participant EventParticipant.contactCount=Contact count EventParticipant.event=Event @@ -988,6 +1034,7 @@ EventParticipant.person=Person EventParticipant.uuid=Event participant ID EventParticipant.region=Responsible region EventParticipant.district=Responsible district + #EventParticipant export EventParticipantExport.eventParticipantU=Event disease EventParticipantExport.eventDisease=Event disease @@ -1012,6 +1059,7 @@ EventParticipantExport.sampleInformation=Sample information EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID + # Expo export=Export exportBasic=Basic Export @@ -1026,13 +1074,16 @@ exportCaseManagement=Case Management Export exportCaseCustom=Custom Case Export exportNewExportConfiguration=New Export Configuration exportEditExportConfiguration=Edit Export Configuration + ExportConfiguration.NAME=Configuration name ExportConfiguration.myExports=My exports ExportConfiguration.sharedExports=Shared exports ExportConfiguration.sharedToPublic=Shared to public + exposureFlightNumber=Flight number exposureTimePeriod=Time period exposureSourceCaseName=Name of source case + Exposure.startDate=Start of exposure Exposure.endDate=End of exposure Exposure.exposureType=Type of activity @@ -1083,13 +1134,16 @@ Exposure.prophylaxisDate=Date of prophylaxis Exposure.riskArea=Risk area as defined by public health institution Exposure.exposureDate=Exposure date Exposure.exposureRole=Role + # Facility facilityActiveFacilities=Active facilities facilityArchivedFacilities=Archived facilities facilityAllFacilities=All facilities + Facility.CONFIGURED_FACILITY=Configured facility Facility.NO_FACILITY=Home or other place Facility.OTHER_FACILITY=Other facility + Facility.archived=Archived Facility.city=City Facility.community=Community @@ -1102,18 +1156,22 @@ Facility.publicOwnership=Public ownership Facility.region=Region Facility.type=Facility type Facility.typeGroup=Facility category + FeatureConfiguration.districtName=District FeatureConfiguration.enabled=Line listing enabled? FeatureConfiguration.endDate=End date + # Formats formatNumberOfVisitsFormat=%d (%d missed) formatNumberOfVisitsLongFormat=%d visits (%d missed) formatSimpleNumberFormat=%d + # FollowUp FollowUp.uuid=Follow-up ID FollowUp.person=Follow-up person FollowUp.reportDate=Date of report FollowUp.followUpUntil=Follow-up until + # HealthConditions HealthConditions=Health conditions HealthConditions.tuberculosis=Tuberculosis @@ -1139,6 +1197,7 @@ HealthConditions.formerSmoker=Former smoker\t\t HealthConditions.asthma=Asthma HealthConditions.sickleCellDisease=Sickle cell disease\t HealthConditions.immunodeficiencyIncludingHiv=Immunodeficiency including HIV + # Import importDetailed=Detailed Import importDownloadCaseImportTemplate=Download Case Import Template @@ -1155,6 +1214,7 @@ importLineListing=Line Listing Import importProcessed=%d/%d Processed importSkips=%d Skipped importCancelImport=Cancel import + #Lab Message LabMessage=Lab Message LabMessage.labMessageDetails=Lab message details @@ -1176,10 +1236,12 @@ LabMessage.sampleMaterial=Type of sample LabMessage.sampleReceivedDate=Sample received LabMessage.specimenCondition=Specimen condition LabMessage.testedDisease=Tested disease -labMessageFetch=Fetch lab messages + +labMessageFetch= Fetch lab messages labMessageProcess=Process labMessageProcessed=Processed labMessageUnprocessed=Unprocessed + #Line listing lineListingAddLine=Add line lineListingInfrastructureData=Take over infrastructure data from last line @@ -1192,6 +1254,7 @@ lineListingEnableAll=Enable all lineListingDisableAllShort=Disable all lineListingEndDate=End date lineListingSetEndDateForAll=Set end date for all + # Location Location=Location Location.additionalInformation=Additional information @@ -1209,27 +1272,31 @@ Location.latLonAccuracy=GPS accuracy in m Location.longitude=GPS longitude Location.postalCode=Postal code Location.street=Street + # Login Login.doLogIn=Log in Login.login=Login Login.password=password Login.username=username + #LoginSidebar LoginSidebar.diseaseDetection=Disease Detection LoginSidebar.diseasePrevention=Disease Prevention LoginSidebar.outbreakResponse=Outbreak Response LoginSidebar.poweredBy=Powered By + # Messaging messagesSendSMS=Send SMS messagesSentBy=Sent by messagesNoSmsSentForCase=No SMS sent to case person messagesNoPhoneNumberForCasePerson=Case person has no phone number -messagesSms=SMS -messagesEmail=Email -messagesSendingSms=Send new SMS -messagesNumberOfMissingPhoneNumbers=Number of selected cases without phone number\: %s -messagesCharacters=Characters\: %d / 160 -messagesNumberOfMessages=Nr. of messages\: %d +messagesSms = SMS +messagesEmail = Email +messagesSendingSms = Send new SMS +messagesNumberOfMissingPhoneNumbers = Number of selected cases without phone number\: %s +messagesCharacters = Characters\: %d / 160 +messagesNumberOfMessages = Nr. of messages\: %d + # Main Menu mainMenuAbout=About mainMenuCampaigns=Campaigns @@ -1245,6 +1312,7 @@ mainMenuStatistics=Statistics mainMenuTasks=Tasks mainMenuUsers=Users mainMenuAggregateReports=mSERS + MaternalHistory.childrenNumber=Total number of children MaternalHistory.ageAtBirth=Mother's age at birth of infant patient MaternalHistory.conjunctivitis=Conjunctivitis @@ -1271,16 +1339,19 @@ MaternalHistory.otherComplications=Other complications MaternalHistory.otherComplicationsOnset=Date of onset MaternalHistory.otherComplicationsMonth=Month of pregnancy MaternalHistory.otherComplicationsDetails=Complication details + # Outbreak outbreakAffectedDistricts=Affected districts outbreakNoOutbreak=No outbreak outbreakNormal=Normal outbreakOutbreak=Outbreak + # PathogenTest pathogenTestCreateNew=Create new pathogen test pathogenTestNewResult=New result pathogenTestNewTest=New test result pathogenTestSelect=Select pathogen test + PathogenTest=Pathogen test PathogenTests=Pathogen tests PathogenTest.fourFoldIncreaseAntibodyTiter=4 fold increase of antibody titer @@ -1297,6 +1368,7 @@ PathogenTest.testedDiseaseDetails=Tested disease name PathogenTest.typingId=Typing ID PathogenTest.serotype=Serotype PathogenTest.cqValue=CQ/CT Value + # Person personPersonsList=Person list personCreateNew=Create a new person @@ -1309,6 +1381,7 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person + Person=Person Person.address=Home address Person.addresses=Addresses @@ -1380,9 +1453,11 @@ Person.otherSalutation=Other salutation Person.birthName=Birth name Person.birthCountry=Country of birth Person.citizenship=Citizenship + pointOfEntryActivePointsOfEntry=Active points of entry pointOfEntryArchivedPointsOfEntry=Archived points of entry pointOfEntryAllPointsOfEntry=All points of entry + PointOfEntry.OTHER_AIRPORT=Other airport PointOfEntry.OTHER_SEAPORT=Other seaport PointOfEntry.OTHER_GROUND_CROSSING=Other ground crossing @@ -1392,8 +1467,10 @@ PointOfEntry.active=Active? PointOfEntry.latitude=Latitude PointOfEntry.longitude=Longitude PointOfEntry.externalID=External ID + populationDataMaleTotal=Male total populationDataFemaleTotal=Female total + PortHealthInfo=Port health information PortHealthInfo.airlineName=Airline name PortHealthInfo.flightNumber=Flight number @@ -1417,8 +1494,10 @@ PortHealthInfo.conveyanceTypeDetails=Specify the conveyance type PortHealthInfo.departureLocation=Start location of travel PortHealthInfo.finalDestination=Final destination PortHealthInfo.details=Point of entry details + # Prescription prescriptionNewPrescription=New prescription + Prescription.additionalNotes=Additional notes Prescription.dose=Dose Prescription.drugIntakeDetails=Drug name @@ -1434,27 +1513,33 @@ Prescription.prescriptionType=Prescription type Prescription.route=Route Prescription.routeDetails=Route specification Prescription.typeOfDrug=Type of drug + PrescriptionExport.caseUuid=Case ID PrescriptionExport.caseName=Case name + # Country countryActiveCountries=Active countries countryArchivedCountries=Archived countries countryAllCountries=All countries + Country.archived=Archived Country.externalId=External ID Country.defaultName=Default name Country.displayName=Name Country.isoCode=ISO code Country.unoCode=UNO code + # Region regionActiveRegions=Active regions regionArchivedRegions=Archived regions regionAllRegions=All regions + Region.archived=Archived Region.epidCode=Epid code Region.growthRate=Growth rate Region.population=Population Region.externalID=External ID + # Sample sampleCreateNew=Create new sample sampleIncludeTestOnCreation=Create test result for this sample now @@ -1481,6 +1566,7 @@ sampleActiveSamples=Active samples sampleArchivedSamples=Archived samples sampleAllSamples=All samples sampleAssociationType=Sample type + Sample=Sample Sample.additionalTestingRequested=Request additional tests to be performed? Sample.additionalTestingStatus=Additional testing status @@ -1530,22 +1616,23 @@ Sample.testType=Type of test Sample.typeOfTest=Type of test Sample.uuid=Sample ID Sample.samplePurpose=Purpose of the Sample + SampleExport.additionalTestingRequested=Have additional tests been requested? SampleExport.personAddressCaption=Address of case/contact/event participant person SampleExport.personAge=Age of case/contact/event participant person SampleExport.caseDistrict=District of case SampleExport.caseCommunity=Community of case SampleExport.caseFacility=Facility of case -SampleExport.contactRegion=Region of contact -SampleExport.contactDistrict=District of contact -SampleExport.contactCommunity=Community of contact +SampleExport.contactRegion = Region of contact +SampleExport.contactDistrict = District of contact +SampleExport.contactCommunity = Community of contact SampleExport.caseOutcome=Outcome of case SampleExport.caseRegion=Region of case SampleExport.caseReportDate=Case report date SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID -SampleExport.contactUuid=Contact UUID -SampleExport.contactReportDate=Contact report date +SampleExport.contactUuid = Contact UUID +SampleExport.contactReportDate = Contact report date SampleExport.id=Sample SN SampleExport.sampleReportDate=Sample report date SampleExport.noTestPossibleReason=No test possible reason @@ -1597,6 +1684,7 @@ SampleExport.testDateTime=Date and time of latest additional test SampleExport.totalBilirubin=Total bilirubin of latest additional test SampleExport.urea=Urea of latest additional test SampleExport.wbcCount=WBC count of latest additional test + # Statistics statisticsAddFilter=Add filter statisticsAttribute=Attribute @@ -1619,11 +1707,13 @@ statisticsStatistics=Statistics statisticsVisualizationType=Type statisticsIncidenceDivisor=Incidence divisor statisticsDataDisplayed=Data displayed + # Symptoms symptomsLesionsLocations=Localization of the lesions symptomsMaxTemperature=Maximum body temperature in ° C symptomsSetClearedToNo=Set cleared to No symptomsSetClearedToUnknown=Set cleared to Unknown + Symptoms=Symptoms Symptoms.abdominalPain=Abdominal pain Symptoms.alteredConsciousness=Altered level of consciousness @@ -1811,6 +1901,7 @@ Symptoms.palpitations=Palpitations Symptoms.dizzinessStandingUp=Dizziness (when standing up from a sitting or lying position) Symptoms.highOrLowBloodPressure=Blood pressure too high or too low (measured) Symptoms.urinaryRetention=Urinary retention + # Task taskMyTasks=My tasks taskNewTask=New task @@ -1819,6 +1910,7 @@ taskOfficerTasks=Officer tasks taskActiveTasks=Active tasks taskArchivedTasks=Archived tasks taskAllTasks=All tasks + Task=Task Task.assigneeReply=Comments on execution Task.assigneeUser=Assigned to @@ -1836,7 +1928,9 @@ Task.suggestedStart=Suggested start Task.taskContext=Task context Task.taskStatus=Task status Task.taskType=Task type + # TestReport + TestReport.testDateTime=Date and time of result TestReport.testLabCity=Lab city TestReport.testLabExternalId=Lab external ID @@ -1844,10 +1938,12 @@ TestReport.testLabName=Lab name TestReport.testLabPostalCode=Lab postal code TestReport.testResult=Test result TestReport.testType=Type of test + # Treatment treatmentCreateTreatment=Create treatment treatmentNewTreatment=New treatment treatmentOpenPrescription=Open prescription + Treatment.additionalNotes=Additional notes Treatment.dose=Dose Treatment.drugIntakeDetails=Drug name @@ -1861,8 +1957,10 @@ Treatment.treatmentDetails=Treatment details Treatment.treatmentType=Treatment type Treatment.typeOfDrug=Type of drug Treatment.treatmentRoute=Treatment route + TreatmentExport.caseUuid=Case ID TreatmentExport.caseName=Case name + # User userNewUser=New user userResetPassword=Create new password @@ -1872,6 +1970,7 @@ syncUsers=Sync Users syncErrors=%d Error(s) syncSuccessful=%d Synced syncProcessed=%d/%d Processed + User=User User.active=Active? User.associatedOfficer=Associated officer @@ -1886,16 +1985,20 @@ User.userName=User name User.userRoles=User roles User.address=Address User.uuid=UUID + # Views View.actions=Action Directory + View.aggregatereports=Aggregate Reporting (mSERS) View.aggregatereports.sub= + View.campaign.campaigns=Campaign Directory View.campaign.campaigns.short=Campaigns View.campaign.campaigndata=Campaign Data View.campaign.campaigndata.short=Campaign Data View.campaign.campaigndata.dataform=Campaign Data Form View.campaign.campaigndata.dataform.short=Data Form + View.cases=Case Directory View.cases.merge=Merge Duplicate Cases View.cases.archive=Case Archive @@ -1911,8 +2014,10 @@ View.cases.clinicalcourse=Clinical Course View.cases.maternalhistory=Maternal History View.cases.porthealthinfo=Port Health Information View.cases.visits=Case Visits + View.persons=Person Directory View.persons.data=Person Information + View.configuration.communities=Communities Configuration View.configuration.communities.short=Communities View.configuration.districts=Districts Configuration @@ -1943,6 +2048,7 @@ View.configuration.populationdata=Population Data View.configuration.populationdata.short=Population View.configuration.linelisting=Line Listing Configuration View.configuration.linelisting.short=Line Listing + View.contacts=Contact Directory View.contacts.archive=Contact Archive View.contacts.epidata=Contact Epidemiological Data @@ -1950,9 +2056,11 @@ View.contacts.data=Contact Information View.contacts.person=Contact Person View.contacts.sub= View.contacts.visits=Contact Visits + View.dashboard.contacts=Contacts Dashboard View.dashboard.surveillance=Surveillance Dashboard View.dashboard.campaigns=Campaigns Dashboard + View.events=Event Directory View.events.archive=Event Archive View.events.data=Event Information @@ -1960,22 +2068,30 @@ View.events.eventactions=Event Actions View.events.eventparticipants=Event Participants View.events.sub= View.events.eventparticipants.data=Event Participant Information + View.samples.labMessages=Lab Message Directory + View.reports=Weekly Reports View.reports.sub= + View.samples=Sample Directory View.samples.archive=Sample Archive View.samples.data=Sample Information View.samples.sub= + View.statistics=Statistics View.statistics.database-export=Database export + View.tasks=Task Management View.tasks.archive=Task Archive View.tasks.sub= + View.users=User Management View.users.sub= + # Visit visitNewVisit=New visit + Visit=Visit Visit.person=Visited person Visit.symptoms=Symptoms @@ -1987,19 +2103,24 @@ Visit.visitUser=Visiting officer Visit.disease=Disease Visit.reportLat=Report latitude Visit.reportLon=Report longitude + # WeeklyReport weeklyReportNoReport=Missing report weeklyReportOfficerInformants=Informants weeklyReportsInDistrict=Weekly Reports in %s weeklyReportRegionOfficers=Officers weeklyReportRegionInformants=Informants + WeeklyReport.epiWeek=Epi Week WeeklyReport.year=Year + # WeeklyReportEntry WeeklyReportEntry.numberOfCases=Cases reported + # WeeklyReportInformantSummary WeeklyReportInformantSummary.informantReportDate=Informant report submission WeeklyReportInformantSummary.totalCaseCount=Cases reported by informant + # WeeklyReportOfficerSummary WeeklyReportOfficerSummary.informants=Number of informants WeeklyReportOfficerSummary.informantReports=Number of informant reports @@ -2008,6 +2129,7 @@ WeeklyReportOfficerSummary.informantZeroReports=Number of informant zero reports WeeklyReportOfficerSummary.officer=Officer WeeklyReportOfficerSummary.officerReportDate=Officer report submission WeeklyReportOfficerSummary.totalCaseCount=Cases reported by officer + # WeeklyReportRegionSummary WeeklyReportRegionSummary.informants=Number of informants WeeklyReportRegionSummary.informantReports=Number of informant reports @@ -2017,6 +2139,7 @@ WeeklyReportRegionSummary.officers=Number of officers WeeklyReportRegionSummary.officerReports=Number of officers reports WeeklyReportRegionSummary.officerReportPercentage=Percentage WeeklyReportRegionSummary.officerZeroReports=Number of officer zero reports + # SORMAS to SORMAS SormasToSormasOptions.organization=Orgainzation SormasToSormasOptions.withAssociatedContacts=Share associated contacts @@ -2037,17 +2160,23 @@ sormasToSormasSharedWith=Shared with sormasToSormasSharedBy=By sormasToSormasSharedDate=On sormasToSormasSentFrom=Sent from + BAGExport=BAG Export + # Survnet Gateway SurvnetGateway.title=SurvNet SurvnetGateway.send=send to own SurvNet instance SurvnetGateway.unableToSend=Unable to send SurvnetGateway.confirmSend=Confirm sending SurvnetGateway.sendShort=Send to SurvNet + patientDiaryRegistrationError=Could not register person in the patient diary. patientDiaryPersonNotExportable=Cannot export the person to the patient diary. The person needs a valid birthdate and either a valid phone number or email address. + showPlacesOnMap=Show + changeUserEmail=Change user email + VaccinationInfo.vaccination=Vaccination status for this disease VaccinationInfo.firstVaccinationDate=Date of first vaccination VaccinationInfo.lastVaccinationDate=Date of last vaccination diff --git a/sormas-api/src/main/resources/enum.properties b/sormas-api/src/main/resources/enum.properties index 23914f0da75..1ef13675220 100644 --- a/sormas-api/src/main/resources/enum.properties +++ b/sormas-api/src/main/resources/enum.properties @@ -15,27 +15,33 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . ############################################################################### + # Enum captions and descriptions + # ActionContext -ActionContext.EVENT=Event -ActionMeasure.PROHIBITION_OF_ENTRY_AND_WORK_CASES=Prohibition of entry and work for case persons -ActionMeasure.SAMPLE_COLLECTION=Sample collection -ActionMeasure.FORWARDING_TO_NATIONAL_REFERENCE_CENTER=Forwarding to the national reference center -ActionMeasure.CONTACT_FOLLOW_UP=Active follow-up of contact persons -ActionMeasure.VERIFICATION_OF_VACCINATION_IMMUNIZATION=Verification of vaccination or immunization status -ActionMeasure.POST_EXPOSURE_PROPHYLAXIS_VACCINATION=Conduct post-exposure prophylaxis vaccination -ActionMeasure.CLOSURE_OF_FACILITY=Closure of facility -ActionMeasure.PROHIBITION_OF_ENTRY_AND_WORK_CONTACTS=Prohibition of entry and work for contact persons -ActionMeasure.POPULATION_INFORMATION=Population information about outbreak -ActionMeasure.OTHER=Other +ActionContext.EVENT = Event + +ActionMeasure.PROHIBITION_OF_ENTRY_AND_WORK_CASES = Prohibition of entry and work for case persons +ActionMeasure.SAMPLE_COLLECTION = Sample collection +ActionMeasure.FORWARDING_TO_NATIONAL_REFERENCE_CENTER = Forwarding to the national reference center +ActionMeasure.CONTACT_FOLLOW_UP = Active follow-up of contact persons +ActionMeasure.VERIFICATION_OF_VACCINATION_IMMUNIZATION = Verification of vaccination or immunization status +ActionMeasure.POST_EXPOSURE_PROPHYLAXIS_VACCINATION = Conduct post-exposure prophylaxis vaccination +ActionMeasure.CLOSURE_OF_FACILITY = Closure of facility +ActionMeasure.PROHIBITION_OF_ENTRY_AND_WORK_CONTACTS = Prohibition of entry and work for contact persons +ActionMeasure.POPULATION_INFORMATION = Population information about outbreak +ActionMeasure.OTHER = Other + # ActionPriority -ActionPriority.HIGH=High -ActionPriority.LOW=Low -ActionPriority.NORMAL=Normal +ActionPriority.HIGH = High +ActionPriority.LOW = Low +ActionPriority.NORMAL = Normal + # ActionStatus -ActionStatus.DONE=Done -ActionStatus.PENDING=Pending -ActionStatus.IN_PROGRESS=In progress +ActionStatus.DONE = Done +ActionStatus.PENDING = Pending +ActionStatus.IN_PROGRESS = In progress + # ActivityAsCaseType ActivityAsCaseType.WORK=Work ActivityAsCaseType.TRAVEL=Travel @@ -47,604 +53,666 @@ ActivityAsCaseType.PERSONAL_SERVICES=Personal Services ActivityAsCaseType.CARED_FOR=Cared for ActivityAsCaseType.OTHER=Other ActivityAsCaseType.UNKNOWN=Unknown + # AdditionalTestingStatus -AdditionalTestingStatus.NOT_REQUESTED=Not requested -AdditionalTestingStatus.REQUESTED=Requested -AdditionalTestingStatus.PERFORMED=Performed +AdditionalTestingStatus.NOT_REQUESTED = Not requested +AdditionalTestingStatus.REQUESTED = Requested +AdditionalTestingStatus.PERFORMED = Performed + # AdditionalTestType -AdditionalTestType.HAEMOGLOBINURIA=Haemoglobin in urine -AdditionalTestType.PROTEINURIA=Protein in urine -AdditionalTestType.HEMATURIA=Red blood cells in urine -AdditionalTestType.ARTERIAL_VENOUS_BLOOD_GAS=Arterial/venous blood gas -AdditionalTestType.ALT_SGPT=ALT/SGPT -AdditionalTestType.AST_SGOT=AST/SGOT -AdditionalTestType.CREATININE=Creatinine -AdditionalTestType.POTASSIUM=Potassium -AdditionalTestType.UREA=Urea -AdditionalTestType.HAEMOGLOBIN=Haemoglobin -AdditionalTestType.TOTAL_BILIRUBIN=Total bilirubin -AdditionalTestType.CONJ_BILIRUBIN=Conj. bilirubin -AdditionalTestType.WBC_COUNT=WBC count -AdditionalTestType.PLATELETS=Platelets -AdditionalTestType.PROTHROMBIN_TIME=Prothrombin time -AgeGroup.AGE_0_4=0--4 -AgeGroup.AGE_5_9=5--9 -AgeGroup.AGE_10_14=10--14 -AgeGroup.AGE_15_19=15--19 -AgeGroup.AGE_20_24=20--24 -AgeGroup.AGE_25_29=25--29 -AgeGroup.AGE_30_34=30--34 -AgeGroup.AGE_35_39=35--59 -AgeGroup.AGE_40_44=40--44 -AgeGroup.AGE_45_49=45--49 -AgeGroup.AGE_50_54=50--54 -AgeGroup.AGE_55_59=55--59 -AgeGroup.AGE_60_64=60--64 -AgeGroup.AGE_65_69=65--69 -AgeGroup.AGE_70_74=70--74 -AgeGroup.AGE_75_79=75--79 -AgeGroup.AGE_80_84=80--84 -AgeGroup.AGE_80_PLUS=80+ +AdditionalTestType.HAEMOGLOBINURIA = Haemoglobin in urine +AdditionalTestType.PROTEINURIA = Protein in urine +AdditionalTestType.HEMATURIA = Red blood cells in urine +AdditionalTestType.ARTERIAL_VENOUS_BLOOD_GAS = Arterial/venous blood gas +AdditionalTestType.ALT_SGPT = ALT/SGPT +AdditionalTestType.AST_SGOT = AST/SGOT +AdditionalTestType.CREATININE = Creatinine +AdditionalTestType.POTASSIUM = Potassium +AdditionalTestType.UREA = Urea +AdditionalTestType.HAEMOGLOBIN = Haemoglobin +AdditionalTestType.TOTAL_BILIRUBIN = Total bilirubin +AdditionalTestType.CONJ_BILIRUBIN = Conj. bilirubin +AdditionalTestType.WBC_COUNT = WBC count +AdditionalTestType.PLATELETS = Platelets +AdditionalTestType.PROTHROMBIN_TIME = Prothrombin time + +AgeGroup.AGE_0_4 = 0--4 +AgeGroup.AGE_5_9 = 5--9 +AgeGroup.AGE_10_14 = 10--14 +AgeGroup.AGE_15_19 = 15--19 +AgeGroup.AGE_20_24 = 20--24 +AgeGroup.AGE_25_29 = 25--29 +AgeGroup.AGE_30_34 = 30--34 +AgeGroup.AGE_35_39 = 35--59 +AgeGroup.AGE_40_44 = 40--44 +AgeGroup.AGE_45_49 = 45--49 +AgeGroup.AGE_50_54 = 50--54 +AgeGroup.AGE_55_59 = 55--59 +AgeGroup.AGE_60_64 = 60--64 +AgeGroup.AGE_65_69 = 65--69 +AgeGroup.AGE_70_74 = 70--74 +AgeGroup.AGE_75_79 = 75--79 +AgeGroup.AGE_80_84 = 80--84 +AgeGroup.AGE_80_PLUS = 80+ + #AggregatedReportGroupingLevel -AggregateReportGroupingLevel.REGION=Region -AggregateReportGroupingLevel.DISTRICT=District -AggregateReportGroupingLevel.HEALTH_FACILITY=Facility -AggregateReportGroupingLevel.POINT_OF_ENTRY=Point of entry +AggregateReportGroupingLevel.REGION = Region +AggregateReportGroupingLevel.DISTRICT = District +AggregateReportGroupingLevel.HEALTH_FACILITY = Facility +AggregateReportGroupingLevel.POINT_OF_ENTRY = Point of entry + # AnimalCondition -AnimalCondition.ALIVE=Alive -AnimalCondition.DEAD=Dead -AnimalCondition.PROCESSED=Processed -AnimalCondition.UNKNOWN=Unknown +AnimalCondition.ALIVE = Alive +AnimalCondition.DEAD = Dead +AnimalCondition.PROCESSED = Processed +AnimalCondition.UNKNOWN = Unknown + AnimalContactType.BITE=Bite AnimalContactType.TOUCH=Touch AnimalContactType.SCRATCH=Scratch AnimalContactType.LICK=Lick AnimalContactType.OTHER=Other + # AnimalLocation -AnimalLocation.ZOO=Zoo -AnimalLocation.FARM=Farm -AnimalLocation.PARK=Park -AnimalLocation.FOREST=Forest -AnimalLocation.OTHER=Other +AnimalLocation.ZOO = Zoo +AnimalLocation.FARM = Farm +AnimalLocation.PARK = Park +AnimalLocation.FOREST = Forest +AnimalLocation.OTHER = Other + # ApproximateAgeType -ApproximateAgeType.DAYS=Days -ApproximateAgeType.MONTHS=Months -ApproximateAgeType.YEARS=Years -AreaType.URBAN=Urban -AreaType.RURAL=Rural -AreaType.UNKNOWN=Unknown -ArmedForcesRelationType.UNKNOWN=Unknown -ArmedForcesRelationType.NO_RELATION=No relation to armed forces -ArmedForcesRelationType.CIVIL=Civil person working for/accomodated in facility of armed forces -ArmedForcesRelationType.SOLDIER_OR_RELATIVE=Soldier, Relative -ArrivalOrDeparture.ARRIVAL=Arrival -ArrivalOrDeparture.DEPARTURE=Departure -ArrivalOrDeparture.UNKNOWN=Unknown +ApproximateAgeType.DAYS = Days +ApproximateAgeType.MONTHS = Months +ApproximateAgeType.YEARS = Years + +AreaType.URBAN = Urban +AreaType.RURAL = Rural +AreaType.UNKNOWN = Unknown + +ArmedForcesRelationType.UNKNOWN = Unknown +ArmedForcesRelationType.NO_RELATION = No relation to armed forces +ArmedForcesRelationType.CIVIL = Civil person working for/accomodated in facility of armed forces +ArmedForcesRelationType.SOLDIER_OR_RELATIVE = Soldier, Relative + +ArrivalOrDeparture.ARRIVAL = Arrival +ArrivalOrDeparture.DEPARTURE = Departure +ArrivalOrDeparture.UNKNOWN = Unknown + # BurialConductor -BurialConductor.FAMILY_COMMUNITY=Family/Community -BurialConductor.OUTBREAK_TEAM=Outbreak burial team +BurialConductor.FAMILY_COMMUNITY = Family/Community +BurialConductor.OUTBREAK_TEAM = Outbreak burial team + # CampaignPhase -CampaignPhase.PRE=Pre-Campaign -CampaignPhase.INTRA=Intra-Campaign -CampaignPhase.POST=Post-Campaign +CampaignPhase.PRE = Pre-Campaign +CampaignPhase.INTRA = Intra-Campaign +CampaignPhase.POST = Post-Campaign + # CampaignJurisdictionLevel -CampaignJurisdictionLevel.AREA=Area -CampaignJurisdictionLevel.REGION=Region -CampaignJurisdictionLevel.DISTRICT=District -CampaignJurisdictionLevel.COMMUNITY=Community +CampaignJurisdictionLevel.AREA = Area +CampaignJurisdictionLevel.REGION = Region +CampaignJurisdictionLevel.DISTRICT = District +CampaignJurisdictionLevel.COMMUNITY = Community + # CaseClassification -CaseClassification.CONFIRMED=Confirmed case -CaseClassification.CONFIRMED_NO_SYMPTOMS=Confirmed case with no symptoms -CaseClassification.CONFIRMED_UNKNOWN_SYMPTOMS=Confirmed case with unknown symptoms -CaseClassification.NO_CASE=Not a case -CaseClassification.NOT_CLASSIFIED=Not yet classified -CaseClassification.PROBABLE=Probable case -CaseClassification.SUSPECT=Possible case -CaseClassification.Short.CONFIRMED=Confirmed -CaseClassification.Short.CONFIRMED_NO_SYMPTOMS=Confirmed with symptoms -CaseClassification.Short.CONFIRMED_UNKNOWN_SYMPTOMS=Confirmed unknown symptoms -CaseClassification.Short.NO_CASE=No case -CaseClassification.Short.NOT_CLASSIFIED=Not classified -CaseClassification.Short.PROBABLE=Probable -CaseClassification.Short.SUSPECT=Suspect +CaseClassification.CONFIRMED = Confirmed case +CaseClassification.CONFIRMED_NO_SYMPTOMS = Confirmed case with no symptoms +CaseClassification.CONFIRMED_UNKNOWN_SYMPTOMS = Confirmed case with unknown symptoms +CaseClassification.NO_CASE = Not a case +CaseClassification.NOT_CLASSIFIED = Not yet classified +CaseClassification.PROBABLE = Probable case +CaseClassification.SUSPECT = Possible case +CaseClassification.Short.CONFIRMED = Confirmed +CaseClassification.Short.CONFIRMED_NO_SYMPTOMS = Confirmed with symptoms +CaseClassification.Short.CONFIRMED_UNKNOWN_SYMPTOMS = Confirmed unknown symptoms +CaseClassification.Short.NO_CASE = No case +CaseClassification.Short.NOT_CLASSIFIED = Not classified +CaseClassification.Short.PROBABLE = Probable +CaseClassification.Short.SUSPECT = Suspect + # CaseIdentificationSource -CaseIdentificationSource.UNKNOWN=Unknown -CaseIdentificationSource.OUTBREAK_INVESTIGATION=Outbreak investigation -CaseIdentificationSource.CONTACT_TRACKING_APP=Contact tracking app -CaseIdentificationSource.SUSPICION_REPORT=Suspicion report -CaseIdentificationSource.CONTACT_TRACING=Contact tracing -CaseIdentificationSource.SCREENING=Screening -CaseIdentificationSource.OTHER=Other -ScreeningType.ON_HOSPITAL_ADMISSION=On admission in a hospital -ScreeningType.ON_CARE_HOME_ADMISSION=On admission in care home -ScreeningType.ON_ASYLUM_ADMISSION=On admission in an asylum seeking centre -ScreeningType.ON_ENTRY_FROM_RISK_AREA=On entry from risk area -ScreeningType.HEALTH_SECTOR_EMPLOYEE=Employee in health sector -ScreeningType.EDUCATIONAL_INSTITUTIONS=Educational institutions -ScreeningType.SELF_ARRANGED_TEST=Self arranged test -ScreeningType.SELF_CONDUCTED_TEST=Self conducted test -ScreeningType.OTHER=Other -CaseCountOrIncidence.CASE_COUNT=Case count -CaseCountOrIncidence.CASE_INCIDENCE=Case incidence -CaseJurisdictionType.RESPONSIBLE=Responsible jurisdiction -CaseJurisdictionType.PLACE_OF_STAY=Place of stay -CaseJurisdictionType.ALL=All +CaseIdentificationSource.UNKNOWN = Unknown +CaseIdentificationSource.OUTBREAK_INVESTIGATION = Outbreak investigation +CaseIdentificationSource.CONTACT_TRACKING_APP = Contact tracking app +CaseIdentificationSource.SUSPICION_REPORT = Suspicion report +CaseIdentificationSource.CONTACT_TRACING = Contact tracing +CaseIdentificationSource.SCREENING = Screening +CaseIdentificationSource.OTHER = Other + +ScreeningType.ON_HOSPITAL_ADMISSION = On admission in a hospital +ScreeningType.ON_CARE_HOME_ADMISSION = On admission in care home +ScreeningType.ON_ASYLUM_ADMISSION = On admission in an asylum seeking centre +ScreeningType.ON_ENTRY_FROM_RISK_AREA = On entry from risk area +ScreeningType.HEALTH_SECTOR_EMPLOYEE = Employee in health sector +ScreeningType.EDUCATIONAL_INSTITUTIONS = Educational institutions +ScreeningType.SELF_ARRANGED_TEST = Self arranged test +ScreeningType.SELF_CONDUCTED_TEST = Self conducted test +ScreeningType.OTHER = Other + +CaseCountOrIncidence.CASE_COUNT = Case count +CaseCountOrIncidence.CASE_INCIDENCE = Case incidence + +CaseJurisdictionType.RESPONSIBLE = Responsible jurisdiction +CaseJurisdictionType.PLACE_OF_STAY = Place of stay +CaseJurisdictionType.ALL = All + # CaseMeasure -CaseMeasure.CASE_COUNT=Case count -CaseMeasure.CASE_INCIDENCE=Case incidence proportion -CaseOrigin.IN_COUNTRY=In-Country -CaseOrigin.POINT_OF_ENTRY=Point of Entry +CaseMeasure.CASE_COUNT = Case count +CaseMeasure.CASE_INCIDENCE = Case incidence proportion + +CaseOrigin.IN_COUNTRY = In-Country +CaseOrigin.POINT_OF_ENTRY = Point of Entry + # CaseOutcome -CaseOutcome.DECEASED=Deceased -CaseOutcome.NO_OUTCOME=No Outcome Yet -CaseOutcome.RECOVERED=Recovered -CaseOutcome.UNKNOWN=Unknown +CaseOutcome.DECEASED = Deceased +CaseOutcome.NO_OUTCOME = No Outcome Yet +CaseOutcome.RECOVERED = Recovered +CaseOutcome.UNKNOWN = Unknown #CaseImportedStatus CaseImportedStatus.IMPORTED_CASE=Imported case CaseImportedStatus.IMPORT_RELATED_CASE=Import related case CaseImportedStatus.UNKNOWN_IMPORTATION_STATUS=Unknown importation status CaseImportedStatus.NOT_IMPORTED_CASE=Not imported (locally acquired) case + + # CaseReferenceDefinition -CaseReferenceDefinition.FULFILLED=Fulfilled -CaseReferenceDefinition.NOT_FULFILLED=Not fulfilled +CaseReferenceDefinition.FULFILLED = Fulfilled +CaseReferenceDefinition.NOT_FULFILLED = Not fulfilled + # CauseOfDeath -CauseOfDeath.EPIDEMIC_DISEASE=Epidemic disease -CauseOfDeath.OTHER_CAUSE=Other cause +CauseOfDeath.EPIDEMIC_DISEASE = Epidemic disease +CauseOfDeath.OTHER_CAUSE = Other cause + ## Confirmed case classification -CaseConfirmationBasis.CLINICAL_CONFIRMATION=Clinical confirmation -CaseConfirmationBasis.EPIDEMIOLOGICAL_CONFIRMATION=Epidemiological confirmation -CaseConfirmationBasis.LABORATORY_DIAGNOSTIC_CONFIRMATION=Laboratory diagnostic confirmation +CaseConfirmationBasis.CLINICAL_CONFIRMATION = Clinical confirmation +CaseConfirmationBasis.EPIDEMIOLOGICAL_CONFIRMATION = Epidemiological confirmation +CaseConfirmationBasis.LABORATORY_DIAGNOSTIC_CONFIRMATION = Laboratory diagnostic confirmation + # ClusterType -ClusterType.KINDERGARTEN_OR_CHILDCARE=Kindergarten or childcare -ClusterType.FAMILY=Family -ClusterType.MILITARY=Military -ClusterType.NOSOCOMIAL=Nosocomial (hospital) -ClusterType.SCHOOL=School -ClusterType.SPORTS_TEAM=Sports team -ClusterType.UNIVERSITY=University -ClusterType.OTHER=Other -CongenitalHeartDiseaseType.PDA=Patent ductus arteriosus (PDA) -CongenitalHeartDiseaseType.PPS=Peripheral pulmonary stenosis (PPS) -CongenitalHeartDiseaseType.VSD=Ventricular septal defect (VSD) -CongenitalHeartDiseaseType.OTHER=Other heart defect +ClusterType.KINDERGARTEN_OR_CHILDCARE = Kindergarten or childcare +ClusterType.FAMILY = Family +ClusterType.MILITARY = Military +ClusterType.NOSOCOMIAL = Nosocomial (hospital) +ClusterType.SCHOOL = School +ClusterType.SPORTS_TEAM = Sports team +ClusterType.UNIVERSITY = University +ClusterType.OTHER = Other + + +CongenitalHeartDiseaseType.PDA = Patent ductus arteriosus (PDA) +CongenitalHeartDiseaseType.PPS = Peripheral pulmonary stenosis (PPS) +CongenitalHeartDiseaseType.VSD = Ventricular septal defect (VSD) +CongenitalHeartDiseaseType.OTHER = Other heart defect + # ContactCategory -ContactCategory.HIGH_RISK=High risk contact -ContactCategory.HIGH_RISK_MED=High risk medical contact -ContactCategory.MEDIUM_RISK_MED=Medium risk medical contact -ContactCategory.LOW_RISK=Low risk contact -ContactCategory.NO_RISK=No risk contact +ContactCategory.HIGH_RISK = High risk contact +ContactCategory.HIGH_RISK_MED = High risk medical contact +ContactCategory.MEDIUM_RISK_MED = Medium risk medical contact +ContactCategory.LOW_RISK = Low risk contact +ContactCategory.NO_RISK = No risk contact + # ContactClassification -ContactClassification.CONFIRMED=Confirmed contact -ContactClassification.NO_CONTACT=Not a contact -ContactClassification.UNCONFIRMED=Unconfirmed contact -ContactClassification.Short.CONFIRMED=Confirmed -ContactClassification.Short.NO_CONTACT=No contact -ContactClassification.Short.UNCONFIRMED=Unconfirmed +ContactClassification.CONFIRMED = Confirmed contact +ContactClassification.NO_CONTACT = Not a contact +ContactClassification.UNCONFIRMED = Unconfirmed contact +ContactClassification.Short.CONFIRMED = Confirmed +ContactClassification.Short.NO_CONTACT = No contact +ContactClassification.Short.UNCONFIRMED = Unconfirmed + # ContactDateType -ContactDateType.REPORT_DATE=Report date -ContactDateType.LAST_CONTACT_DATE=Last contact date -ContactsEpiCurveMode.FOLLOW_UP_STATUS=Follow-up status -ContactsEpiCurveMode.CONTACT_CLASSIFICATION=Contact classification -ContactsEpiCurveMode.FOLLOW_UP_UNTIL=Follow-up until +ContactDateType.REPORT_DATE = Report date +ContactDateType.LAST_CONTACT_DATE = Last contact date + +ContactsEpiCurveMode.FOLLOW_UP_STATUS = Follow-up status +ContactsEpiCurveMode.CONTACT_CLASSIFICATION = Contact classification +ContactsEpiCurveMode.FOLLOW_UP_UNTIL = Follow-up until + # ContactIdentificationSource -ContactIdentificationSource.CASE_PERSON=Case person -ContactIdentificationSource.CONTACT_PERSON=Contact person -ContactIdentificationSource.TRACING_APP=Proximity tracing app -ContactIdentificationSource.OTHER=Other -ContactIdentificationSource.UNKNOWN=Unknown +ContactIdentificationSource.CASE_PERSON = Case person +ContactIdentificationSource.CONTACT_PERSON = Contact person +ContactIdentificationSource.TRACING_APP = Proximity tracing app +ContactIdentificationSource.OTHER = Other +ContactIdentificationSource.UNKNOWN = Unknown + # ContactProximity -ContactProximity.AEROSOL=Persons exposed to aerosol producing activities -ContactProximity.AIRPLANE=Airplane, sitting up to two rows in front or behind the source case -ContactProximity.CLOSE_CONTACT=Was in close proximity (1 meter) with source case -ContactProximity.CLOTHES_OR_OTHER=Manipulation of clothes or other objects of source case -ContactProximity.FACE_TO_FACE_LONG=Face-to-face contact of at least 15 minutes -ContactProximity.FACE_TO_FACE_SHORT=Face-to-face contact of less than 15 minutes -ContactProximity.MEDICAL_DISTANT=Medical personnel at safe proximity (> 2 meter), without direct contact with secretions or excretions of the patient and without aerosol exposure -ContactProximity.MEDICAL_SAME_ROOM=Medical personnel that was in same room or house with source case -ContactProximity.MEDICAL_SAFE=Medical personnel at safe proximity (> 2 meter) or with protective equipment -ContactProximity.MEDICAL_UNSAFE=Medical personnel with a high risk of exposure, e.g. unprotected relevant exposure to secretions, exposure to aerosols from COVID-19 cases -ContactProximity.MEDICAL_LIMITED=Medical personnel with limited exposure, e.g. with contact < 2m to COVID-19 cases without protective equipment, ≥ 15min face-to-face contact (without exposure as described under Ia) -ContactProximity.PHYSICAL_CONTACT=Direct physical contact with source case -ContactProximity.SAME_ROOM=Was in same room or house with source case -ContactProximity.TOUCHED_FLUID=Touched fluid of source case +ContactProximity.AEROSOL = Persons exposed to aerosol producing activities +ContactProximity.AIRPLANE = Airplane, sitting up to two rows in front or behind the source case +ContactProximity.CLOSE_CONTACT = Was in close proximity (1 meter) with source case +ContactProximity.CLOTHES_OR_OTHER = Manipulation of clothes or other objects of source case +ContactProximity.FACE_TO_FACE_LONG = Face-to-face contact of at least 15 minutes +ContactProximity.FACE_TO_FACE_SHORT = Face-to-face contact of less than 15 minutes +ContactProximity.MEDICAL_DISTANT = Medical personnel at safe proximity (> 2 meter), without direct contact with secretions or excretions of the patient and without aerosol exposure +ContactProximity.MEDICAL_SAME_ROOM = Medical personnel that was in same room or house with source case +ContactProximity.MEDICAL_SAFE = Medical personnel at safe proximity (> 2 meter) or with protective equipment +ContactProximity.MEDICAL_UNSAFE = Medical personnel with a high risk of exposure, e.g. unprotected relevant exposure to secretions, exposure to aerosols from COVID-19 cases +ContactProximity.MEDICAL_LIMITED = Medical personnel with limited exposure, e.g. with contact < 2m to COVID-19 cases without protective equipment, ≥ 15min face-to-face contact (without exposure as described under Ia) +ContactProximity.PHYSICAL_CONTACT = Direct physical contact with source case +ContactProximity.SAME_ROOM = Was in same room or house with source case +ContactProximity.TOUCHED_FLUID = Touched fluid of source case + # ContactRelation -ContactRelation.FAMILY_MEMBER_OR_FRIEND=Other family member or friend -ContactRelation.SAME_ENVIRONMENT=Work in the same environment -ContactRelation.SAME_HOUSEHOLD=Live in the same household -ContactRelation.MEDICAL_CARE=Provided medical care for the case -ContactRelation.OTHER=Other +ContactRelation.FAMILY_MEMBER_OR_FRIEND = Other family member or friend +ContactRelation.SAME_ENVIRONMENT = Work in the same environment +ContactRelation.SAME_HOUSEHOLD = Live in the same household +ContactRelation.MEDICAL_CARE = Provided medical care for the case +ContactRelation.OTHER = Other + # ContactStatus -ContactStatus.ACTIVE=Active contact -ContactStatus.CONVERTED=Converted to case -ContactStatus.DROPPED=Dropped -ConveyanceType.CAR=Car -ConveyanceType.BUS=Bus -ConveyanceType.MOTORBIKE=Motorbike -ConveyanceType.OTHER=Other -CustomizableEnumType.DISEASE_VARIANT=Disease variant -CustomizableEnumType.SPECIFIC_EVENT_RISK=Specific event risk -CustomizableEnumType.OCCUPATION_TYPE=Occupation type -CustomizableEnumType.PATHOGEN=Pathogen +ContactStatus.ACTIVE = Active contact +ContactStatus.CONVERTED = Converted to case +ContactStatus.DROPPED = Dropped + +ConveyanceType.CAR = Car +ConveyanceType.BUS = Bus +ConveyanceType.MOTORBIKE = Motorbike +ConveyanceType.OTHER = Other + +CustomizableEnumType.DISEASE_VARIANT = Disease variant +CustomizableEnumType.SPECIFIC_EVENT_RISK = Specific event risk +CustomizableEnumType.OCCUPATION_TYPE = Occupation type +CustomizableEnumType.PATHOGEN = Pathogen + #ComplianceWithTreatment -ComplianceWithTreatment.NO_COMPLIANCE=No compliance -ComplianceWithTreatment.TREATMENT_COMPLETED=Treatment completed -ComplianceWithTreatment.TREATMENT_FAILED=Treatment failed -ComplianceWithTreatment.TREATMENT_NOT_COMPLETED=Treatment not completed -ComplianceWithTreatment.UNKNOWN=Unknown -ComplianceWithTreatment.NOT_APPLICABLE=Not applicable +ComplianceWithTreatment.NO_COMPLIANCE = No compliance +ComplianceWithTreatment.TREATMENT_COMPLETED = Treatment completed +ComplianceWithTreatment.TREATMENT_FAILED = Treatment failed +ComplianceWithTreatment.TREATMENT_NOT_COMPLETED = Treatment not completed +ComplianceWithTreatment.UNKNOWN = Unknown +ComplianceWithTreatment.NOT_APPLICABLE = Not applicable + # DashboardType -DashboardType.CONTACTS=Contacts -DashboardType.SURVEILLANCE=Surveillance -DashboardType.CAMPAIGNS=Campaigns -DashboardType.ADVERSE_EVENTS=Adverse Events -DashboardType.GIS=Geographical Analysis +DashboardType.CONTACTS = Contacts +DashboardType.SURVEILLANCE = Surveillance +DashboardType.CAMPAIGNS = Campaigns +DashboardType.ADVERSE_EVENTS = Adverse Events +DashboardType.GIS = Geographical Analysis + # DatabaseTable -DatabaseTable.ACTIONS=Actions -DatabaseTable.CASES=Cases -DatabaseTable.SYMPTOMS=Symptoms -DatabaseTable.CLINICAL_COURSES=Clinical courses -DatabaseTable.CLINICAL_VISITS=Clinical visits -DatabaseTable.COMMUNITIES=Communities -DatabaseTable.CONTACTS=Contacts -DatabaseTable.CONTACTS_VISITS=Contacts → Visits -DatabaseTable.CONTINENTS=Continents -DatabaseTable.SUBCONTINENTS=Subcontinents -DatabaseTable.AREAS=Areas -DatabaseTable.COUNTRIES=Countries -DatabaseTable.CUSTOMIZABLE_ENUM_VALUES=Customizable enum values -DatabaseTable.DISTRICTS=Districts -DatabaseTable.EPIDATA=Epidemiological data -DatabaseTable.EVENTS=Events -DatabaseTable.EVENTS_EVENTGROUPS=Events → Event groups -DatabaseTable.EVENTGROUPS=Event groups -DatabaseTable.EVENTPARTICIPANTS=Event participants -DatabaseTable.EXPOSURES=Exposures -DatabaseTable.ACTIVITIES_AS_CASE=Activities as case -DatabaseTable.FACILITIES=Facilities -DatabaseTable.POINTS_OF_ENTRY=Points of entry -DatabaseTable.HEALTH_CONDITIONS=Health conditions -DatabaseTable.HOSPITALIZATIONS=Hospitalizations -DatabaseTable.IMMUNIZATIONS=Immunizations -DatabaseTable.LOCATIONS=Locations -DatabaseTable.OUTBREAKS=Outbreaks -DatabaseTable.PERSONS=Persons -DatabaseTable.PERSON_CONTACT_DETAILS=Person contact details -DatabaseTable.PERSON_LOCATIONS=Person locations -DatabaseTable.PRESCRIPTIONS=Prescriptions -DatabaseTable.PREVIOUSHOSPITALIZATIONS=Previous hospitalizations -DatabaseTable.REGIONS=Regions -DatabaseTable.SAMPLES=Samples -DatabaseTable.PATHOGEN_TESTS=Pathogen tests -DatabaseTable.ADDITIONAL_TESTS=Additional tests -DatabaseTable.TASKS=Tasks -DatabaseTable.TASK_OBSERVER=Task observer -DatabaseTable.THERAPIES=Therapies -DatabaseTable.TRAVEL_ENTRIES=Travel entries -DatabaseTable.TREATMENTS=Treatments -DatabaseTable.USERS=Users -DatabaseTable.USER_ROLES=User roles -DatabaseTable.USERS_USERROLES=Users → User roles -DatabaseTable.USERROLES_USERRIGHTS=User roles → User rights -DatabaseTable.USERROLES_EMAILNOTIFICATIONTYPES=User roles → Email notification types -DatabaseTable.USERROLES_SMSNOTIFICATIONTYPES=User roles → SMS notification types -DatabaseTable.VACCINATIONS=Vaccinations -DatabaseTable.VISITS=Visits -DatabaseTable.WEEKLYREPORTS=Weekly reports -DatabaseTable.WEEKLYREPORTENTRIES=Weekly report entries -DatabaseTable.PORT_HEALTH_INFO=Port health information -DatabaseTable.MATERNAL_HISTORIES=Maternal histories -DatabaseTable.EXTERNAL_MESSAGES=Messages -DatabaseTable.SAMPLE_REPORTS=Sample reports -DatabaseTable.TEST_REPORTS=Test reports -DatabaseTable.SORMAS_TO_SORMAS_ORIGIN_INFO=SORMAS 2 SORMAS origin information -DatabaseTable.SORMAS_TO_SORMAS_SHARE_INFO=SORMAS 2 SORMAS share information -DatabaseTable.SORMAS_TO_SORMAS_SHARE_REQUESTS=SORMAS 2 SORMAS share requests -DatabaseTable.SHARE_REQUEST_INFO=SORMAS 2 SORMAS share request information -DatabaseTable.SHARE_REQUEST_INFO_SHARE_INFO=SORMAS 2 SORMAS share request information → Share Info -DatabaseTable.EXTERNAL_SHARE_INFO=External share information -DatabaseTable.CAMPAIGNS=Campaigns -DatabaseTable.CAMPAIGN_CAMPAIGNFORMMETA=Campaigns → Campaign Form Meta -DatabaseTable.CAMPAIGN_FORM_META=Campaign form meta -DatabaseTable.CAMPAIGN_FORM_DATA=Campaign form data -DatabaseTable.CAMPAIGN_DIAGRAM_DEFINITIONS=Campaign diagram definitions -DatabaseTable.POPULATION_DATA=Population data -DatabaseTable.SURVEILLANCE_REPORTS=Surveillance reports -DatabaseTable.AGGREGATE_REPORTS=Aggregate reports -DatabaseTable.WEEKLY_REPORTS=Weekly reports -DatabaseTable.WEEKLY_REPORT_ENTRIES=Weekly report entries -DatabaseTable.DOCUMENTS=Documents -DatabaseTable.EXPORT_CONFIGURATIONS=Export configurations -DatabaseTable.FEATURE_CONFIGURATIONS=Feature configurations -DatabaseTable.DISEASE_CONFIGURATIONS=Disease configurations -DatabaseTable.DELETION_CONFIGURATIONS=Deletion configurations -DatabaseTable.SYSTEM_CONFIGURATION_VALUES=System configuration values -DatabaseTable.SYSTEM_CONFIGURATION_CATEGORIES=System configuration categories -DatabaseTable.NOTIFIER=Notifier -DatabaseTable.DRUG_SUSCEPTIBILITY=Drug susceptibility -DatabaseTable.SPECIAL_CASE_ACCESSES=Special case accesses -DatabaseTable.ENVIRONMENTS=Environments -DatabaseTable.EVENT_ENVIRONMENTS=Events → Environments -DatabaseTable.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATIONS=Adverse events following immunizations -DatabaseTable.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_INVESTIGATIONS=Adverse events following immunization investigations -DatabaseTable.ADVERSE_EVENTS=Adverse events -DatabaseTable.DOCUMENT_RELATED_ENTITIES=Document related entities +DatabaseTable.ACTIONS = Actions +DatabaseTable.CASES = Cases +DatabaseTable.SYMPTOMS = Symptoms +DatabaseTable.CLINICAL_COURSES = Clinical courses +DatabaseTable.CLINICAL_VISITS = Clinical visits +DatabaseTable.COMMUNITIES = Communities +DatabaseTable.CONTACTS = Contacts +DatabaseTable.CONTACTS_VISITS = Contacts → Visits +DatabaseTable.CONTINENTS = Continents +DatabaseTable.SUBCONTINENTS = Subcontinents +DatabaseTable.AREAS = Areas +DatabaseTable.COUNTRIES = Countries +DatabaseTable.CUSTOMIZABLE_ENUM_VALUES = Customizable enum values +DatabaseTable.DISTRICTS = Districts +DatabaseTable.EPIDATA = Epidemiological data +DatabaseTable.EVENTS = Events +DatabaseTable.EVENTS_EVENTGROUPS = Events → Event groups +DatabaseTable.EVENTGROUPS = Event groups +DatabaseTable.EVENTPARTICIPANTS = Event participants +DatabaseTable.EXPOSURES = Exposures +DatabaseTable.ACTIVITIES_AS_CASE = Activities as case +DatabaseTable.FACILITIES = Facilities +DatabaseTable.POINTS_OF_ENTRY = Points of entry +DatabaseTable.HEALTH_CONDITIONS = Health conditions +DatabaseTable.HOSPITALIZATIONS = Hospitalizations +DatabaseTable.IMMUNIZATIONS = Immunizations +DatabaseTable.LOCATIONS = Locations +DatabaseTable.OUTBREAKS = Outbreaks +DatabaseTable.PERSONS = Persons +DatabaseTable.PERSON_CONTACT_DETAILS = Person contact details +DatabaseTable.PERSON_LOCATIONS = Person locations +DatabaseTable.PRESCRIPTIONS = Prescriptions +DatabaseTable.PREVIOUSHOSPITALIZATIONS = Previous hospitalizations +DatabaseTable.REGIONS = Regions +DatabaseTable.SAMPLES = Samples +DatabaseTable.PATHOGEN_TESTS = Pathogen tests +DatabaseTable.ADDITIONAL_TESTS = Additional tests +DatabaseTable.TASKS = Tasks +DatabaseTable.TASK_OBSERVER = Task observer +DatabaseTable.THERAPIES = Therapies +DatabaseTable.TRAVEL_ENTRIES = Travel entries +DatabaseTable.TREATMENTS = Treatments +DatabaseTable.USERS = Users +DatabaseTable.USER_ROLES = User roles +DatabaseTable.USERS_USERROLES = Users → User roles +DatabaseTable.USERROLES_USERRIGHTS = User roles → User rights +DatabaseTable.USERROLES_EMAILNOTIFICATIONTYPES = User roles → Email notification types +DatabaseTable.USERROLES_SMSNOTIFICATIONTYPES = User roles → SMS notification types +DatabaseTable.VACCINATIONS = Vaccinations +DatabaseTable.VISITS = Visits +DatabaseTable.WEEKLYREPORTS = Weekly reports +DatabaseTable.WEEKLYREPORTENTRIES = Weekly report entries +DatabaseTable.PORT_HEALTH_INFO = Port health information +DatabaseTable.MATERNAL_HISTORIES = Maternal histories +DatabaseTable.EXTERNAL_MESSAGES = Messages +DatabaseTable.SAMPLE_REPORTS = Sample reports +DatabaseTable.TEST_REPORTS = Test reports +DatabaseTable.SORMAS_TO_SORMAS_ORIGIN_INFO = SORMAS 2 SORMAS origin information +DatabaseTable.SORMAS_TO_SORMAS_SHARE_INFO = SORMAS 2 SORMAS share information +DatabaseTable.SORMAS_TO_SORMAS_SHARE_REQUESTS = SORMAS 2 SORMAS share requests +DatabaseTable.SHARE_REQUEST_INFO = SORMAS 2 SORMAS share request information +DatabaseTable.SHARE_REQUEST_INFO_SHARE_INFO = SORMAS 2 SORMAS share request information → Share Info +DatabaseTable.EXTERNAL_SHARE_INFO = External share information +DatabaseTable.CAMPAIGNS = Campaigns +DatabaseTable.CAMPAIGN_CAMPAIGNFORMMETA = Campaigns → Campaign Form Meta +DatabaseTable.CAMPAIGN_FORM_META = Campaign form meta +DatabaseTable.CAMPAIGN_FORM_DATA = Campaign form data +DatabaseTable.CAMPAIGN_DIAGRAM_DEFINITIONS = Campaign diagram definitions +DatabaseTable.POPULATION_DATA = Population data +DatabaseTable.SURVEILLANCE_REPORTS = Surveillance reports +DatabaseTable.AGGREGATE_REPORTS = Aggregate reports +DatabaseTable.WEEKLY_REPORTS = Weekly reports +DatabaseTable.WEEKLY_REPORT_ENTRIES = Weekly report entries +DatabaseTable.DOCUMENTS = Documents +DatabaseTable.EXPORT_CONFIGURATIONS = Export configurations +DatabaseTable.FEATURE_CONFIGURATIONS = Feature configurations +DatabaseTable.DISEASE_CONFIGURATIONS = Disease configurations +DatabaseTable.DELETION_CONFIGURATIONS = Deletion configurations +DatabaseTable.SYSTEM_CONFIGURATION_VALUES = System configuration values +DatabaseTable.SYSTEM_CONFIGURATION_CATEGORIES = System configuration categories +DatabaseTable.NOTIFIER = Notifier +DatabaseTable.DRUG_SUSCEPTIBILITY = Drug susceptibility +DatabaseTable.SPECIAL_CASE_ACCESSES = Special case accesses +DatabaseTable.ENVIRONMENTS = Environments +DatabaseTable.EVENT_ENVIRONMENTS = Events → Environments +DatabaseTable.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATIONS = Adverse events following immunizations +DatabaseTable.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_INVESTIGATIONS = Adverse events following immunization investigations +DatabaseTable.ADVERSE_EVENTS = Adverse events +DatabaseTable.DOCUMENT_RELATED_ENTITIES = Document related entities + # DateFilterOption -DateFilterOption.DATE=By Date -DateFilterOption.EPI_WEEK=By Epi Week +DateFilterOption.DATE = By Date +DateFilterOption.EPI_WEEK = By Epi Week + # DeathPlaceType -DeathPlaceType.COMMUNITY=Community -DeathPlaceType.HOSPITAL=Hospital -DeathPlaceType.OTHER=Other +DeathPlaceType.COMMUNITY = Community +DeathPlaceType.HOSPITAL = Hospital +DeathPlaceType.OTHER = Other + # DefaultUserRole -DefaultUserRole.ADMIN=Admin -DefaultUserRole.CASE_OFFICER=Case Officer -DefaultUserRole.CASE_SUPERVISOR=Clinician -DefaultUserRole.COMMUNITY_INFORMANT=Community Informant -DefaultUserRole.COMMUNITY_OFFICER=Community Officer -DefaultUserRole.CONTACT_OFFICER=Contact Officer -DefaultUserRole.CONTACT_SUPERVISOR=Contact Supervisor -DefaultUserRole.DISTRICT_OBSERVER=District Observer -DefaultUserRole.EVENT_OFFICER=Event Officer -DefaultUserRole.EXTERNAL_LAB_USER=External Lab Officer -DefaultUserRole.HOSPITAL_INFORMANT=Hospital Informant -DefaultUserRole.IMPORT_USER=Import User -DefaultUserRole.LAB_USER=Lab Officer -DefaultUserRole.NATIONAL_CLINICIAN=National Clinician -DefaultUserRole.NATIONAL_OBSERVER=National Observer -DefaultUserRole.NATIONAL_USER=National User -DefaultUserRole.POE_INFORMANT=POE Informant -DefaultUserRole.POE_NATIONAL_USER=POE National User -DefaultUserRole.POE_SUPERVISOR=POE Supervisor -DefaultUserRole.STATE_OBSERVER=Region Observer -DefaultUserRole.SURVEILLANCE_OFFICER=Surveillance Officer -DefaultUserRole.SURVEILLANCE_SUPERVISOR=Surveillance Supervisor -DefaultUserRole.REST_EXTERNAL_VISITS_USER=External Visits User -DefaultUserRole.SORMAS_TO_SORMAS_CLIENT=Sormas to Sormas Client -DefaultUserRole.ADMIN_SUPERVISOR=Admin Surveillance Supervisor -DefaultUserRole.BAG_USER=BAG User -DefaultUserRole.ENVIRONMENTAL_SURVEILLANCE_USER=Environmental Surveillance User -DefaultUserRole.Short.ADMIN=Admin -DefaultUserRole.Short.CASE_OFFICER=CaseOff -DefaultUserRole.Short.CASE_SUPERVISOR=Clinician -DefaultUserRole.Short.CONTACT_OFFICER=ContOff -DefaultUserRole.Short.CONTACT_SUPERVISOR=ContSup -DefaultUserRole.Short.COMMUNITY_INFORMANT=CommInf -DefaultUserRole.Short.DISTRICT_OBSERVER=DistObs -DefaultUserRole.Short.EVENT_OFFICER=EventOff -DefaultUserRole.Short.EXTERNAL_LAB_USER=ExtLabOff -DefaultUserRole.Short.HOSPITAL_INFORMANT=HospInf -DefaultUserRole.Short.IMPORT_USER=ImpUser -DefaultUserRole.Short.LAB_USER=LabOff -DefaultUserRole.Short.NATIONAL_CLINICIAN=NatClin -DefaultUserRole.Short.NATIONAL_OBSERVER=NatObs -DefaultUserRole.Short.NATIONAL_USER=NatUser -DefaultUserRole.Short.POE_INFORMANT=POEInf -DefaultUserRole.Short.POE_NATIONAL_USER=POENat -DefaultUserRole.Short.POE_SUPERVISOR=POESup -DefaultUserRole.Short.STATE_OBSERVER=RegObs -DefaultUserRole.Short.SURVEILLANCE_SUPERVISOR=SurvSup -DefaultUserRole.Short.ADMIN_SUPERVISOR=AdminSup -DefaultUserRole.Short.SURVEILLANCE_OFFICER=SurvOff -DefaultUserRole.Short.REST_EXTERNAL_VISITS_USER=ExtVis -DefaultUserRole.Short.SORMAS_TO_SORMAS_CLIENT=SormasToSormas -DefaultUserRole.Short.BAG_USER=BAG -DefaultUserRole.Short.ENVIRONMENTAL_SURVEILLANCE_USER=EnvSurv +DefaultUserRole.ADMIN = Admin +DefaultUserRole.CASE_OFFICER = Case Officer +DefaultUserRole.CASE_SUPERVISOR = Clinician +DefaultUserRole.COMMUNITY_INFORMANT = Community Informant +DefaultUserRole.COMMUNITY_OFFICER = Community Officer +DefaultUserRole.CONTACT_OFFICER = Contact Officer +DefaultUserRole.CONTACT_SUPERVISOR = Contact Supervisor +DefaultUserRole.DISTRICT_OBSERVER = District Observer +DefaultUserRole.EVENT_OFFICER = Event Officer +DefaultUserRole.EXTERNAL_LAB_USER = External Lab Officer +DefaultUserRole.HOSPITAL_INFORMANT = Hospital Informant +DefaultUserRole.IMPORT_USER = Import User +DefaultUserRole.LAB_USER = Lab Officer +DefaultUserRole.NATIONAL_CLINICIAN = National Clinician +DefaultUserRole.NATIONAL_OBSERVER = National Observer +DefaultUserRole.NATIONAL_USER = National User +DefaultUserRole.POE_INFORMANT = POE Informant +DefaultUserRole.POE_NATIONAL_USER = POE National User +DefaultUserRole.POE_SUPERVISOR = POE Supervisor +DefaultUserRole.STATE_OBSERVER = Region Observer +DefaultUserRole.SURVEILLANCE_OFFICER = Surveillance Officer +DefaultUserRole.SURVEILLANCE_SUPERVISOR = Surveillance Supervisor +DefaultUserRole.REST_EXTERNAL_VISITS_USER = External Visits User +DefaultUserRole.SORMAS_TO_SORMAS_CLIENT = Sormas to Sormas Client +DefaultUserRole.ADMIN_SUPERVISOR = Admin Surveillance Supervisor +DefaultUserRole.BAG_USER = BAG User +DefaultUserRole.ENVIRONMENTAL_SURVEILLANCE_USER = Environmental Surveillance User +DefaultUserRole.Short.ADMIN = Admin +DefaultUserRole.Short.CASE_OFFICER = CaseOff +DefaultUserRole.Short.CASE_SUPERVISOR = Clinician +DefaultUserRole.Short.CONTACT_OFFICER = ContOff +DefaultUserRole.Short.CONTACT_SUPERVISOR = ContSup +DefaultUserRole.Short.COMMUNITY_INFORMANT = CommInf +DefaultUserRole.Short.DISTRICT_OBSERVER = DistObs +DefaultUserRole.Short.EVENT_OFFICER = EventOff +DefaultUserRole.Short.EXTERNAL_LAB_USER = ExtLabOff +DefaultUserRole.Short.HOSPITAL_INFORMANT = HospInf +DefaultUserRole.Short.IMPORT_USER = ImpUser +DefaultUserRole.Short.LAB_USER = LabOff +DefaultUserRole.Short.NATIONAL_CLINICIAN = NatClin +DefaultUserRole.Short.NATIONAL_OBSERVER = NatObs +DefaultUserRole.Short.NATIONAL_USER = NatUser +DefaultUserRole.Short.POE_INFORMANT = POEInf +DefaultUserRole.Short.POE_NATIONAL_USER = POENat +DefaultUserRole.Short.POE_SUPERVISOR = POESup +DefaultUserRole.Short.STATE_OBSERVER = RegObs +DefaultUserRole.Short.SURVEILLANCE_SUPERVISOR = SurvSup +DefaultUserRole.Short.ADMIN_SUPERVISOR = AdminSup +DefaultUserRole.Short.SURVEILLANCE_OFFICER = SurvOff +DefaultUserRole.Short.REST_EXTERNAL_VISITS_USER = ExtVis +DefaultUserRole.Short.SORMAS_TO_SORMAS_CLIENT = SormasToSormas +DefaultUserRole.Short.BAG_USER = BAG +DefaultUserRole.Short.ENVIRONMENTAL_SURVEILLANCE_USER = EnvSurv + #DeleteReason -DeletionReason.GDPR=Deletion request by affected person according to GDPR -DeletionReason.DELETION_REQUEST=Deletion request by another authority -DeletionReason.CREATED_WITH_NO_LEGAL_REASON=Entity created without legal reason -DeletionReason.TRANSFERRED_RESPONSIBILITY=Responsibility transferred to another authority -DeletionReason.DUPLICATE_ENTRIES=Deletion of duplicate entries -DeletionReason.OTHER_REASON=Other reason +DeletionReason.GDPR = Deletion request by affected person according to GDPR +DeletionReason.DELETION_REQUEST = Deletion request by another authority +DeletionReason.CREATED_WITH_NO_LEGAL_REASON = Entity created without legal reason +DeletionReason.TRANSFERRED_RESPONSIBILITY = Responsibility transferred to another authority +DeletionReason.DUPLICATE_ENTRIES = Deletion of duplicate entries +DeletionReason.OTHER_REASON = Other reason + # DengueFeverType -DengueFeverType.DENGUE_FEVER=Dengue Fever -DengueFeverType.DENGUE_HEMORRHAGIC_FEVER=Dengue Hemorrhagic Fever -DengueFeverType.DENUGE_SHOCK_SYNDROME=Denuge Shock Syndrome +DengueFeverType.DENGUE_FEVER = Dengue Fever +DengueFeverType.DENGUE_HEMORRHAGIC_FEVER = Dengue Hemorrhagic Fever +DengueFeverType.DENUGE_SHOCK_SYNDROME = Denuge Shock Syndrome + # HumanRabiesType -RabiesType.FURIOUS_RABIES=Furious Rabies -RabiesType.PARALYTIC_RABIES=Paralytic Rabies +RabiesType.FURIOUS_RABIES = Furious Rabies +RabiesType.PARALYTIC_RABIES = Paralytic Rabies + # Disease -Disease.AFP=Acute Flaccid Paralysis -Disease.CHOLERA=Cholera -Disease.CONGENITAL_RUBELLA=Congenital Rubella -Disease.CSM=Meningitis (CSM) -Disease.DENGUE=Dengue Fever -Disease.EVD=Ebola Virus Disease -Disease.GUINEA_WORM=Guinea Worm -Disease.LASSA=Lassa -Disease.MEASLES=Measles -Disease.MONKEYPOX=Mpox -Disease.NEW_INFLUENZA=Influenza (New subtype) -Disease.UNDEFINED=Not Yet Defined -Disease.OTHER=Other Epidemic Disease -Disease.PLAGUE=Plague -Disease.POLIO=Poliomyelitis -Disease.UNSPECIFIED_VHF=Unspecified VHF -Disease.WEST_NILE_FEVER=West Nile Fever -Disease.YELLOW_FEVER=Yellow Fever -Disease.RABIES=Human Rabies -Disease.ANTHRAX=Anthrax -Disease.PNEUMONIA=Pneumonia -Disease.MALARIA=Malaria -Disease.TYPHOID_FEVER=Typhoid Fever -Disease.ACUTE_VIRAL_HEPATITIS=Acute Viral Hepatitis -Disease.NON_NEONATAL_TETANUS=Non-Neonatal Tetanus -Disease.HIV=HIV -Disease.SCHISTOSOMIASIS=Schistosomiasis -Disease.SOIL_TRANSMITTED_HELMINTHS=Soil-Transmitted Helminths -Disease.TRYPANOSOMIASIS=Trypanosomiasis -Disease.DIARRHEA_DEHYDRATION=Diarrhea w/ Dehydration (< 5) -Disease.DIARRHEA_BLOOD=Diarrhea w/ Blood (Shigella) -Disease.SNAKE_BITE=Snake Bite -Disease.RUBELLA=Rubella -Disease.TUBERCULOSIS=Tuberculosis -Disease.LATENT_TUBERCULOSIS=Latent Tuberculosis -Disease.LEPROSY=Leprosy -Disease.LYMPHATIC_FILARIASIS=Lymphatic Filariasis -Disease.BURULI_ULCER=Buruli Ulcer -Disease.PERTUSSIS=Pertussis -Disease.NEONATAL_TETANUS=Neonatal Tetanus -Disease.ONCHOCERCIASIS=Onchocerciasis -Disease.DIPHTERIA=Diphteria -Disease.TRACHOMA=Trachoma -Disease.YAWS_ENDEMIC_SYPHILIS=Yaws and Endemic Syphilis -Disease.MATERNAL_DEATHS=Maternal Deaths -Disease.PERINATAL_DEATHS=Perinatal Deaths -Disease.CORONAVIRUS=COVID-19 +Disease.AFP = Acute Flaccid Paralysis +Disease.CHOLERA = Cholera +Disease.CONGENITAL_RUBELLA = Congenital Rubella +Disease.CSM = Meningitis (CSM) +Disease.DENGUE = Dengue Fever +Disease.EVD = Ebola Virus Disease +Disease.GUINEA_WORM = Guinea Worm +Disease.LASSA = Lassa +Disease.MEASLES = Measles +Disease.MONKEYPOX = Mpox +Disease.NEW_INFLUENZA = Influenza (New subtype) +Disease.UNDEFINED = Not Yet Defined +Disease.OTHER = Other Epidemic Disease +Disease.PLAGUE = Plague +Disease.POLIO = Poliomyelitis +Disease.UNSPECIFIED_VHF = Unspecified VHF +Disease.WEST_NILE_FEVER = West Nile Fever +Disease.YELLOW_FEVER = Yellow Fever +Disease.RABIES = Human Rabies +Disease.ANTHRAX = Anthrax +Disease.PNEUMONIA = Pneumonia +Disease.MALARIA = Malaria +Disease.TYPHOID_FEVER = Typhoid Fever +Disease.ACUTE_VIRAL_HEPATITIS = Acute Viral Hepatitis +Disease.NON_NEONATAL_TETANUS = Non-Neonatal Tetanus +Disease.HIV = HIV +Disease.SCHISTOSOMIASIS = Schistosomiasis +Disease.SOIL_TRANSMITTED_HELMINTHS = Soil-Transmitted Helminths +Disease.TRYPANOSOMIASIS = Trypanosomiasis +Disease.DIARRHEA_DEHYDRATION = Diarrhea w/ Dehydration (< 5) +Disease.DIARRHEA_BLOOD = Diarrhea w/ Blood (Shigella) +Disease.SNAKE_BITE = Snake Bite +Disease.RUBELLA = Rubella +Disease.TUBERCULOSIS = Tuberculosis +Disease.LATENT_TUBERCULOSIS = Latent Tuberculosis +Disease.LEPROSY = Leprosy +Disease.LYMPHATIC_FILARIASIS = Lymphatic Filariasis +Disease.BURULI_ULCER = Buruli Ulcer +Disease.PERTUSSIS = Pertussis +Disease.NEONATAL_TETANUS = Neonatal Tetanus +Disease.ONCHOCERCIASIS = Onchocerciasis +Disease.DIPHTERIA = Diphteria +Disease.TRACHOMA = Trachoma +Disease.YAWS_ENDEMIC_SYPHILIS = Yaws and Endemic Syphilis +Disease.MATERNAL_DEATHS = Maternal Deaths +Disease.PERINATAL_DEATHS = Perinatal Deaths +Disease.CORONAVIRUS = COVID-19 Disease.INFLUENZA=Influenza -Disease.INFLUENZA_A=Influenza A -Disease.INFLUENZA_B=Influenza B -Disease.H_METAPNEUMOVIRUS=H.metapneumovirus -Disease.RESPIRATORY_SYNCYTIAL_VIRUS=Respiratory syncytial virus (RSV) -Disease.PARAINFLUENZA_1_4=Parainfluenza (1-4) -Disease.ADENOVIRUS=Adenovirus -Disease.RHINOVIRUS=Rhinovirus -Disease.ENTEROVIRUS=Enterovirus -Disease.M_PNEUMONIAE=M.pneumoniae -Disease.C_PNEUMONIAE=C.pneumoniae -Disease.ARI=ARI (Acute Respiratory Infections) -Disease.CHIKUNGUNYA=Chikungunya -Disease.INVASIVE_PNEUMOCOCCAL_INFECTION=Invasive Pneumococcal Infection -Disease.INVASIVE_MENINGOCOCCAL_INFECTION=Invasive Meningococcal Infection -Disease.POST_IMMUNIZATION_ADVERSE_EVENTS_MILD=Post-immunization adverse events mild -Disease.POST_IMMUNIZATION_ADVERSE_EVENTS_SEVERE=Post-immunization adverse events severe -Disease.FHA=FHA (Functional Hypothalamic Amenorrhea) +Disease.INFLUENZA_A = Influenza A +Disease.INFLUENZA_B = Influenza B +Disease.H_METAPNEUMOVIRUS = H.metapneumovirus +Disease.RESPIRATORY_SYNCYTIAL_VIRUS = Respiratory syncytial virus (RSV) +Disease.PARAINFLUENZA_1_4 = Parainfluenza (1-4) +Disease.ADENOVIRUS = Adenovirus +Disease.RHINOVIRUS = Rhinovirus +Disease.ENTEROVIRUS = Enterovirus +Disease.M_PNEUMONIAE = M.pneumoniae +Disease.C_PNEUMONIAE = C.pneumoniae +Disease.ARI = ARI (Acute Respiratory Infections) +Disease.CHIKUNGUNYA = Chikungunya +Disease.INVASIVE_PNEUMOCOCCAL_INFECTION = Invasive Pneumococcal Infection +Disease.INVASIVE_MENINGOCOCCAL_INFECTION = Invasive Meningococcal Infection +Disease.POST_IMMUNIZATION_ADVERSE_EVENTS_MILD = Post-immunization adverse events mild +Disease.POST_IMMUNIZATION_ADVERSE_EVENTS_SEVERE = Post-immunization adverse events severe +Disease.FHA = FHA (Functional Hypothalamic Amenorrhea) Disease.GIARDIASIS=Giardiasis Disease.CRYPTOSPORIDIOSIS=Cryptosporidiosis -Disease.Short.AFP=AFP -Disease.Short.CHOLERA=Cholera -Disease.Short.CONGENITAL_RUBELLA=CRS -Disease.Short.CSM=Meningitis -Disease.Short.DENGUE=Dengue -Disease.Short.EVD=EVD -Disease.Short.GUINEA_WORM=Guinea Worm -Disease.Short.LASSA=Lassa -Disease.Short.MEASLES=Measles -Disease.Short.MONKEYPOX=Mpox -Disease.Short.NEW_INFLUENZA=New Flu -Disease.Short.UNDEFINED=Undefined -Disease.Short.OTHER=Other -Disease.Short.PLAGUE=Plague -Disease.Short.POLIO=Polio -Disease.Short.UNSPECIFIED_VHF=VHF -Disease.Short.WEST_NILE_FEVER=West Nile Fever -Disease.Short.YELLOW_FEVER=Yellow Fever -Disease.Short.RABIES=Rabies -Disease.Short.ANTHRAX=Anthrax -Disease.Short.PNEUMONIA=Pneumonia -Disease.Short.MALARIA=Malaria -Disease.Short.TYPHOID_FEVER=Typhoid Fever -Disease.Short.ACUTE_VIRAL_HEPATITIS=Acute Viral Hepatitis -Disease.Short.NON_NEONATAL_TETANUS=Non-Neonatal Tetanus -Disease.Short.HIV=HIV -Disease.Short.SCHISTOSOMIASIS=Schistosomiasis -Disease.Short.SOIL_TRANSMITTED_HELMINTHS=Soil-Transmitted Helminths -Disease.Short.TRYPANOSOMIASIS=Trypanosomiasis -Disease.Short.DIARRHEA_DEHYDRATION=Diarrhea w/ Dehydration (< 5) -Disease.Short.DIARRHEA_BLOOD=Diarrhea w/ Blood (Shigella) -Disease.Short.SNAKE_BITE=Snake Bite -Disease.Short.RUBELLA=Rubella -Disease.Short.TUBERCULOSIS=TB -Disease.Short.LATENT_TUBERCULOSIS=Latent Tuberculosis -Disease.Short.LEPROSY=Leprosy -Disease.Short.LYMPHATIC_FILARIASIS=Lymphatic Filariasis -Disease.Short.BURULI_ULCER=Buruli Ulcer -Disease.Short.PERTUSSIS=Pertussis -Disease.Short.NEONATAL_TETANUS=Neonatal Tetanus -Disease.Short.ONCHOCERCIASIS=Onchocerciasis -Disease.Short.DIPHTERIA=Diphteria -Disease.Short.TRACHOMA=Trachoma -Disease.Short.YAWS_ENDEMIC_SYPHILIS=Yaws and Endemic Syphilis -Disease.Short.MATERNAL_DEATHS=Maternal Deaths -Disease.Short.PERINATAL_DEATHS=Perinatal Deaths -Disease.Short.CORONAVIRUS=COVID-19 -Disease.Short.INFLUENZA_A=Influenza A -Disease.Short.INFLUENZA_B=Influenza B -Disease.Short.H_METAPNEUMOVIRUS=H.metapneumovirus -Disease.Short.RESPIRATORY_SYNCYTIAL_VIRUS=RSV -Disease.Short.PARAINFLUENZA_1_4=Parainfluenza -Disease.Short.ADENOVIRUS=Adenovirus -Disease.Short.RHINOVIRUS=Rhinovirus -Disease.Short.ENTEROVIRUS=Enterovirus -Disease.Short.M_PNEUMONIAE=M.pneumoniae -Disease.Short.C_PNEUMONIAE=C.pneumoniae -Disease.Short.ARI=ARI -Disease.Short.CHIKUNGUNYA=Chikungunya -Disease.Short.POST_IMMUNIZATION_ADVERSE_EVENTS_MILD=Post-immunization adverse events mild -Disease.Short.POST_IMMUNIZATION_ADVERSE_EVENTS_SEVERE=Post-immunization adverse events severe -Disease.Short.FHA=FHA -Disease.Short.INVASIVE_PNEUMOCOCCAL_INFECTION=IPI -Disease.Short.INVASIVE_MENINGOCOCCAL_INFECTION=IMI +Disease.Short.AFP = AFP +Disease.Short.CHOLERA = Cholera +Disease.Short.CONGENITAL_RUBELLA = CRS +Disease.Short.CSM = Meningitis +Disease.Short.DENGUE = Dengue +Disease.Short.EVD = EVD +Disease.Short.GUINEA_WORM = Guinea Worm +Disease.Short.LASSA = Lassa +Disease.Short.MEASLES = Measles +Disease.Short.MONKEYPOX = Mpox +Disease.Short.NEW_INFLUENZA = New Flu +Disease.Short.UNDEFINED = Undefined +Disease.Short.OTHER = Other +Disease.Short.PLAGUE = Plague +Disease.Short.POLIO = Polio +Disease.Short.UNSPECIFIED_VHF = VHF +Disease.Short.WEST_NILE_FEVER = West Nile Fever +Disease.Short.YELLOW_FEVER = Yellow Fever +Disease.Short.RABIES = Rabies +Disease.Short.ANTHRAX = Anthrax +Disease.Short.PNEUMONIA = Pneumonia +Disease.Short.MALARIA = Malaria +Disease.Short.TYPHOID_FEVER = Typhoid Fever +Disease.Short.ACUTE_VIRAL_HEPATITIS = Acute Viral Hepatitis +Disease.Short.NON_NEONATAL_TETANUS = Non-Neonatal Tetanus +Disease.Short.HIV = HIV +Disease.Short.SCHISTOSOMIASIS = Schistosomiasis +Disease.Short.SOIL_TRANSMITTED_HELMINTHS = Soil-Transmitted Helminths +Disease.Short.TRYPANOSOMIASIS = Trypanosomiasis +Disease.Short.DIARRHEA_DEHYDRATION = Diarrhea w/ Dehydration (< 5) +Disease.Short.DIARRHEA_BLOOD = Diarrhea w/ Blood (Shigella) +Disease.Short.SNAKE_BITE = Snake Bite +Disease.Short.RUBELLA = Rubella +Disease.Short.TUBERCULOSIS = TB +Disease.Short.LATENT_TUBERCULOSIS = Latent Tuberculosis +Disease.Short.LEPROSY = Leprosy +Disease.Short.LYMPHATIC_FILARIASIS = Lymphatic Filariasis +Disease.Short.BURULI_ULCER = Buruli Ulcer +Disease.Short.PERTUSSIS = Pertussis +Disease.Short.NEONATAL_TETANUS = Neonatal Tetanus +Disease.Short.ONCHOCERCIASIS = Onchocerciasis +Disease.Short.DIPHTERIA = Diphteria +Disease.Short.TRACHOMA = Trachoma +Disease.Short.YAWS_ENDEMIC_SYPHILIS = Yaws and Endemic Syphilis +Disease.Short.MATERNAL_DEATHS = Maternal Deaths +Disease.Short.PERINATAL_DEATHS = Perinatal Deaths +Disease.Short.CORONAVIRUS = COVID-19 +Disease.Short.INFLUENZA_A = Influenza A +Disease.Short.INFLUENZA_B = Influenza B +Disease.Short.H_METAPNEUMOVIRUS = H.metapneumovirus +Disease.Short.RESPIRATORY_SYNCYTIAL_VIRUS = RSV +Disease.Short.PARAINFLUENZA_1_4 = Parainfluenza +Disease.Short.ADENOVIRUS = Adenovirus +Disease.Short.RHINOVIRUS = Rhinovirus +Disease.Short.ENTEROVIRUS = Enterovirus +Disease.Short.M_PNEUMONIAE = M.pneumoniae +Disease.Short.C_PNEUMONIAE = C.pneumoniae +Disease.Short.ARI = ARI +Disease.Short.CHIKUNGUNYA = Chikungunya +Disease.Short.POST_IMMUNIZATION_ADVERSE_EVENTS_MILD = Post-immunization adverse events mild +Disease.Short.POST_IMMUNIZATION_ADVERSE_EVENTS_SEVERE = Post-immunization adverse events severe +Disease.Short.FHA = FHA +Disease.Short.INVASIVE_PNEUMOCOCCAL_INFECTION = IPI +Disease.Short.INVASIVE_MENINGOCOCCAL_INFECTION = IMI Disease.Short.GIARDIASIS=Giardia Disease.Short.CRYPTOSPORIDIOSIS=Cryptosporidiosis -DiseaseTransmissionMode.HUMAN_TO_HUMAN=Primarily via human to human -DiseaseTransmissionMode.ANIMAL=Primarily via animal -DiseaseTransmissionMode.ENVIRONMENT=Primarily via environment -DiseaseTransmissionMode.FOOD=Primarily via food -DiseaseTransmissionMode.VECTOR_BORNE=Primarily vector-borne -DiseaseTransmissionMode.UNKNOWN=Unknown + +DiseaseTransmissionMode.HUMAN_TO_HUMAN = Primarily via human to human +DiseaseTransmissionMode.ANIMAL = Primarily via animal +DiseaseTransmissionMode.ENVIRONMENT = Primarily via environment +DiseaseTransmissionMode.FOOD = Primarily via food +DiseaseTransmissionMode.VECTOR_BORNE = Primarily vector-borne +DiseaseTransmissionMode.UNKNOWN = Unknown + # DocumentRelatedEntityType -DocumentRelatedEntityType.ACTION=Action -DocumentRelatedEntityType.CASE=Case -DocumentRelatedEntityType.CONTACT=Contact -DocumentRelatedEntityType.EVENT=Event -DocumentRelatedEntityType.TRAVEL_ENTRY=Travel Entry +DocumentRelatedEntityType.ACTION = Action +DocumentRelatedEntityType.CASE = Case +DocumentRelatedEntityType.CONTACT = Contact +DocumentRelatedEntityType.EVENT = Event +DocumentRelatedEntityType.TRAVEL_ENTRY = Travel Entry + # DocumentWorkflow -DocumentWorkflow.QUARANTINE_ORDER_CASE=Document Templates Case -DocumentWorkflow.QUARANTINE_ORDER_CONTACT=Document Templates Contact -DocumentWorkflow.QUARANTINE_ORDER_EVENT_PARTICIPANT=Document Templates Event Participant -DocumentWorkflow.QUARANTINE_ORDER_TRAVEL_ENTRY=Document Templates Travel Entry -DocumentWorkflow.EVENT_HANDOUT=Templates Event Handout -DocumentWorkflow.CASE_EMAIL=Case email templates -DocumentWorkflow.CONTACT_EMAIL=Contact email templates -DocumentWorkflow.EVENT_PARTICIPANT_EMAIL=Event participant email templates -DocumentWorkflow.TRAVEL_ENTRY_EMAIL=Travel entry email templates -DocumentWorkflow.SURVEY_DOCUMENT=Survey request document template -DocumentWorkflow.SURVEY_EMAIL=Survey request email template -EducationType.NONE=No education -EducationType.NURSERY=Nursery -EducationType.PRIMARY=Primary -EducationType.SECONDARY=Secondary -EducationType.TERTIARY=Tertiary -EducationType.OTHER=Other -EntityRelevanceStatus.ACTIVE=Active -EntityRelevanceStatus.ARCHIVED=Archived -EntityRelevanceStatus.ALL=All +DocumentWorkflow.QUARANTINE_ORDER_CASE = Document Templates Case +DocumentWorkflow.QUARANTINE_ORDER_CONTACT = Document Templates Contact +DocumentWorkflow.QUARANTINE_ORDER_EVENT_PARTICIPANT = Document Templates Event Participant +DocumentWorkflow.QUARANTINE_ORDER_TRAVEL_ENTRY = Document Templates Travel Entry +DocumentWorkflow.EVENT_HANDOUT = Templates Event Handout +DocumentWorkflow.CASE_EMAIL = Case email templates +DocumentWorkflow.CONTACT_EMAIL = Contact email templates +DocumentWorkflow.EVENT_PARTICIPANT_EMAIL = Event participant email templates +DocumentWorkflow.TRAVEL_ENTRY_EMAIL = Travel entry email templates +DocumentWorkflow.SURVEY_DOCUMENT = Survey request document template +DocumentWorkflow.SURVEY_EMAIL = Survey request email template + +EducationType.NONE = No education +EducationType.NURSERY = Nursery +EducationType.PRIMARY = Primary +EducationType.SECONDARY = Secondary +EducationType.TERTIARY = Tertiary +EducationType.OTHER = Other + +EntityRelevanceStatus.ACTIVE = Active +EntityRelevanceStatus.ARCHIVED = Archived +EntityRelevanceStatus.ALL = All + # EnvironmentInfrastructureDetails -EnvironmentInfrastructureDetails.SEPTIC_TANK=Septic tank -EnvironmentInfrastructureDetails.LATRIN=Latrin -EnvironmentInfrastructureDetails.TOILET=Toilet -EnvironmentInfrastructureDetails.MANHOLE=Manhole -EnvironmentInfrastructureDetails.WELLS=Wells -EnvironmentInfrastructureDetails.SURFACE_WATER=Surface water -EnvironmentInfrastructureDetails.OPEN_DRAIN=Open drain -EnvironmentInfrastructureDetails.OTHER=Other -EnvironmentInfrastructureDetails.UNKNOWN=Unknown +EnvironmentInfrastructureDetails.SEPTIC_TANK = Septic tank +EnvironmentInfrastructureDetails.LATRIN = Latrin +EnvironmentInfrastructureDetails.TOILET = Toilet +EnvironmentInfrastructureDetails.MANHOLE = Manhole +EnvironmentInfrastructureDetails.WELLS = Wells +EnvironmentInfrastructureDetails.SURFACE_WATER = Surface water +EnvironmentInfrastructureDetails.OPEN_DRAIN = Open drain +EnvironmentInfrastructureDetails.OTHER = Other +EnvironmentInfrastructureDetails.UNKNOWN = Unknown + # EnvironmentMedia -EnvironmentMedia.WATER=Water -EnvironmentMedia.SOIL_ROCK=Soil or rock -EnvironmentMedia.AIR=Air -EnvironmentMedia.BIOTA=Biota -EnvironmentMedia.VECTORS=Vectors +EnvironmentMedia.WATER = Water +EnvironmentMedia.SOIL_ROCK = Soil or rock +EnvironmentMedia.AIR = Air +EnvironmentMedia.BIOTA = Biota +EnvironmentMedia.VECTORS = Vectors + # EpiCurveGrouping -EpiCurveGrouping.DAY=Day -EpiCurveGrouping.MONTH=Month -EpiCurveGrouping.WEEK=Epi Week +EpiCurveGrouping.DAY = Day +EpiCurveGrouping.MONTH = Month +EpiCurveGrouping.WEEK = Epi Week + # EpiCurveContactsMode -EpiCurveContactsMode.CONTACT_CLASSIFICATION=Contact Classification -EpiCurveContactsMode.FOLLOW_UP_STATUS=Follow-Up Status -EpiCurveContactsMode.FOLLOW_UP_UNTIL=Follow-Up Until +EpiCurveContactsMode.CONTACT_CLASSIFICATION = Contact Classification +EpiCurveContactsMode.FOLLOW_UP_STATUS = Follow-Up Status +EpiCurveContactsMode.FOLLOW_UP_UNTIL = Follow-Up Until + # EpiCurveSurveillanceMode -EpiCurveSurveillanceMode.ALIVE_OR_DEAD=Alive or dead -EpiCurveSurveillanceMode.CASE_STATUS=Case status +EpiCurveSurveillanceMode.ALIVE_OR_DEAD = Alive or dead +EpiCurveSurveillanceMode.CASE_STATUS = Case status + # EpiWeekFilterOption -EpiWeekFilterOption.LAST_WEEK=Last Week -EpiWeekFilterOption.SPECIFY_WEEK=Specify -EpiWeekFilterOption.THIS_WEEK=This Week +EpiWeekFilterOption.LAST_WEEK = Last Week +EpiWeekFilterOption.SPECIFY_WEEK = Specify +EpiWeekFilterOption.THIS_WEEK = This Week + # EventContactCountMethod -EventContactCountMethod.ALL=Count all contacts -EventContactCountMethod.SOURCE_CASE_IN_EVENT=Only count contacts with source case in event -EventContactCountMethod.BOTH_METHODS=Show both methods +EventContactCountMethod.ALL = Count all contacts +EventContactCountMethod.SOURCE_CASE_IN_EVENT = Only count contacts with source case in event +EventContactCountMethod.BOTH_METHODS = Show both methods + # EventInvestigationStatus EventInvestigationStatus.DISCARDED=Investigation discarded EventInvestigationStatus.DONE=Investigation done @@ -654,51 +722,58 @@ EventInvestigationStatus.Short.DISCARDED=Discarded EventInvestigationStatus.Short.DONE=Done EventInvestigationStatus.Short.ONGOING=Ongoing EventInvestigationStatus.Short.PENDING=Pending + # EventStatus -EventStatus.EVENT=Event -EventStatus.DROPPED=Dropped -EventStatus.SIGNAL=Signal -EventStatus.SCREENING=Screening -EventStatus.CLUSTER=Cluster -EventStatus.Short.EVENT=Event -EventStatus.Short.DROPPED=Dropped -EventStatus.Short.SIGNAL=Signal -EventStatus.Short.SCREENING=Screening -EventStatus.Short.CLUSTER=Cluster +EventStatus.EVENT = Event +EventStatus.DROPPED = Dropped +EventStatus.SIGNAL = Signal +EventStatus.SCREENING = Screening +EventStatus.CLUSTER = Cluster +EventStatus.Short.EVENT = Event +EventStatus.Short.DROPPED = Dropped +EventStatus.Short.SIGNAL = Signal +EventStatus.Short.SCREENING = Screening +EventStatus.Short.CLUSTER = Cluster + # EventManagementStatus -EventManagementStatus.PENDING=Pending -EventManagementStatus.ONGOING=Ongoing -EventManagementStatus.DONE=Done -EventManagementStatus.CLOSED=Closed +EventManagementStatus.PENDING = Pending +EventManagementStatus.ONGOING = Ongoing +EventManagementStatus.DONE = Done +EventManagementStatus.CLOSED = Closed + # EventIndentificationSource -EventIdentificationSource.UNKNOWN=Unknown -EventIdentificationSource.BACKWARD_TRACING=Backward-tracing -EventIdentificationSource.FORWARD_TRACING=Forward-tracing -ExportGroupType.CORE=Core Data -ExportGroupType.SENSITIVE=Sensitive Person Data -ExportGroupType.PERSON=General Person Data -ExportGroupType.HOSPITALIZATION=Hospitalization Data -ExportGroupType.EPIDEMIOLOGICAL=Epidemiological Data -ExportGroupType.VACCINATION=Vaccination Data -ExportGroupType.FOLLOW_UP=Follow-up Data -ExportGroupType.ADDITIONAL=Additional Data -ExportGroupType.LOCATION=Location Data -ExportGroupType.EVENT=Event Data -ExportGroupType.EVENT_GROUP=Event Group Data -ExportGroupType.EVENT_SOURCE=Event Source Data -ExportGroupType.CLINICAL_COURSE=Clinical Course Data -ExportGroupType.THERAPY=Therapy Data -EventSourceType.NOT_APPLICABLE=Not applicable -EventSourceType.MEDIA_NEWS=Media/News -EventSourceType.HOTLINE_PERSON=Hotline/Person -EventSourceType.MATHEMATICAL_MODEL=Mathematical model -EventSourceType.INSTITUTIONAL_PARTNER=Institutional partner -InstitutionalPartnerType.HEALTH_INSURANCE=Health insurance -InstitutionalPartnerType.TERRITORIAL_COMMUNITIES=Territorial communities -InstitutionalPartnerType.NATIONAL_EDUCATION=National education -InstitutionalPartnerType.HEALTH_ESTABLISHMENTS=Health establishments -InstitutionalPartnerType.MEDICO_SOCIAL_ESTABLISHMENTS=Medico-social establishments -InstitutionalPartnerType.OTHER=Other +EventIdentificationSource.UNKNOWN = Unknown +EventIdentificationSource.BACKWARD_TRACING = Backward-tracing +EventIdentificationSource.FORWARD_TRACING = Forward-tracing + +ExportGroupType.CORE = Core Data +ExportGroupType.SENSITIVE = Sensitive Person Data +ExportGroupType.PERSON = General Person Data +ExportGroupType.HOSPITALIZATION = Hospitalization Data +ExportGroupType.EPIDEMIOLOGICAL = Epidemiological Data +ExportGroupType.VACCINATION = Vaccination Data +ExportGroupType.FOLLOW_UP = Follow-up Data +ExportGroupType.ADDITIONAL = Additional Data +ExportGroupType.LOCATION = Location Data +ExportGroupType.EVENT = Event Data +ExportGroupType.EVENT_GROUP = Event Group Data +ExportGroupType.EVENT_SOURCE = Event Source Data +ExportGroupType.CLINICAL_COURSE = Clinical Course Data +ExportGroupType.THERAPY = Therapy Data + +EventSourceType.NOT_APPLICABLE = Not applicable +EventSourceType.MEDIA_NEWS = Media/News +EventSourceType.HOTLINE_PERSON = Hotline/Person +EventSourceType.MATHEMATICAL_MODEL = Mathematical model +EventSourceType.INSTITUTIONAL_PARTNER = Institutional partner + +InstitutionalPartnerType.HEALTH_INSURANCE = Health insurance +InstitutionalPartnerType.TERRITORIAL_COMMUNITIES = Territorial communities +InstitutionalPartnerType.NATIONAL_EDUCATION = National education +InstitutionalPartnerType.HEALTH_ESTABLISHMENTS = Health establishments +InstitutionalPartnerType.MEDICO_SOCIAL_ESTABLISHMENTS = Medico-social establishments +InstitutionalPartnerType.OTHER = Other + ExposureType.WORK=Work ExposureType.TRAVEL=Travel ExposureType.SPORT=Sport @@ -716,6 +791,7 @@ ExposureType.FOOD=Food ExposureType.SEXUAL_CONTACT=Sexual contact ExposureType.SYMPTOMATIC_CONTACT=Contact with symptomatic individuals ExposureType.FLOOD_EXPOSURE=Flooded area + # FacilityType FacilityType.ASSOCIATION=Association, club FacilityType.BAR=Bar @@ -761,22 +837,23 @@ FacilityType.SWIMMING_POOL=Swimming pool FacilityType.THEATER=Theater/cinema FacilityType.UNIVERSITY=University FacilityType.ZOO=Zoological garden, animal park -FacilityType.RETAIL=Retail -FacilityType.WHOLESALE=Wholesale -FacilityType.AMBULATORY_SURGERY_FACILITY=Ambulatory surgery facility -FacilityType.DIALYSIS_FACILITY=Dialysis facility -FacilityType.DAY_HOSPITAL=Day hospital -FacilityType.MATERNITY_FACILITY=Maternity facility -FacilityType.MEDICAL_PRACTICE=Medical practice -FacilityType.DENTAL_PRACTICE=Dental practice -FacilityType.OTHER_MEDICAL_PRACTICE=Other medical practice -FacilityType.DIAGNOSTIC_PREVENTATIVE_THERAPEUTIC_FACILITY=Diagnostic, preventative, therapeutic facility -FacilityType.EMERGENCY_MEDICAL_SERVICES=Emergency medical services -FacilityType.ELDERLY_CARE_FACILITY=Elderly care facility -FacilityType.DISABLED_PERSON_HABITATION=Disabled person habitation -FacilityType.CARE_RECIPIENT_HABITATION=Care recipient habitation -FacilityType.VISITING_AMBULATORY_AID=Visiting ambulatory aid -FacilityType.AFTER_SCHOOL=After school facility +FacilityType.RETAIL = Retail +FacilityType.WHOLESALE = Wholesale +FacilityType.AMBULATORY_SURGERY_FACILITY = Ambulatory surgery facility +FacilityType.DIALYSIS_FACILITY = Dialysis facility +FacilityType.DAY_HOSPITAL = Day hospital +FacilityType.MATERNITY_FACILITY = Maternity facility +FacilityType.MEDICAL_PRACTICE = Medical practice +FacilityType.DENTAL_PRACTICE = Dental practice +FacilityType.OTHER_MEDICAL_PRACTICE = Other medical practice +FacilityType.DIAGNOSTIC_PREVENTATIVE_THERAPEUTIC_FACILITY = Diagnostic, preventative, therapeutic facility +FacilityType.EMERGENCY_MEDICAL_SERVICES = Emergency medical services +FacilityType.ELDERLY_CARE_FACILITY = Elderly care facility +FacilityType.DISABLED_PERSON_HABITATION = Disabled person habitation +FacilityType.CARE_RECIPIENT_HABITATION = Care recipient habitation +FacilityType.VISITING_AMBULATORY_AID = Visiting ambulatory aid +FacilityType.AFTER_SCHOOL = After school facility + #FacilityTypeGroup FacilityTypeGroup.ACCOMMODATION=Accommodation FacilityTypeGroup.CARE_FACILITY=Care facility @@ -787,11 +864,13 @@ FacilityTypeGroup.MEDICAL_FACILITY=Medical facility FacilityTypeGroup.RESIDENCE=Residence FacilityTypeGroup.WORKING_PLACE=Working place/company FacilityTypeGroup.COMMERCE=Commerce + # FollowUpStartDateType FollowUpStartDateType.SYMPTOM_ONSET_DATE=symptom onset date FollowUpStartDateType.LAST_CONTACT_DATE=last contact date FollowUpStartDateType.EARLIEST_SAMPLE_COLLECTION_DATE=earliest sample collection date FollowUpStartDateType.REPORT_DATE=report date + # FollowUpStatus FollowUpStatus.CANCELED=Canceled follow-up FollowUpStatus.COMPLETED=Completed follow-up @@ -808,6 +887,7 @@ FollowUpStatus.Desc.COMPLETED=The follow-up process has been completed FollowUpStatus.Desc.FOLLOW_UP=The follow-up process is running FollowUpStatus.Desc.LOST=The follow-up process could not be continued because the person was not available FollowUpStatus.Desc.NO_FOLLOW_UP=No contact follow-up is being done + GatheringType.PARTY=Party GatheringType.RELIGIOUS=Religious Gathering GatheringType.MUSICAL=Choir/Singing Club/Orchestra @@ -817,55 +897,61 @@ GatheringType.CARNIVAL=Carnival GatheringType.FAIR=Fair GatheringType.SPORTING_EVENT=Sporting event GatheringType.OTHER=Other + # GestationalAgeCategory GestationalAgeCategory.AT_TERM=At term (between 38 and 42 weeks of pregnancy) GestationalAgeCategory.PREMATURE_BEFORE_32=Prematurely before 32 weeks of pregnancy GestationalAgeCategory.PREMATURE_32_TO_38=Prematurely between 32 and 38 weeks of pregnancy + #GenoTypeResult -GenoTypeResult.GENOTYPE_A=Genotype A -GenoTypeResult.GENOTYPE_B=Genotype B -GenoTypeResult.GENOTYPE_B2=Genotype B2 -GenoTypeResult.GENOTYPE_B3=Genotype B3 -GenoTypeResult.GENOTYPE_C1=Genotype C1 -GenoTypeResult.GENOTYPE_C2=Genotype C2 -GenoTypeResult.GENOTYPE_D1=Genotype D1 -GenoTypeResult.GENOTYPE_D10=Genotype D10 -GenoTypeResult.GENOTYPE_D11=Genotype D11 -GenoTypeResult.GENOTYPE_D2=Genotype D2 -GenoTypeResult.GENOTYPE_D3=Genotype D3 -GenoTypeResult.GENOTYPE_D4=Genotype D4 -GenoTypeResult.GENOTYPE_D5=Genotype D5 -GenoTypeResult.GENOTYPE_D6=Genotype D6 -GenoTypeResult.GENOTYPE_D7=Genotype D7 -GenoTypeResult.GENOTYPE_D8=Genotype D8 -GenoTypeResult.GENOTYPE_D9=Genotype D9 -GenoTypeResult.GENOTYPE_E=Genotype E -GenoTypeResult.GENOTYPE_F=Genotype F -GenoTypeResult.GENOTYPE_G1=Genotype G1 -GenoTypeResult.GENOTYPE_G2=Genotype G2 -GenoTypeResult.GENOTYPE_G3=Genotype G3 -GenoTypeResult.GENOTYPE_H1=Genotype H1 -GenoTypeResult.GENOTYPE_H2=Genotype H2 -GenoTypeResult.CRYPTOSPORIDIUM_HOMINIS=Cryptosporidium hominis -GenoTypeResult.CRYPTOSPORIDIUM_PARVUM=Cryptosporidium parvum -GenoTypeResult.CRYPTOSPORIDIUM_SPECIES=Cryptosporidium species -GenoTypeResult.OTHER=Other -GenoTypeResult.UNKNOWN=Unknown +GenoTypeResult.GENOTYPE_A = Genotype A +GenoTypeResult.GENOTYPE_B = Genotype B +GenoTypeResult.GENOTYPE_B2 = Genotype B2 +GenoTypeResult.GENOTYPE_B3 = Genotype B3 +GenoTypeResult.GENOTYPE_C1 = Genotype C1 +GenoTypeResult.GENOTYPE_C2 = Genotype C2 +GenoTypeResult.GENOTYPE_D1 = Genotype D1 +GenoTypeResult.GENOTYPE_D10 = Genotype D10 +GenoTypeResult.GENOTYPE_D11 = Genotype D11 +GenoTypeResult.GENOTYPE_D2 = Genotype D2 +GenoTypeResult.GENOTYPE_D3 = Genotype D3 +GenoTypeResult.GENOTYPE_D4 = Genotype D4 +GenoTypeResult.GENOTYPE_D5 = Genotype D5 +GenoTypeResult.GENOTYPE_D6 = Genotype D6 +GenoTypeResult.GENOTYPE_D7 = Genotype D7 +GenoTypeResult.GENOTYPE_D8 = Genotype D8 +GenoTypeResult.GENOTYPE_D9 = Genotype D9 +GenoTypeResult.GENOTYPE_E = Genotype E +GenoTypeResult.GENOTYPE_F = Genotype F +GenoTypeResult.GENOTYPE_G1 = Genotype G1 +GenoTypeResult.GENOTYPE_G2 = Genotype G2 +GenoTypeResult.GENOTYPE_G3 = Genotype G3 +GenoTypeResult.GENOTYPE_H1 = Genotype H1 +GenoTypeResult.GENOTYPE_H2 = Genotype H2 +GenoTypeResult.CRYPTOSPORIDIUM_HOMINIS = Cryptosporidium hominis +GenoTypeResult.CRYPTOSPORIDIUM_PARVUM = Cryptosporidium parvum +GenoTypeResult.CRYPTOSPORIDIUM_SPECIES = Cryptosporidium species +GenoTypeResult.OTHER = Other +GenoTypeResult.UNKNOWN = Unknown + HabitationType.MEDICAL=Stay in a Medical Institution HabitationType.OTHER=Other + HospitalizationReasonType.REPORTED_DISEASE=Reported disease HospitalizationReasonType.ISOLATION=Isolation HospitalizationReasonType.OTHER=Other reason HospitalizationReasonType.UNKNOWN=Unknown -HospitalWardType.PEDIATRIC_INPATIENT=Pediatric-Inpatient -HospitalWardType.NURSERY=Nursery -HospitalWardType.EPU=EPU -HospitalWardType.CHER=CHER -HospitalWardType.OPD=OPD -HospitalWardType.EYE=Eye -HospitalWardType.ENT=ENT -HospitalWardType.CARDIOLOGY=Cardiology -HospitalWardType.OTHER=Other + +HospitalWardType.PEDIATRIC_INPATIENT = Pediatric-Inpatient +HospitalWardType.NURSERY = Nursery +HospitalWardType.EPU = EPU +HospitalWardType.CHER = CHER +HospitalWardType.OPD = OPD +HospitalWardType.EYE = Eye +HospitalWardType.ENT = ENT +HospitalWardType.CARDIOLOGY = Cardiology +HospitalWardType.OTHER = Other + # ImmunizationDateType ImmunizationDateType.FIRST_VACCINATION_DATE=Date of first vaccination ImmunizationDateType.IMMUNIZATION_END=End of immunization @@ -873,11 +959,13 @@ ImmunizationDateType.LAST_VACCINATION_DATE=Date of last vaccination ImmunizationDateType.RECOVERY_DATE=Date of recovery ImmunizationDateType.REPORT_DATE=Date of report ImmunizationDateType.VALID_UNTIL=Valid until + # InfectionSource InfectionSource.ANIMAL=Animal InfectionSource.NOT_APPLICABLE=Not applicable InfectionSource.FOOD=Food InfectionSource.OTHER=Other + # InvestigationStatus InvestigationStatus.DISCARDED=Investigation discarded InvestigationStatus.DONE=Investigation done @@ -885,303 +973,339 @@ InvestigationStatus.PENDING=Investigation pending InvestigationStatus.Short.DISCARDED=Discarded InvestigationStatus.Short.DONE=Done InvestigationStatus.Short.PENDING=Pending + # KindOfInvolvement -KindOfInvolvement.OTHER=Other -KindOfInvolvement.POTENTIALLY_EXPOSED=Potentially exposed -KindOfInvolvement.POTENTIAL_INDEX_CASE=Potential index case -Language.EN=English -Language.EN_GM=English (The Gambia) -Language.EN_LR=English (Liberia) -Language.EN_AF=English (Afghanistan) -Language.EN_NG=English (Nigeria) -Language.EN_GH=English (Ghana) -Language.EN_KE=English (Kenya) -Language.FR=Français -Language.DE=Deutsch -Language.ES_BO=Español (Bolivia) -Language.ES_EC=Español (Ecuador) -Language.ES_CU=Español (Cuba) -Language.FI=Suomi -Language.IT=Italiano -Language.DE_CH=Deutsch (Schweiz) -Language.PT_CV=Português (Cabo Verde) -Language.IT_CH=Italiano (Svizzera) -Language.FR_CH=Français (Suisse) -Language.PS=Pashto -Language.FA=Dari -Language.CZ=Čeština -Language.UR_PK=Urdu -Language.FR_TN=Français (Tunisie) +KindOfInvolvement.OTHER = Other +KindOfInvolvement.POTENTIALLY_EXPOSED = Potentially exposed +KindOfInvolvement.POTENTIAL_INDEX_CASE = Potential index case + +Language.EN = English +Language.EN_GM = English (The Gambia) +Language.EN_LR = English (Liberia) +Language.EN_AF = English (Afghanistan) +Language.EN_NG = English (Nigeria) +Language.EN_GH = English (Ghana) +Language.EN_KE = English (Kenya) +Language.FR = Français +Language.DE = Deutsch +Language.ES_BO = Español (Bolivia) +Language.ES_EC = Español (Ecuador) +Language.ES_CU = Español (Cuba) +Language.FI = Suomi +Language.IT = Italiano +Language.DE_CH = Deutsch (Schweiz) +Language.PT_CV = Português (Cabo Verde) +Language.IT_CH = Italiano (Svizzera) +Language.FR_CH = Français (Suisse) +Language.PS = Pashto +Language.FA = Dari +Language.CZ = Čeština +Language.UR_PK = Urdu +Language.FR_TN = Français (Tunisie) + #LivingStatus -LivingStatus.MIGRANT=Migrant -LivingStatus.FOREIGNER=Foreigner -LivingStatus.HOMELESS=Homeless -LivingStatus.REGISTERED_AT_A_RESIDENCE=Registered as living at a residence in LU +LivingStatus.MIGRANT = Migrant +LivingStatus.FOREIGNER = Foreigner +LivingStatus.HOMELESS = Homeless +LivingStatus.REGISTERED_AT_A_RESIDENCE = Registered as living at a residence in LU + # MapCaseDisplayMode -MapCaseDisplayMode.CASE_ADDRESS=... by home address -MapCaseDisplayMode.FACILITY=... by facility -MapCaseDisplayMode.FACILITY_OR_CASE_ADDRESS=... by facility or home address -MapCaseClassificationOption.ALL_CASES=Show all cases -MapCaseClassificationOption.CONFIRMED_CASES_ONLY=Show confirmed cases only -MapPeriodType.DAILY=Daily -MapPeriodType.WEEKLY=Weekly -MapPeriodType.MONTHLY=Monthly -MapPeriodType.YEARLY=Yearly +MapCaseDisplayMode.CASE_ADDRESS = ... by home address +MapCaseDisplayMode.FACILITY = ... by facility +MapCaseDisplayMode.FACILITY_OR_CASE_ADDRESS = ... by facility or home address + +MapCaseClassificationOption.ALL_CASES = Show all cases +MapCaseClassificationOption.CONFIRMED_CASES_ONLY = Show confirmed cases only + +MapPeriodType.DAILY = Daily +MapPeriodType.WEEKLY = Weekly +MapPeriodType.MONTHLY = Monthly +MapPeriodType.YEARLY = Yearly + + MeansOfTransport.LOCAL_PUBLIC_TRANSPORT=Local public transport MeansOfTransport.BUS=Bus MeansOfTransport.FERRY=Ship/Ferry MeansOfTransport.PLANE=Plane MeansOfTransport.TRAIN=Train MeansOfTransport.OTHER=Other + # MessageSubject -MessageSubject.CASE_CLASSIFICATION_CHANGED=Case classification changed -MessageSubject.CASE_INVESTIGATION_DONE=Case investigation done -MessageSubject.EVENT_PARTICIPANT_CASE_CLASSIFICATION_CONFIRMED=Event participant identified as a confirmed %s case -MessageSubject.EVENT_PARTICIPANT_RELATED_TO_OTHER_EVENTS=Event Participant related to other Events -MessageSubject.LAB_RESULT_ARRIVED=Lab result arrived -MessageSubject.LAB_SAMPLE_SHIPPED=Lab sample shipped -MessageSubject.CONTACT_SYMPTOMATIC=Contact has become symptomatic -MessageSubject.TASK_START=Task to be started -MessageSubject.TASK_DUE=Task overdue -MessageSubject.TASK_UPDATED_ASSIGNEE=Updated task assignee -MessageSubject.VISIT_COMPLETED=Follow-up visit completed -MessageSubject.DISEASE_CHANGED=Case disease changed -MessageSubject.EVENT_GROUP_CREATED=Event Group created -MessageSubject.EVENT_ADDED_TO_EVENT_GROUP=Event added to Event Group -MessageSubject.EVENT_REMOVED_FROM_EVENT_GROUP=Event removed from Event Group +MessageSubject.CASE_CLASSIFICATION_CHANGED = Case classification changed +MessageSubject.CASE_INVESTIGATION_DONE = Case investigation done +MessageSubject.EVENT_PARTICIPANT_CASE_CLASSIFICATION_CONFIRMED = Event participant identified as a confirmed %s case +MessageSubject.EVENT_PARTICIPANT_RELATED_TO_OTHER_EVENTS = Event Participant related to other Events +MessageSubject.LAB_RESULT_ARRIVED = Lab result arrived +MessageSubject.LAB_SAMPLE_SHIPPED = Lab sample shipped +MessageSubject.CONTACT_SYMPTOMATIC = Contact has become symptomatic +MessageSubject.TASK_START = Task to be started +MessageSubject.TASK_DUE = Task overdue +MessageSubject.TASK_UPDATED_ASSIGNEE = Updated task assignee +MessageSubject.VISIT_COMPLETED = Follow-up visit completed +MessageSubject.DISEASE_CHANGED = Case disease changed +MessageSubject.EVENT_GROUP_CREATED = Event Group created +MessageSubject.EVENT_ADDED_TO_EVENT_GROUP = Event added to Event Group +MessageSubject.EVENT_REMOVED_FROM_EVENT_GROUP = Event removed from Event Group + # ModeOfTransmission -ModeOfTransmission.ANIMAL_TO_HUMAN=Animal to human -ModeOfTransmission.FOOD_OR_WATER=Food including drinking water -ModeOfTransmission.PERSON_TO_PERSON=Person-to-person (faecal-oral, excluding mother-to-child and sexual transmission) -ModeOfTransmission.RECREATIONAL_WATER=Recreational water -ModeOfTransmission.HEALTHCARE_ASSOCIATED=Healthcare associated -ModeOfTransmission.INJECTING_DRUG_USERS=Injecting drug users -ModeOfTransmission.LAB_OCCUPATIONAL_EXPOSURE=Transmission in a laboratory due to occupational exposure -ModeOfTransmission.MOTHER_TO_CHILD=Transmission from mother to child during pregnancy or at birth -ModeOfTransmission.SEXUAL=Sexual transmission -ModeOfTransmission.TRANSFUSION_RECIPIENT=Transfusion recipient -ModeOfTransmission.ORGAN_RECIPIENT=Organ recipient -ModeOfTransmission.UNKNOWN=Unknown -ModeOfTransmission.OTHER=Other +ModeOfTransmission.ANIMAL_TO_HUMAN = Animal to human +ModeOfTransmission.FOOD_OR_WATER = Food including drinking water +ModeOfTransmission.PERSON_TO_PERSON = Person-to-person (faecal-oral, excluding mother-to-child and sexual transmission) +ModeOfTransmission.RECREATIONAL_WATER = Recreational water +ModeOfTransmission.HEALTHCARE_ASSOCIATED = Healthcare associated +ModeOfTransmission.INJECTING_DRUG_USERS = Injecting drug users +ModeOfTransmission.LAB_OCCUPATIONAL_EXPOSURE = Transmission in a laboratory due to occupational exposure +ModeOfTransmission.MOTHER_TO_CHILD = Transmission from mother to child during pregnancy or at birth +ModeOfTransmission.SEXUAL = Sexual transmission +ModeOfTransmission.TRANSFUSION_RECIPIENT = Transfusion recipient +ModeOfTransmission.ORGAN_RECIPIENT = Organ recipient +ModeOfTransmission.UNKNOWN = Unknown +ModeOfTransmission.OTHER = Other + + # Month -Month.JANUARY=January -Month.FEBRUARY=February -Month.MARCH=March -Month.APRIL=April -Month.MAY=May -Month.JUNE=June -Month.JULY=July -Month.AUGUST=August -Month.SEPTEMBER=September -Month.OCTOBER=October -Month.NOVEMBER=November -Month.DECEMBER=December +Month.JANUARY = January +Month.FEBRUARY = February +Month.MARCH = March +Month.APRIL = April +Month.MAY = May +Month.JUNE = June +Month.JULY = July +Month.AUGUST = August +Month.SEPTEMBER = September +Month.OCTOBER = October +Month.NOVEMBER = November +Month.DECEMBER = December + # NewCaseDateType -NewCaseDateType.MOST_RELEVANT=Most relevant date -NewCaseDateType.ONSET=Symptom onset date -NewCaseDateType.REPORT=Case report date +NewCaseDateType.MOST_RELEVANT = Most relevant date +NewCaseDateType.ONSET = Symptom onset date +NewCaseDateType.REPORT = Case report date + # OccupationType # Temporarily necessary for data migration of older systems; can be removed at a later point in time -OccupationType.BUSINESSMAN_WOMAN=Businessman / woman -OccupationType.BUTCHER=Butcher -OccupationType.CHILD=Child -OccupationType.FARMER=Farmer -OccupationType.HEALTHCARE_WORKER=Healthcare worker -OccupationType.HOUSEWIFE=Housewife -OccupationType.HUNTER_MEAT_TRADER=Hunter / trader of game meat -OccupationType.MINER=Miner -OccupationType.OTHER=Other -OccupationType.PUPIL_STUDENT=Pupil / student -OccupationType.RELIGIOUS_LEADER=Religious leader -OccupationType.TRADITIONAL_SPIRITUAL_HEALER=Traditional / spiritual healer -OccupationType.TRANSPORTER=Transporter -OccupationType.WORKING_WITH_ANIMALS=Working with animals -OccupationType.LABORATORY_STAFF=Laboratory staff -OccupationType.UNKNOWN=Unknown -OccupationType.AGRICULTURE=A. Agriculture & forestry, fisheries -OccupationType.MINING=B. Mining & quarrying -OccupationType.MANUFACTURING=C. Manufacturing industry /manufacture of goods -OccupationType.ENERGY_SUPPLY=D. Energy supply -OccupationType.WATER_SUPPLY_AND_WASTE=E. Water supply; sewerage and waste management -OccupationType.CONSTRUCTION=F. Construction industry /building -OccupationType.RETAIL_AND_REPAIR_SERVICE=G. Wholesale and retail trade; repair services -OccupationType.TRANSPORT_AND_STORAGE=H. Transport and storage -OccupationType.ACCOMMODATION_AND_FOOD_SERVICES=I. Hotels and restaurants /accommodation & gastronomy -OccupationType.INFORMATION_AND_COMMUNICATION=J. Information & communication -OccupationType.FINANCE_AND_INSURANCE=K. Finance & insurance -OccupationType.REAL_ESTATE=L. Real estate and housing -OccupationType.PROFESSIONAL_SCIENTIFIC_AND_TECHNICAL=M. Service: freelance, scientific, technical -OccupationType.ADMINISTRATIVE_AND_SUPPORT=N. Service: other economic activities -OccupationType.PUBLIC_ADMINISTRATION_AND_DEFENCE=O. Public administration and defence; social services/security -OccupationType.EDUCATION=P. Education & teaching -OccupationType.HEALTH_AND_SOCIAL=Q. Health & social services -OccupationType.ARTS_ENTERTAINMENT_AND_RECREATION=R. Arts, entertainment & recreation -OccupationType.SERVICE_OTHER=S. Service: other -OccupationType.PRIVATE_HOUSEHOLD=T. Private households with domestic staff -OccupationType.EXTRATERRITORIAL_ORGANIZATIONS=U. Exterritorial organisations & bodies +OccupationType.BUSINESSMAN_WOMAN = Businessman / woman +OccupationType.BUTCHER = Butcher +OccupationType.CHILD = Child +OccupationType.FARMER = Farmer +OccupationType.HEALTHCARE_WORKER = Healthcare worker +OccupationType.HOUSEWIFE = Housewife +OccupationType.HUNTER_MEAT_TRADER = Hunter / trader of game meat +OccupationType.MINER = Miner +OccupationType.OTHER = Other +OccupationType.PUPIL_STUDENT = Pupil / student +OccupationType.RELIGIOUS_LEADER = Religious leader +OccupationType.TRADITIONAL_SPIRITUAL_HEALER = Traditional / spiritual healer +OccupationType.TRANSPORTER = Transporter +OccupationType.WORKING_WITH_ANIMALS = Working with animals +OccupationType.LABORATORY_STAFF = Laboratory staff +OccupationType.UNKNOWN = Unknown + +OccupationType.AGRICULTURE = A. Agriculture & forestry, fisheries +OccupationType.MINING = B. Mining & quarrying +OccupationType.MANUFACTURING = C. Manufacturing industry /manufacture of goods +OccupationType.ENERGY_SUPPLY = D. Energy supply +OccupationType.WATER_SUPPLY_AND_WASTE = E. Water supply; sewerage and waste management +OccupationType.CONSTRUCTION = F. Construction industry /building +OccupationType.RETAIL_AND_REPAIR_SERVICE = G. Wholesale and retail trade; repair services +OccupationType.TRANSPORT_AND_STORAGE = H. Transport and storage +OccupationType.ACCOMMODATION_AND_FOOD_SERVICES = I. Hotels and restaurants /accommodation & gastronomy +OccupationType.INFORMATION_AND_COMMUNICATION = J. Information & communication +OccupationType.FINANCE_AND_INSURANCE = K. Finance & insurance +OccupationType.REAL_ESTATE = L. Real estate and housing +OccupationType.PROFESSIONAL_SCIENTIFIC_AND_TECHNICAL = M. Service: freelance, scientific, technical +OccupationType.ADMINISTRATIVE_AND_SUPPORT = N. Service: other economic activities +OccupationType.PUBLIC_ADMINISTRATION_AND_DEFENCE = O. Public administration and defence; social services/security +OccupationType.EDUCATION = P. Education & teaching +OccupationType.HEALTH_AND_SOCIAL = Q. Health & social services +OccupationType.ARTS_ENTERTAINMENT_AND_RECREATION = R. Arts, entertainment & recreation +OccupationType.SERVICE_OTHER = S. Service: other +OccupationType.PRIVATE_HOUSEHOLD = T. Private households with domestic staff +OccupationType.EXTRATERRITORIAL_ORGANIZATIONS = U. Exterritorial organisations & bodies + # PathogenTestResultType -PathogenTestResultType.INDETERMINATE=Indeterminate -PathogenTestResultType.NEGATIVE=Negative -PathogenTestResultType.PENDING=Pending -PathogenTestResultType.POSITIVE=Positive -PathogenTestResultType.NOT_DONE=Not done -PathogenTestResultType.NOT_APPLICABLE=Not applicable +PathogenTestResultType.INDETERMINATE = Indeterminate +PathogenTestResultType.NEGATIVE = Negative +PathogenTestResultType.PENDING = Pending +PathogenTestResultType.POSITIVE = Positive +PathogenTestResultType.NOT_DONE = Not done +PathogenTestResultType.NOT_APPLICABLE = Not applicable + # PathogenTestType -PathogenTestType.ANTIGEN_DETECTION=Antigen detection test -PathogenTestType.CULTURE=Culture -PathogenTestType.DENGUE_FEVER_ANTIBODIES=Dengue fever neutralizing antibodies -PathogenTestType.DENGUE_FEVER_IGM=Dengue fever IgM serum antibody -PathogenTestType.DNA_MICROARRAY=DNA Microarray -PathogenTestType.HISTOPATHOLOGY=Histopathology -PathogenTestType.IGG_SERUM_ANTIBODY=IgG serum antibody -PathogenTestType.IGM_SERUM_ANTIBODY=IgM serum antibody -PathogenTestType.IGA_SERUM_ANTIBODY=IgA serum antibody -PathogenTestType.ISOLATION=Isolation -PathogenTestType.MICROSCOPY=Microscopy -PathogenTestType.NEUTRALIZING_ANTIBODIES=Neutralizing antibodies -PathogenTestType.OTHER=Other -PathogenTestType.PCR_RT_PCR=PCR / RT-PCR -PathogenTestType.RAPID_TEST=Antigen detection test (rapid test) -PathogenTestType.WEST_NILE_FEVER_ANTIBODIES=West nile fever neutralizing antibodies -PathogenTestType.WEST_NILE_FEVER_IGM=West nile fever IgM serum antibody -PathogenTestType.YELLOW_FEVER_ANTIBODIES=Yellow fever neutralizing antibodies -PathogenTestType.YELLOW_FEVER_IGM=Yellow fever IgM serum antibody -PathogenTestType.YERSINIA_PESTIS_ANTIGEN=Yersinia pestis antigen test -PathogenTestType.ANTIBODY_DETECTION=Antibody detection -PathogenTestType.INCUBATION_TIME=Incubation time -PathogenTestType.INDIRECT_FLUORESCENT_ANTIBODY=Indirect Fluorescent Antibody (IFA) -PathogenTestType.DIRECT_FLUORESCENT_ANTIBODY=Direct Fluorescent Antibody (FA) -PathogenTestType.GRAM_STAIN=Gram Stain -PathogenTestType.LATEX_AGGLUTINATION=Latex Agglutination -PathogenTestType.CQ_VALUE_DETECTION=CQ Value Detection -PathogenTestType.SEQUENCING=Sequencing -PathogenTestType.TMA=Transcription-mediated amplification (TMA) -PathogenTestType.IGRA=Interferon-Gamma Release Assays -PathogenTestType.TST=Tuberculine Skin Test -PathogenTestType.BEIJINGGENOTYPING=Beijing Genotyping -PathogenTestType.SPOLIGOTYPING=Spoligotyping -PathogenTestType.MIRU_PATTERN_CODE=MIRU Pattern Code -PathogenTestType.ANTIBIOTIC_SUSCEPTIBILITY=Antibiotic susceptibility -PathogenTestType.MULTILOCUS_SEQUENCE_TYPING=Multilocus Sequence Typing (MLST) -PathogenTestType.SLIDE_AGGLUTINATION=Slide Agglutination -PathogenTestType.WHOLE_GENOME_SEQUENCING=Whole-Genome Sequencing (WGS) -PathogenTestType.SEROGROUPING=Serogrouping -PathogenTestType.GENOTYPING=Genotyping -PathogenTestType.RAPID_ANTIGEN_DETECTION=Rapid antigen detection test -PathogenTestType.ENZYME_LINKED_IMMUNOSORBENT_ASSAY=Enzyme-linked immunosorbent assay (ELISA) -PCRTestSpecification.VARIANT_SPECIFIC=Variant specific -PCRTestSpecification.N501Y_MUTATION_DETECTION=N501Y mutation detection +PathogenTestType.ANTIGEN_DETECTION = Antigen detection test +PathogenTestType.CULTURE = Culture +PathogenTestType.DENGUE_FEVER_ANTIBODIES = Dengue fever neutralizing antibodies +PathogenTestType.DENGUE_FEVER_IGM = Dengue fever IgM serum antibody +PathogenTestType.DNA_MICROARRAY = DNA Microarray +PathogenTestType.HISTOPATHOLOGY = Histopathology +PathogenTestType.IGG_SERUM_ANTIBODY = IgG serum antibody +PathogenTestType.IGM_SERUM_ANTIBODY = IgM serum antibody +PathogenTestType.IGA_SERUM_ANTIBODY = IgA serum antibody +PathogenTestType.ISOLATION = Isolation +PathogenTestType.MICROSCOPY = Microscopy +PathogenTestType.NEUTRALIZING_ANTIBODIES = Neutralizing antibodies +PathogenTestType.OTHER = Other +PathogenTestType.PCR_RT_PCR = PCR / RT-PCR +PathogenTestType.RAPID_TEST = Antigen detection test (rapid test) +PathogenTestType.WEST_NILE_FEVER_ANTIBODIES = West nile fever neutralizing antibodies +PathogenTestType.WEST_NILE_FEVER_IGM = West nile fever IgM serum antibody +PathogenTestType.YELLOW_FEVER_ANTIBODIES = Yellow fever neutralizing antibodies +PathogenTestType.YELLOW_FEVER_IGM = Yellow fever IgM serum antibody +PathogenTestType.YERSINIA_PESTIS_ANTIGEN = Yersinia pestis antigen test +PathogenTestType.ANTIBODY_DETECTION = Antibody detection +PathogenTestType.INCUBATION_TIME = Incubation time +PathogenTestType.INDIRECT_FLUORESCENT_ANTIBODY = Indirect Fluorescent Antibody (IFA) +PathogenTestType.DIRECT_FLUORESCENT_ANTIBODY = Direct Fluorescent Antibody (FA) +PathogenTestType.GRAM_STAIN = Gram Stain +PathogenTestType.LATEX_AGGLUTINATION = Latex Agglutination +PathogenTestType.CQ_VALUE_DETECTION = CQ Value Detection +PathogenTestType.SEQUENCING = Sequencing +PathogenTestType.TMA = Transcription-mediated amplification (TMA) +PathogenTestType.IGRA = Interferon-Gamma Release Assays +PathogenTestType.TST = Tuberculine Skin Test +PathogenTestType.BEIJINGGENOTYPING = Beijing Genotyping +PathogenTestType.SPOLIGOTYPING = Spoligotyping +PathogenTestType.MIRU_PATTERN_CODE = MIRU Pattern Code +PathogenTestType.ANTIBIOTIC_SUSCEPTIBILITY = Antibiotic susceptibility +PathogenTestType.MULTILOCUS_SEQUENCE_TYPING = Multilocus Sequence Typing (MLST) +PathogenTestType.SLIDE_AGGLUTINATION = Slide Agglutination +PathogenTestType.WHOLE_GENOME_SEQUENCING = Whole-Genome Sequencing (WGS) +PathogenTestType.SEROGROUPING = Serogrouping +PathogenTestType.GENOTYPING = Genotyping +PathogenTestType.RAPID_ANTIGEN_DETECTION = Rapid antigen detection test +PathogenTestType.ENZYME_LINKED_IMMUNOSORBENT_ASSAY = Enzyme-linked immunosorbent assay (ELISA) + +PCRTestSpecification.VARIANT_SPECIFIC = Variant specific +PCRTestSpecification.N501Y_MUTATION_DETECTION = N501Y mutation detection + # SpoligotypeSpecie -PathogenSpecie.MYCOBATERIUM_AFRICANUM=Mycobaterium Africanum -PathogenSpecie.MYCOBATERIUM_BOVIS=Mycobaterium bovis -PathogenSpecie.MYCOBATERIUM_TUBERCULOSIS=Mycobaterium tuberculosis -PathogenSpecie.OTHER_MTBC_MEMBER=Other member of the MTBC -PathogenSpecie.UNKNOWN=Unknown -PathogenSpecie.NOT_APPLICABLE=Not Applicable +PathogenSpecie.MYCOBATERIUM_AFRICANUM = Mycobaterium Africanum +PathogenSpecie.MYCOBATERIUM_BOVIS = Mycobaterium bovis +PathogenSpecie.MYCOBATERIUM_TUBERCULOSIS = Mycobaterium tuberculosis +PathogenSpecie.OTHER_MTBC_MEMBER = Other member of the MTBC +PathogenSpecie.UNKNOWN = Unknown +PathogenSpecie.NOT_APPLICABLE = Not Applicable + # PathogenTestScale -PathogenTestScale.ONE_PLUS=+ -PathogenTestScale.TWO_PLUS=++ -PathogenTestScale.THREE_PLUS=+++ +PathogenTestScale.ONE_PLUS = + +PathogenTestScale.TWO_PLUS = ++ +PathogenTestScale.THREE_PLUS = +++ + # PathogenStrainCallStatus -PathogenStrainCallStatus.BEIJING=Beijing -PathogenStrainCallStatus.NOBEIJING=Not Beijing -PathogenStrainCallStatus.POSSBEIJING=Possible Beijing -PathogenStrainCallStatus.UNKNOWN=Unknown -PersonContactDetailType.PHONE=Phone -PersonContactDetailType.EMAIL=Email -PersonContactDetailType.OTHER=Other -PhoneNumberType.LANDLINE=Landline -PhoneNumberType.MOBILE=Mobile -PhoneNumberType.WORK=Work -PhoneNumberType.OTHER=Other -ExposureRole.PASSENGER=Passenger -ExposureRole.STAFF=Staff -ExposureRole.NURSING_STAFF=Nursing staff -ExposureRole.MEDICAL_STAFF=Medical staff -ExposureRole.VISITOR=Visitor -ExposureRole.GUEST=Guest -ExposureRole.CUSTOMER=Customer -ExposureRole.CONSERVATEE=Conservatee -ExposureRole.PATIENT=Patient -ExposureRole.EDUCATOR=Educator -ExposureRole.TRAINEE_TEACHER=Trainee teacher -ExposureRole.PUPIL=Pupil -ExposureRole.STUDENT=Student -ExposureRole.PARENT=Parent -ExposureRole.TEACHER=Teacher -ExposureRole.UNKNOWN=Unknown -ExposureRole.OTHER=Other +PathogenStrainCallStatus.BEIJING = Beijing +PathogenStrainCallStatus.NOBEIJING = Not Beijing +PathogenStrainCallStatus.POSSBEIJING = Possible Beijing +PathogenStrainCallStatus.UNKNOWN = Unknown + +PersonContactDetailType.PHONE = Phone +PersonContactDetailType.EMAIL = Email +PersonContactDetailType.OTHER = Other + +PhoneNumberType.LANDLINE = Landline +PhoneNumberType.MOBILE = Mobile +PhoneNumberType.WORK = Work +PhoneNumberType.OTHER = Other + +ExposureRole.PASSENGER = Passenger +ExposureRole.STAFF = Staff +ExposureRole.NURSING_STAFF = Nursing staff +ExposureRole.MEDICAL_STAFF = Medical staff +ExposureRole.VISITOR = Visitor +ExposureRole.GUEST = Guest +ExposureRole.CUSTOMER = Customer +ExposureRole.CONSERVATEE = Conservatee +ExposureRole.PATIENT = Patient +ExposureRole.EDUCATOR = Educator +ExposureRole.TRAINEE_TEACHER = Trainee teacher +ExposureRole.PUPIL = Pupil +ExposureRole.STUDENT = Student +ExposureRole.PARENT = Parent +ExposureRole.TEACHER = Teacher +ExposureRole.UNKNOWN = Unknown +ExposureRole.OTHER = Other + #SymptomJournalStatus -SymptomJournalStatus.UNREGISTERED=Unregistered -SymptomJournalStatus.REGISTERED=Registered -SymptomJournalStatus.ACCEPTED=Accepted -SymptomJournalStatus.REJECTED=Rejected -SymptomJournalStatus.DELETED=Deleted +SymptomJournalStatus.UNREGISTERED = Unregistered +SymptomJournalStatus.REGISTERED = Registered +SymptomJournalStatus.ACCEPTED = Accepted +SymptomJournalStatus.REJECTED = Rejected +SymptomJournalStatus.DELETED = Deleted + # PlagueType -PlagueType.BUBONIC=Bubonic plague -PlagueType.PNEUMONIC=Pneumonic plague -PlagueType.SEPTICAEMIC=Septicaemic plague +PlagueType.BUBONIC = Bubonic plague +PlagueType.PNEUMONIC = Pneumonic plague +PlagueType.SEPTICAEMIC = Septicaemic plague + # PersonAddressType -PersonAddressType.HOME=Home -PersonAddressType.PLACE_OF_RESIDENCE=Place of residence -PersonAddressType.PLACE_OF_EXPOSURE=Place of exposure -PersonAddressType.PLACE_OF_WORK=Place of work -PersonAddressType.PLACE_OF_ISOLATION=Place of isolation -PersonAddressType.EVENT_LOCATION=Event location -PersonAddressType.OTHER_ADDRESS=Other address +PersonAddressType.HOME = Home +PersonAddressType.PLACE_OF_RESIDENCE = Place of residence +PersonAddressType.PLACE_OF_EXPOSURE = Place of exposure +PersonAddressType.PLACE_OF_WORK = Place of work +PersonAddressType.PLACE_OF_ISOLATION = Place of isolation +PersonAddressType.EVENT_LOCATION = Event location +PersonAddressType.OTHER_ADDRESS = Other address + # PointOfEntryType -PointOfEntryType.AIRPORT=Airport -PointOfEntryType.SEAPORT=Seaport -PointOfEntryType.GROUND_CROSSING=Ground crossing -PointOfEntryType.OTHER=Other +PointOfEntryType.AIRPORT = Airport +PointOfEntryType.SEAPORT = Seaport +PointOfEntryType.GROUND_CROSSING = Ground crossing +PointOfEntryType.OTHER = Other + # PresentCondition PresentCondition.ALIVE=Alive PresentCondition.BURIED=Buried PresentCondition.DEAD=Dead PresentCondition.UNKNOWN=Unknown + # QuarantineType -QuarantineType.HOME=Home -QuarantineType.INSTITUTIONELL=Institutional -QuarantineType.NONE=None -QuarantineType.UNKNOWN=Unknown -QuarantineType.OTHER=Other -QuarantineType.HOSPITAL=Hospital -QuarantineType.HOTEL=Hotel -QuarantineType.ASYLUM_ACCOMMODATION=Asylum Accommodation +QuarantineType.HOME = Home +QuarantineType.INSTITUTIONELL = Institutional +QuarantineType.NONE = None +QuarantineType.UNKNOWN = Unknown +QuarantineType.OTHER = Other + +QuarantineType.HOSPITAL = Hospital +QuarantineType.HOTEL = Hotel +QuarantineType.ASYLUM_ACCOMMODATION = Asylum Accommodation + # ReportingType -ReportingType.NOT_RAISED=Not raised -ReportingType.OTHER=Other -ReportingType.DOCTOR=Doctor -ReportingType.LABORATORY=Laboratory -ReportingType.OWN_DETERMINATION=Own Determination -ReportingType.HOSPITAL_OR_STATIONARY_CARE=Hospital or stationary care -ReportingType.NOT_DETERMINABLE=Not determinable -ReportingType.FORWARDING=Forwarding -ReportingType.COMMUNITY_FACILITY=Community facility -ReportingType.COMMUNITY_FACILITY_IFSG_ARTICLE_34=Community facility (§ 34 IfSG) +ReportingType.NOT_RAISED = Not raised +ReportingType.PHONE_NOTIFICATION = Phone notification +ReportingType.OTHER = Other +ReportingType.DOCTOR = Doctor +ReportingType.LABORATORY = Laboratory +ReportingType.OWN_DETERMINATION = Own Determination +ReportingType.HOSPITAL_OR_STATIONARY_CARE = Hospital or stationary care +ReportingType.NOT_DETERMINABLE = Not determinable +ReportingType.FORWARDING = Forwarding +ReportingType.COMMUNITY_FACILITY = Community facility +ReportingType.COMMUNITY_FACILITY_IFSG_ARTICLE_34 = Community facility (§ 34 IfSG) + # RiskLevel -RiskLevel.LOW=Low risk -RiskLevel.MODERATE=Moderate risk -RiskLevel.HIGH=High risk -RiskLevel.UNKNOWN=Unknown +RiskLevel.LOW = Low risk +RiskLevel.MODERATE = Moderate risk +RiskLevel.HIGH = High risk +RiskLevel.UNKNOWN = Unknown + # RsvSubtype -RsvSubtype.RSV_A=RSV A -RsvSubtype.RSV_B=RSV B -RsvSubtype.RSV_A_AND_B=RSV A+B -RsvSubtype.INDETERMINATE=Indeterminate +RsvSubtype.RSV_A = RSV A +RsvSubtype.RSV_B = RSV B +RsvSubtype.RSV_A_AND_B = RSV A+B +RsvSubtype.INDETERMINATE = Indeterminate + # SampleMaterial -SampleMaterial.BLOOD=Blood -SampleMaterial.CEREBROSPINAL_FLUID=Cerebrospinal fluid -SampleMaterial.CRUST=Crust -SampleMaterial.NASAL_SWAB=Nasal swab -SampleMaterial.NP_SWAB=Nasopharyngeal swab -SampleMaterial.OTHER=Other -SampleMaterial.RECTAL_SWAB=Rectal swab -SampleMaterial.SERA=Sera -SampleMaterial.STOOL=Stool -SampleMaterial.THROAT_SWAB=Throat swab -SampleMaterial.TISSUE=Tissue -SampleMaterial.URINE=Urine +SampleMaterial.BLOOD = Blood +SampleMaterial.CEREBROSPINAL_FLUID = Cerebrospinal fluid +SampleMaterial.CRUST = Crust +SampleMaterial.NASAL_SWAB = Nasal swab +SampleMaterial.NP_SWAB = Nasopharyngeal swab +SampleMaterial.OTHER = Other +SampleMaterial.RECTAL_SWAB = Rectal swab +SampleMaterial.SERA = Sera +SampleMaterial.STOOL = Stool +SampleMaterial.THROAT_SWAB = Throat swab +SampleMaterial.TISSUE = Tissue +SampleMaterial.URINE = Urine SampleMaterial.CORNEA_PM=Cornea p.m SampleMaterial.SALIVA=Saliva SampleMaterial.URINE_PM=Urine p.m @@ -1197,15 +1321,15 @@ SampleMaterial.NP_ASPIRATE=Nasopharyngeal aspirate SampleMaterial.NASOPHARYNGEAL_LAVAGE=Nasopharyngeal lavage SampleMaterial.PLEURAL_FLUID=Pleural fluid specimen SampleMaterial.CLINICAL_SAMPLE=Clinical sample -SampleMaterial.PERITONEAL_FLUID=Peritoneal Fluid -SampleMaterial.SYNOVIAL_FLUID=Synovial Fluid -SampleMaterial.DRY_BLOOD=Dried blood spot -SampleMaterial.AMNIOTIC_FLUID=Amniotic fluid -SampleMaterial.THROAT_ASPIRATE=Throat aspirate -SampleMaterial.EDTA_WHOLE_BLOOD=EDTA Whole Blood -SampleMaterial.INTESTINAL_FLUID=Intestinal Fluid -SampleMaterial.DUODENUM_FLUID=Duodenum fluid -SampleMaterial.BIOPSY=Biopsy +SampleMaterial.PERITONEAL_FLUID = Peritoneal Fluid +SampleMaterial.SYNOVIAL_FLUID = Synovial Fluid +SampleMaterial.DRY_BLOOD = Dried blood spot +SampleMaterial.AMNIOTIC_FLUID = Amniotic fluid +SampleMaterial.THROAT_ASPIRATE = Throat aspirate +SampleMaterial.EDTA_WHOLE_BLOOD = EDTA Whole Blood +SampleMaterial.INTESTINAL_FLUID = Intestinal Fluid +SampleMaterial.DUODENUM_FLUID = Duodenum fluid +SampleMaterial.BIOPSY = Biopsy # SampleSource SampleSource.ANIMAL=Animal SampleSource.ENVIRONMENT=Environment @@ -1221,27 +1345,30 @@ Sex.FEMALE=Female Sex.MALE=Male Sex.OTHER=Other Sex.UNKNOWN=Unknown + # SeroGroupSpecification -SeroGroupSpecification.SEROGROUP_A=Serogroup A -SeroGroupSpecification.SEROGROUP_B=Serogroup B -SeroGroupSpecification.SEROGROUP_C=Serogroup C -SeroGroupSpecification.SEROGROUP_W=Serogroup W -SeroGroupSpecification.SEROGROUP_X=Serogroup X -SeroGroupSpecification.SEROGROUP_Y=Serogroup Y -SeroGroupSpecification.SEROGROUP_Z=Serogroup Z -SeroGroupSpecification.SEROGROUP_29E=Serogroup 29E -SeroGroupSpecification.NOT_GROUPABLE=Not Groupable -SeroGroupSpecification.NOT_UNDER_SURVEILLANCE=Not Under Surveillance -SeroGroupSpecification.OTHER=Other -SeroGroupSpecification.UNKNOWN=Unknown +SeroGroupSpecification.SEROGROUP_A = Serogroup A +SeroGroupSpecification.SEROGROUP_B = Serogroup B +SeroGroupSpecification.SEROGROUP_C = Serogroup C +SeroGroupSpecification.SEROGROUP_W = Serogroup W +SeroGroupSpecification.SEROGROUP_X = Serogroup X +SeroGroupSpecification.SEROGROUP_Y = Serogroup Y +SeroGroupSpecification.SEROGROUP_Z = Serogroup Z +SeroGroupSpecification.SEROGROUP_29E = Serogroup 29E +SeroGroupSpecification.NOT_GROUPABLE = Not Groupable +SeroGroupSpecification.NOT_UNDER_SURVEILLANCE = Not Under Surveillance +SeroGroupSpecification.OTHER = Other +SeroGroupSpecification.UNKNOWN = Unknown + # SerotypingMethod -SerotypingMethod.MULTIPLEX_PCR=Multiplex PCR -SerotypingMethod.QUELLUNG_REACTION=Quellung Reaction -SerotypingMethod.COAGGLUTINATION=Coagglutination -SerotypingMethod.GEL_DIFFUSION=Gel Diffusion -SerotypingMethod.PNEUMOTEST=Pneumotest -SerotypingMethod.SLIDE_AGGLUTINATION=Slide Agglutination -SerotypingMethod.OTHER=Other +SerotypingMethod.MULTIPLEX_PCR = Multiplex PCR +SerotypingMethod.QUELLUNG_REACTION = Quellung Reaction +SerotypingMethod.COAGGLUTINATION = Coagglutination +SerotypingMethod.GEL_DIFFUSION = Gel Diffusion +SerotypingMethod.PNEUMOTEST = Pneumotest +SerotypingMethod.SLIDE_AGGLUTINATION = Slide Agglutination +SerotypingMethod.OTHER = Other + # ShipmentStatus ShipmentStatus.NOT_SHIPPED=Not shipped ShipmentStatus.RECEIVED=Received @@ -1255,172 +1382,200 @@ ShipmentStatus.Short.SHIPPED=Shipped SimpleTestResultType.POSITIVE=Positive SimpleTestResultType.NEGATIVE=Negative SimpleTestResultType.INDETERMINATE=Indeterminate + # SpecimenCondition -SpecimenCondition.ADEQUATE=Adequate -SpecimenCondition.NOT_ADEQUATE=Not adequate +SpecimenCondition.ADEQUATE = Adequate +SpecimenCondition.NOT_ADEQUATE = Not adequate + # StatisticsCaseAttribute -StatisticsCaseAttribute.AGE_INTERVAL_1_YEAR=Age stratification: 1 year intervals -StatisticsCaseAttribute.AGE_INTERVAL_5_YEARS=Age stratification: 5 year intervals -StatisticsCaseAttribute.AGE_INTERVAL_BASIC=Age stratification: basic -StatisticsCaseAttribute.AGE_INTERVAL_CHILDREN_COARSE=Age stratification: children coarse -StatisticsCaseAttribute.AGE_INTERVAL_CHILDREN_FINE=Age stratification: children fine -StatisticsCaseAttribute.AGE_INTERVAL_CHILDREN_MEDIUM=Age stratification: children medium -StatisticsCaseAttribute.CLASSIFICATION=Classification -StatisticsCaseAttribute.DISEASE=Disease -StatisticsCaseAttribute.ONSET_TIME=Onset time -StatisticsCaseAttribute.OUTCOME=Outcome -StatisticsCaseAttribute.OUTCOME_TIME=Outcome time -StatisticsCaseAttribute.JURISDICTION=Region / District / Community / Facility -StatisticsCaseAttribute.REPORT_TIME=Report time -StatisticsCaseAttribute.REPORTING_USER_ROLE=Reporting user role -StatisticsCaseAttribute.SEX=Sex -StatisticsCaseAttribute.PLACE_OF_RESIDENCE=Place of residence +StatisticsCaseAttribute.AGE_INTERVAL_1_YEAR= Age stratification: 1 year intervals +StatisticsCaseAttribute.AGE_INTERVAL_5_YEARS= Age stratification: 5 year intervals +StatisticsCaseAttribute.AGE_INTERVAL_BASIC= Age stratification: basic +StatisticsCaseAttribute.AGE_INTERVAL_CHILDREN_COARSE= Age stratification: children coarse +StatisticsCaseAttribute.AGE_INTERVAL_CHILDREN_FINE= Age stratification: children fine +StatisticsCaseAttribute.AGE_INTERVAL_CHILDREN_MEDIUM= Age stratification: children medium +StatisticsCaseAttribute.CLASSIFICATION = Classification +StatisticsCaseAttribute.DISEASE = Disease +StatisticsCaseAttribute.ONSET_TIME = Onset time +StatisticsCaseAttribute.OUTCOME = Outcome +StatisticsCaseAttribute.OUTCOME_TIME = Outcome time +StatisticsCaseAttribute.JURISDICTION = Region / District / Community / Facility +StatisticsCaseAttribute.REPORT_TIME = Report time +StatisticsCaseAttribute.REPORTING_USER_ROLE = Reporting user role +StatisticsCaseAttribute.SEX = Sex +StatisticsCaseAttribute.PLACE_OF_RESIDENCE = Place of residence + # StatisticsCaseAttributeGroup -StatisticsCaseAttributeGroup.CASE=Case -StatisticsCaseAttributeGroup.PERSON=Person -StatisticsCaseAttributeGroup.PLACE=Place -StatisticsCaseAttributeGroup.TIME=Time +StatisticsCaseAttributeGroup.CASE = Case +StatisticsCaseAttributeGroup.PERSON = Person +StatisticsCaseAttributeGroup.PLACE = Place +StatisticsCaseAttributeGroup.TIME = Time + # StatisticsCaseSubAttribute -StatisticsCaseSubAttribute.DATE_RANGE=Date range -StatisticsCaseSubAttribute.DISTRICT=District -StatisticsCaseSubAttribute.EPI_WEEK=Epi week -StatisticsCaseSubAttribute.EPI_WEEK_OF_YEAR=Epi week of year -StatisticsCaseSubAttribute.MONTH=Month -StatisticsCaseSubAttribute.MONTH_OF_YEAR=Month of year -StatisticsCaseSubAttribute.QUARTER=Quarter -StatisticsCaseSubAttribute.QUARTER_OF_YEAR=Quarter of year -StatisticsCaseSubAttribute.REGION=Region -StatisticsCaseSubAttribute.YEAR=Year -StatisticsCaseSubAttribute.COMMUNITY=Community -StatisticsCaseSubAttribute.FACILITY=Facility -StatisticsCaseSubAttribute.PERSON_REGION=Person's region -StatisticsCaseSubAttribute.PERSON_DISTRICT=Person's district -StatisticsCaseSubAttribute.PERSON_COMMUNITY=Person's community -StatisticsCaseSubAttribute.PERSON_CITY=Person's city -StatisticsCaseSubAttribute.PERSON_POSTCODE=Person's postcode -StatisticsCaseSubAttribute.PERSON_ADDRESS=Person's address +StatisticsCaseSubAttribute.DATE_RANGE = Date range +StatisticsCaseSubAttribute.DISTRICT = District +StatisticsCaseSubAttribute.EPI_WEEK = Epi week +StatisticsCaseSubAttribute.EPI_WEEK_OF_YEAR = Epi week of year +StatisticsCaseSubAttribute.MONTH = Month +StatisticsCaseSubAttribute.MONTH_OF_YEAR = Month of year +StatisticsCaseSubAttribute.QUARTER = Quarter +StatisticsCaseSubAttribute.QUARTER_OF_YEAR = Quarter of year +StatisticsCaseSubAttribute.REGION = Region +StatisticsCaseSubAttribute.YEAR = Year +StatisticsCaseSubAttribute.COMMUNITY = Community +StatisticsCaseSubAttribute.FACILITY = Facility +StatisticsCaseSubAttribute.PERSON_REGION = Person's region +StatisticsCaseSubAttribute.PERSON_DISTRICT = Person's district +StatisticsCaseSubAttribute.PERSON_COMMUNITY = Person's community +StatisticsCaseSubAttribute.PERSON_CITY = Person's city +StatisticsCaseSubAttribute.PERSON_POSTCODE = Person's postcode +StatisticsCaseSubAttribute.PERSON_ADDRESS = Person's address + # StatisticsVisualizationChartType -StatisticsVisualizationChartType.COLUMN=Column -StatisticsVisualizationChartType.LINE=Line -StatisticsVisualizationChartType.PIE=Pie -StatisticsVisualizationChartType.STACKED_COLUMN=Stacked column +StatisticsVisualizationChartType.COLUMN = Column +StatisticsVisualizationChartType.LINE = Line +StatisticsVisualizationChartType.PIE = Pie +StatisticsVisualizationChartType.STACKED_COLUMN = Stacked column + # StatisticsVisualizationElementType -StatisticsVisualizationElementType.COLUMNS=Columns -StatisticsVisualizationElementType.Chart.COLUMNS=X-axis -StatisticsVisualizationElementType.Chart.ROWS=Series -StatisticsVisualizationElementType.ROWS=Rows +StatisticsVisualizationElementType.COLUMNS = Columns +StatisticsVisualizationElementType.Chart.COLUMNS = X-axis +StatisticsVisualizationElementType.Chart.ROWS = Series +StatisticsVisualizationElementType.ROWS = Rows + # StatisticsVisualizationType -StatisticsVisualizationType.CHART=Chart -StatisticsVisualizationMapType.DISTRICTS=Districts -StatisticsVisualizationType.MAP=Map -StatisticsVisualizationMapType.REGIONS=Regions -StatisticsVisualizationType.TABLE=Table -SurveillanceEpiCurveMode.CASE_STATUS=Case status -SurveillanceEpiCurveMode.ALIVE_OR_DEAD=Alive or dead +StatisticsVisualizationType.CHART = Chart +StatisticsVisualizationMapType.DISTRICTS = Districts +StatisticsVisualizationType.MAP = Map +StatisticsVisualizationMapType.REGIONS = Regions +StatisticsVisualizationType.TABLE = Table + +SurveillanceEpiCurveMode.CASE_STATUS = Case status +SurveillanceEpiCurveMode.ALIVE_OR_DEAD = Alive or dead + # SwimmingLocation -SwimmingLocation.PUBLIC=Public pool -SwimmingLocation.PRIVATE=Private pool -SwimmingLocation.LAKE=Lake -SwimmingLocation.RIVER=River -SwimmingLocation.OCEAN=Ocean -SwimmingLocation.WATER_PARK=Water Park -SwimmingLocation.OTHER=Other +SwimmingLocation.PUBLIC = Public pool +SwimmingLocation.PRIVATE = Private pool +SwimmingLocation.LAKE = Lake +SwimmingLocation.RIVER = River +SwimmingLocation.OCEAN = Ocean +SwimmingLocation.WATER_PARK = Water Park +SwimmingLocation.OTHER = Other + + # SymptomState -SymptomState.NO=No -SymptomState.UNKNOWN=Unknown -SymptomState.YES=Yes +SymptomState.NO = No +SymptomState.UNKNOWN = Unknown +SymptomState.YES = Yes + + + + # TaskAssignee -TaskAssignee.ALL=All tasks -TaskAssignee.CURRENT_USER=Tasks assigned to me -TaskAssignee.OTHER_USERS=Tasks created by me +TaskAssignee.ALL = All tasks +TaskAssignee.CURRENT_USER = Tasks assigned to me +TaskAssignee.OTHER_USERS = Tasks created by me + # TaskContext -TaskContext.CASE=Case -TaskContext.CONTACT=Contact -TaskContext.EVENT=Event -TaskContext.GENERAL=General -TaskContext.TRAVEL_ENTRY=Travel entry -TaskContext.ENVIRONMENT=Environment +TaskContext.CASE = Case +TaskContext.CONTACT = Contact +TaskContext.EVENT = Event +TaskContext.GENERAL = General +TaskContext.TRAVEL_ENTRY = Travel entry +TaskContext.ENVIRONMENT = Environment + # TaskDateType -TaskDateType.SUGGESTED_START_DATE=Suggested start date -TaskDateType.DUE_DATE=Due date +TaskDateType.SUGGESTED_START_DATE = Suggested start date +TaskDateType.DUE_DATE = Due date + # TaskPriority -TaskPriority.HIGH=High -TaskPriority.LOW=Low -TaskPriority.NORMAL=Normal +TaskPriority.HIGH = High +TaskPriority.LOW = Low +TaskPriority.NORMAL = Normal + # TaskStatus -TaskStatus.DONE=done -TaskStatus.NOT_EXECUTABLE=not executable -TaskStatus.PENDING=pending -TaskStatus.IN_PROGRESS=in progress -TaskStatus.REMOVED=removed +TaskStatus.DONE = done +TaskStatus.NOT_EXECUTABLE = not executable +TaskStatus.PENDING = pending +TaskStatus.IN_PROGRESS = in progress +TaskStatus.REMOVED = removed + # TaskType -TaskType.ACTIVE_SEARCH_FOR_OTHER_CASES=active search for other cases e.g. in household or workplace -TaskType.ANIMAL_DEPOPULATION=depopulation of animals -TaskType.ANIMAL_TESTING=testing of animals -TaskType.CASE_BURIAL=safe burial / cremation -TaskType.CASE_INVESTIGATION=case investigation -TaskType.CASE_ISOLATION=case isolation -TaskType.CASE_MANAGEMENT=case management -TaskType.CONTACT_FOLLOW_UP=contact follow up -TaskType.CONTACT_INVESTIGATION=contact investigation -TaskType.CONTACT_MANAGEMENT=contact management -TaskType.CONTACT_TRACING=contact tracing -TaskType.DAILY_REPORT_GENERATION=generate daily report -TaskType.DECONTAMINATION_DISINFECTION_ACTIVITIES=decontamination / disinfection activities -TaskType.ENVIRONMENTAL_HEALTH_ACTIVITIES=environmental health activities -TaskType.EVENT_INVESTIGATION=investigate the event -TaskType.EVENT_CONTINUE_INVESTIGATION=continue the investigation following a change in the event -TaskType.EVENT_REQUEST_ADDITIONAL_INFORMATION=request for an investigation report / a summary / additional information to be collected -TaskType.OTHER=other task as described in comments -TaskType.QUARANTINE_MANAGEMENT=quarantine management -TaskType.QUARANTINE_ORDER_SEND=send quarantine order -TaskType.QUARANTINE_PLACE=quarantine place -TaskType.SAMPLE_COLLECTION=sample collection -TaskType.SOURCECASE_TRACING=source case tracing -TaskType.SURVEILLANCE_REPORT_GENERATION=generate surveillance report -TaskType.TREATMENT_CENTER_ESTABLISHMENT=establishment of local treatment center -TaskType.VACCINATION_ACTIVITIES=vaccination activities -TaskType.WEEKLY_REPORT_GENERATION=generate weekly report -TaskType.ENVIRONMENT_INVESTIGATION=environment investigation +TaskType.ACTIVE_SEARCH_FOR_OTHER_CASES = active search for other cases e.g. in household or workplace +TaskType.ANIMAL_DEPOPULATION = depopulation of animals +TaskType.ANIMAL_TESTING = testing of animals +TaskType.CASE_BURIAL = safe burial / cremation +TaskType.CASE_INVESTIGATION = case investigation +TaskType.CASE_ISOLATION = case isolation +TaskType.CASE_MANAGEMENT = case management +TaskType.CONTACT_FOLLOW_UP = contact follow up +TaskType.CONTACT_INVESTIGATION = contact investigation +TaskType.CONTACT_MANAGEMENT = contact management +TaskType.CONTACT_TRACING = contact tracing +TaskType.DAILY_REPORT_GENERATION = generate daily report +TaskType.DECONTAMINATION_DISINFECTION_ACTIVITIES = decontamination / disinfection activities +TaskType.ENVIRONMENTAL_HEALTH_ACTIVITIES = environmental health activities +TaskType.EVENT_INVESTIGATION = investigate the event +TaskType.EVENT_CONTINUE_INVESTIGATION = continue the investigation following a change in the event +TaskType.EVENT_REQUEST_ADDITIONAL_INFORMATION = request for an investigation report / a summary / additional information to be collected +TaskType.OTHER = other task as described in comments +TaskType.QUARANTINE_MANAGEMENT = quarantine management +TaskType.QUARANTINE_ORDER_SEND = send quarantine order +TaskType.QUARANTINE_PLACE = quarantine place +TaskType.SAMPLE_COLLECTION = sample collection +TaskType.SOURCECASE_TRACING = source case tracing +TaskType.SURVEILLANCE_REPORT_GENERATION = generate surveillance report +TaskType.TREATMENT_CENTER_ESTABLISHMENT = establishment of local treatment center +TaskType.VACCINATION_ACTIVITIES = vaccination activities +TaskType.WEEKLY_REPORT_GENERATION = generate weekly report +TaskType.ENVIRONMENT_INVESTIGATION = environment investigation + # TemperatureSource TemperatureSource.AXILLARY=axillary -TemperatureSource.NON_CONTACT=Non-contact (infrared) +TemperatureSource.NON_CONTACT = Non-contact (infrared) TemperatureSource.ORAL=oral TemperatureSource.RECTAL=rectal + #TracingApp -TracingApp.CORONA_WARN_APP=Corona warn app -TracingApp.OTHER=Other -TracingApp.UNKNOWN=Unknown +TracingApp.CORONA_WARN_APP = Corona warn app +TracingApp.OTHER = Other +TracingApp.UNKNOWN = Unknown + # TravelType -TravelType.ABROAD=Abroad -TravelType.WITHIN_COUNTRY=Within the country +TravelType.ABROAD = Abroad +TravelType.WITHIN_COUNTRY = Within the country + # TravelAccommodation -TravelAccommodation.HOTEL=Hotel -TravelAccommodation.CAMPING=Camping site -TravelAccommodation.RENTED_APARTMENT_OR_HOUSE=Rented apartment/ house -TravelAccommodation.FRIENDS_OR_FAMILY=Friends/Family -TravelAccommodation.OTHER=Other +TravelAccommodation.HOTEL = Hotel +TravelAccommodation.CAMPING = Camping site +TravelAccommodation.RENTED_APARTMENT_OR_HOUSE = Rented apartment/ house +TravelAccommodation.FRIENDS_OR_FAMILY = Friends/Family +TravelAccommodation.OTHER = Other + # TreatmentRoute -TreatmentRoute.ORAL=Oral -TreatmentRoute.IV=IV -TreatmentRoute.RECTAL=Rectal -TreatmentRoute.TOPICAL=Topical -TreatmentRoute.OTHER=Other +TreatmentRoute.ORAL = Oral +TreatmentRoute.IV = IV +TreatmentRoute.RECTAL = Rectal +TreatmentRoute.TOPICAL = Topical +TreatmentRoute.OTHER = Other + # TreatmentType -TreatmentType.DRUG_INTAKE=Drug intake -TreatmentType.ORAL_REHYDRATION_SALTS=Oral rehydration salts -TreatmentType.BLOOD_TRANSFUSION=Blood transfusion -TreatmentType.RENAL_REPLACEMENT_THERAPY=Renal replacement therapy -TreatmentType.IV_FLUID_THERAPY=IV fluid therapy -TreatmentType.OXYGEN_THERAPY=Oxygen therapy -TreatmentType.INVASIVE_MECHANICAL_VENTILATION=Invasive mechanical ventilation -TreatmentType.VASOPRESSORS_INOTROPES=Vasopressors/Inotropes -TreatmentType.OTHER=Other +TreatmentType.DRUG_INTAKE = Drug intake +TreatmentType.ORAL_REHYDRATION_SALTS = Oral rehydration salts +TreatmentType.BLOOD_TRANSFUSION = Blood transfusion +TreatmentType.RENAL_REPLACEMENT_THERAPY = Renal replacement therapy +TreatmentType.IV_FLUID_THERAPY = IV fluid therapy +TreatmentType.OXYGEN_THERAPY = Oxygen therapy +TreatmentType.INVASIVE_MECHANICAL_VENTILATION = Invasive mechanical ventilation +TreatmentType.VASOPRESSORS_INOTROPES = Vasopressors/Inotropes +TreatmentType.OTHER = Other + # Trimester -Trimester.FIRST=First -Trimester.SECOND=Second -Trimester.THIRD=Third -Trimester.UNKNOWN=Unknown +Trimester.FIRST = First +Trimester.SECOND = Second +Trimester.THIRD = Third +Trimester.UNKNOWN = Unknown + TypeOfAnimal.BAT=Bat or its excreta TypeOfAnimal.POULTRY=Poultry or wild bird TypeOfAnimal.CAMEL=Camel @@ -1440,282 +1595,288 @@ TypeOfAnimal.GOAT=Goat TypeOfAnimal.HORSE=Horse TypeOfAnimal.SHEEP=Sheep TypeOfAnimal.OTHER=Other + TypeOfChildcareFacility.NURSERY_CRECHE=Nursery/Creche TypeOfChildcareFacility.NURSERY_SCHOOL=Nursery School TypeOfChildcareFacility.CHILDMINDER_CENTER=Childminder Centre TypeOfChildcareFacility.CHILDCARE_CENTER=Childcare Centre TypeOfChildcareFacility.SCHOOL=School TypeOfChildcareFacility.OTHER=Other + # TypeOfDrug -TypeOfDrug.ANTIMICROBIAL=Antimicrobial -TypeOfDrug.ANTIVIRAL=Antiviral -TypeOfDrug.ANTIBIOTIC=Antibiotic -TypeOfDrug.OTHER=Other +TypeOfDrug.ANTIMICROBIAL = Antimicrobial +TypeOfDrug.ANTIVIRAL = Antiviral +TypeOfDrug.ANTIBIOTIC = Antibiotic +TypeOfDrug.OTHER = Other + # Drug -Drug.AMIKACIN=Amikacin -Drug.BEDAQUILINE=Bedaquiline -Drug.CAPREOMYCIN=Capreomycin -Drug.CIPROFLOXACIN=Ciprofloxacin -Drug.DELAMANID=Delamanid -Drug.ETHAMBUTOL=Ethambutol -Drug.GATIFLOXACIN=Gatifloxacin -Drug.ISONIAZID=Isoniazid -Drug.KANAMYCIN=Kanamycin -Drug.LEVOFLOXACIN=Levofloxacin -Drug.MOXIFLOXACIN=Moxifloxacin -Drug.OFLOXACIN=Ofloxacin -Drug.RIFAMPICIN=Rifampicin -Drug.STREPTOMYCIN=Streptomycin -Drug.CEFTRIAXONE=Ceftriaxone -Drug.PENICILLIN=Penicillin -Drug.ERYTHROMYCIN=Erythromycin -Drug.OTHER=Other -DrugSusceptibilityType.NOT_APPLICABLE=Not applicable -DrugSusceptibilityType.RESISTANT=Resistant -DrugSusceptibilityType.SUSCEPTIBLE=Susceptible -DrugSusceptibilityType.UNKNOWN=Unknown -DrugSusceptibilityType.INTERMEDIATE=Intermediate +Drug.AMIKACIN = Amikacin +Drug.BEDAQUILINE = Bedaquiline +Drug.CAPREOMYCIN = Capreomycin +Drug.CIPROFLOXACIN = Ciprofloxacin +Drug.DELAMANID = Delamanid +Drug.ETHAMBUTOL = Ethambutol +Drug.GATIFLOXACIN = Gatifloxacin +Drug.ISONIAZID = Isoniazid +Drug.KANAMYCIN = Kanamycin +Drug.LEVOFLOXACIN = Levofloxacin +Drug.MOXIFLOXACIN = Moxifloxacin +Drug.OFLOXACIN = Ofloxacin +Drug.RIFAMPICIN = Rifampicin +Drug.STREPTOMYCIN =Streptomycin +Drug.CEFTRIAXONE = Ceftriaxone +Drug.PENICILLIN = Penicillin +Drug.ERYTHROMYCIN = Erythromycin +Drug.OTHER = Other + +DrugSusceptibilityType.NOT_APPLICABLE = Not applicable +DrugSusceptibilityType.RESISTANT = Resistant +DrugSusceptibilityType.SUSCEPTIBLE = Susceptible +DrugSusceptibilityType.UNKNOWN = Unknown +DrugSusceptibilityType.INTERMEDIATE = Intermediate + # TypeOfPlace -TypeOfPlace.FACILITY=Facility -TypeOfPlace.FACILITY_23_IFSG=Facility (§ 23 IfSG) -TypeOfPlace.COMMUNITY_FACILITY=Community facility (§ 33 IfSG) -TypeOfPlace.FACILITY_36_IFSG=Facility (§ 36 IfSG) -TypeOfPlace.FESTIVITIES=Festivities -TypeOfPlace.HOME=Home -TypeOfPlace.HOSPITAL=Hospital -TypeOfPlace.MEANS_OF_TRANSPORT=Means of transport -TypeOfPlace.OTHER=Other -TypeOfPlace.PUBLIC_PLACE=Public place -TypeOfPlace.UNKNOWN=Unknown -TypeOfPlace.SCATTERED=Scattered -TypeOfPlace.SCHOOL=School -TypeOfPlace.EDUCATION_AND_CHILDCARE=Education and childcare -TypeOfPlace.NURSING_HOME=Nursing home -TypeOfPlace.ASYLUM_SEEKERS_SHELTER=Asylum seekers' shelter +TypeOfPlace.FACILITY = Facility +TypeOfPlace.FACILITY_23_IFSG = Facility (§ 23 IfSG) +TypeOfPlace.COMMUNITY_FACILITY = Community facility (§ 33 IfSG) +TypeOfPlace.FACILITY_36_IFSG = Facility (§ 36 IfSG) +TypeOfPlace.FESTIVITIES = Festivities +TypeOfPlace.HOME = Home +TypeOfPlace.HOSPITAL = Hospital +TypeOfPlace.MEANS_OF_TRANSPORT = Means of transport +TypeOfPlace.OTHER = Other +TypeOfPlace.PUBLIC_PLACE = Public place +TypeOfPlace.UNKNOWN = Unknown +TypeOfPlace.SCATTERED = Scattered +TypeOfPlace.SCHOOL = School +TypeOfPlace.EDUCATION_AND_CHILDCARE = Education and childcare +TypeOfPlace.NURSING_HOME = Nursing home +TypeOfPlace.ASYLUM_SEEKERS_SHELTER = Asylum seekers' shelter + # UserRight -UserRight.CASE_ARCHIVE=Archive cases -UserRight.CASE_CHANGE_DISEASE=Edit case disease -UserRight.CASE_CHANGE_EPID_NUMBER=Edit case epid number -UserRight.CASE_CLASSIFY=Edit case classification and outcome -UserRight.CASE_CREATE=Create new cases -UserRight.CASE_DELETE=Delete cases from the system -UserRight.CASE_EDIT=Edit existing cases -UserRight.CASE_EXPORT=Export cases from SORMAS -UserRight.CASE_IMPORT=Import cases into SORMAS -UserRight.CASE_INVESTIGATE=Edit case investigation status -UserRight.CASE_TRANSFER=Transfer cases to another region/district/facility -UserRight.CASE_REFER_FROM_POE=Refer case from point of entry -UserRight.CASE_RESPONSIBLE=Can be responsible for a case -UserRight.CASE_VIEW=View existing cases -UserRight.CASE_VIEW_ARCHIVED=View archived cases -UserRight.CONTACT_ASSIGN=Assign contacts to officers -UserRight.CONTACT_CLASSIFY=Edit contact classification -UserRight.CONTACT_CONVERT=Create resulting cases from contacts -UserRight.CONTACT_CREATE=Create new contacts -UserRight.CONTACT_IMPORT=Import contacts -UserRight.CONTACT_DELETE=Delete contacts from the system -UserRight.CONTACT_EDIT=Edit existing contacts -UserRight.CONTACT_EXPORT=Export contacts from SORMAS -UserRight.CONTACT_RESPONSIBLE=Can be responsible for a contact -UserRight.CONTACT_VIEW=View existing contacts -UserRight.CONTACT_VIEW_ARCHIVED=View archived contacts -UserRight.CONTACT_ARCHIVE=Archive contacts -UserRight.DASHBOARD_CONTACT_VIEW=Access the contact supervisor dashboard -UserRight.DASHBOARD_SURVEILLANCE_VIEW=Access the surveillance supervisor dashboard -UserRight.DASHBOARD_SAMPLES_VIEW=Access the samples dashboard -UserRight.DASHBOARD_ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_VIEW=Access the adverse events dashboard -UserRight.DATABASE_EXPORT_ACCESS=Export the whole database -UserRight.EVENT_ARCHIVE=Archive events -UserRight.EVENT_CREATE=Create new events -UserRight.EVENT_EDIT=Edit existing events -UserRight.EVENT_EXPORT=Export events from SORMAS -UserRight.EVENT_RESPONSIBLE=Can be responsible for an event -UserRight.EVENT_VIEW=View existing events -UserRight.EVENT_VIEW_ARCHIVED=View archived events -UserRight.EVENTPARTICIPANT_CREATE=Create new event participants -UserRight.EVENTPARTICIPANT_EDIT=Edit existing event participants -UserRight.EVENTPARTICIPANT_ARCHIVE=Event participant archive -UserRight.EVENTPARTICIPANT_VIEW=View existing event participants -UserRight.EVENTPARTICIPANT_VIEW_ARCHIVED=View archived event participants -UserRight.INFRASTRUCTURE_CREATE=Create new regions/districts/communities/facilities -UserRight.INFRASTRUCTURE_EDIT=Edit regions/districts/communities/facilities -UserRight.INFRASTRUCTURE_VIEW=View regions/districts/communities/facilities in the system -UserRight.INFRASTRUCTURE_VIEW_ARCHIVED=View archived infrastructure data -UserRight.PERFORM_BULK_OPERATIONS=Perform bulk operations in lists -UserRight.SAMPLE_CREATE=Create new samples -UserRight.SAMPLE_EDIT=Edit existing samples -UserRight.SAMPLE_EXPORT=Export samples from SORMAS -UserRight.SAMPLE_DELETE=Delete samples from the system -UserRight.SAMPLE_SEE_ARCHIVED=View archived samples -UserRight.SAMPLE_TRANSFER=Transfer samples to another lab -UserRight.SAMPLE_VIEW=View existing samples -UserRight.SAMPLETEST_CREATE=Create new sample tests -UserRight.SAMPLETEST_EDIT=Edit existing sample tests -UserRight.STATISTICS_EXPORT=Export detailed statistics from SORMAS -UserRight.TASK_ASSIGN=Assign tasks to users -UserRight.TASK_CREATE=Create new tasks -UserRight.TASK_EDIT=Edit existing tasks -UserRight.TASK_SEE_ARCHIVED=View archived tasks -UserRight.TASK_VIEW=View existing tasks -UserRight.TASK_VIEW_ARCHIVED=View archived tasks -UserRight.USER_CREATE=Create new users -UserRight.USER_EDIT=Edit existing users -UserRight.USER_VIEW=View existing users -UserRight.USER_ROLE_EDIT=Edit existing user roles -UserRight.USER_ROLE_DELETE=Delete user roles from the system -UserRight.USER_ROLE_VIEW=View existing user roles -UserRight.VISIT_CREATE=Create new visits -UserRight.VISIT_EDIT=Edit existing visits -UserRight.WEEKLYREPORT_CREATE=Create weekly reports -UserRight.WEEKLYREPORT_VIEW=View weekly reports -UserRight.CASE_MERGE=Merge cases -UserRight.PERSON_VIEW=View existing persons -UserRight.PERSON_EDIT=Edit existing persons -UserRight.PERSON_DELETE=Delete persons from the system -UserRight.PERSON_CONTACT_DETAILS_DELETE=Delete person contact details -UserRight.SAMPLE_EDIT_NOT_OWNED=Edit samples reported by other users -UserRight.PATHOGEN_TEST_CREATE=Create new pathogen tests -UserRight.PATHOGEN_TEST_EDIT=Edit existing pathogen tests -UserRight.PATHOGEN_TEST_DELETE=Delete pathogen tests from the system -UserRight.ADDITIONAL_TEST_VIEW=View existing additional tests -UserRight.ADDITIONAL_TEST_CREATE=Create new additional tests -UserRight.ADDITIONAL_TEST_EDIT=Edit existing additional tests -UserRight.ADDITIONAL_TEST_DELETE=Delete additional tests from the system -UserRight.CONTACT_REASSIGN_CASE=Reassign the source case of contacts -UserRight.MANAGE_EXTERNAL_SYMPTOM_JOURNAL=Manage external symptom journal -UserRight.VISIT_DELETE=Delete visits from the system -UserRight.VISIT_EXPORT=Export visits from SORMAS -UserRight.TASK_DELETE=Delete tasks from the system -UserRight.TASK_EXPORT=Export tasks from SORMAS -UserRight.TASK_ARCHIVE=Archive tasks -UserRight.ACTION_CREATE=Create new actions -UserRight.ACTION_DELETE=Delete actions from the system -UserRight.ACTION_EDIT=Edit existing actions -UserRight.EVENT_IMPORT=Import events -UserRight.EVENT_DELETE=Delete events from the system -UserRight.EVENTPARTICIPANT_DELETE=Delete event participants from the system -UserRight.EVENTPARTICIPANT_IMPORT=Import event participants -UserRight.SEND_MANUAL_EXTERNAL_MESSAGES=Send manual external messages -UserRight.STATISTICS_ACCESS=Access statistics -UserRight.MANAGE_PUBLIC_EXPORT_CONFIGURATION=Manage public export configurations -UserRight.INFRASTRUCTURE_EXPORT=Export infrastructure data from SORMAS -UserRight.INFRASTRUCTURE_IMPORT=Import infrastructure data -UserRight.INFRASTRUCTURE_ARCHIVE=Archive infrastructure data -UserRight.DASHBOARD_CONTACT_VIEW_TRANSMISSION_CHAINS=View contact transmission chains on the dashboard -UserRight.DASHBOARD_CAMPAIGNS_VIEW=Access campaigns dashboard -UserRight.CASE_CLINICIAN_VIEW=Access case sections concerned with clinician -UserRight.THERAPY_VIEW=View existing therapies -UserRight.PRESCRIPTION_CREATE=Create new prescriptions -UserRight.PRESCRIPTION_EDIT=Edit existing prescriptions -UserRight.PRESCRIPTION_DELETE=Delete prescriptions from the system -UserRight.TREATMENT_CREATE=Create new treatments -UserRight.TREATMENT_EDIT=Edit existing treatments -UserRight.TREATMENT_DELETE=Delete treatments from the system -UserRight.CLINICAL_COURSE_VIEW=View the clinical course of cases -UserRight.CLINICAL_COURSE_EDIT=Edit the clinical course of cases -UserRight.CLINICAL_VISIT_CREATE=Create new clinical visits -UserRight.CLINICAL_VISIT_EDIT=Edit existing clinical visits -UserRight.CLINICAL_VISIT_DELETE=Delete clinical visits from the system -UserRight.PORT_HEALTH_INFO_VIEW=View port health info -UserRight.PORT_HEALTH_INFO_EDIT=Edit existing port health info -UserRight.POPULATION_MANAGE=Manage population data -UserRight.DOCUMENT_TEMPLATE_MANAGEMENT=Manage document templates -UserRight.QUARANTINE_ORDER_CREATE=Create new quarantine orders -UserRight.LINE_LISTING_CONFIGURE=Configure line listing -UserRight.AGGREGATE_REPORT_VIEW=Create new aggregate reports -UserRight.AGGREGATE_REPORT_EXPORT=Export aggregate reports from SORMAS -UserRight.AGGREGATE_REPORT_EDIT=Edit existing aggregate reports -UserRight.SEE_PERSONAL_DATA_IN_JURISDICTION=See personal data in jurisdiction -UserRight.SEE_PERSONAL_DATA_OUTSIDE_JURISDICTION=See personal data outside jurisdiction -UserRight.SEE_SENSITIVE_DATA_IN_JURISDICTION=See sensitive data in jurisdiction -UserRight.SEE_SENSITIVE_DATA_OUTSIDE_JURISDICTION=See sensitive data outside jurisdiction -UserRight.CAMPAIGN_VIEW=View existing campaigns -UserRight.CAMPAIGN_VIEW_ARCHIVED=View archived campaigns -UserRight.CAMPAIGN_EDIT=Edit existing campaigns -UserRight.CAMPAIGN_ARCHIVE=Archive campaigns -UserRight.CAMPAIGN_DELETE=Delete campaigns from the system -UserRight.CAMPAIGN_FORM_DATA_VIEW=View existing campaign form data -UserRight.CAMPAIGN_FORM_DATA_VIEW_ARCHIVED=View archived campaign form data -UserRight.CAMPAIGN_FORM_DATA_EDIT=Edit existing campaign form data -UserRight.CAMPAIGN_FORM_DATA_ARCHIVE=Archive campaign form data -UserRight.CAMPAIGN_FORM_DATA_DELETE=Delete campaign form data from the system -UserRight.CAMPAIGN_FORM_DATA_EXPORT=Export campaign form data from SORMAS -UserRight.BAG_EXPORT=Perform BAG export -UserRight.SORMAS_TO_SORMAS_SHARE=Share data from one SORMAS instance to another -UserRight.SORMAS_TO_SORMAS_PROCESS=Process shares -UserRight.EXTERNAL_SURVEILLANCE_SHARE=Send data to external surveillance tool -UserRight.EXTERNAL_SURVEILLANCE_DELETE=Delete data in external surveillance tool -UserRight.EXTERNAL_MESSAGE_PUSH=Push external messages to the system -UserRight.EXTERNAL_MESSAGE_ACCESS=Access external messages -UserRight.EXTERNAL_MESSAGE_LABORATORY_VIEW=View laboratory messages -UserRight.EXTERNAL_MESSAGE_DOCTOR_DECLARATION_VIEW=View doctor declaration messages -UserRight.EXTERNAL_MESSAGE_LABORATORY_PROCESS=Work with laboratory messages -UserRight.EXTERNAL_MESSAGE_DOCTOR_DECLARATION_PROCESS=Work with doctor declaration messages -UserRight.EXTERNAL_MESSAGE_LABORATORY_DELETE=Delete laboratory messages from the system -UserRight.EXTERNAL_MESSAGE_DOCTOR_DECLARATION_DELETE=Delete doctor declaration messages from the system -UserRight.CASE_SHARE=Share cases with the whole country -UserRight.IMMUNIZATION_VIEW=View existing immunizations and vaccinations -UserRight.IMMUNIZATION_VIEW_ARCHIVED=View archived immunizations and vaccinations -UserRight.IMMUNIZATION_CREATE=Create new immunizations and vaccinations -UserRight.IMMUNIZATION_EDIT=Edit existing immunizations and vaccinations -UserRight.IMMUNIZATION_DELETE=Delete immunizations and vaccinations from the system -UserRight.IMMUNIZATION_ARCHIVE=Archive immunizations -UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_VIEW=View existing adverse events following immunization -UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_CREATE=Create new adverse event following immunization -UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_EDIT=Edit existing adverse event following immunization -UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_DELETE=Delete adverse events following immunization from the system -UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_ARCHIVE=Archive adverse events following immunization -UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_EXPORT=Export adverse events following immunization -UserRight.PERSON_EXPORT=Export persons -UserRight.CONTACT_MERGE=Merge contacts -UserRight.EVENTGROUP_CREATE=Create new event groups -UserRight.EVENTGROUP_EDIT=Edit existing event groups -UserRight.EVENTGROUP_LINK=Link events to event groups -UserRight.EVENTGROUP_ARCHIVE=Archive event groups -UserRight.EVENTGROUP_DELETE=Delete event groups from the system -UserRight.EVENTGROUP_VIEW_ARCHIVED=View archived event groups from the system -UserRight.TRAVEL_ENTRY_MANAGEMENT_ACCESS=Access the travel entry directory -UserRight.TRAVEL_ENTRY_VIEW=View existing travel entries -UserRight.TRAVEL_ENTRY_VIEW_ARCHIVED=View archived travel entries -UserRight.TRAVEL_ENTRY_CREATE=Create new travel entries -UserRight.TRAVEL_ENTRY_EDIT=Edit existing travel entries -UserRight.TRAVEL_ENTRY_DELETE=Delete travel entries from the system -UserRight.TRAVEL_ENTRY_ARCHIVE=Archive travel entries -UserRight.EXPORT_DATA_PROTECTION_DATA=Export data protection data -UserRight.OUTBREAK_VIEW=View outbreaks -UserRight.OUTBREAK_EDIT=Edit outbreaks -UserRight.PERFORM_BULK_OPERATIONS_PSEUDONYM=Perform bulk pseudonomization -UserRight.SORMAS_TO_SORMAS_CLIENT=Sormas to Sormas Client -UserRight.SORMAS_REST=Access Sormas REST -UserRight.EXTERNAL_VISITS=External visits -UserRight.SORMAS_UI=Access Sormas UI -UserRight.DEV_MODE=Access developer options -UserRight.CUSTOMIZABLE_ENUM_MANAGEMENT=Manage customizable enums -UserRight.DISEASE_MANAGEMENT=Disease management -UserRight.DOCUMENT_VIEW=View existing documents -UserRight.DOCUMENT_UPLOAD=Upload documents -UserRight.DOCUMENT_DELETE=Delete documents from the system -UserRight.PERSON_MERGE=Merge persons -UserRight.ENVIRONMENT_VIEW=View existing environments -UserRight.ENVIRONMENT_CREATE=Create new environments -UserRight.ENVIRONMENT_EDIT=Edit existing environments -UserRight.ENVIRONMENT_ARCHIVE=Archive environments -UserRight.ENVIRONMENT_VIEW_ARCHIVED=View archived environments -UserRight.ENVIRONMENT_DELETE=Delete environments from the system -UserRight.ENVIRONMENT_IMPORT=Import environments -UserRight.ENVIRONMENT_EXPORT=Export environments -UserRight.ENVIRONMENT_LINK=Linking the environments -UserRight.ENVIRONMENT_SAMPLE_VIEW=View existing environment samples -UserRight.ENVIRONMENT_SAMPLE_CREATE=Create new environment samples -UserRight.ENVIRONMENT_SAMPLE_EDIT=Edit existing environment samples -UserRight.ENVIRONMENT_SAMPLE_EDIT_DISPATCH=Edit environment samples dispatch information -UserRight.ENVIRONMENT_SAMPLE_EDIT_RECEIVAL=Edit environment samples receival information -UserRight.ENVIRONMENT_SAMPLE_DELETE=Delete environment samples from the system -UserRight.ENVIRONMENT_SAMPLE_IMPORT=Import environment samples -UserRight.ENVIRONMENT_SAMPLE_EXPORT=Export environment samples -UserRight.ENVIRONMENT_PATHOGEN_TEST_CREATE=Create environment sample pathogen tests -UserRight.ENVIRONMENT_PATHOGEN_TEST_EDIT=Edit environment sample pathogen tests -UserRight.ENVIRONMENT_PATHOGEN_TEST_DELETE=Delete environment sample pathogen tests +UserRight.CASE_ARCHIVE = Archive cases +UserRight.CASE_CHANGE_DISEASE = Edit case disease +UserRight.CASE_CHANGE_EPID_NUMBER = Edit case epid number +UserRight.CASE_CLASSIFY = Edit case classification and outcome +UserRight.CASE_CREATE = Create new cases +UserRight.CASE_DELETE = Delete cases from the system +UserRight.CASE_EDIT = Edit existing cases +UserRight.CASE_EXPORT = Export cases from SORMAS +UserRight.CASE_IMPORT = Import cases into SORMAS +UserRight.CASE_INVESTIGATE = Edit case investigation status +UserRight.CASE_TRANSFER = Transfer cases to another region/district/facility +UserRight.CASE_REFER_FROM_POE = Refer case from point of entry +UserRight.CASE_RESPONSIBLE = Can be responsible for a case +UserRight.CASE_VIEW = View existing cases +UserRight.CASE_VIEW_ARCHIVED = View archived cases +UserRight.CONTACT_ASSIGN = Assign contacts to officers +UserRight.CONTACT_CLASSIFY = Edit contact classification +UserRight.CONTACT_CONVERT = Create resulting cases from contacts +UserRight.CONTACT_CREATE = Create new contacts +UserRight.CONTACT_IMPORT = Import contacts +UserRight.CONTACT_DELETE = Delete contacts from the system +UserRight.CONTACT_EDIT = Edit existing contacts +UserRight.CONTACT_EXPORT = Export contacts from SORMAS +UserRight.CONTACT_RESPONSIBLE = Can be responsible for a contact +UserRight.CONTACT_VIEW = View existing contacts +UserRight.CONTACT_VIEW_ARCHIVED = View archived contacts +UserRight.CONTACT_ARCHIVE = Archive contacts +UserRight.DASHBOARD_CONTACT_VIEW = Access the contact supervisor dashboard +UserRight.DASHBOARD_SURVEILLANCE_VIEW = Access the surveillance supervisor dashboard +UserRight.DASHBOARD_SAMPLES_VIEW = Access the samples dashboard +UserRight.DASHBOARD_ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_VIEW = Access the adverse events dashboard +UserRight.DATABASE_EXPORT_ACCESS = Export the whole database +UserRight.EVENT_ARCHIVE = Archive events +UserRight.EVENT_CREATE = Create new events +UserRight.EVENT_EDIT = Edit existing events +UserRight.EVENT_EXPORT = Export events from SORMAS +UserRight.EVENT_RESPONSIBLE = Can be responsible for an event +UserRight.EVENT_VIEW = View existing events +UserRight.EVENT_VIEW_ARCHIVED = View archived events +UserRight.EVENTPARTICIPANT_CREATE = Create new event participants +UserRight.EVENTPARTICIPANT_EDIT = Edit existing event participants +UserRight.EVENTPARTICIPANT_ARCHIVE = Event participant archive +UserRight.EVENTPARTICIPANT_VIEW = View existing event participants +UserRight.EVENTPARTICIPANT_VIEW_ARCHIVED = View archived event participants +UserRight.INFRASTRUCTURE_CREATE = Create new regions/districts/communities/facilities +UserRight.INFRASTRUCTURE_EDIT = Edit regions/districts/communities/facilities +UserRight.INFRASTRUCTURE_VIEW = View regions/districts/communities/facilities in the system +UserRight.INFRASTRUCTURE_VIEW_ARCHIVED = View archived infrastructure data +UserRight.PERFORM_BULK_OPERATIONS = Perform bulk operations in lists +UserRight.SAMPLE_CREATE = Create new samples +UserRight.SAMPLE_EDIT = Edit existing samples +UserRight.SAMPLE_EXPORT = Export samples from SORMAS +UserRight.SAMPLE_DELETE = Delete samples from the system +UserRight.SAMPLE_SEE_ARCHIVED = View archived samples +UserRight.SAMPLE_TRANSFER = Transfer samples to another lab +UserRight.SAMPLE_VIEW = View existing samples +UserRight.SAMPLETEST_CREATE = Create new sample tests +UserRight.SAMPLETEST_EDIT = Edit existing sample tests +UserRight.STATISTICS_EXPORT = Export detailed statistics from SORMAS +UserRight.TASK_ASSIGN = Assign tasks to users +UserRight.TASK_CREATE = Create new tasks +UserRight.TASK_EDIT = Edit existing tasks +UserRight.TASK_SEE_ARCHIVED = View archived tasks +UserRight.TASK_VIEW = View existing tasks +UserRight.TASK_VIEW_ARCHIVED = View archived tasks +UserRight.USER_CREATE = Create new users +UserRight.USER_EDIT = Edit existing users +UserRight.USER_VIEW = View existing users +UserRight.USER_ROLE_EDIT = Edit existing user roles +UserRight.USER_ROLE_DELETE = Delete user roles from the system +UserRight.USER_ROLE_VIEW = View existing user roles +UserRight.VISIT_CREATE = Create new visits +UserRight.VISIT_EDIT = Edit existing visits +UserRight.WEEKLYREPORT_CREATE = Create weekly reports +UserRight.WEEKLYREPORT_VIEW = View weekly reports +UserRight.CASE_MERGE = Merge cases +UserRight.PERSON_VIEW = View existing persons +UserRight.PERSON_EDIT = Edit existing persons +UserRight.PERSON_DELETE = Delete persons from the system +UserRight.PERSON_CONTACT_DETAILS_DELETE = Delete person contact details +UserRight.SAMPLE_EDIT_NOT_OWNED = Edit samples reported by other users +UserRight.PATHOGEN_TEST_CREATE = Create new pathogen tests +UserRight.PATHOGEN_TEST_EDIT = Edit existing pathogen tests +UserRight.PATHOGEN_TEST_DELETE = Delete pathogen tests from the system +UserRight.ADDITIONAL_TEST_VIEW = View existing additional tests +UserRight.ADDITIONAL_TEST_CREATE = Create new additional tests +UserRight.ADDITIONAL_TEST_EDIT = Edit existing additional tests +UserRight.ADDITIONAL_TEST_DELETE = Delete additional tests from the system +UserRight.CONTACT_REASSIGN_CASE = Reassign the source case of contacts +UserRight.MANAGE_EXTERNAL_SYMPTOM_JOURNAL = Manage external symptom journal +UserRight.VISIT_DELETE = Delete visits from the system +UserRight.VISIT_EXPORT = Export visits from SORMAS +UserRight.TASK_DELETE = Delete tasks from the system +UserRight.TASK_EXPORT = Export tasks from SORMAS +UserRight.TASK_ARCHIVE = Archive tasks +UserRight.ACTION_CREATE = Create new actions +UserRight.ACTION_DELETE = Delete actions from the system +UserRight.ACTION_EDIT = Edit existing actions +UserRight.EVENT_IMPORT = Import events +UserRight.EVENT_DELETE = Delete events from the system +UserRight.EVENTPARTICIPANT_DELETE = Delete event participants from the system +UserRight.EVENTPARTICIPANT_IMPORT = Import event participants +UserRight.SEND_MANUAL_EXTERNAL_MESSAGES = Send manual external messages +UserRight.STATISTICS_ACCESS = Access statistics +UserRight.MANAGE_PUBLIC_EXPORT_CONFIGURATION = Manage public export configurations +UserRight.INFRASTRUCTURE_EXPORT = Export infrastructure data from SORMAS +UserRight.INFRASTRUCTURE_IMPORT = Import infrastructure data +UserRight.INFRASTRUCTURE_ARCHIVE = Archive infrastructure data +UserRight.DASHBOARD_CONTACT_VIEW_TRANSMISSION_CHAINS = View contact transmission chains on the dashboard +UserRight.DASHBOARD_CAMPAIGNS_VIEW = Access campaigns dashboard +UserRight.CASE_CLINICIAN_VIEW = Access case sections concerned with clinician +UserRight.THERAPY_VIEW = View existing therapies +UserRight.PRESCRIPTION_CREATE = Create new prescriptions +UserRight.PRESCRIPTION_EDIT = Edit existing prescriptions +UserRight.PRESCRIPTION_DELETE = Delete prescriptions from the system +UserRight.TREATMENT_CREATE = Create new treatments +UserRight.TREATMENT_EDIT = Edit existing treatments +UserRight.TREATMENT_DELETE = Delete treatments from the system +UserRight.CLINICAL_COURSE_VIEW = View the clinical course of cases +UserRight.CLINICAL_COURSE_EDIT = Edit the clinical course of cases +UserRight.CLINICAL_VISIT_CREATE = Create new clinical visits +UserRight.CLINICAL_VISIT_EDIT = Edit existing clinical visits +UserRight.CLINICAL_VISIT_DELETE = Delete clinical visits from the system +UserRight.PORT_HEALTH_INFO_VIEW = View port health info +UserRight.PORT_HEALTH_INFO_EDIT = Edit existing port health info +UserRight.POPULATION_MANAGE = Manage population data +UserRight.DOCUMENT_TEMPLATE_MANAGEMENT = Manage document templates +UserRight.QUARANTINE_ORDER_CREATE = Create new quarantine orders +UserRight.LINE_LISTING_CONFIGURE = Configure line listing +UserRight.AGGREGATE_REPORT_VIEW = Create new aggregate reports +UserRight.AGGREGATE_REPORT_EXPORT = Export aggregate reports from SORMAS +UserRight.AGGREGATE_REPORT_EDIT = Edit existing aggregate reports +UserRight.SEE_PERSONAL_DATA_IN_JURISDICTION = See personal data in jurisdiction +UserRight.SEE_PERSONAL_DATA_OUTSIDE_JURISDICTION = See personal data outside jurisdiction +UserRight.SEE_SENSITIVE_DATA_IN_JURISDICTION = See sensitive data in jurisdiction +UserRight.SEE_SENSITIVE_DATA_OUTSIDE_JURISDICTION = See sensitive data outside jurisdiction +UserRight.CAMPAIGN_VIEW = View existing campaigns +UserRight.CAMPAIGN_VIEW_ARCHIVED = View archived campaigns +UserRight.CAMPAIGN_EDIT = Edit existing campaigns +UserRight.CAMPAIGN_ARCHIVE = Archive campaigns +UserRight.CAMPAIGN_DELETE = Delete campaigns from the system +UserRight.CAMPAIGN_FORM_DATA_VIEW = View existing campaign form data +UserRight.CAMPAIGN_FORM_DATA_VIEW_ARCHIVED = View archived campaign form data +UserRight.CAMPAIGN_FORM_DATA_EDIT = Edit existing campaign form data +UserRight.CAMPAIGN_FORM_DATA_ARCHIVE = Archive campaign form data +UserRight.CAMPAIGN_FORM_DATA_DELETE = Delete campaign form data from the system +UserRight.CAMPAIGN_FORM_DATA_EXPORT = Export campaign form data from SORMAS +UserRight.BAG_EXPORT = Perform BAG export +UserRight.SORMAS_TO_SORMAS_SHARE = Share data from one SORMAS instance to another +UserRight.SORMAS_TO_SORMAS_PROCESS = Process shares +UserRight.EXTERNAL_SURVEILLANCE_SHARE = Send data to external surveillance tool +UserRight.EXTERNAL_SURVEILLANCE_DELETE = Delete data in external surveillance tool +UserRight.EXTERNAL_MESSAGE_PUSH = Push external messages to the system +UserRight.EXTERNAL_MESSAGE_ACCESS = Access external messages +UserRight.EXTERNAL_MESSAGE_LABORATORY_VIEW = View laboratory messages +UserRight.EXTERNAL_MESSAGE_DOCTOR_DECLARATION_VIEW = View doctor declaration messages +UserRight.EXTERNAL_MESSAGE_LABORATORY_PROCESS = Work with laboratory messages +UserRight.EXTERNAL_MESSAGE_DOCTOR_DECLARATION_PROCESS = Work with doctor declaration messages +UserRight.EXTERNAL_MESSAGE_LABORATORY_DELETE = Delete laboratory messages from the system +UserRight.EXTERNAL_MESSAGE_DOCTOR_DECLARATION_DELETE = Delete doctor declaration messages from the system +UserRight.CASE_SHARE = Share cases with the whole country +UserRight.IMMUNIZATION_VIEW = View existing immunizations and vaccinations +UserRight.IMMUNIZATION_VIEW_ARCHIVED = View archived immunizations and vaccinations +UserRight.IMMUNIZATION_CREATE = Create new immunizations and vaccinations +UserRight.IMMUNIZATION_EDIT = Edit existing immunizations and vaccinations +UserRight.IMMUNIZATION_DELETE = Delete immunizations and vaccinations from the system +UserRight.IMMUNIZATION_ARCHIVE = Archive immunizations +UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_VIEW = View existing adverse events following immunization +UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_CREATE = Create new adverse event following immunization +UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_EDIT = Edit existing adverse event following immunization +UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_DELETE = Delete adverse events following immunization from the system +UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_ARCHIVE = Archive adverse events following immunization +UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_EXPORT = Export adverse events following immunization +UserRight.PERSON_EXPORT = Export persons +UserRight.CONTACT_MERGE = Merge contacts +UserRight.EVENTGROUP_CREATE = Create new event groups +UserRight.EVENTGROUP_EDIT = Edit existing event groups +UserRight.EVENTGROUP_LINK = Link events to event groups +UserRight.EVENTGROUP_ARCHIVE = Archive event groups +UserRight.EVENTGROUP_DELETE = Delete event groups from the system +UserRight.EVENTGROUP_VIEW_ARCHIVED = View archived event groups from the system +UserRight.TRAVEL_ENTRY_MANAGEMENT_ACCESS = Access the travel entry directory +UserRight.TRAVEL_ENTRY_VIEW = View existing travel entries +UserRight.TRAVEL_ENTRY_VIEW_ARCHIVED = View archived travel entries +UserRight.TRAVEL_ENTRY_CREATE = Create new travel entries +UserRight.TRAVEL_ENTRY_EDIT = Edit existing travel entries +UserRight.TRAVEL_ENTRY_DELETE = Delete travel entries from the system +UserRight.TRAVEL_ENTRY_ARCHIVE = Archive travel entries +UserRight.EXPORT_DATA_PROTECTION_DATA = Export data protection data +UserRight.OUTBREAK_VIEW = View outbreaks +UserRight.OUTBREAK_EDIT = Edit outbreaks +UserRight.PERFORM_BULK_OPERATIONS_PSEUDONYM = Perform bulk pseudonomization +UserRight.SORMAS_TO_SORMAS_CLIENT = Sormas to Sormas Client +UserRight.SORMAS_REST = Access Sormas REST +UserRight.EXTERNAL_VISITS = External visits +UserRight.SORMAS_UI = Access Sormas UI +UserRight.DEV_MODE = Access developer options +UserRight.CUSTOMIZABLE_ENUM_MANAGEMENT = Manage customizable enums +UserRight.DISEASE_MANAGEMENT = Disease management +UserRight.DOCUMENT_VIEW = View existing documents +UserRight.DOCUMENT_UPLOAD = Upload documents +UserRight.DOCUMENT_DELETE = Delete documents from the system +UserRight.PERSON_MERGE = Merge persons +UserRight.ENVIRONMENT_VIEW = View existing environments +UserRight.ENVIRONMENT_CREATE = Create new environments +UserRight.ENVIRONMENT_EDIT = Edit existing environments +UserRight.ENVIRONMENT_ARCHIVE = Archive environments +UserRight.ENVIRONMENT_VIEW_ARCHIVED = View archived environments +UserRight.ENVIRONMENT_DELETE = Delete environments from the system +UserRight.ENVIRONMENT_IMPORT = Import environments +UserRight.ENVIRONMENT_EXPORT = Export environments +UserRight.ENVIRONMENT_LINK = Linking the environments +UserRight.ENVIRONMENT_SAMPLE_VIEW = View existing environment samples +UserRight.ENVIRONMENT_SAMPLE_CREATE = Create new environment samples +UserRight.ENVIRONMENT_SAMPLE_EDIT = Edit existing environment samples +UserRight.ENVIRONMENT_SAMPLE_EDIT_DISPATCH = Edit environment samples dispatch information +UserRight.ENVIRONMENT_SAMPLE_EDIT_RECEIVAL = Edit environment samples receival information +UserRight.ENVIRONMENT_SAMPLE_DELETE = Delete environment samples from the system +UserRight.ENVIRONMENT_SAMPLE_IMPORT = Import environment samples +UserRight.ENVIRONMENT_SAMPLE_EXPORT = Export environment samples +UserRight.ENVIRONMENT_PATHOGEN_TEST_CREATE = Create environment sample pathogen tests +UserRight.ENVIRONMENT_PATHOGEN_TEST_EDIT = Edit environment sample pathogen tests +UserRight.ENVIRONMENT_PATHOGEN_TEST_DELETE = Delete environment sample pathogen tests UserRight.EMAIL_TEMPLATE_MANAGEMENT=Manage email templates UserRight.EXTERNAL_EMAIL_SEND=Send external emails UserRight.EXTERNAL_EMAIL_ATTACH_DOCUMENTS=Attach documents to external emails @@ -1742,221 +1903,222 @@ UserRight.EPIPULSE_EXPORT_VIEW=View Epipulse export UserRight.EPIPULSE_EXPORT_CREATE=Create Epipulse export UserRight.EPIPULSE_EXPORT_DOWNLOAD=Download Epipulse export UserRight.EPIPULSE_EXPORT_DELETE=Delete Epipulse export + # UserRight descriptions -UserRight.Desc.CASE_ARCHIVE=Able to archive cases -UserRight.Desc.CASE_CHANGE_DISEASE=Able to edit case disease -UserRight.Desc.CASE_CHANGE_EPID_NUMBER=Able to edit case epid number -UserRight.Desc.CASE_CLASSIFY=Able to edit case classification and outcome -UserRight.Desc.CASE_CREATE=Able to create new cases -UserRight.Desc.CASE_DELETE=Able to delete cases from the system -UserRight.Desc.CASE_EDIT=Able to edit existing cases -UserRight.Desc.CASE_EXPORT=Able to export cases from SORMAS -UserRight.Desc.CASE_IMPORT=Able to import cases into SORMAS -UserRight.Desc.CASE_INVESTIGATE=Able to edit case investigation status -UserRight.Desc.CASE_TRANSFER=Able to transfer cases to another region/district/facility -UserRight.Desc.CASE_REFER_FROM_POE=Able to refer case from point of entry -UserRight.Desc.CASE_RESPONSIBLE=Can be responsible for a case -UserRight.Desc.CASE_VIEW=Able to view existing cases -UserRight.Desc.CASE_VIEW_ARCHIVED=Able to view archived cases -UserRight.Desc.CONTACT_ASSIGN=Able to assign contacts to officers -UserRight.Desc.CONTACT_CLASSIFY=Able to edit contact classification -UserRight.Desc.CONTACT_CONVERT=Able to create resulting cases from contacts -UserRight.Desc.CONTACT_CREATE=Able to create new contacts -UserRight.Desc.CONTACT_IMPORT=Able to import contacts -UserRight.Desc.CONTACT_DELETE=Able to delete contacts from the system -UserRight.Desc.CONTACT_EDIT=Able to edit existing contacts -UserRight.Desc.CONTACT_EXPORT=Able to export contacts from SORMAS -UserRight.Desc.CONTACT_RESPONSIBLE=Can be responsible for a contact -UserRight.Desc.CONTACT_VIEW=Able to view existing contacts -UserRight.Desc.CONTACT_VIEW_ARCHIVED=Able to view archived contacts -UserRight.Desc.CONTACT_ARCHIVE=Able to archive contacts -UserRight.Desc.DASHBOARD_CONTACT_VIEW=Able to access the contact supervisor dashboard -UserRight.Desc.DASHBOARD_SURVEILLANCE_VIEW=Able to access the surveillance supervisor dashboard -UserRight.Desc.DATABASE_EXPORT_ACCESS=Able to export the whole database -UserRight.Desc.EVENT_ARCHIVE=Able to archive events -UserRight.Desc.EVENT_CREATE=Able to create new events -UserRight.Desc.EVENT_EDIT=Able to edit existing events -UserRight.Desc.EVENT_EXPORT=Able to export events from SORMAS -UserRight.Desc.EVENT_RESPONSIBLE=Can be responsible for an event -UserRight.Desc.EVENT_VIEW=Able to view existing events -UserRight.Desc.EVENT_VIEW_ARCHIVED=Able to view archived events -UserRight.Desc.EVENTPARTICIPANT_CREATE=Able to create new event participants -UserRight.Desc.EVENTPARTICIPANT_EDIT=Able to edit existing event participants -UserRight.Desc.EVENTPARTICIPANT_ARCHIVE=Able to archive event participants -UserRight.Desc.EVENTPARTICIPANT_VIEW=Able to view existing event participants -UserRight.Desc.EVENTPARTICIPANT_VIEW_ARCHIVED=Able to view archived event participants -UserRight.Desc.INFRASTRUCTURE_CREATE=Able to create new regions/districts/communities/facilities -UserRight.Desc.INFRASTRUCTURE_EDIT=Able to edit regions/districts/communities/facilities -UserRight.Desc.INFRASTRUCTURE_VIEW=Able to view regions/districts/communities/facilities in the system -UserRight.Desc.INFRASTRUCTURE_VIEW_ARCHIVED=Able to view archived infrastructure data -UserRight.Desc.PERFORM_BULK_OPERATIONS=Able to perform bulk operations in lists -UserRight.Desc.SAMPLE_CREATE=Able to create new samples -UserRight.Desc.SAMPLE_EDIT=Able to edit existing samples -UserRight.Desc.SAMPLE_EXPORT=Able to export samples from SORMAS -UserRight.Desc.SAMPLE_DELETE=Able to delete samples from the system -UserRight.Desc.SAMPLE_TRANSFER=Able to transfer samples to another lab -UserRight.Desc.SAMPLE_VIEW=Able to view existing samples -UserRight.Desc.SAMPLETEST_CREATE=Able to create new sample tests -UserRight.Desc.SAMPLETEST_EDIT=Able to edit existing sample tests -UserRight.Desc.STATISTICS_EXPORT=Able to export detailed statistics from SORMAS -UserRight.Desc.TASK_ASSIGN=Able to assign tasks to users -UserRight.Desc.TASK_CREATE=Able to create new tasks -UserRight.Desc.TASK_EDIT=Able to edit existing tasks -UserRight.Desc.TASK_VIEW=Able to view existing tasks -UserRight.Desc.TASK_VIEW_ARCHIVED=Able to view archived tasks -UserRight.Desc.TASK_ARCHIVE=Able to archive tasks -UserRight.Desc.USER_CREATE=Able to create new users -UserRight.Desc.USER_EDIT=Able to edit existing users -UserRight.Desc.USER_VIEW=Able to view existing users -UserRight.Desc.VISIT_CREATE=Able to create new visits -UserRight.Desc.VISIT_EDIT=Able to edit existing visits -UserRight.Desc.WEEKLYREPORT_CREATE=Able to create weekly reports -UserRight.Desc.WEEKLYREPORT_VIEW=Able to view weekly reports -UserRight.Desc.CASE_MERGE=Able to merge cases -UserRight.Desc.PERSON_VIEW=Able to view existing persons -UserRight.Desc.PERSON_EDIT=Able to edit existing persons -UserRight.Desc.PERSON_DELETE=Able to delete persons from the system -UserRight.Desc.PERSON_CONTACT_DETAILS_DELETE=Able to delete person contact details -UserRight.Desc.SAMPLE_EDIT_NOT_OWNED=Able to edit samples reported by other users -UserRight.Desc.PATHOGEN_TEST_CREATE=Able to create new pathogen tests -UserRight.Desc.PATHOGEN_TEST_EDIT=Able to edit existing pathogen tests -UserRight.Desc.PATHOGEN_TEST_DELETE=Able to delete pathogen tests from the system -UserRight.Desc.ADDITIONAL_TEST_VIEW=Able to view existing additional tests -UserRight.Desc.ADDITIONAL_TEST_CREATE=Able to create new additional tests -UserRight.Desc.ADDITIONAL_TEST_EDIT=Able to edit existing additional tests -UserRight.Desc.ADDITIONAL_TEST_DELETE=Able to delete additional tests from the system -UserRight.Desc.CONTACT_REASSIGN_CASE=Able to reassign the source case of contacts -UserRight.Desc.MANAGE_EXTERNAL_SYMPTOM_JOURNAL=Able to manage external symptom journal -UserRight.Desc.VISIT_DELETE=Able to delete visits from the system -UserRight.Desc.VISIT_EXPORT=Able to export visits from SORMAS -UserRight.Desc.TASK_DELETE=Able to delete tasks from the system -UserRight.Desc.TASK_EXPORT=Able to export tasks from SORMAS -UserRight.Desc.ACTION_CREATE=Able to create new actions -UserRight.Desc.ACTION_DELETE=Able to delete actions from the system -UserRight.Desc.ACTION_EDIT=Able to edit existing actions -UserRight.Desc.EVENT_IMPORT=Able to import events -UserRight.Desc.EVENT_DELETE=Able to delete events from the system -UserRight.Desc.EVENTPARTICIPANT_DELETE=Able to delete event participants from the system -UserRight.Desc.EVENTPARTICIPANT_IMPORT=Able to import event participants -UserRight.Desc.SEND_MANUAL_EXTERNAL_MESSAGES=Able to send manual external messages -UserRight.Desc.STATISTICS_ACCESS=Able to access statistics -UserRight.Desc.MANAGE_PUBLIC_EXPORT_CONFIGURATION=Able to manage public export configurations -UserRight.Desc.INFRASTRUCTURE_EXPORT=Able to export infrastructure data from SORMAS -UserRight.Desc.INFRASTRUCTURE_IMPORT=Able to import infrastructure data -UserRight.Desc.INFRASTRUCTURE_ARCHIVE=Able to archive infrastructure data -UserRight.Desc.DASHBOARD_CONTACT_VIEW_TRANSMISSION_CHAINS=Able to view contact transmission chains on the dashboard -UserRight.Desc.DASHBOARD_CAMPAIGNS_VIEW=Able to access campaigns dashboard -UserRight.Desc.CASE_CLINICIAN_VIEW=Able to access case sections concerned with clinician -UserRight.Desc.THERAPY_VIEW=Able to view existing therapies -UserRight.Desc.PRESCRIPTION_CREATE=Able to create new prescriptions -UserRight.Desc.PRESCRIPTION_EDIT=Able to edit existing prescriptions -UserRight.Desc.PRESCRIPTION_DELETE=Able to delete prescriptions from the system -UserRight.Desc.TREATMENT_CREATE=Able to create new treatments -UserRight.Desc.TREATMENT_EDIT=Able to edit existing treatments -UserRight.Desc.TREATMENT_DELETE=Able to delete treatments from the system -UserRight.Desc.CLINICAL_COURSE_VIEW=Able to view the clinical course of cases -UserRight.Desc.CLINICAL_COURSE_EDIT=Able to edit the clinical course of cases -UserRight.Desc.CLINICAL_VISIT_CREATE=Able to create new clinical visits -UserRight.Desc.CLINICAL_VISIT_EDIT=Able to edit existing clinical visits -UserRight.Desc.CLINICAL_VISIT_DELETE=Able to delete clinical visits from the system -UserRight.Desc.PORT_HEALTH_INFO_VIEW=Able to view port health info -UserRight.Desc.PORT_HEALTH_INFO_EDIT=Able to edit existing port health info -UserRight.Desc.POPULATION_MANAGE=Able to manage population data -UserRight.Desc.DOCUMENT_TEMPLATE_MANAGEMENT=Able to manage document templates -UserRight.Desc.QUARANTINE_ORDER_CREATE=Able to create new quarantine orders -UserRight.Desc.LINE_LISTING_CONFIGURE=Able to configure line listing -UserRight.Desc.AGGREGATE_REPORT_VIEW=Able to create new aggregate reports -UserRight.Desc.AGGREGATE_REPORT_EXPORT=Able to export aggregate reports from SORMAS -UserRight.Desc.AGGREGATE_REPORT_EDIT=Able to edit existing aggregate reports -UserRight.Desc.SEE_PERSONAL_DATA_IN_JURISDICTION=Able to see personal data in jurisdiction -UserRight.Desc.SEE_PERSONAL_DATA_OUTSIDE_JURISDICTION=Able to see personal data outside jurisdiction -UserRight.Desc.SEE_SENSITIVE_DATA_IN_JURISDICTION=Able to see sensitive data in jurisdiction -UserRight.Desc.SEE_SENSITIVE_DATA_OUTSIDE_JURISDICTION=Able to see sensitive data outside jurisdiction -UserRight.Desc.CAMPAIGN_VIEW=Able to view existing campaigns -UserRight.Desc.CAMPAIGN_VIEW_ARCHIVED=Able to view archived campaigns -UserRight.Desc.CAMPAIGN_EDIT=Able to edit existing campaigns -UserRight.Desc.CAMPAIGN_ARCHIVE=Able to archive campaigns -UserRight.Desc.CAMPAIGN_DELETE=Able to delete campaigns from the system -UserRight.Desc.CAMPAIGN_FORM_DATA_VIEW=Able to view existing campaign form data -UserRight.Desc.CAMPAIGN_FORM_DATA_VIEW_ARCHIVED=Able to view archived campaign form data -UserRight.Desc.CAMPAIGN_FORM_DATA_EDIT=Able to edit existing campaign form data -UserRight.Desc.CAMPAIGN_FORM_DATA_ARCHIVE=Able to archive campaign form data -UserRight.Desc.CAMPAIGN_FORM_DATA_DELETE=Able to delete campaign form data from the system -UserRight.Desc.CAMPAIGN_FORM_DATA_EXPORT=Able to export campaign form data from SORMAS -UserRight.Desc.BAG_EXPORT=Able to perform BAG export -UserRight.Desc.SORMAS_TO_SORMAS_SHARE=Users with this right can initiate a share to another SORMAS instance -UserRight.Desc.SORMAS_TO_SORMAS_PROCESS=Only users with this right are allowed to see & use the share directory. -UserRight.Desc.EXTERNAL_SURVEILLANCE_SHARE=Allows sharing cases or events to external surveillance tools. In order to do so the related edit user right is needed as-well. -UserRight.Desc.EXTERNAL_SURVEILLANCE_DELETE=Allows deleting cases or events in external surveillance tools. In order to do so the related edit user right is needed as-well. -UserRight.Desc.EXTERNAL_MESSAGE_PUSH=Able to push external messages to the system -UserRight.Desc.EXTERNAL_MESSAGE_ACCESS=Able to access external messages -UserRight.Desc.EXTERNAL_MESSAGE_LABORATORY_VIEW=Able to view laboratory messages -UserRight.Desc.EXTERNAL_MESSAGE_DOCTOR_DECLARATION_VIEW=Able to view doctor declaration messages -UserRight.Desc.EXTERNAL_MESSAGE_LABORATORY_PROCESS=Able to work with laboratory messages -UserRight.Desc.EXTERNAL_MESSAGE_DOCTOR_DECLARATION_PROCESS=Able to process doctor declaration messages -UserRight.Desc.EXTERNAL_MESSAGE_LABORATORY_DELETE=Able to delete laboratory messages -UserRight.Desc.EXTERNAL_MESSAGE_DOCTOR_DECLARATION_DELETE=Able to delete doctor declaration messages -UserRight.Desc.CASE_SHARE=Able to share cases with the whole country -UserRight.Desc.IMMUNIZATION_VIEW=Able to view existing immunizations and vaccinations -UserRight.Desc.IMMUNIZATION_VIEW_ARCHIVED=Able to view arhived immunizations and vaccinations -UserRight.Desc.IMMUNIZATION_CREATE=Able to create new immunizations and vaccinations -UserRight.Desc.IMMUNIZATION_EDIT=Able to edit existing immunizations and vaccinations -UserRight.Desc.IMMUNIZATION_DELETE=Able to delete immunizations and vaccinations from the system -UserRight.Desc.IMMUNIZATION_ARCHIVE=Able to archive immunizations -UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_VIEW=Able to view existing adverse events following immunization -UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_CREATE=Able to create new adverse event following immunization -UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_EDIT=Able to edit existing adverse events following immunization -UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_DELETE=Able to delete adverse events following immunization from the system -UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_ARCHIVE=Able to archive adverse events following immunization -UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_EXPORT=Able to export adverse events following immunization -UserRight.Desc.PERSON_EXPORT=Able to export persons -UserRight.Desc.CONTACT_MERGE=Able to merge contacts -UserRight.Desc.EVENTGROUP_CREATE=Able to create new event groups -UserRight.Desc.EVENTGROUP_EDIT=Able to edit existing event groups -UserRight.Desc.EVENTGROUP_LINK=Able to link events to event groups -UserRight.Desc.EVENTGROUP_ARCHIVE=Able to archive event groups -UserRight.Desc.EVENTGROUP_DELETE=Able to delete event groups from the system -UserRight.Desc.EVENTGROUP_VIEW_ARCHIVED=Able to view archived event groups from the system -UserRight.Desc.TRAVEL_ENTRY_MANAGEMENT_ACCESS=Able to access the travel entry directory -UserRight.Desc.TRAVEL_ENTRY_VIEW=Able to view existing travel entries -UserRight.Desc.TRAVEL_ENTRY_VIEW_ARCHIVED=Able to view archived travel entries -UserRight.Desc.TRAVEL_ENTRY_CREATE=Able to create new travel entries -UserRight.Desc.TRAVEL_ENTRY_EDIT=Able to edit existing travel entries -UserRight.Desc.TRAVEL_ENTRY_DELETE=Able to delete travel entries from the system -UserRight.Desc.TRAVEL_ENTRY_ARCHIVE=Able to archive travel entries -UserRight.Desc.EXPORT_DATA_PROTECTION_DATA=Able to export data protection data -UserRight.Desc.OUTBREAK_VIEW=Able to view outbreaks -UserRight.Desc.OUTBREAK_EDIT=Able to edit outbreaks -UserRight.Desc.PERFORM_BULK_OPERATIONS_PSEUDONYM=Able to perform bulk pseudonomization -UserRight.Desc.SORMAS_TO_SORMAS_CLIENT=Techincal user right for the SORMAS to SORMAS interface -UserRight.Desc.SORMAS_REST=Able to access the SORMAS REST interface -UserRight.Desc.EXTERNAL_VISITS=Able to access external visits REST endpoints -UserRight.Desc.SORMAS_UI=Able to access the SORMAS graphical user interface -UserRight.Desc.DEV_MODE=Able to access developer options in the configuration directory -UserRight.Desc.CUSTOMIZABLE_ENUM_MANAGEMENT=Able to create, edit and delete customizable enum values -UserRight.Desc.DISEASE_MANAGEMENT=Able to configure diseases -UserRight.Desc.DOCUMENT_VIEW=Able to view existing documents -UserRight.Desc.DOCUMENT_UPLOAD=Able to upload documents -UserRight.Desc.DOCUMENT_DELETE=Able to delete documents from the system -UserRight.Desc.PERSON_MERGE=Able to merge persons -UserRight.Desc.ENVIRONMENT_CREATE=Able to create new environments -UserRight.Desc.ENVIRONMENT_EDIT=Able to edit existing environments -UserRight.Desc.ENVIRONMENT_ARCHIVE=Able to archive environments -UserRight.Desc.ENVIRONMENT_DELETE=Able to delete environments from the system -UserRight.Desc.ENVIRONMENT_IMPORT=Able to import environments -UserRight.Desc.ENVIRONMENT_EXPORT=Able to export environments -UserRight.Desc.ENVIRONMENT_LINK=Able to link environments -UserRight.Desc.ENVIRONMENT_SAMPLE_VIEW=Able to view existing environment samples -UserRight.Desc.ENVIRONMENT_SAMPLE_CREATE=Able to create new environment samples -UserRight.Desc.ENVIRONMENT_SAMPLE_EDIT=Able to edit existing environment samples -UserRight.Desc.ENVIRONMENT_SAMPLE_EDIT_DISPATCH=Able to edit environment samples dispatch information -UserRight.Desc.ENVIRONMENT_SAMPLE_EDIT_RECEIVAL=Able to edit environment samples receival information -UserRight.Desc.ENVIRONMENT_SAMPLE_DELETE=Able to delete environment samples from the system -UserRight.Desc.ENVIRONMENT_SAMPLE_IMPORT=Able to import environment samples -UserRight.Desc.ENVIRONMENT_SAMPLE_EXPORT=Able to export environment samples -UserRight.Desc.ENVIRONMENT_PATHOGEN_TEST_CREATE=Able to create environment sample pathogen tests -UserRight.Desc.ENVIRONMENT_PATHOGEN_TEST_EDIT=Able to edit environment sample pathogen tests -UserRight.Desc.ENVIRONMENT_PATHOGEN_TEST_DELETE=Able to delete environment sample pathogen tests +UserRight.Desc.CASE_ARCHIVE = Able to archive cases +UserRight.Desc.CASE_CHANGE_DISEASE = Able to edit case disease +UserRight.Desc.CASE_CHANGE_EPID_NUMBER = Able to edit case epid number +UserRight.Desc.CASE_CLASSIFY = Able to edit case classification and outcome +UserRight.Desc.CASE_CREATE = Able to create new cases +UserRight.Desc.CASE_DELETE = Able to delete cases from the system +UserRight.Desc.CASE_EDIT = Able to edit existing cases +UserRight.Desc.CASE_EXPORT = Able to export cases from SORMAS +UserRight.Desc.CASE_IMPORT = Able to import cases into SORMAS +UserRight.Desc.CASE_INVESTIGATE = Able to edit case investigation status +UserRight.Desc.CASE_TRANSFER = Able to transfer cases to another region/district/facility +UserRight.Desc.CASE_REFER_FROM_POE = Able to refer case from point of entry +UserRight.Desc.CASE_RESPONSIBLE = Can be responsible for a case +UserRight.Desc.CASE_VIEW = Able to view existing cases +UserRight.Desc.CASE_VIEW_ARCHIVED = Able to view archived cases +UserRight.Desc.CONTACT_ASSIGN = Able to assign contacts to officers +UserRight.Desc.CONTACT_CLASSIFY = Able to edit contact classification +UserRight.Desc.CONTACT_CONVERT = Able to create resulting cases from contacts +UserRight.Desc.CONTACT_CREATE = Able to create new contacts +UserRight.Desc.CONTACT_IMPORT = Able to import contacts +UserRight.Desc.CONTACT_DELETE = Able to delete contacts from the system +UserRight.Desc.CONTACT_EDIT = Able to edit existing contacts +UserRight.Desc.CONTACT_EXPORT = Able to export contacts from SORMAS +UserRight.Desc.CONTACT_RESPONSIBLE = Can be responsible for a contact +UserRight.Desc.CONTACT_VIEW = Able to view existing contacts +UserRight.Desc.CONTACT_VIEW_ARCHIVED = Able to view archived contacts +UserRight.Desc.CONTACT_ARCHIVE = Able to archive contacts +UserRight.Desc.DASHBOARD_CONTACT_VIEW = Able to access the contact supervisor dashboard +UserRight.Desc.DASHBOARD_SURVEILLANCE_VIEW = Able to access the surveillance supervisor dashboard +UserRight.Desc.DATABASE_EXPORT_ACCESS = Able to export the whole database +UserRight.Desc.EVENT_ARCHIVE = Able to archive events +UserRight.Desc.EVENT_CREATE = Able to create new events +UserRight.Desc.EVENT_EDIT = Able to edit existing events +UserRight.Desc.EVENT_EXPORT = Able to export events from SORMAS +UserRight.Desc.EVENT_RESPONSIBLE = Can be responsible for an event +UserRight.Desc.EVENT_VIEW = Able to view existing events +UserRight.Desc.EVENT_VIEW_ARCHIVED = Able to view archived events +UserRight.Desc.EVENTPARTICIPANT_CREATE = Able to create new event participants +UserRight.Desc.EVENTPARTICIPANT_EDIT = Able to edit existing event participants +UserRight.Desc.EVENTPARTICIPANT_ARCHIVE = Able to archive event participants +UserRight.Desc.EVENTPARTICIPANT_VIEW = Able to view existing event participants +UserRight.Desc.EVENTPARTICIPANT_VIEW_ARCHIVED = Able to view archived event participants +UserRight.Desc.INFRASTRUCTURE_CREATE = Able to create new regions/districts/communities/facilities +UserRight.Desc.INFRASTRUCTURE_EDIT = Able to edit regions/districts/communities/facilities +UserRight.Desc.INFRASTRUCTURE_VIEW = Able to view regions/districts/communities/facilities in the system +UserRight.Desc.INFRASTRUCTURE_VIEW_ARCHIVED = Able to view archived infrastructure data +UserRight.Desc.PERFORM_BULK_OPERATIONS = Able to perform bulk operations in lists +UserRight.Desc.SAMPLE_CREATE = Able to create new samples +UserRight.Desc.SAMPLE_EDIT = Able to edit existing samples +UserRight.Desc.SAMPLE_EXPORT = Able to export samples from SORMAS +UserRight.Desc.SAMPLE_DELETE = Able to delete samples from the system +UserRight.Desc.SAMPLE_TRANSFER = Able to transfer samples to another lab +UserRight.Desc.SAMPLE_VIEW = Able to view existing samples +UserRight.Desc.SAMPLETEST_CREATE = Able to create new sample tests +UserRight.Desc.SAMPLETEST_EDIT = Able to edit existing sample tests +UserRight.Desc.STATISTICS_EXPORT = Able to export detailed statistics from SORMAS +UserRight.Desc.TASK_ASSIGN = Able to assign tasks to users +UserRight.Desc.TASK_CREATE = Able to create new tasks +UserRight.Desc.TASK_EDIT = Able to edit existing tasks +UserRight.Desc.TASK_VIEW = Able to view existing tasks +UserRight.Desc.TASK_VIEW_ARCHIVED = Able to view archived tasks +UserRight.Desc.TASK_ARCHIVE = Able to archive tasks +UserRight.Desc.USER_CREATE = Able to create new users +UserRight.Desc.USER_EDIT = Able to edit existing users +UserRight.Desc.USER_VIEW = Able to view existing users +UserRight.Desc.VISIT_CREATE = Able to create new visits +UserRight.Desc.VISIT_EDIT = Able to edit existing visits +UserRight.Desc.WEEKLYREPORT_CREATE = Able to create weekly reports +UserRight.Desc.WEEKLYREPORT_VIEW = Able to view weekly reports +UserRight.Desc.CASE_MERGE = Able to merge cases +UserRight.Desc.PERSON_VIEW = Able to view existing persons +UserRight.Desc.PERSON_EDIT = Able to edit existing persons +UserRight.Desc.PERSON_DELETE = Able to delete persons from the system +UserRight.Desc.PERSON_CONTACT_DETAILS_DELETE = Able to delete person contact details +UserRight.Desc.SAMPLE_EDIT_NOT_OWNED = Able to edit samples reported by other users +UserRight.Desc.PATHOGEN_TEST_CREATE = Able to create new pathogen tests +UserRight.Desc.PATHOGEN_TEST_EDIT = Able to edit existing pathogen tests +UserRight.Desc.PATHOGEN_TEST_DELETE = Able to delete pathogen tests from the system +UserRight.Desc.ADDITIONAL_TEST_VIEW = Able to view existing additional tests +UserRight.Desc.ADDITIONAL_TEST_CREATE = Able to create new additional tests +UserRight.Desc.ADDITIONAL_TEST_EDIT = Able to edit existing additional tests +UserRight.Desc.ADDITIONAL_TEST_DELETE = Able to delete additional tests from the system +UserRight.Desc.CONTACT_REASSIGN_CASE = Able to reassign the source case of contacts +UserRight.Desc.MANAGE_EXTERNAL_SYMPTOM_JOURNAL = Able to manage external symptom journal +UserRight.Desc.VISIT_DELETE = Able to delete visits from the system +UserRight.Desc.VISIT_EXPORT = Able to export visits from SORMAS +UserRight.Desc.TASK_DELETE = Able to delete tasks from the system +UserRight.Desc.TASK_EXPORT = Able to export tasks from SORMAS +UserRight.Desc.ACTION_CREATE = Able to create new actions +UserRight.Desc.ACTION_DELETE = Able to delete actions from the system +UserRight.Desc.ACTION_EDIT = Able to edit existing actions +UserRight.Desc.EVENT_IMPORT = Able to import events +UserRight.Desc.EVENT_DELETE = Able to delete events from the system +UserRight.Desc.EVENTPARTICIPANT_DELETE = Able to delete event participants from the system +UserRight.Desc.EVENTPARTICIPANT_IMPORT = Able to import event participants +UserRight.Desc.SEND_MANUAL_EXTERNAL_MESSAGES = Able to send manual external messages +UserRight.Desc.STATISTICS_ACCESS = Able to access statistics +UserRight.Desc.MANAGE_PUBLIC_EXPORT_CONFIGURATION = Able to manage public export configurations +UserRight.Desc.INFRASTRUCTURE_EXPORT = Able to export infrastructure data from SORMAS +UserRight.Desc.INFRASTRUCTURE_IMPORT = Able to import infrastructure data +UserRight.Desc.INFRASTRUCTURE_ARCHIVE = Able to archive infrastructure data +UserRight.Desc.DASHBOARD_CONTACT_VIEW_TRANSMISSION_CHAINS = Able to view contact transmission chains on the dashboard +UserRight.Desc.DASHBOARD_CAMPAIGNS_VIEW = Able to access campaigns dashboard +UserRight.Desc.CASE_CLINICIAN_VIEW = Able to access case sections concerned with clinician +UserRight.Desc.THERAPY_VIEW = Able to view existing therapies +UserRight.Desc.PRESCRIPTION_CREATE = Able to create new prescriptions +UserRight.Desc.PRESCRIPTION_EDIT = Able to edit existing prescriptions +UserRight.Desc.PRESCRIPTION_DELETE = Able to delete prescriptions from the system +UserRight.Desc.TREATMENT_CREATE = Able to create new treatments +UserRight.Desc.TREATMENT_EDIT = Able to edit existing treatments +UserRight.Desc.TREATMENT_DELETE = Able to delete treatments from the system +UserRight.Desc.CLINICAL_COURSE_VIEW = Able to view the clinical course of cases +UserRight.Desc.CLINICAL_COURSE_EDIT = Able to edit the clinical course of cases +UserRight.Desc.CLINICAL_VISIT_CREATE = Able to create new clinical visits +UserRight.Desc.CLINICAL_VISIT_EDIT = Able to edit existing clinical visits +UserRight.Desc.CLINICAL_VISIT_DELETE = Able to delete clinical visits from the system +UserRight.Desc.PORT_HEALTH_INFO_VIEW = Able to view port health info +UserRight.Desc.PORT_HEALTH_INFO_EDIT = Able to edit existing port health info +UserRight.Desc.POPULATION_MANAGE = Able to manage population data +UserRight.Desc.DOCUMENT_TEMPLATE_MANAGEMENT = Able to manage document templates +UserRight.Desc.QUARANTINE_ORDER_CREATE = Able to create new quarantine orders +UserRight.Desc.LINE_LISTING_CONFIGURE = Able to configure line listing +UserRight.Desc.AGGREGATE_REPORT_VIEW = Able to create new aggregate reports +UserRight.Desc.AGGREGATE_REPORT_EXPORT = Able to export aggregate reports from SORMAS +UserRight.Desc.AGGREGATE_REPORT_EDIT = Able to edit existing aggregate reports +UserRight.Desc.SEE_PERSONAL_DATA_IN_JURISDICTION = Able to see personal data in jurisdiction +UserRight.Desc.SEE_PERSONAL_DATA_OUTSIDE_JURISDICTION = Able to see personal data outside jurisdiction +UserRight.Desc.SEE_SENSITIVE_DATA_IN_JURISDICTION = Able to see sensitive data in jurisdiction +UserRight.Desc.SEE_SENSITIVE_DATA_OUTSIDE_JURISDICTION = Able to see sensitive data outside jurisdiction +UserRight.Desc.CAMPAIGN_VIEW = Able to view existing campaigns +UserRight.Desc.CAMPAIGN_VIEW_ARCHIVED = Able to view archived campaigns +UserRight.Desc.CAMPAIGN_EDIT = Able to edit existing campaigns +UserRight.Desc.CAMPAIGN_ARCHIVE = Able to archive campaigns +UserRight.Desc.CAMPAIGN_DELETE = Able to delete campaigns from the system +UserRight.Desc.CAMPAIGN_FORM_DATA_VIEW = Able to view existing campaign form data +UserRight.Desc.CAMPAIGN_FORM_DATA_VIEW_ARCHIVED = Able to view archived campaign form data +UserRight.Desc.CAMPAIGN_FORM_DATA_EDIT = Able to edit existing campaign form data +UserRight.Desc.CAMPAIGN_FORM_DATA_ARCHIVE = Able to archive campaign form data +UserRight.Desc.CAMPAIGN_FORM_DATA_DELETE = Able to delete campaign form data from the system +UserRight.Desc.CAMPAIGN_FORM_DATA_EXPORT = Able to export campaign form data from SORMAS +UserRight.Desc.BAG_EXPORT = Able to perform BAG export +UserRight.Desc.SORMAS_TO_SORMAS_SHARE = Users with this right can initiate a share to another SORMAS instance +UserRight.Desc.SORMAS_TO_SORMAS_PROCESS = Only users with this right are allowed to see & use the share directory. +UserRight.Desc.EXTERNAL_SURVEILLANCE_SHARE = Allows sharing cases or events to external surveillance tools. In order to do so the related edit user right is needed as-well. +UserRight.Desc.EXTERNAL_SURVEILLANCE_DELETE = Allows deleting cases or events in external surveillance tools. In order to do so the related edit user right is needed as-well. +UserRight.Desc.EXTERNAL_MESSAGE_PUSH = Able to push external messages to the system +UserRight.Desc.EXTERNAL_MESSAGE_ACCESS = Able to access external messages +UserRight.Desc.EXTERNAL_MESSAGE_LABORATORY_VIEW = Able to view laboratory messages +UserRight.Desc.EXTERNAL_MESSAGE_DOCTOR_DECLARATION_VIEW = Able to view doctor declaration messages +UserRight.Desc.EXTERNAL_MESSAGE_LABORATORY_PROCESS = Able to work with laboratory messages +UserRight.Desc.EXTERNAL_MESSAGE_DOCTOR_DECLARATION_PROCESS = Able to process doctor declaration messages +UserRight.Desc.EXTERNAL_MESSAGE_LABORATORY_DELETE = Able to delete laboratory messages +UserRight.Desc.EXTERNAL_MESSAGE_DOCTOR_DECLARATION_DELETE = Able to delete doctor declaration messages +UserRight.Desc.CASE_SHARE = Able to share cases with the whole country +UserRight.Desc.IMMUNIZATION_VIEW = Able to view existing immunizations and vaccinations +UserRight.Desc.IMMUNIZATION_VIEW_ARCHIVED = Able to view arhived immunizations and vaccinations +UserRight.Desc.IMMUNIZATION_CREATE = Able to create new immunizations and vaccinations +UserRight.Desc.IMMUNIZATION_EDIT = Able to edit existing immunizations and vaccinations +UserRight.Desc.IMMUNIZATION_DELETE = Able to delete immunizations and vaccinations from the system +UserRight.Desc.IMMUNIZATION_ARCHIVE = Able to archive immunizations +UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_VIEW = Able to view existing adverse events following immunization +UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_CREATE = Able to create new adverse event following immunization +UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_EDIT = Able to edit existing adverse events following immunization +UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_DELETE = Able to delete adverse events following immunization from the system +UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_ARCHIVE = Able to archive adverse events following immunization +UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_EXPORT = Able to export adverse events following immunization +UserRight.Desc.PERSON_EXPORT = Able to export persons +UserRight.Desc.CONTACT_MERGE = Able to merge contacts +UserRight.Desc.EVENTGROUP_CREATE = Able to create new event groups +UserRight.Desc.EVENTGROUP_EDIT = Able to edit existing event groups +UserRight.Desc.EVENTGROUP_LINK = Able to link events to event groups +UserRight.Desc.EVENTGROUP_ARCHIVE = Able to archive event groups +UserRight.Desc.EVENTGROUP_DELETE = Able to delete event groups from the system +UserRight.Desc.EVENTGROUP_VIEW_ARCHIVED = Able to view archived event groups from the system +UserRight.Desc.TRAVEL_ENTRY_MANAGEMENT_ACCESS = Able to access the travel entry directory +UserRight.Desc.TRAVEL_ENTRY_VIEW = Able to view existing travel entries +UserRight.Desc.TRAVEL_ENTRY_VIEW_ARCHIVED = Able to view archived travel entries +UserRight.Desc.TRAVEL_ENTRY_CREATE = Able to create new travel entries +UserRight.Desc.TRAVEL_ENTRY_EDIT = Able to edit existing travel entries +UserRight.Desc.TRAVEL_ENTRY_DELETE = Able to delete travel entries from the system +UserRight.Desc.TRAVEL_ENTRY_ARCHIVE = Able to archive travel entries +UserRight.Desc.EXPORT_DATA_PROTECTION_DATA = Able to export data protection data +UserRight.Desc.OUTBREAK_VIEW = Able to view outbreaks +UserRight.Desc.OUTBREAK_EDIT = Able to edit outbreaks +UserRight.Desc.PERFORM_BULK_OPERATIONS_PSEUDONYM = Able to perform bulk pseudonomization +UserRight.Desc.SORMAS_TO_SORMAS_CLIENT = Techincal user right for the SORMAS to SORMAS interface +UserRight.Desc.SORMAS_REST = Able to access the SORMAS REST interface +UserRight.Desc.EXTERNAL_VISITS = Able to access external visits REST endpoints +UserRight.Desc.SORMAS_UI = Able to access the SORMAS graphical user interface +UserRight.Desc.DEV_MODE = Able to access developer options in the configuration directory +UserRight.Desc.CUSTOMIZABLE_ENUM_MANAGEMENT = Able to create, edit and delete customizable enum values +UserRight.Desc.DISEASE_MANAGEMENT = Able to configure diseases +UserRight.Desc.DOCUMENT_VIEW = Able to view existing documents +UserRight.Desc.DOCUMENT_UPLOAD = Able to upload documents +UserRight.Desc.DOCUMENT_DELETE = Able to delete documents from the system +UserRight.Desc.PERSON_MERGE = Able to merge persons +UserRight.Desc.ENVIRONMENT_CREATE = Able to create new environments +UserRight.Desc.ENVIRONMENT_EDIT = Able to edit existing environments +UserRight.Desc.ENVIRONMENT_ARCHIVE = Able to archive environments +UserRight.Desc.ENVIRONMENT_DELETE = Able to delete environments from the system +UserRight.Desc.ENVIRONMENT_IMPORT = Able to import environments +UserRight.Desc.ENVIRONMENT_EXPORT = Able to export environments +UserRight.Desc.ENVIRONMENT_LINK = Able to link environments +UserRight.Desc.ENVIRONMENT_SAMPLE_VIEW = Able to view existing environment samples +UserRight.Desc.ENVIRONMENT_SAMPLE_CREATE = Able to create new environment samples +UserRight.Desc.ENVIRONMENT_SAMPLE_EDIT = Able to edit existing environment samples +UserRight.Desc.ENVIRONMENT_SAMPLE_EDIT_DISPATCH = Able to edit environment samples dispatch information +UserRight.Desc.ENVIRONMENT_SAMPLE_EDIT_RECEIVAL = Able to edit environment samples receival information +UserRight.Desc.ENVIRONMENT_SAMPLE_DELETE = Able to delete environment samples from the system +UserRight.Desc.ENVIRONMENT_SAMPLE_IMPORT = Able to import environment samples +UserRight.Desc.ENVIRONMENT_SAMPLE_EXPORT = Able to export environment samples +UserRight.Desc.ENVIRONMENT_PATHOGEN_TEST_CREATE = Able to create environment sample pathogen tests +UserRight.Desc.ENVIRONMENT_PATHOGEN_TEST_EDIT = Able to edit environment sample pathogen tests +UserRight.Desc.ENVIRONMENT_PATHOGEN_TEST_DELETE = Able to delete environment sample pathogen tests UserRight.Desc.EMAIL_TEMPLATE_MANAGEMENT=Able to manage email templates UserRight.Desc.EXTERNAL_EMAIL_SEND=Able to send external emails UserRight.Desc.EXTERNAL_EMAIL_ATTACH_DOCUMENTS=Able to attach documents to external emails @@ -1983,129 +2145,149 @@ UserRight.Desc.EPIPULSE_EXPORT_VIEW=Able to view Epipulse export UserRight.Desc.EPIPULSE_EXPORT_CREATE=Able to create Epipulse export UserRight.Desc.EPIPULSE_EXPORT_DOWNLOAD=Able to download Epipulse export UserRight.Desc.EPIPULSE_EXPORT_DELETE=Able to delete Epipulse export + # UserRightGroup -UserRightGroup.GENERAL=General -UserRightGroup.DATA_PROTECTION=Data Protection -UserRightGroup.PERSON=Persons -UserRightGroup.CASE=Case Surveillance -UserRightGroup.CASE_MANAGEMENT=Case Management -UserRightGroup.PORT_HEALTH=Port Health -UserRightGroup.CONTACT=Contact Surveillance -UserRightGroup.VISIT=Follow-Up -UserRightGroup.SAMPLE=Sample Testing -UserRightGroup.IMMUNIZATION=Immunization -UserRightGroup.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION=Adverse Events Following Immunization -UserRightGroup.TRAVEL_ENTRY=Travel Entries -UserRightGroup.TASK=Tasks -UserRightGroup.EVENT=Events -UserRightGroup.AGGREGATED_REPORTING=Aggregated Reporting -UserRightGroup.CAMPAIGN=Campaigns -UserRightGroup.DASHBOARD=Dashboard -UserRightGroup.STATISTICS=Statistics -UserRightGroup.EXPORT=Export -UserRightGroup.EXTERNAL=External Systems -UserRightGroup.USER=Users -UserRightGroup.INFRASTRUCTURE=Infrastructure -UserRightGroup.CONFIGURATION=Configuration -UserRightGroup.DOCUMENT=Documents +UserRightGroup.GENERAL = General +UserRightGroup.DATA_PROTECTION = Data Protection +UserRightGroup.PERSON = Persons +UserRightGroup.CASE = Case Surveillance +UserRightGroup.CASE_MANAGEMENT = Case Management +UserRightGroup.PORT_HEALTH = Port Health +UserRightGroup.CONTACT = Contact Surveillance +UserRightGroup.VISIT = Follow-Up +UserRightGroup.SAMPLE = Sample Testing +UserRightGroup.IMMUNIZATION = Immunization +UserRightGroup.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION = Adverse Events Following Immunization +UserRightGroup.TRAVEL_ENTRY = Travel Entries +UserRightGroup.TASK = Tasks +UserRightGroup.EVENT = Events +UserRightGroup.AGGREGATED_REPORTING = Aggregated Reporting +UserRightGroup.CAMPAIGN = Campaigns +UserRightGroup.DASHBOARD = Dashboard +UserRightGroup.STATISTICS = Statistics +UserRightGroup.EXPORT = Export +UserRightGroup.EXTERNAL = External Systems +UserRightGroup.USER = Users +UserRightGroup.INFRASTRUCTURE = Infrastructure +UserRightGroup.CONFIGURATION = Configuration +UserRightGroup.DOCUMENT = Documents UserRightGroup.EXTERNAL_EMAILS=External emails -UserRightGroup.ENVIRONMENT=Environments +UserRightGroup.ENVIRONMENT = Environments UserRightGroup.SELF_REPORT=Self Reports UserRightGroup.SURVEY=Surveys UserRightGroup.EPIPULSE=Epipulse export + # Vaccination -VaccinationStatus.UNKNOWN=Unknown -VaccinationStatus.OTHER=Other -VaccinationStatus.UNVACCINATED=Unvaccinated -VaccinationStatus.VACCINATED=Vaccinated -VaccinationStatus.VACCINATED_ONE_DOSE=Vaccinated one dose -VaccinationStatus.VACCINATED_TWO_DOSE=Vaccinated two dose -VaccinationStatus.RECOVERED=Had the disease +VaccinationStatus.UNKNOWN = Unknown +VaccinationStatus.OTHER = Other +VaccinationStatus.UNVACCINATED = Unvaccinated +VaccinationStatus.VACCINATED = Vaccinated +VaccinationStatus.VACCINATED_ONE_DOSE = Vaccinated one dose +VaccinationStatus.VACCINATED_TWO_DOSE = Vaccinated two dose +VaccinationStatus.RECOVERED = Had the disease + # VaccinationInfoSource -VaccinationInfoSource.ORAL_COMMUNICATION=Oral communication -VaccinationInfoSource.VACCINATION_CARD=Vaccination card -VaccinationInfoSource.NO_EVIDENCE=No evidence -VaccinationInfoSource.UNKNOWN=Unknown +VaccinationInfoSource.ORAL_COMMUNICATION = Oral communication +VaccinationInfoSource.VACCINATION_CARD = Vaccination card +VaccinationInfoSource.NO_EVIDENCE = No evidence +VaccinationInfoSource.UNKNOWN = Unknown + # ValueSeparator -ValueSeparator.DEFAULT=Default (%s) -ValueSeparator.COMMA=Comma -ValueSeparator.SEMICOLON=Semicolon -ValueSeparator.TAB=Tab +ValueSeparator.DEFAULT = Default (%s) +ValueSeparator.COMMA = Comma +ValueSeparator.SEMICOLON = Semicolon +ValueSeparator.TAB = Tab + # ViewMode -ViewMode.NORMAL=Normal view -ViewMode.SIMPLE=Simple view -VisitResult.NOT_SYMPTOMATIC=Seen (no signs) -VisitResult.SYMPTOMATIC=Seen with signs -VisitResult.UNAVAILABLE=Unavailable -VisitResult.UNCOOPERATIVE=Uncooperative -VisitResult.NOT_PERFORMED=Not performed +ViewMode.NORMAL = Normal view +ViewMode.SIMPLE = Simple view + +VisitResult.NOT_SYMPTOMATIC = Seen (no signs) +VisitResult.SYMPTOMATIC = Seen with signs +VisitResult.UNAVAILABLE = Unavailable +VisitResult.UNCOOPERATIVE = Uncooperative +VisitResult.NOT_PERFORMED = Not performed + # VisitStatus -VisitStatus.COOPERATIVE=Available and cooperative -VisitStatus.UNAVAILABLE=Unavailable -VisitStatus.UNCOOPERATIVE=Available, but uncooperative -VisitStatus.Short.COOPERATIVE=Cooperative -VisitStatus.Short.UNAVAILABLE=Unavailable -VisitStatus.Short.UNCOOPERATIVE=Uncooperative +VisitStatus.COOPERATIVE = Available and cooperative +VisitStatus.UNAVAILABLE = Unavailable +VisitStatus.UNCOOPERATIVE = Available, but uncooperative +VisitStatus.Short.COOPERATIVE = Cooperative +VisitStatus.Short.UNAVAILABLE = Unavailable +VisitStatus.Short.UNCOOPERATIVE = Uncooperative + # VisitOrigin -VisitOrigin.USER=Created by user -VisitOrigin.EXTERNAL_JOURNAL=External symptom journal +VisitOrigin.USER = Created by user +VisitOrigin.EXTERNAL_JOURNAL = External symptom journal + # VectorType -VectorType.MOSQUITOS=Mosquitos -VectorType.TICKS=Ticks + +VectorType.MOSQUITOS = Mosquitos +VectorType.TICKS = Ticks + # WaterSource -WaterSource.COMMUNITY_BOREHOLE_WELL=Community borehole/well -WaterSource.OTHER=Other -WaterSource.PIPE_NETWORK=Pipe network -WaterSource.PRIVATE_BOREHOLE_WELL=Private borehole/well -WaterSource.STREAM=Stream +WaterSource.COMMUNITY_BOREHOLE_WELL = Community borehole/well +WaterSource.OTHER = Other +WaterSource.PIPE_NETWORK = Pipe network +WaterSource.PRIVATE_BOREHOLE_WELL = Private borehole/well +WaterSource.STREAM = Stream + # WaterType -WaterType.WASTEWATER=Wastewater -WaterType.GROUNDWATER=Groundwater -WaterType.SURFACE_WATER=Surface water (lakes, rivers, runoff, etc.) -WaterType.PRECIPITATION=Precipitation (rain or snow) -WaterType.OTHER=Other -WaterType.UNKNOWN=Unknown +WaterType.WASTEWATER = Wastewater +WaterType.GROUNDWATER = Groundwater +WaterType.SURFACE_WATER = Surface water (lakes, rivers, runoff, etc.) +WaterType.PRECIPITATION = Precipitation (rain or snow) +WaterType.OTHER = Other +WaterType.UNKNOWN = Unknown + # WaterUse -WaterUse.DRINKING_HOUSEHOLD_NEEDS=Drinking and household needs -WaterUse.RECREATION=Recreation -WaterUse.INDUSTRY_COMMERCE=Industry and commerce -WaterUse.AGRICULTURE=Agriculture (plants or livestock) -WaterUse.THERMOELECTRICITY_ENERGY=Thermoelectricity/Energy -WaterUse.INSTITUTIONAL_USE=Institutional use -WaterUse.OTHER=Other -WaterUse.UNKNOWN=Unknown +WaterUse.DRINKING_HOUSEHOLD_NEEDS = Drinking and household needs +WaterUse.RECREATION = Recreation +WaterUse.INDUSTRY_COMMERCE = Industry and commerce +WaterUse.AGRICULTURE = Agriculture (plants or livestock) +WaterUse.THERMOELECTRICITY_ENERGY = Thermoelectricity/Energy +WaterUse.INSTITUTIONAL_USE = Institutional use +WaterUse.OTHER = Other +WaterUse.UNKNOWN = Unknown + # Work environment -WorkEnvironment.UNKNOWN=Unknown -WorkEnvironment.OPEN_SPACE_OFFICE=Open space office -WorkEnvironment.FOOD_SECTOR=Food sector -WorkEnvironment.BUILDING_SECTOR=Building sector -WorkEnvironment.LOGISTICS_CENTER=Logistics center -WorkEnvironment.OTHER=Other +WorkEnvironment.UNKNOWN = Unknown +WorkEnvironment.OPEN_SPACE_OFFICE = Open space office +WorkEnvironment.FOOD_SECTOR = Food sector +WorkEnvironment.BUILDING_SECTOR = Building sector +WorkEnvironment.LOGISTICS_CENTER = Logistics center +WorkEnvironment.OTHER = Other + # WorkPlace -WorkPlace.SCHOOL=School -WorkPlace.NURSERY=Nursery -WorkPlace.UNKNOWN=Unknown -WorkPlace.OTHER=Other +WorkPlace.SCHOOL = School +WorkPlace.NURSERY = Nursery +WorkPlace.UNKNOWN = Unknown +WorkPlace.OTHER = Other + # YesNoUnknown -YesNoUnknown.NO=No -YesNoUnknown.UNKNOWN=Unknown -YesNoUnknown.YES=Yes +YesNoUnknown.NO = No +YesNoUnknown.UNKNOWN = Unknown +YesNoUnknown.YES = Yes + #SamplePurpose -SamplePurpose.EXTERNAL=External lab testing -SamplePurpose.INTERNAL=Internal/in-house testing +SamplePurpose.EXTERNAL = External lab testing +SamplePurpose.INTERNAL = Internal/in-house testing + #JurisdictionLevel -JurisdictionLevel.NONE=None -JurisdictionLevel.NATION=Nation -JurisdictionLevel.REGION=Region -JurisdictionLevel.DISTRICT=District -JurisdictionLevel.COMMUNITY=Community -JurisdictionLevel.HEALTH_FACILITY=Facility -JurisdictionLevel.LABORATORY=Laboratory -JurisdictionLevel.POINT_OF_ENTRY=Point of entry -JurisdictionLevel.EXTERNAL_LABORATORY=External laboratory +JurisdictionLevel.NONE = None +JurisdictionLevel.NATION = Nation +JurisdictionLevel.REGION = Region +JurisdictionLevel.DISTRICT = District +JurisdictionLevel.COMMUNITY = Community +JurisdictionLevel.HEALTH_FACILITY = Facility +JurisdictionLevel.LABORATORY = Laboratory +JurisdictionLevel.POINT_OF_ENTRY = Point of entry +JurisdictionLevel.EXTERNAL_LABORATORY = External laboratory + #CampaignFormElementImportance -CampaignFormElementImportance.ALL=All columns -CampaignFormElementImportance.IMPORTANT=Important +CampaignFormElementImportance.ALL = All columns +CampaignFormElementImportance.IMPORTANT = Important + SamplingReason.PRESENCE_OF_SYMPTOMS=Presence of symptoms SamplingReason.OUTBREAK=Exposed to an outbreak area SamplingReason.SCREENING=Screening @@ -2136,6 +2318,7 @@ EndOfQuarantineReason.ASYMPTOMATIC=Asymptomatic after 10 days EndOfQuarantineReason.ISOLATED_AS_CASE=Isolated as Case EndOfQuarantineReason.LOST_TO_FOLLOWUP=Lost to follow-up EndOfQuarantineReason.OTHER=Other + #InfectionSetting InfectionSetting.UNKNOWN=Unknown InfectionSetting.AMBULATORY=Ambulatory @@ -2156,6 +2339,7 @@ InfectionSetting.OTHER_STATION=Other station InfectionSetting.NURSING_HOME=Nursing home InfectionSetting.REHAB_FACILITY=Rehab facility InfectionSetting.OTHER_STATIONARY_FACILITY=Other in-patient facililty + SymptomGroup.GENERAL=General SymptomGroup.RESPIRATORY=Respiratory SymptomGroup.CARDIOVASCULAR=Cardiovascular @@ -2164,6 +2348,7 @@ SymptomGroup.URINARY=Urinary SymptomGroup.NERVOUS_SYSTEM=Nervous system SymptomGroup.SKIN=Skin SymptomGroup.OTHER=Other + #Salutation Salutation.MR=Dear Sir Salutation.MRS=Dear Madame @@ -2171,6 +2356,7 @@ Salutation.MR_AND_MRS=Dear Sir and Madame Salutation.FAMILY=Dear family Salutation.GUARDIAN_OF_MINOR=Dear guardian of the child Salutation.OTHER=Other + #PersonAssociation PersonAssociation.ALL=All PersonAssociation.CASE=Case @@ -2178,22 +2364,26 @@ PersonAssociation.CONTACT=Contact PersonAssociation.EVENT_PARTICIPANT=Event Participant PersonAssociation.IMMUNIZATION=Immunization PersonAssociation.TRAVEL_ENTRY=Travel Entry -ReinfectionDetail.GENOME_SEQUENCE_PREVIOUS_INFECTION_KNOWN=Genome sequence of virus from previous SARS-CoV-2 infection is known -ReinfectionDetail.GENOME_SEQUENCE_CURRENT_INFECTION_KNOWN=Genome sequence of virus from current SARS-CoV-2 infection is known -ReinfectionDetail.GENOME_SEQUENCES_NOT_MATCHING=Genome sequences of viruses from previous and current SARS-CoV-2 infections do not match -ReinfectionDetail.GENOME_COPY_NUMBER_ABOVE_THRESHOLD=SARS-CoV-2 genome copy number within current PCR detection >= 10^6/ml or Ct value < 30 -ReinfectionDetail.GENOME_COPY_NUMBER_BELOW_THRESHOLD=Individual tested positive for SARS-CoV-2 by PCR, but SARS-CoV-2 genome copy number within current PCR detection < 10^6/ml or Ct value >= 30, or both not known -ReinfectionDetail.ACUTE_RESPIRATORY_ILLNESS_OVERCOME=Person has overcome acute respiratory illness following confirmed SARS-CoV-2 infection -ReinfectionDetail.PREVIOUS_ASYMPTOMATIC_INFECTION=Person had an asymptomatic SARS-CoV-2 infection -ReinfectionDetail.TESTED_NEGATIVE_AFTER_PREVIOUS_INFECTION=Person tested conclusively negative by PCR at least once after previous SARS-CoV-2 infection -ReinfectionDetail.LAST_PCR_DETECTION_NOT_RECENT=The last positive PCR detection of the preceding infection was more than 3 months ago -ReinfectionDetailGroup.GENOME_SEQUENCE= -ReinfectionDetailGroup.PRECEDING_INFECTION=Information on the preceding infection -ReinfectionDetailGroup.REINFECTION_EVALUATION=More information on the evaluation of reinfection -ReinfectionDetailGroup.PREVIOUS_INFECTION_COMPLETED=Previous infection completed -ReinfectionStatus.CONFIRMED=Confirmed reinfection -ReinfectionStatus.PROBABLE=Probable reinfection -ReinfectionStatus.POSSIBLE=Possible reinfection + +ReinfectionDetail.GENOME_SEQUENCE_PREVIOUS_INFECTION_KNOWN = Genome sequence of virus from previous SARS-CoV-2 infection is known +ReinfectionDetail.GENOME_SEQUENCE_CURRENT_INFECTION_KNOWN = Genome sequence of virus from current SARS-CoV-2 infection is known +ReinfectionDetail.GENOME_SEQUENCES_NOT_MATCHING = Genome sequences of viruses from previous and current SARS-CoV-2 infections do not match +ReinfectionDetail.GENOME_COPY_NUMBER_ABOVE_THRESHOLD = SARS-CoV-2 genome copy number within current PCR detection >= 10^6/ml or Ct value < 30 +ReinfectionDetail.GENOME_COPY_NUMBER_BELOW_THRESHOLD = Individual tested positive for SARS-CoV-2 by PCR, but SARS-CoV-2 genome copy number within current PCR detection < 10^6/ml or Ct value >= 30, or both not known +ReinfectionDetail.ACUTE_RESPIRATORY_ILLNESS_OVERCOME = Person has overcome acute respiratory illness following confirmed SARS-CoV-2 infection +ReinfectionDetail.PREVIOUS_ASYMPTOMATIC_INFECTION = Person had an asymptomatic SARS-CoV-2 infection +ReinfectionDetail.TESTED_NEGATIVE_AFTER_PREVIOUS_INFECTION = Person tested conclusively negative by PCR at least once after previous SARS-CoV-2 infection +ReinfectionDetail.LAST_PCR_DETECTION_NOT_RECENT = The last positive PCR detection of the preceding infection was more than 3 months ago + +ReinfectionDetailGroup.GENOME_SEQUENCE = +ReinfectionDetailGroup.PRECEDING_INFECTION = Information on the preceding infection +ReinfectionDetailGroup.REINFECTION_EVALUATION = More information on the evaluation of reinfection +ReinfectionDetailGroup.PREVIOUS_INFECTION_COMPLETED = Previous infection completed + +ReinfectionStatus.CONFIRMED = Confirmed reinfection +ReinfectionStatus.PROBABLE = Probable reinfection +ReinfectionStatus.POSSIBLE = Possible reinfection + # Vaccine Vaccine.COMIRNATY=Pfizer-BioNTech COVID-19 vaccine Vaccine.MRNA_1273=Moderna COVID-19 Vaccine @@ -2215,10 +2405,12 @@ Vaccine.LC_16=LC-16 Vaccine.MVA_BN=JYNNEOS Vaccine.UNKNOWN=Unknown Vaccine.OTHER=Other -Vaccine.PREVENAR_13_PFIZER=Pneumococcal polysaccharide conjugate vaccine 13-valent-adsorb (Pfizer) -Vaccine.VAXNEUVANCE_MERCK=Pneumococcal polysaccharide conjugate vaccine 15-valent (Merck) -Vaccine.PREVNAR_20_PFIZER=Pneumococcal polysaccharide conjugate vaccine 20-valent (Pfizer) -Vaccine.PNEUMOVAX_23_MERCK=Pneumococcal polysaccharide vaccine 23-valent (Merck) +Vaccine.PREVENAR_13_PFIZER = Pneumococcal polysaccharide conjugate vaccine 13-valent-adsorb (Pfizer) +Vaccine.VAXNEUVANCE_MERCK = Pneumococcal polysaccharide conjugate vaccine 15-valent (Merck) +Vaccine.PREVNAR_20_PFIZER = Pneumococcal polysaccharide conjugate vaccine 20-valent (Pfizer) +Vaccine.PNEUMOVAX_23_MERCK = Pneumococcal polysaccharide vaccine 23-valent (Merck) + + # VaccineManufacturer VaccineManufacturer.BIONTECH_PFIZER=BioNTech/Pfizer VaccineManufacturer.PFIZER=Pfizer @@ -2236,11 +2428,13 @@ VaccineManufacturer.VALNEVA=Valneva VaccineManufacturer.MERCK=Merck VaccineManufacturer.UNKNOWN=Unknown VaccineManufacturer.OTHER=Other + # InfectionPathCertainty InfectionPathCertainty.SUSPECT=Suspect InfectionPathCertainty.PROBABLE=Probable InfectionPathCertainty.CONFIRMED=Confirmed InfectionPathCertainty.UNKNOWN=Unknown + # HumanTransmissionMode HumanTransmissionMode.FECAL_ORAL_SMEAR_INFECTION=Fecal-oral/smear infection HumanTransmissionMode.PARENTERAL=Parenteral @@ -2249,6 +2443,7 @@ HumanTransmissionMode.RESPIRATORY=Respiratory HumanTransmissionMode.SEXUAL=Sexual HumanTransmissionMode.CONNATAL=Connatal HumanTransmissionMode.OTHER=Other + # ParenteralTransmissionMode ParenteralTransmissionMode.INTRAVENOUS_DRUG_USE=Intravenous drug use ParenteralTransmissionMode.HOUSEHOLD_CONTACT=Household contact @@ -2256,42 +2451,52 @@ ParenteralTransmissionMode.MEDICALLY_ASSOCIATED=Medically associated ParenteralTransmissionMode.TATTOOING_PIERCING=Tattooing/piercing ParenteralTransmissionMode.PEDICURE_MANICURE=Pedicure/manicure ParenteralTransmissionMode.OTHER=Other + # MedicallyAssociatedTransmissionMode MedicallyAssociatedTransmissionMode.OPERATIVE_OR_DIAGNOSTIC_PROCEDURE=Operative or diagnostic procedure MedicallyAssociatedTransmissionMode.BLOOD_PRODUCTS=Blood products MedicallyAssociatedTransmissionMode.ORGAN_TRANSPLANTATION=Organ transplantation MedicallyAssociatedTransmissionMode.DIALYSIS=Dialysis MedicallyAssociatedTransmissionMode.INJECTION_FOR_MEDICAL_PURPOSES=Injection for medical purposes + + # MultipleBirth MultipleBirth.SINGLE=Single birth (Singleton - 1) MultipleBirth.TWINS=Twin birth (Twins - 2) MultipleBirth.MULTIPLE=Multiple birth (Triplet 3+ or more) + # ExternalShareDateType -ExternalShareDateType.LAST_EXTERNAL_SURVEILLANCE_TOOL_SHARE=Last share with reporting tool +ExternalShareDateType.LAST_EXTERNAL_SURVEILLANCE_TOOL_SHARE = Last share with reporting tool + # ExternalShareStatus ExternalShareStatus.SHARED=Shared ExternalShareStatus.DELETED=Deleted + # ExternalMessageStatus ExternalMessageStatus.UNPROCESSED=Unprocessed ExternalMessageStatus.PROCESSED=Processed ExternalMessageStatus.FORWARDED=Forwarded ExternalMessageStatus.UNCLEAR=Unclear + # ExternalMessageType ExternalMessageType.LAB_MESSAGE=Lab message ExternalMessageType.PHYSICIANS_REPORT=Physician's report -ExternalMessageType.SURVEY_RESPONSE=Survey response + # ShareRequestDataType -ShareRequestDataType.CASE=Case -ShareRequestDataType.CONTACT=Contact -ShareRequestDataType.EVENT=Event +ShareRequestDataType.CASE = Case +ShareRequestDataType.CONTACT = Contact +ShareRequestDataType.EVENT = Event + # ShareRequestStatus -ShareRequestStatus.PENDING=Pending -ShareRequestStatus.ACCEPTED=Accepted -ShareRequestStatus.REJECTED=Rejected -ShareRequestStatus.REVOKED=Revoked +ShareRequestStatus.PENDING = Pending +ShareRequestStatus.ACCEPTED = Accepted +ShareRequestStatus.REJECTED = Rejected +ShareRequestStatus.REVOKED = Revoked + # EventCriteriaDateType -EventCriteriaDateType.EVENT_DATE=Event date -EventCriteriaDateType.REPORT_DATE=Report date +EventCriteriaDateType.EVENT_DATE = Event date +EventCriteriaDateType.REPORT_DATE = Report date + #EpidemiologicalEvidenceDetail EpidemiologicalEvidenceDetail.STUDY=Study EpidemiologicalEvidenceDetail.CASE_CONTROL_STUDY=Case control study @@ -2306,6 +2511,7 @@ EpidemiologicalEvidenceDetail.DIRECT_OCCURENCE=Person: cases were in direct or i EpidemiologicalEvidenceDetail.SUSPICION=Suspicion EpidemiologicalEvidenceDetail.EXPRESSED_BY_DISEASED=Expressed by the diseased person EpidemiologicalEvidenceDetail.EXPRESSED_BY_HEALTH_DEPARTMENT=Expressed by the health department + #LaboratoryDiagnosticEvidenceDetail LaboratoryDiagnosticEvidenceDetail.VERIFICATION_OF_AT_LEAST_TWO_INFECTED=Verification of at least two infected or diseased persons LaboratoryDiagnosticEvidenceDetail.COMPLIANT_PATHOGEN_FINE_TYPING=Compliant pathogen fine typing @@ -2314,142 +2520,158 @@ LaboratoryDiagnosticEvidenceDetail.IMPRESSION_TEST=Impression test LaboratoryDiagnosticEvidenceDetail.WATER_SAMPLE=Water sample LaboratoryDiagnosticEvidenceDetail.OTHER=Other LaboratoryDiagnosticEvidenceDetail.PATHOGEN_FINE_TYPING_COMPLIANT_WITH_CASE=Pathogen fine typing compliant with the one of cases + #ImmunizationStatus -ImmunizationStatus.PENDING=Pending -ImmunizationStatus.ACQUIRED=Acquired -ImmunizationStatus.NOT_ACQUIRED=Not acquired -ImmunizationStatus.EXPIRED=Expired +ImmunizationStatus.PENDING = Pending +ImmunizationStatus.ACQUIRED = Acquired +ImmunizationStatus.NOT_ACQUIRED = Not acquired +ImmunizationStatus.EXPIRED = Expired + #ImmunizationManagementStatus -ImmunizationManagementStatus.SCHEDULED=Scheduled -ImmunizationManagementStatus.ONGOING=Ongoing -ImmunizationManagementStatus.COMPLETED=Completed -ImmunizationManagementStatus.CANCELED=Canceled +ImmunizationManagementStatus.SCHEDULED = Scheduled +ImmunizationManagementStatus.ONGOING = Ongoing +ImmunizationManagementStatus.COMPLETED = Completed +ImmunizationManagementStatus.CANCELED = Canceled + #MeansOfImmunization -MeansOfImmunization.VACCINATION=Vaccination -MeansOfImmunization.RECOVERY=Recovery -MeansOfImmunization.VACCINATION_RECOVERY=Vaccination/Recovery -MeansOfImmunization.MATERNAL_VACCINATION=Maternal vaccination -MeansOfImmunization.MONOCLONAL_ANTIBODY=Monoclonal antibody -MeansOfImmunization.OTHER=Other +MeansOfImmunization.VACCINATION = Vaccination +MeansOfImmunization.RECOVERY = Recovery +MeansOfImmunization.VACCINATION_RECOVERY = Vaccination/Recovery +MeansOfImmunization.MATERNAL_VACCINATION = Maternal vaccination +MeansOfImmunization.MONOCLONAL_ANTIBODY = Monoclonal antibody +MeansOfImmunization.OTHER = Other + #InjectionFacility -InjectionFacility.MATERNITY_WARD=Maternity ward -InjectionFacility.PAEDIATRIC_PRACTICE=Paediatric practice -InjectionFacility.HOSPITAL=Hospital +InjectionFacility.MATERNITY_WARD = Maternity ward +InjectionFacility.PAEDIATRIC_PRACTICE = Paediatric practice +InjectionFacility.HOSPITAL = Hospital + #EnumColumn -EnumColumn.TYPE=Type -EnumColumn.VALUE=Value -EnumColumn.CAPTION=Caption -EnumColumn.DESCRIPTION=Description -EnumColumn.SHORT=Short +EnumColumn.TYPE = Type +EnumColumn.VALUE = Value +EnumColumn.CAPTION = Caption +EnumColumn.DESCRIPTION = Description +EnumColumn.SHORT = Short + #NotificationType -NotificationType.CASE_CLASSIFICATION_CHANGED=Case classification changed -NotificationType.Desc.CASE_CLASSIFICATION_CHANGED=Sent to all users associated to the region or responsible region of a case. -NotificationType.CASE_INVESTIGATION_DONE=Case investigation done -NotificationType.Desc.CASE_INVESTIGATION_DONE=Sent to all users associated to the region or responsible region of a case. -NotificationType.EVENT_PARTICIPANT_CASE_CLASSIFICATION_CONFIRMED=Event participant case classification confirmed -NotificationType.Desc.EVENT_PARTICIPANT_CASE_CLASSIFICATION_CONFIRMED=When a case is set to a confirmed classification, this is sent to all responsible users of active events in which the case person participated and which took place no earlier than 30 days before the case was classified. -NotificationType.EVENT_PARTICIPANT_RELATED_TO_OTHER_EVENTS=Event participant related to other events -NotificationType.Desc.EVENT_PARTICIPANT_RELATED_TO_OTHER_EVENTS=When a new event participant is created, this is sent to all responsible users of active events in which the person also participated and which took place no earlier than 30 days before. -NotificationType.CASE_LAB_RESULT_ARRIVED=Case lab result arrived -NotificationType.Desc.CASE_LAB_RESULT_ARRIVED=Sent to all users associated to the region or responsible region of a case when a pathogen test result is entered or modified (non-pending). -NotificationType.CONTACT_LAB_RESULT_ARRIVED=Contact lab result arrived -NotificationType.Desc.CONTACT_LAB_RESULT_ARRIVED=Sent to all users associated to the region of a contact when a pathogen test result is entered or modified (non-pending). If the contact has no region the region of the source case is used. -NotificationType.EVENT_PARTICIPANT_LAB_RESULT_ARRIVED=Event participant lab result arrived -NotificationType.Desc.EVENT_PARTICIPANT_LAB_RESULT_ARRIVED=Sent to all users associated to the region of an event participant when a pathogen test result is entered or modified (non-pending). -NotificationType.LAB_SAMPLE_SHIPPED=Lab sample shipped -NotificationType.Desc.LAB_SAMPLE_SHIPPED=Sent to all users of a laboratory when a sample of that laboratory is shipped. -NotificationType.CONTACT_SYMPTOMATIC=Contact symptomatic -NotificationType.Desc.CONTACT_SYMPTOMATIC=Sent to all users associated to the region of a contact when a new symptomatic visit is created and the contact was previously asymptomatic. If the contact has no region the region of the source case is used. -NotificationType.TASK_START=Task start -NotificationType.Desc.TASK_START=Sent to the assignee of a task and all observer users when the task start date is within the last 10 minutes. -NotificationType.TASK_DUE=Task due -NotificationType.Desc.TASK_DUE=Sent to the assignee of a task and all observer users when the task due date is within the last 10 minutes. -NotificationType.TASK_UPDATED_ASSIGNEE=Task assignee updated -NotificationType.Desc.TASK_UPDATED_ASSIGNEE=Sent to the previous and new assignee of a task. -NotificationType.CONTACT_VISIT_COMPLETED=Contact visit completed -NotificationType.Desc.CONTACT_VISIT_COMPLETED=Sent to all users associated to the region of a contact and all observer users when a "Contact follow-up" task is completed. If the contact has no region the region of the source case is used. -NotificationType.CASE_DISEASE_CHANGED=Case disease changed -NotificationType.Desc.CASE_DISEASE_CHANGED=Sent to all users associated to the region or responsible region of a case when the disease was previously set to 'Unspecified VHF'. -NotificationType.EVENT_GROUP_CREATED=Event group created -NotificationType.Desc.EVENT_GROUP_CREATED=Sent to all responsible users of events that are part of a newly created event group. -NotificationType.EVENT_ADDED_TO_EVENT_GROUP=Event added to event group -NotificationType.Desc.EVENT_ADDED_TO_EVENT_GROUP=Sent to all responsible users of events that are part of the modified event group. -NotificationType.EVENT_REMOVED_FROM_EVENT_GROUP=Event removed from event group -NotificationType.Desc.EVENT_REMOVED_FROM_EVENT_GROUP=Sent to all responsible users of the removed event and events that are part of the modified event group. -#NotificationTypeGroup -NotificationTypeGroup.CASES=Cases -NotificationTypeGroup.CONTACTS=Contacts -NotificationTypeGroup.EVENTS=Events -NotificationTypeGroup.SAMPLES=Samples -NotificationTypeGroup.TASKS=Tasks +NotificationType.CASE_CLASSIFICATION_CHANGED = Case classification changed +NotificationType.Desc.CASE_CLASSIFICATION_CHANGED = Sent to all users associated to the region or responsible region of a case. +NotificationType.CASE_INVESTIGATION_DONE = Case investigation done +NotificationType.Desc.CASE_INVESTIGATION_DONE = Sent to all users associated to the region or responsible region of a case. +NotificationType.EVENT_PARTICIPANT_CASE_CLASSIFICATION_CONFIRMED = Event participant case classification confirmed +NotificationType.Desc.EVENT_PARTICIPANT_CASE_CLASSIFICATION_CONFIRMED = When a case is set to a confirmed classification, this is sent to all responsible users of active events in which the case person participated and which took place no earlier than 30 days before the case was classified. +NotificationType.EVENT_PARTICIPANT_RELATED_TO_OTHER_EVENTS = Event participant related to other events +NotificationType.Desc.EVENT_PARTICIPANT_RELATED_TO_OTHER_EVENTS = When a new event participant is created, this is sent to all responsible users of active events in which the person also participated and which took place no earlier than 30 days before. +NotificationType.CASE_LAB_RESULT_ARRIVED = Case lab result arrived +NotificationType.Desc.CASE_LAB_RESULT_ARRIVED = Sent to all users associated to the region or responsible region of a case when a pathogen test result is entered or modified (non-pending). +NotificationType.CONTACT_LAB_RESULT_ARRIVED = Contact lab result arrived +NotificationType.Desc.CONTACT_LAB_RESULT_ARRIVED = Sent to all users associated to the region of a contact when a pathogen test result is entered or modified (non-pending). If the contact has no region the region of the source case is used. +NotificationType.EVENT_PARTICIPANT_LAB_RESULT_ARRIVED = Event participant lab result arrived +NotificationType.Desc.EVENT_PARTICIPANT_LAB_RESULT_ARRIVED = Sent to all users associated to the region of an event participant when a pathogen test result is entered or modified (non-pending). +NotificationType.LAB_SAMPLE_SHIPPED = Lab sample shipped +NotificationType.Desc.LAB_SAMPLE_SHIPPED = Sent to all users of a laboratory when a sample of that laboratory is shipped. +NotificationType.CONTACT_SYMPTOMATIC = Contact symptomatic +NotificationType.Desc.CONTACT_SYMPTOMATIC = Sent to all users associated to the region of a contact when a new symptomatic visit is created and the contact was previously asymptomatic. If the contact has no region the region of the source case is used. +NotificationType.TASK_START= Task start +NotificationType.Desc.TASK_START= Sent to the assignee of a task and all observer users when the task start date is within the last 10 minutes. +NotificationType.TASK_DUE = Task due +NotificationType.Desc.TASK_DUE = Sent to the assignee of a task and all observer users when the task due date is within the last 10 minutes. +NotificationType.TASK_UPDATED_ASSIGNEE = Task assignee updated +NotificationType.Desc.TASK_UPDATED_ASSIGNEE = Sent to the previous and new assignee of a task. +NotificationType.CONTACT_VISIT_COMPLETED = Contact visit completed +NotificationType.Desc.CONTACT_VISIT_COMPLETED = Sent to all users associated to the region of a contact and all observer users when a "Contact follow-up" task is completed. If the contact has no region the region of the source case is used. +NotificationType.CASE_DISEASE_CHANGED = Case disease changed +NotificationType.Desc.CASE_DISEASE_CHANGED = Sent to all users associated to the region or responsible region of a case when the disease was previously set to 'Unspecified VHF'. +NotificationType.EVENT_GROUP_CREATED = Event group created +NotificationType.Desc.EVENT_GROUP_CREATED = Sent to all responsible users of events that are part of a newly created event group. +NotificationType.EVENT_ADDED_TO_EVENT_GROUP = Event added to event group +NotificationType.Desc.EVENT_ADDED_TO_EVENT_GROUP = Sent to all responsible users of events that are part of the modified event group. +NotificationType.EVENT_REMOVED_FROM_EVENT_GROUP = Event removed from event group +NotificationType.Desc.EVENT_REMOVED_FROM_EVENT_GROUP = Sent to all responsible users of the removed event and events that are part of the modified event group. + + #NotificationTypeGroup +NotificationTypeGroup.CASES = Cases +NotificationTypeGroup.CONTACTS = Contacts +NotificationTypeGroup.EVENTS = Events +NotificationTypeGroup.SAMPLES = Samples +NotificationTypeGroup.TASKS = Tasks + #S2SOwnershipStatusFilter S2SOwnershipStatusFilter.OWNED=With ownership S2SOwnershipStatusFilter.NOT_OWNED=To view S2SOwnershipStatusFilter.ALL=All + #ShareRequestViewType ShareRequestViewType.INCOMING=Incoming ShareRequestViewType.OUTGOING=Outgoing + # SampleDashboardFilterDateType SampleDashboardFilterDateType.SAMPLE_DATE_TIME=Date sample was collected SampleDashboardFilterDateType.ASSOCIATED_ENTITY_REPORT_DATE=Report date of associated entity SampleDashboardFilterDateType.MOST_RELEVANT=Most relevant date + #SampleDashboardCustomDiseaseFilter -SampleDashboardCustomDiseaseFilter.NO_DISEASE=No Disease +SampleDashboardCustomDiseaseFilter.NO_DISEASE = No Disease + #SampleShipmentStatus SampleShipmentStatus.SHIPPED=Shipped SampleShipmentStatus.NOT_SHIPPED=Not shipped SampleShipmentStatus.RECEIVED=Received + #Pathogen Customizable enum -Pathogen.CAMPYLOBACTER_JEJUNI=Campylobacter jejuni -Pathogen.ESCHERICHIA_COLI=Escherichia coli -Pathogen.SALMONELLA_SPP=Salmonella spp. -Pathogen.SHIGELLA_SPP=Shigella spp. -Pathogen.VIBRIO_CHOLERAE=Vibrio cholerae -Pathogen.YERSINIA_SPP=Yersinia spp. -Pathogen.SARS_COV_2=SARS-CoV-2 -Pathogen.ADENOVIRUS=Adenovirus -Pathogen.ASTROVIRUS=Astrovirus -Pathogen.COXSACKIE_VIRUS=Coxsackie virus -Pathogen.ECHOVIRUS=Echovirus -Pathogen.HEPATITIS_A_VIRUS=Hepatitis A virus -Pathogen.HEPATITIS_E_VIRUS=Hepatitis E virus -Pathogen.HUMAN_CALICIVIRUS=Human calicivirus -Pathogen.POLIO_VIRUS=Polio virus 2 -Pathogen.REOVIRUS=Reovirus -Pathogen.ROTAVIRUS=Rotavirus -Pathogen.TT_HEPATITIS=TT hepatitis -Pathogen.OTHER=Other +Pathogen.CAMPYLOBACTER_JEJUNI = Campylobacter jejuni +Pathogen.ESCHERICHIA_COLI = Escherichia coli +Pathogen.SALMONELLA_SPP = Salmonella spp. +Pathogen.SHIGELLA_SPP = Shigella spp. +Pathogen.VIBRIO_CHOLERAE = Vibrio cholerae +Pathogen.YERSINIA_SPP = Yersinia spp. +Pathogen.SARS_COV_2 = SARS-CoV-2 +Pathogen.ADENOVIRUS = Adenovirus +Pathogen.ASTROVIRUS = Astrovirus +Pathogen.COXSACKIE_VIRUS = Coxsackie virus +Pathogen.ECHOVIRUS = Echovirus +Pathogen.HEPATITIS_A_VIRUS = Hepatitis A virus +Pathogen.HEPATITIS_E_VIRUS = Hepatitis E virus +Pathogen.HUMAN_CALICIVIRUS = Human calicivirus +Pathogen.POLIO_VIRUS = Polio virus 2 +Pathogen.REOVIRUS = Reovirus +Pathogen.ROTAVIRUS = Rotavirus +Pathogen.TT_HEPATITIS = TT hepatitis +Pathogen.OTHER = Other + # EnvironmentSampleMaterial -EnvironmentSampleMaterial.WATER=Water -EnvironmentSampleMaterial.SOIL=Soil -EnvironmentSampleMaterial.AIR=Air -EnvironmentSampleMaterial.VECTORS=Vectors -EnvironmentSampleMaterial.OTHER=Other +EnvironmentSampleMaterial.WATER = Water +EnvironmentSampleMaterial.SOIL = Soil +EnvironmentSampleMaterial.AIR = Air +EnvironmentSampleMaterial.VECTORS = Vectors +EnvironmentSampleMaterial.OTHER = Other + # WeatherCondition -WeatherCondition.SUNNY=Sunny -WeatherCondition.CLOUDY=Cloudy -WeatherCondition.RAINING=Raining -WeatherCondition.WINDY=Windy +WeatherCondition.SUNNY = Sunny +WeatherCondition.CLOUDY = Cloudy +WeatherCondition.RAINING = Raining +WeatherCondition.WINDY = Windy + #Pathogen Customizable enum -Pathogen.CAMPYLOBACTER_JEJUNI=Campylobacter jejuni -Pathogen.ESCHERICHIA_COLI=Escherichia coli -Pathogen.SALMONELLA_SPP=Salmonella spp. -Pathogen.SHIGELLA_SPP=Shigella spp. -Pathogen.VIBRIO_CHOLERAE=Vibrio cholerae -Pathogen.YERSINIA_SPP=Yersinia spp. -Pathogen.SARS_COV_2=SARS-CoV-2 -Pathogen.ADENOVIRUS=Adenovirus -Pathogen.ASTROVIRUS=Astrovirus -Pathogen.COXSACKIE_VIRUS=Coxsackie virus -Pathogen.ECHOVIRUS=Echovirus -Pathogen.HEPATITIS_A_VIRUS=Hepatitis A virus -Pathogen.HEPATITIS_E_VIRUS=Hepatitis E virus -Pathogen.HUMAN_CALICIVIRUS=Human calicivirus -Pathogen.POLIO_VIRUS=Polio virus 2 -Pathogen.REOVIRUS=Reovirus -Pathogen.ROTAVIRUS=Rotavirus -Pathogen.TT_HEPATITIS=TT hepatitis -Pathogen.OTHER=Other +Pathogen.CAMPYLOBACTER_JEJUNI = Campylobacter jejuni +Pathogen.ESCHERICHIA_COLI = Escherichia coli +Pathogen.SALMONELLA_SPP = Salmonella spp. +Pathogen.SHIGELLA_SPP = Shigella spp. +Pathogen.VIBRIO_CHOLERAE = Vibrio cholerae +Pathogen.YERSINIA_SPP = Yersinia spp. +Pathogen.SARS_COV_2 = SARS-CoV-2 +Pathogen.ADENOVIRUS = Adenovirus +Pathogen.ASTROVIRUS = Astrovirus +Pathogen.COXSACKIE_VIRUS = Coxsackie virus +Pathogen.ECHOVIRUS = Echovirus +Pathogen.HEPATITIS_A_VIRUS = Hepatitis A virus +Pathogen.HEPATITIS_E_VIRUS = Hepatitis E virus +Pathogen.HUMAN_CALICIVIRUS = Human calicivirus +Pathogen.POLIO_VIRUS = Polio virus 2 +Pathogen.REOVIRUS = Reovirus +Pathogen.ROTAVIRUS = Rotavirus +Pathogen.TT_HEPATITIS = TT hepatitis +Pathogen.OTHER = Other # SelfReportType SelfReportType.CASE=Case SelfReportType.CONTACT=Contact @@ -2461,15 +2683,18 @@ SelfReportInvestigationStatus.REJECTED=Rejected # SelfReportProcessingStatus SelfReportProcessingStatus.UNPROCESSED=Unprocessed SelfReportProcessingStatus.PROCESSED=Processed + # AefiAgeGroup -AefiAgeGroup.ZERO_TO_ONE=0 < 1 year -AefiAgeGroup.ONE_TO_FIVE=1- 5 years -AefiAgeGroup.FIVE_TO_EIGHTEEN=> 5 years - 18 years -AefiAgeGroup.EIGHTEEN_TO_SIXTY=> 18 years - 60 years -AefiAgeGroup.SIXY_AND_ABOVE=> 60 years +AefiAgeGroup.ZERO_TO_ONE = 0 < 1 year +AefiAgeGroup.ONE_TO_FIVE = 1- 5 years +AefiAgeGroup.FIVE_TO_EIGHTEEN = > 5 years - 18 years +AefiAgeGroup.EIGHTEEN_TO_SIXTY = > 18 years - 60 years +AefiAgeGroup.SIXY_AND_ABOVE = > 60 years + # SeizureType SeizureType.FEBRILE=Febrile SeizureType.AFEBRILE=Afebrile + # SeriousAefiReason SeriousAefiReason.DEATH=Death SeriousAefiReason.LIFE_THREATENING=Life threatening @@ -2477,6 +2702,7 @@ SeriousAefiReason.DISABILITY=Disability SeriousAefiReason.HOSPITALIZATION=Hospitalization SeriousAefiReason.CONGENITAL_ANOMALY=Congenital anomaly SeriousAefiReason.OTHER=Other + # AefiOutcome AefiOutcome.RECOVERING=Recovering AefiOutcome.RECOVERED=Recovered @@ -2484,109 +2710,137 @@ AefiOutcome.RECOVERED_WITH_SEQUELAE=Recovered with sequelae AefiOutcome.NOT_RECOVERED=Not Recovered AefiOutcome.UNKNOWN=Unknown AefiOutcome.DIED=Died + # AefiType AefiType.SERIOUS=Serious AefiType.NON_SERIOUS=Non-serious + # AefiDateType AefiDateType.REPORT_DATE=Date of report AefiDateType.START_DATE=Date of onset AefiDateType.VACCINATION_DATE=Date of vaccination + # AefiDashboardFilterDateType AefiDashboardFilterDateType.REPORT_DATE=Date of report AefiDashboardFilterDateType.START_DATE=Date of onset + # AefiInvestigationDateType AefiInvestigationDateType.REPORT_DATE=Date of report AefiInvestigationDateType.INVESTIGATION_DATE=Date of investigation AefiInvestigationDateType.VACCINATION_DATE=Date of vaccination + # PlaceOfVaccination PlaceOfVaccination.GOVERNMENT_HEALTH_FACILITY=Government health facility PlaceOfVaccination.PRIVATE_HEALTH_FACILITY=Private health facility PlaceOfVaccination.OTHER=Other + # VaccinationActivity VaccinationActivity.CAMPAIGN=Campaign VaccinationActivity.ROUTINE=Routine VaccinationActivity.OTHER=Other + # AefiInvestigationStage AefiInvestigationStage.FIRST=First AefiInvestigationStage.INTERIM=Interim AefiInvestigationStage.FINAL=Final + # VaccinationSite VaccinationSite.FIXED=Fixed VaccinationSite.MOBILE=Mobile VaccinationSite.OUTREACH=Outreach VaccinationSite.OTHER=Other + # PatientStatusAtAefiInvestigation PatientStatusAtAefiInvestigation.DIED=Died PatientStatusAtAefiInvestigation.DISABLED=Disabled PatientStatusAtAefiInvestigation.RECOVERED=Recovering PatientStatusAtAefiInvestigation.RECOVERED_COMPLETELY=Recovered completely PatientStatusAtAefiInvestigation.UNKNOWN=Unknown + # BirthTerm BirthTerm.FULL_TERM=Full-term BirthTerm.PRE_TERM=Pre-term BirthTerm.POST_TERM=Post-term + # BirthWeightCategory BirthWeightCategory.NORMAL=Normal birth weight BirthWeightCategory.LOW_BIRTH_WEIGHT=Low birth weight (stunted growth) + # DeliveryProcedure DeliveryProcedure.NORMAL=Normal DeliveryProcedure.CAESAREAN=Caesarean DeliveryProcedure.ASSISTED=Assisted (forceps, vacuum etc.) DeliveryProcedure.WITH_COMPLICATION=with complication + # SeriousAefiInfoSource SeriousAefiInfoSource.EXAMINATION=Examination by the investigator SeriousAefiInfoSource.DOCUMENTS=Documents SeriousAefiInfoSource.VERBAL_AUTOPSY=Verbal autopsy SeriousAefiInfoSource.OTHER=Other + # AefiImmunizationPeriod AefiImmunizationPeriod.WITHIN_FIRST_VACCINATIONS=Within the first vaccinations of the session AefiImmunizationPeriod.WITHIN_LAST_VACCINATIONS=Within the last vaccinations of the session AefiImmunizationPeriod.UNKNOWN=Unknown + # AefiVaccinationPeriod AefiVaccinationPeriod.WITHIN_FIRST_FEW_DOSES=Within the first few doses of the vial administered AefiVaccinationPeriod.WITHIN_LAST_DOSES=Within the last doses of the vial administered AefiVaccinationPeriod.UNKNOWN=Unknown + # SyringeType SyringeType.GLASS=Glass SyringeType.DISPOSABLE=Disposable SyringeType.RECYCLED_DISPOSABLE=Recycled disposable SyringeType.OTHER=Other + # VaccineCarrier VaccineCarrier.SHORT_RANGE=Short range VaccineCarrier.LONG_RANGE=Long range VaccineCarrier.OTHER=Other + # AefiInvestigationStatus AefiInvestigationStatus.DONE=Done AefiInvestigationStatus.DISCARDED=Discarded + # AefiCausality AefiCausality.CONFIRMED=Confirmed AefiCausality.INCONCLUSIVE=Inconclusive + # AefiClassification AefiClassification.RELATED_TO_VACCINE_OR_VACCINATION=Related to vaccine or vaccination AefiClassification.COINCIDENTAL_ADVERSE_EVENT=Coincidental adverse event AefiClassification.UNDETERMINED=Undetermined + # AefiClassificationSubType AefiClassificationSubType.VACCINE_PRODUCT_RELATED=Vaccine product related AefiClassificationSubType.VACCINE_QUALITY_DEFECT_RELATED=Vaccine quality defect related AefiClassificationSubType.IMMUNIZATION_ERROR_RELATED=Immunization error related AefiClassificationSubType.IMMUNIZATION_ANXIETY_RELATED=Immunization anxiety related + # SurveyResponseStatus SurveyResponseStatus.RECEIVED=Response received SurveyResponseStatus.NOT_RECEIVED=No response received + + # DiseaseConfigurationFilterReportingType DiseaseConfigurationFilterReportingType.CASE_BASED_SURVEILLANCE=Case surveillance DiseaseConfigurationFilterReportingType.AGGREGATE_REPORTING=Aggregate reporting + # ActiveRelevanceStatus ActiveRelevanceStatus.ALL=Active and inactive records ActiveRelevanceStatus.ACTIVE=Active records ActiveRelevanceStatus.INACTIVE=Inactive records + # RadiographyCompatibility -RadiographyCompatibility.COMPATIBLE_WITH_TB=Compatible with TB regardless of the anatomical site the sites of the disease -RadiographyCompatibility.NOT_COMPATIBLE_WITH_TB=Not compatible with TB regardless of the anatomical site +RadiographyCompatibility.COMPATIBLE_WITH_TB = Compatible with TB regardless of the anatomical site the sites of the disease +RadiographyCompatibility.NOT_COMPATIBLE_WITH_TB = Not compatible with TB regardless of the anatomical site + # ClinicalPresentationStatus ClinicalPresentationStatus.ASYMPTOMATIC=Asymtomatic ClinicalPresentationStatus.COMPATIBLE=Compatible with %s regardless of the anatomical site ClinicalPresentationStatus.UNKNOWN=Unknown + # InfectionSite InfectionSite.NOT_APPLICABLE=Not applicable InfectionSite.BONES_JOINTS_OTHER_THAN_VERTEBRAE=Bones/ joints (other than vertebrae) @@ -2604,36 +2858,26 @@ InfectionSite.UROGENITAL_SYSTEM=Urogenital system InfectionSite.VERTEBRAE=Vertebrae InfectionSite.UNKNOWN=Unknown InfectionSite.OTHER=Other + # DiagnosisType DiagnosisType.PULMONARY=Pulmonary DiagnosisType.EXTRAPULMONARY=Extrapulmonary + # EpipulseExportStatus EpipulseExportStatus.PENDING=Pending EpipulseExportStatus.IN_PROGRESS=In Progress EpipulseExportStatus.COMPLETED=Completed EpipulseExportStatus.FAILED=Failed EpipulseExportStatus.CANCELLED=Cancelled + # EpipulseSubjectCode -EpipulseSubjectCode.PERT=Pertussis -EpipulseSubjectCode.MEAS=Measles -EpipulseSubjectCode.PNEU=Invasive Pneumococcal Infection -EpipulseSubjectCode.MENI=Invasive Meningococcal Infection +EpipulseSubjectCode.PERT = Pertussis +EpipulseSubjectCode.MEAS = Measles +EpipulseSubjectCode.PNEU = Invasive Pneumococcal Infection +EpipulseSubjectCode.MENI = Invasive Meningococcal Infection + # EpipulseDiseaseRef -EpipulseDiseaseRef.PERT=Pertussis -EpipulseDiseaseRef.MEAS=Measles -EpipulseDiseaseRef.PNEU=Invasive Pneumococcal Infection -EpipulseDiseaseRef.MENI=Invasive Meningococcal Infection -# DataPatchFailureCause -DataPatchFailureCause.INVALID_MULTIPLE_FIELDS_FORMAT=Invalid multiple-fields path format -DataPatchFailureCause.MISSING_MANDATORY_FIELD_FOR_GROUP=Missing mandatory field required by this group -DataPatchFailureCause.FORBIDDEN_NON_UNIQUE_ALIAS=Alias maps to multiple fields and cannot be used -DataPatchFailureCause.NOT_PRESENT_IN_REFERENCE_DATA_LIST=Value not found in the allowed reference data list -DataPatchFailureCause.UNSUPPORTED_FIELD_FOR_DISEASE_OR_COUNTRY_OR_FEATURE=Field not supported for this disease, country or feature configuration -DataPatchFailureCause.UNSUPPORTED_PREFIX=Path prefix is not supported (must start with CaseData or Person) -DataPatchFailureCause.FIELD_DOES_NOT_EXIST=Field does not exist -DataPatchFailureCause.FORBIDDEN_FIELD=Field is not allowed to be modified -DataPatchFailureCause.FORBIDDEN_VALUE_OVERRIDE=Field already has a value and the replacement strategy prevents overwriting it -DataPatchFailureCause.INVALID_VALUE_TYPE=Provided value has the wrong type for this field -DataPatchFailureCause.UNSUPPORTED_TARGET_TYPE=Field type is not yet supported for patching -DataPatchFailureCause.INVALID_PATH_FORMAT=Field path has an invalid format -DataPatchFailureCause.TECHNICAL=Internal processing error +EpipulseDiseaseRef.PERT = Pertussis +EpipulseDiseaseRef.MEAS = Measles +EpipulseDiseaseRef.PNEU = Invasive Pneumococcal Infection +EpipulseDiseaseRef.MENI = Invasive Meningococcal Infection diff --git a/sormas-api/src/main/resources/enum_fr-FR.properties b/sormas-api/src/main/resources/enum_fr-FR.properties index 33e985e3fdf..eee28de29a4 100644 --- a/sormas-api/src/main/resources/enum_fr-FR.properties +++ b/sormas-api/src/main/resources/enum_fr-FR.properties @@ -15,27 +15,33 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . ############################################################################### + # Enum captions and descriptions + # ActionContext -ActionContext.EVENT=Évènement -ActionMeasure.PROHIBITION_OF_ENTRY_AND_WORK_CASES=Interdiction d'entrée et de travail pour les personnes de cas -ActionMeasure.SAMPLE_COLLECTION=Collection d'échantillons -ActionMeasure.FORWARDING_TO_NATIONAL_REFERENCE_CENTER=Transmission vers le centre national de référence -ActionMeasure.CONTACT_FOLLOW_UP=Activer le suivi des personnes de contact -ActionMeasure.VERIFICATION_OF_VACCINATION_IMMUNIZATION=Vérification du statut de vaccination ou d'immunisation -ActionMeasure.POST_EXPOSURE_PROPHYLAXIS_VACCINATION=Effectuer une vaccination prophylactique après exposition -ActionMeasure.CLOSURE_OF_FACILITY=Fermeture de l'établissement -ActionMeasure.PROHIBITION_OF_ENTRY_AND_WORK_CONTACTS=Interdiction d'entrée et de travail pour les personnes de contact -ActionMeasure.POPULATION_INFORMATION=Informations sur la population à propos de l'épidémie -ActionMeasure.OTHER=Autres +ActionContext.EVENT = Évènement + +ActionMeasure.PROHIBITION_OF_ENTRY_AND_WORK_CASES = Interdiction d'entrée et de travail pour les personnes de cas +ActionMeasure.SAMPLE_COLLECTION = Collection d'échantillons +ActionMeasure.FORWARDING_TO_NATIONAL_REFERENCE_CENTER = Transmission vers le centre national de référence +ActionMeasure.CONTACT_FOLLOW_UP = Activer le suivi des personnes de contact +ActionMeasure.VERIFICATION_OF_VACCINATION_IMMUNIZATION = Vérification du statut de vaccination ou d'immunisation +ActionMeasure.POST_EXPOSURE_PROPHYLAXIS_VACCINATION = Effectuer une vaccination prophylactique après exposition +ActionMeasure.CLOSURE_OF_FACILITY = Fermeture de l'établissement +ActionMeasure.PROHIBITION_OF_ENTRY_AND_WORK_CONTACTS = Interdiction d'entrée et de travail pour les personnes de contact +ActionMeasure.POPULATION_INFORMATION = Informations sur la population à propos de l'épidémie +ActionMeasure.OTHER = Autres + # ActionPriority -ActionPriority.HIGH=Élevée -ActionPriority.LOW=Bas -ActionPriority.NORMAL=Normal +ActionPriority.HIGH = Élevée +ActionPriority.LOW = Bas +ActionPriority.NORMAL = Normal + # ActionStatus -ActionStatus.DONE=Fait -ActionStatus.PENDING=En attente -ActionStatus.IN_PROGRESS=En cours +ActionStatus.DONE = Fait +ActionStatus.PENDING = En attente +ActionStatus.IN_PROGRESS = En cours + # ActivityAsCaseType ActivityAsCaseType.WORK=Travail ActivityAsCaseType.TRAVEL=Voyage @@ -47,563 +53,620 @@ ActivityAsCaseType.PERSONAL_SERVICES=Services personnels ActivityAsCaseType.CARED_FOR=Soigné pour ActivityAsCaseType.OTHER=Autres ActivityAsCaseType.UNKNOWN=Inconnu + # AdditionalTestingStatus -AdditionalTestingStatus.NOT_REQUESTED=Non demandé -AdditionalTestingStatus.REQUESTED=Demandé -AdditionalTestingStatus.PERFORMED=Exécutées +AdditionalTestingStatus.NOT_REQUESTED = Non demandé +AdditionalTestingStatus.REQUESTED = Demandé +AdditionalTestingStatus.PERFORMED = Exécutées + # AdditionalTestType -AdditionalTestType.HAEMOGLOBINURIA=Hémoglobine dans l'urine -AdditionalTestType.PROTEINURIA=Protéine dans l'urine -AdditionalTestType.HEMATURIA=Cellules sanguines rouges dans l'urine -AdditionalTestType.ARTERIAL_VENOUS_BLOOD_GAS=Gaz du sang artériel/veineux -AdditionalTestType.ALT_SGPT=ALT/SGPT -AdditionalTestType.AST_SGOT=AST/SGOT -AdditionalTestType.CREATININE=Créatinine -AdditionalTestType.POTASSIUM=Potassium -AdditionalTestType.UREA=Urée -AdditionalTestType.HAEMOGLOBIN=Hémoglobine -AdditionalTestType.TOTAL_BILIRUBIN=Bilirubine totale -AdditionalTestType.CONJ_BILIRUBIN=Conj.bilirubine -AdditionalTestType.WBC_COUNT=Nombre WBC -AdditionalTestType.PLATELETS=Plaquettes -AdditionalTestType.PROTHROMBIN_TIME=Heure Prothrombine -AgeGroup.AGE_0_4=0-4 -AgeGroup.AGE_5_9=5-9 -AgeGroup.AGE_10_14=10-14 -AgeGroup.AGE_15_19=15-19 -AgeGroup.AGE_20_24=20-24 -AgeGroup.AGE_25_29=25-29 -AgeGroup.AGE_30_34=30-34 -AgeGroup.AGE_35_39=35-59 -AgeGroup.AGE_40_44=40-44 -AgeGroup.AGE_45_49=45-49 -AgeGroup.AGE_50_54=50-54 -AgeGroup.AGE_55_59=55-59 -AgeGroup.AGE_60_64=60-64 -AgeGroup.AGE_65_69=65-69 -AgeGroup.AGE_70_74=70-74 -AgeGroup.AGE_75_79=75-79 -AgeGroup.AGE_80_84=80-84 -AgeGroup.AGE_80_PLUS=80+ +AdditionalTestType.HAEMOGLOBINURIA = Hémoglobine dans l'urine +AdditionalTestType.PROTEINURIA = Protéine dans l'urine +AdditionalTestType.HEMATURIA = Cellules sanguines rouges dans l'urine +AdditionalTestType.ARTERIAL_VENOUS_BLOOD_GAS = Gaz du sang artériel/veineux +AdditionalTestType.ALT_SGPT = ALT/SGPT +AdditionalTestType.AST_SGOT = AST/SGOT +AdditionalTestType.CREATININE = Créatinine +AdditionalTestType.POTASSIUM = Potassium +AdditionalTestType.UREA = Urée +AdditionalTestType.HAEMOGLOBIN = Hémoglobine +AdditionalTestType.TOTAL_BILIRUBIN = Bilirubine totale +AdditionalTestType.CONJ_BILIRUBIN = Conj.bilirubine +AdditionalTestType.WBC_COUNT = Nombre WBC +AdditionalTestType.PLATELETS = Plaquettes +AdditionalTestType.PROTHROMBIN_TIME = Heure Prothrombine + +AgeGroup.AGE_0_4 = 0-4 +AgeGroup.AGE_5_9 = 5-9 +AgeGroup.AGE_10_14 = 10-14 +AgeGroup.AGE_15_19 = 15-19 +AgeGroup.AGE_20_24 = 20-24 +AgeGroup.AGE_25_29 = 25-29 +AgeGroup.AGE_30_34 = 30-34 +AgeGroup.AGE_35_39 = 35-59 +AgeGroup.AGE_40_44 = 40-44 +AgeGroup.AGE_45_49 = 45-49 +AgeGroup.AGE_50_54 = 50-54 +AgeGroup.AGE_55_59 = 55-59 +AgeGroup.AGE_60_64 = 60-64 +AgeGroup.AGE_65_69 = 65-69 +AgeGroup.AGE_70_74 = 70-74 +AgeGroup.AGE_75_79 = 75-79 +AgeGroup.AGE_80_84 = 80-84 +AgeGroup.AGE_80_PLUS = 80+ + #AggregatedReportGroupingLevel -AggregateReportGroupingLevel.REGION=Province -AggregateReportGroupingLevel.DISTRICT=Zone de santé -AggregateReportGroupingLevel.HEALTH_FACILITY=Établissement -AggregateReportGroupingLevel.POINT_OF_ENTRY=Point d'entrée +AggregateReportGroupingLevel.REGION = Province +AggregateReportGroupingLevel.DISTRICT = Zone de santé +AggregateReportGroupingLevel.HEALTH_FACILITY = Établissement +AggregateReportGroupingLevel.POINT_OF_ENTRY = Point d'entrée + # AnimalCondition -AnimalCondition.ALIVE=Vivant -AnimalCondition.DEAD=Mort -AnimalCondition.PROCESSED=Traité -AnimalCondition.UNKNOWN=Inconnu +AnimalCondition.ALIVE = Vivant +AnimalCondition.DEAD = Mort +AnimalCondition.PROCESSED = Traité +AnimalCondition.UNKNOWN = Inconnu + AnimalContactType.BITE=Mordre AnimalContactType.TOUCH=Toucher AnimalContactType.SCRATCH=Griffer AnimalContactType.LICK=Léchage AnimalContactType.OTHER=Autres + # ApproximateAgeType -ApproximateAgeType.DAYS=Jours -ApproximateAgeType.MONTHS=Mois -ApproximateAgeType.YEARS=Années -AreaType.URBAN=Urbain -AreaType.RURAL=Rural -AreaType.UNKNOWN=Inconnu -ArmedForcesRelationType.UNKNOWN=Inconnu -ArmedForcesRelationType.NO_RELATION=Aucun rapport avec les forces armées -ArmedForcesRelationType.CIVIL=Personne civile travaillant pour/logée dans une installation des forces armées -ArmedForcesRelationType.SOLDIER_OR_RELATIVE=Soldat, parent -ArrivalOrDeparture.ARRIVAL=Arrivée -ArrivalOrDeparture.DEPARTURE=Départ -ArrivalOrDeparture.UNKNOWN=Inconnu +ApproximateAgeType.DAYS = Jours +ApproximateAgeType.MONTHS = Mois +ApproximateAgeType.YEARS = Années + +AreaType.URBAN = Urbain +AreaType.RURAL = Rural +AreaType.UNKNOWN = Inconnu + +ArmedForcesRelationType.UNKNOWN = Inconnu +ArmedForcesRelationType.NO_RELATION = Aucun rapport avec les forces armées +ArmedForcesRelationType.CIVIL = Personne civile travaillant pour/logée dans une installation des forces armées +ArmedForcesRelationType.SOLDIER_OR_RELATIVE = Soldat, parent + +ArrivalOrDeparture.ARRIVAL = Arrivée +ArrivalOrDeparture.DEPARTURE = Départ +ArrivalOrDeparture.UNKNOWN = Inconnu + # BurialConductor -BurialConductor.FAMILY_COMMUNITY=Famille/Communauté -BurialConductor.OUTBREAK_TEAM=Équipe d'enterrement d'épidémie +BurialConductor.FAMILY_COMMUNITY = Famille/Communauté +BurialConductor.OUTBREAK_TEAM = Équipe d'enterrement d'épidémie + # CampaignPhase -CampaignPhase.PRE=Pré-Campagne -CampaignPhase.INTRA=Intra-Campagne -CampaignPhase.POST=Post-Campagne +CampaignPhase.PRE = Pré-Campagne +CampaignPhase.INTRA = Intra-Campagne +CampaignPhase.POST = Post-Campagne + # CampaignJurisdictionLevel -CampaignJurisdictionLevel.AREA=Zone -CampaignJurisdictionLevel.REGION=Province -CampaignJurisdictionLevel.DISTRICT=Zone de santé -CampaignJurisdictionLevel.COMMUNITY=Aires de santé +CampaignJurisdictionLevel.AREA = Zone +CampaignJurisdictionLevel.REGION = Province +CampaignJurisdictionLevel.DISTRICT = Zone de santé +CampaignJurisdictionLevel.COMMUNITY = Aires de santé + # CaseClassification -CaseClassification.CONFIRMED=Cas Confirmé -CaseClassification.CONFIRMED_NO_SYMPTOMS=Cas confirmé sans symptômes -CaseClassification.CONFIRMED_UNKNOWN_SYMPTOMS=Cas confirmé avec symptômes inconnus -CaseClassification.NO_CASE=Pas un cas -CaseClassification.NOT_CLASSIFIED=Non classé -CaseClassification.PROBABLE=Cas Probable -CaseClassification.SUSPECT=Cas Suspect -CaseClassification.Short.CONFIRMED=Confirmée -CaseClassification.Short.CONFIRMED_NO_SYMPTOMS=Confirmé avec des symptômes -CaseClassification.Short.CONFIRMED_UNKNOWN_SYMPTOMS=Symptômes inconnus confirmés -CaseClassification.Short.NO_CASE=Pas un cas -CaseClassification.Short.NOT_CLASSIFIED=Non classé -CaseClassification.Short.PROBABLE=Probable -CaseClassification.Short.SUSPECT=Suspect +CaseClassification.CONFIRMED = Cas Confirmé +CaseClassification.CONFIRMED_NO_SYMPTOMS = Cas confirmé sans symptômes +CaseClassification.CONFIRMED_UNKNOWN_SYMPTOMS = Cas confirmé avec symptômes inconnus +CaseClassification.NO_CASE = Pas un cas +CaseClassification.NOT_CLASSIFIED = Non classé +CaseClassification.PROBABLE = Cas Probable +CaseClassification.SUSPECT = Cas Suspect +CaseClassification.Short.CONFIRMED = Confirmée +CaseClassification.Short.CONFIRMED_NO_SYMPTOMS = Confirmé avec des symptômes +CaseClassification.Short.CONFIRMED_UNKNOWN_SYMPTOMS = Symptômes inconnus confirmés +CaseClassification.Short.NO_CASE = Pas un cas +CaseClassification.Short.NOT_CLASSIFIED = Non classé +CaseClassification.Short.PROBABLE = Probable +CaseClassification.Short.SUSPECT = Suspect + # CaseIdentificationSource -CaseIdentificationSource.UNKNOWN=Inconnu -CaseIdentificationSource.OUTBREAK_INVESTIGATION=Enquête sur l'épidémie -CaseIdentificationSource.CONTACT_TRACKING_APP=Application de suivi des contacts -CaseIdentificationSource.SUSPICION_REPORT=Rapport de suspicion -CaseIdentificationSource.CONTACT_TRACING=Suivi des contacts -CaseIdentificationSource.SCREENING=Dépistage -CaseIdentificationSource.OTHER=Autre -ScreeningType.ON_HOSPITAL_ADMISSION=A l'admission dans un hôpital -ScreeningType.ON_CARE_HOME_ADMISSION=A l'entrée dans un établissement de soins -ScreeningType.ON_ASYLUM_ADMISSION=A l'admission dans un établissement d'accueil de réfugies -ScreeningType.ON_ENTRY_FROM_RISK_AREA=A l'entrée de la zone à risque -ScreeningType.HEALTH_SECTOR_EMPLOYEE=Employé du secteur de la santé -ScreeningType.EDUCATIONAL_INSTITUTIONS=Institutions éducatives -ScreeningType.SELF_ARRANGED_TEST=Auto-test organisé -ScreeningType.SELF_CONDUCTED_TEST=Auto-test effectué -ScreeningType.OTHER=Autre -CaseCountOrIncidence.CASE_COUNT=Nombre de cas -CaseCountOrIncidence.CASE_INCIDENCE=Incidence de cas -CaseJurisdictionType.RESPONSIBLE=Juridiction responsable -CaseJurisdictionType.PLACE_OF_STAY=Lieu du séjour -CaseJurisdictionType.ALL=Tous +CaseIdentificationSource.UNKNOWN = Inconnu +CaseIdentificationSource.OUTBREAK_INVESTIGATION = Enquête sur l'épidémie +CaseIdentificationSource.CONTACT_TRACKING_APP = Application de suivi des contacts +CaseIdentificationSource.SUSPICION_REPORT = Rapport de suspicion +CaseIdentificationSource.CONTACT_TRACING = Suivi des contacts +CaseIdentificationSource.SCREENING = Dépistage +CaseIdentificationSource.OTHER = Autre + +ScreeningType.ON_HOSPITAL_ADMISSION = A l'admission dans un hôpital +ScreeningType.ON_CARE_HOME_ADMISSION = A l'entrée dans un établissement de soins +ScreeningType.ON_ASYLUM_ADMISSION = A l'admission dans un établissement d'accueil de réfugies +ScreeningType.ON_ENTRY_FROM_RISK_AREA = A l'entrée de la zone à risque +ScreeningType.HEALTH_SECTOR_EMPLOYEE = Employé du secteur de la santé +ScreeningType.EDUCATIONAL_INSTITUTIONS = Institutions éducatives +ScreeningType.SELF_ARRANGED_TEST = Auto-test organisé +ScreeningType.SELF_CONDUCTED_TEST = Auto-test effectué +ScreeningType.OTHER = Autre + +CaseCountOrIncidence.CASE_COUNT = Nombre de cas +CaseCountOrIncidence.CASE_INCIDENCE = Incidence de cas + +CaseJurisdictionType.RESPONSIBLE = Juridiction responsable +CaseJurisdictionType.PLACE_OF_STAY = Lieu du séjour +CaseJurisdictionType.ALL = Tous + # CaseMeasure -CaseMeasure.CASE_COUNT=Nombre de cas -CaseMeasure.CASE_INCIDENCE=Proportion d'incidence de cas -CaseOrigin.IN_COUNTRY=Dans le pays -CaseOrigin.POINT_OF_ENTRY=Point d'entrée +CaseMeasure.CASE_COUNT = Nombre de cas +CaseMeasure.CASE_INCIDENCE = Proportion d'incidence de cas + +CaseOrigin.IN_COUNTRY = Dans le pays +CaseOrigin.POINT_OF_ENTRY = Point d'entrée + # CaseOutcome -CaseOutcome.DECEASED=Décédé -CaseOutcome.NO_OUTCOME=Pas encore connu -CaseOutcome.RECOVERED=Guéri -CaseOutcome.UNKNOWN=Inconnu +CaseOutcome.DECEASED = Décédé +CaseOutcome.NO_OUTCOME = Pas encore connu +CaseOutcome.RECOVERED = Guéri +CaseOutcome.UNKNOWN = Inconnu + # CaseReferenceDefinition -CaseReferenceDefinition.FULFILLED=Réalisées -CaseReferenceDefinition.NOT_FULFILLED=Non réalisé +CaseReferenceDefinition.FULFILLED = Réalisées +CaseReferenceDefinition.NOT_FULFILLED = Non réalisé + # CauseOfDeath -CauseOfDeath.EPIDEMIC_DISEASE=Maladie épidémique -CauseOfDeath.OTHER_CAUSE=Autre cause +CauseOfDeath.EPIDEMIC_DISEASE = Maladie épidémique +CauseOfDeath.OTHER_CAUSE = Autre cause + ## Confirmed case classification -CaseConfirmationBasis.CLINICAL_CONFIRMATION=Confirmation clinique -CaseConfirmationBasis.EPIDEMIOLOGICAL_CONFIRMATION=Confirmation épidémiologique -CaseConfirmationBasis.LABORATORY_DIAGNOSTIC_CONFIRMATION=Confirmation du diagnostic par le laboratoire -CongenitalHeartDiseaseType.PDA=Persistance du canal artériel (PCA) -CongenitalHeartDiseaseType.PPS=Sténose pulmonaire périphérique (PPS) -CongenitalHeartDiseaseType.VSD=Défaut septal ventriculaire (VSD) -CongenitalHeartDiseaseType.OTHER=Autre défaut cardiaque +CaseConfirmationBasis.CLINICAL_CONFIRMATION = Confirmation clinique +CaseConfirmationBasis.EPIDEMIOLOGICAL_CONFIRMATION = Confirmation épidémiologique +CaseConfirmationBasis.LABORATORY_DIAGNOSTIC_CONFIRMATION = Confirmation du diagnostic par le laboratoire + +CongenitalHeartDiseaseType.PDA = Persistance du canal artériel (PCA) +CongenitalHeartDiseaseType.PPS = Sténose pulmonaire périphérique (PPS) +CongenitalHeartDiseaseType.VSD = Défaut septal ventriculaire (VSD) +CongenitalHeartDiseaseType.OTHER = Autre défaut cardiaque + # ContactCategory -ContactCategory.HIGH_RISK=Contact à haut risque -ContactCategory.HIGH_RISK_MED=Contact médical à haut risque -ContactCategory.MEDIUM_RISK_MED=Contact médical de risque moyen -ContactCategory.LOW_RISK=Contact à faible risque -ContactCategory.NO_RISK=Contact sans risque +ContactCategory.HIGH_RISK = Contact à haut risque +ContactCategory.HIGH_RISK_MED = Contact médical à haut risque +ContactCategory.MEDIUM_RISK_MED = Contact médical de risque moyen +ContactCategory.LOW_RISK = Contact à faible risque +ContactCategory.NO_RISK = Contact sans risque + # ContactClassification -ContactClassification.CONFIRMED=Contact confirmé -ContactClassification.NO_CONTACT=Pas un contact -ContactClassification.UNCONFIRMED=Contact non confirmé -ContactClassification.Short.CONFIRMED=Confirmée -ContactClassification.Short.NO_CONTACT=Aucun contact -ContactClassification.Short.UNCONFIRMED=Non confirmé +ContactClassification.CONFIRMED = Contact confirmé +ContactClassification.NO_CONTACT = Pas un contact +ContactClassification.UNCONFIRMED = Contact non confirmé +ContactClassification.Short.CONFIRMED = Confirmée +ContactClassification.Short.NO_CONTACT = Aucun contact +ContactClassification.Short.UNCONFIRMED = Non confirmé + # ContactDateType -ContactDateType.REPORT_DATE=Date du signalé -ContactDateType.LAST_CONTACT_DATE=Date de dernier contact -ContactsEpiCurveMode.FOLLOW_UP_STATUS=Statut de suivi -ContactsEpiCurveMode.CONTACT_CLASSIFICATION=Classification de contact -ContactsEpiCurveMode.FOLLOW_UP_UNTIL=Suivi jusqu’à +ContactDateType.REPORT_DATE = Date du signalé +ContactDateType.LAST_CONTACT_DATE = Date de dernier contact + +ContactsEpiCurveMode.FOLLOW_UP_STATUS = Statut de suivi +ContactsEpiCurveMode.CONTACT_CLASSIFICATION = Classification de contact +ContactsEpiCurveMode.FOLLOW_UP_UNTIL = Suivi jusqu’à + # ContactIdentificationSource -ContactIdentificationSource.CASE_PERSON=Personne (Cas) -ContactIdentificationSource.CONTACT_PERSON=Personne (contact) -ContactIdentificationSource.TRACING_APP=Application de recherche de proximité -ContactIdentificationSource.OTHER=Autre -ContactIdentificationSource.UNKNOWN=Inconnu +ContactIdentificationSource.CASE_PERSON = Personne (Cas) +ContactIdentificationSource.CONTACT_PERSON = Personne (contact) +ContactIdentificationSource.TRACING_APP = Application de recherche de proximité +ContactIdentificationSource.OTHER = Autre +ContactIdentificationSource.UNKNOWN = Inconnu + # ContactProximity -ContactProximity.AEROSOL=Personnes exposées aux activités de production d'aérosols -ContactProximity.AIRPLANE=Avion, assis jusqu'à deux rangées devant ou derrière le cas source -ContactProximity.CLOSE_CONTACT=4-Était à proximité (1 mètre) du cas -ContactProximity.CLOTHES_OR_OTHER=3-Manipulation de vêtements ou autres objets du cas source -ContactProximity.FACE_TO_FACE_LONG=Face à face d'au moins 15 minutes -ContactProximity.FACE_TO_FACE_SHORT=Face à face de moins de 15 minutes -ContactProximity.MEDICAL_DISTANT=Personnel médical à proximité (> 2 mètres), sans contact direct avec les sécrétions ou excrétions du patient et sans exposition aux aérosols -ContactProximity.MEDICAL_SAME_ROOM=Personnel médical dans la même pièce ou maison que le cas source -ContactProximity.MEDICAL_SAFE=Personnel médical à proximité (> 2 mètres) ou avec équipement de protection -ContactProximity.MEDICAL_UNSAFE=Personnel médical présentant un risque d'exposition élevé , par exemple, exposition non protégée aux sécrétions ou aux aérosols des cas COVID-19 -ContactProximity.MEDICAL_LIMITED=Personnel médical avec exposition limitée, par exemple avec un contact < 2m aux cas COVID-19 sans équipement de protection, ≥ Contact face à face de 15min (sans exposition comme décrit sous Ia) -ContactProximity.PHYSICAL_CONTACT=2-Contact physique direct avec le cas -ContactProximity.SAME_ROOM=5-Était dans la même pièce ou maison que le cas -ContactProximity.TOUCHED_FLUID=1- Contact avec un fluide corporel du cas +ContactProximity.AEROSOL = Personnes exposées aux activités de production d'aérosols +ContactProximity.AIRPLANE = Avion, assis jusqu'à deux rangées devant ou derrière le cas source +ContactProximity.CLOSE_CONTACT = 4-Était à proximité (1 mètre) du cas +ContactProximity.CLOTHES_OR_OTHER = 3-Manipulation de vêtements ou autres objets du cas source +ContactProximity.FACE_TO_FACE_LONG = Face à face d'au moins 15 minutes +ContactProximity.FACE_TO_FACE_SHORT = Face à face de moins de 15 minutes +ContactProximity.MEDICAL_DISTANT = Personnel médical à proximité (> 2 mètres), sans contact direct avec les sécrétions ou excrétions du patient et sans exposition aux aérosols +ContactProximity.MEDICAL_SAME_ROOM = Personnel médical dans la même pièce ou maison que le cas source +ContactProximity.MEDICAL_SAFE = Personnel médical à proximité (> 2 mètres) ou avec équipement de protection +ContactProximity.MEDICAL_UNSAFE = Personnel médical présentant un risque d'exposition élevé , par exemple, exposition non protégée aux sécrétions ou aux aérosols des cas COVID-19 +ContactProximity.MEDICAL_LIMITED = Personnel médical avec exposition limitée, par exemple avec un contact < 2m aux cas COVID-19 sans équipement de protection, ≥ Contact face à face de 15min (sans exposition comme décrit sous Ia) +ContactProximity.PHYSICAL_CONTACT = 2-Contact physique direct avec le cas +ContactProximity.SAME_ROOM = 5-Était dans la même pièce ou maison que le cas +ContactProximity.TOUCHED_FLUID = 1- Contact avec un fluide corporel du cas + # ContactRelation -ContactRelation.FAMILY_MEMBER_OR_FRIEND=Autre membre de la famille ou ami -ContactRelation.SAME_ENVIRONMENT=Travaille dans le même environnement -ContactRelation.SAME_HOUSEHOLD=Vit dans la même maison -ContactRelation.MEDICAL_CARE=Soins médicaux donnés au cas -ContactRelation.OTHER=Autres +ContactRelation.FAMILY_MEMBER_OR_FRIEND = Autre membre de la famille ou ami +ContactRelation.SAME_ENVIRONMENT = Travaille dans le même environnement +ContactRelation.SAME_HOUSEHOLD = Vit dans la même maison +ContactRelation.MEDICAL_CARE = Soins médicaux donnés au cas +ContactRelation.OTHER = Autres + # ContactStatus -ContactStatus.ACTIVE=Contact actif -ContactStatus.CONVERTED=Converti en cas -ContactStatus.DROPPED=Abandonné -ConveyanceType.CAR=Voiture -ConveyanceType.BUS=Bus -ConveyanceType.MOTORBIKE=Moto -ConveyanceType.OTHER=Autres -CustomizableEnumType.DISEASE_VARIANT=Variant de la maladie -CustomizableEnumType.SPECIFIC_EVENT_RISK=Risque d'événement spécifique -CustomizableEnumType.OCCUPATION_TYPE=Type de profession -CustomizableEnumType.PATHOGEN=Agent pathogène +ContactStatus.ACTIVE = Contact actif +ContactStatus.CONVERTED = Converti en cas +ContactStatus.DROPPED = Abandonné + +ConveyanceType.CAR = Voiture +ConveyanceType.BUS = Bus +ConveyanceType.MOTORBIKE = Moto +ConveyanceType.OTHER = Autres + +CustomizableEnumType.DISEASE_VARIANT = Variant de la maladie +CustomizableEnumType.SPECIFIC_EVENT_RISK = Risque d'événement spécifique +CustomizableEnumType.OCCUPATION_TYPE = Type de profession +CustomizableEnumType.PATHOGEN = Agent pathogène + # DashboardType -DashboardType.CONTACTS=Contacts -DashboardType.SURVEILLANCE=Surveillance -DashboardType.CAMPAIGNS=Campagnes -DashboardType.ADVERSE_EVENTS=Adverse Events +DashboardType.CONTACTS = Contacts +DashboardType.SURVEILLANCE = Surveillance +DashboardType.CAMPAIGNS = Campagnes +DashboardType.ADVERSE_EVENTS = Adverse Events + # DatabaseTable -DatabaseTable.ACTIONS=Actions -DatabaseTable.CASES=Cas -DatabaseTable.SYMPTOMS=Symptômes -DatabaseTable.CLINICAL_COURSES=Suivi médical -DatabaseTable.CLINICAL_VISITS=Visites médicales -DatabaseTable.COMMUNITIES=Communautés -DatabaseTable.CONTACTS=Contacts -DatabaseTable.CONTACTS_VISITS=Contacts → Visites -DatabaseTable.CONTINENTS=Continents -DatabaseTable.SUBCONTINENTS=Sous-continents -DatabaseTable.AREAS=Zones -DatabaseTable.COUNTRIES=Pays -DatabaseTable.CUSTOMIZABLE_ENUM_VALUES=Valeurs de l'énumération personnalisables -DatabaseTable.DISTRICTS=Zone de santé -DatabaseTable.EPIDATA=Données épidémiologiques -DatabaseTable.EVENTS=Événements -DatabaseTable.EVENTS_EVENTGROUPS=Événements → Groupes d'événements -DatabaseTable.EVENTGROUPS=Groupes d'événements -DatabaseTable.EVENTPARTICIPANTS=Event participants -DatabaseTable.EXPOSURES=Expositions -DatabaseTable.ACTIVITIES_AS_CASE=Activités comme cas -DatabaseTable.FACILITIES=Etablissements -DatabaseTable.POINTS_OF_ENTRY=Points d'entrée -DatabaseTable.HEALTH_CONDITIONS=Etats de santé -DatabaseTable.HOSPITALIZATIONS=Hospitalisations -DatabaseTable.IMMUNIZATIONS=Immunisation -DatabaseTable.LOCATIONS=Lieux -DatabaseTable.OUTBREAKS=Epidémies -DatabaseTable.PERSONS=Personnes -DatabaseTable.PERSON_CONTACT_DETAILS=Coordonnées de la personne -DatabaseTable.PERSON_LOCATIONS=Emplacements des personnes -DatabaseTable.PRESCRIPTIONS=Ordonnances -DatabaseTable.PREVIOUSHOSPITALIZATIONS=Hospitalisations précédentes -DatabaseTable.REGIONS=Province -DatabaseTable.SAMPLES=Échantillons -DatabaseTable.PATHOGEN_TESTS=Tests pathogènes -DatabaseTable.ADDITIONAL_TESTS=Tests supplémentaires -DatabaseTable.TASKS=Tâches -DatabaseTable.TASK_OBSERVER=Observateur de tâche -DatabaseTable.THERAPIES=Thérapies -DatabaseTable.TRAVEL_ENTRIES=Entrées de voyage -DatabaseTable.TREATMENTS=Traitements -DatabaseTable.USERS=Utilisateurs -DatabaseTable.USER_ROLES=Rôles utilisateur -DatabaseTable.USERS_USERROLES=Utilisateurs → Rôles d'utilisateur -DatabaseTable.USERROLES_USERRIGHTS=Rôles d'utilisateur → Droits d'utilisateur -DatabaseTable.USERROLES_EMAILNOTIFICATIONTYPES=Rôles d'utilisateur → Types de notification par e-mail -DatabaseTable.USERROLES_SMSNOTIFICATIONTYPES=Rôles d'utilisateur → Types de notification SMS -DatabaseTable.VACCINATIONS=Vaccinations -DatabaseTable.VISITS=Visites -DatabaseTable.WEEKLYREPORTS=Rapports hebdomadaires -DatabaseTable.WEEKLYREPORTENTRIES=Entrées du rapport hebdomadaire -DatabaseTable.PORT_HEALTH_INFO=Informations sur la santé des ports -DatabaseTable.MATERNAL_HISTORIES=Antécédents maternels -DatabaseTable.EXTERNAL_MESSAGES=Messages -DatabaseTable.SAMPLE_REPORTS=Exemples de rapports -DatabaseTable.TEST_REPORTS=Rapports d'essai -DatabaseTable.SORMAS_TO_SORMAS_ORIGIN_INFO=Informations sur l'origine SORMAS 2 SORMAS -DatabaseTable.SORMAS_TO_SORMAS_SHARE_INFO=SORMAS 2 SORMAS partager des informations -DatabaseTable.SORMAS_TO_SORMAS_SHARE_REQUESTS=Demandes de partage SORMAS 2 SORMAS -DatabaseTable.SHARE_REQUEST_INFO=SORMAS 2 SORMAS partager les informations de la demande -DatabaseTable.SHARE_REQUEST_INFO_SHARE_INFO=SORMAS 2 SORMAS partager les informations de demande → Partager les informations -DatabaseTable.EXTERNAL_SHARE_INFO=Informations sur le partage externe -DatabaseTable.CAMPAIGNS=Campagnes -DatabaseTable.CAMPAIGN_CAMPAIGNFORMMETA=Campagnes → Méta formulaire de campagne -DatabaseTable.CAMPAIGN_FORM_META=Méta formulaire de campagne -DatabaseTable.CAMPAIGN_FORM_DATA=Données du formulaire de campagne -DatabaseTable.CAMPAIGN_DIAGRAM_DEFINITIONS=Définitions des diagrammes de campagne -DatabaseTable.POPULATION_DATA=Données de la population -DatabaseTable.SURVEILLANCE_REPORTS=Rapports de surveillance -DatabaseTable.AGGREGATE_REPORTS=Rapports agrégés -DatabaseTable.WEEKLY_REPORTS=Rapports hebdomadaires -DatabaseTable.WEEKLY_REPORT_ENTRIES=Entrées du rapport hebdomadaire -DatabaseTable.DOCUMENTS=Documents -DatabaseTable.EXPORT_CONFIGURATIONS=Configurations d'exportation -DatabaseTable.FEATURE_CONFIGURATIONS=Configurations de fonctionnalité -DatabaseTable.DISEASE_CONFIGURATIONS=Configurations de la maladie -DatabaseTable.DELETION_CONFIGURATIONS=Configurations de suppression -DatabaseTable.SYSTEM_CONFIGURATION_VALUES=Valeurs de configuration système -DatabaseTable.SYSTEM_CONFIGURATION_CATEGORIES=Catégories de configuration système -DatabaseTable.NOTIFIER=Notificateur -DatabaseTable.DRUG_SUSCEPTIBILITY=Sensibilité aux médicaments -DatabaseTable.SPECIAL_CASE_ACCESSES=Accès spéciaux aux cas -DatabaseTable.ENVIRONMENTS=Environnements -DatabaseTable.EVENT_ENVIRONMENTS=Événements → Environnements -DatabaseTable.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATIONS=Événements indésirables suivant les immunisations -DatabaseTable.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_INVESTIGATIONS=Enquêtes sur les événements indésirables suivant l'immunisation -DatabaseTable.ADVERSE_EVENTS=Événements indésirables -DatabaseTable.DOCUMENT_RELATED_ENTITIES=Entités liées aux documents +DatabaseTable.ACTIONS = Actions +DatabaseTable.CASES = Cas +DatabaseTable.SYMPTOMS = Symptômes +DatabaseTable.CLINICAL_COURSES = Suivi médical +DatabaseTable.CLINICAL_VISITS = Visites médicales +DatabaseTable.COMMUNITIES = Communautés +DatabaseTable.CONTACTS = Contacts +DatabaseTable.CONTACTS_VISITS = Contacts → Visites +DatabaseTable.CONTINENTS = Continents +DatabaseTable.SUBCONTINENTS = Sous-continents +DatabaseTable.AREAS = Zones +DatabaseTable.COUNTRIES = Pays +DatabaseTable.CUSTOMIZABLE_ENUM_VALUES = Valeurs de l'énumération personnalisables +DatabaseTable.DISTRICTS = Zone de santé +DatabaseTable.EPIDATA = Données épidémiologiques +DatabaseTable.EVENTS = Événements +DatabaseTable.EVENTS_EVENTGROUPS = Événements → Groupes d'événements +DatabaseTable.EVENTGROUPS = Groupes d'événements +DatabaseTable.EVENTPARTICIPANTS = Event participants +DatabaseTable.EXPOSURES = Expositions +DatabaseTable.ACTIVITIES_AS_CASE = Activités comme cas +DatabaseTable.FACILITIES = Etablissements +DatabaseTable.POINTS_OF_ENTRY = Points d'entrée +DatabaseTable.HEALTH_CONDITIONS = Etats de santé +DatabaseTable.HOSPITALIZATIONS = Hospitalisations +DatabaseTable.IMMUNIZATIONS = Immunisation +DatabaseTable.LOCATIONS = Lieux +DatabaseTable.OUTBREAKS = Epidémies +DatabaseTable.PERSONS = Personnes +DatabaseTable.PERSON_CONTACT_DETAILS = Coordonnées de la personne +DatabaseTable.PERSON_LOCATIONS = Emplacements des personnes +DatabaseTable.PRESCRIPTIONS = Ordonnances +DatabaseTable.PREVIOUSHOSPITALIZATIONS = Hospitalisations précédentes +DatabaseTable.REGIONS = Province +DatabaseTable.SAMPLES = Échantillons +DatabaseTable.PATHOGEN_TESTS = Tests pathogènes +DatabaseTable.ADDITIONAL_TESTS = Tests supplémentaires +DatabaseTable.TASKS = Tâches +DatabaseTable.TASK_OBSERVER = Observateur de tâche +DatabaseTable.THERAPIES = Thérapies +DatabaseTable.TRAVEL_ENTRIES = Entrées de voyage +DatabaseTable.TREATMENTS = Traitements +DatabaseTable.USERS = Utilisateurs +DatabaseTable.USER_ROLES = Rôles utilisateur +DatabaseTable.USERS_USERROLES = Utilisateurs → Rôles d'utilisateur +DatabaseTable.USERROLES_USERRIGHTS = Rôles d'utilisateur → Droits d'utilisateur +DatabaseTable.USERROLES_EMAILNOTIFICATIONTYPES = Rôles d'utilisateur → Types de notification par e-mail +DatabaseTable.USERROLES_SMSNOTIFICATIONTYPES = Rôles d'utilisateur → Types de notification SMS +DatabaseTable.VACCINATIONS = Vaccinations +DatabaseTable.VISITS = Visites +DatabaseTable.WEEKLYREPORTS = Rapports hebdomadaires +DatabaseTable.WEEKLYREPORTENTRIES = Entrées du rapport hebdomadaire +DatabaseTable.PORT_HEALTH_INFO = Informations sur la santé des ports +DatabaseTable.MATERNAL_HISTORIES = Antécédents maternels +DatabaseTable.EXTERNAL_MESSAGES = Messages +DatabaseTable.SAMPLE_REPORTS = Exemples de rapports +DatabaseTable.TEST_REPORTS = Rapports d'essai +DatabaseTable.SORMAS_TO_SORMAS_ORIGIN_INFO = Informations sur l'origine SORMAS 2 SORMAS +DatabaseTable.SORMAS_TO_SORMAS_SHARE_INFO = SORMAS 2 SORMAS partager des informations +DatabaseTable.SORMAS_TO_SORMAS_SHARE_REQUESTS = Demandes de partage SORMAS 2 SORMAS +DatabaseTable.SHARE_REQUEST_INFO = SORMAS 2 SORMAS partager les informations de la demande +DatabaseTable.SHARE_REQUEST_INFO_SHARE_INFO = SORMAS 2 SORMAS partager les informations de demande → Partager les informations +DatabaseTable.EXTERNAL_SHARE_INFO = Informations sur le partage externe +DatabaseTable.CAMPAIGNS = Campagnes +DatabaseTable.CAMPAIGN_CAMPAIGNFORMMETA = Campagnes → Méta formulaire de campagne +DatabaseTable.CAMPAIGN_FORM_META = Méta formulaire de campagne +DatabaseTable.CAMPAIGN_FORM_DATA = Données du formulaire de campagne +DatabaseTable.CAMPAIGN_DIAGRAM_DEFINITIONS = Définitions des diagrammes de campagne +DatabaseTable.POPULATION_DATA = Données de la population +DatabaseTable.SURVEILLANCE_REPORTS = Rapports de surveillance +DatabaseTable.AGGREGATE_REPORTS = Rapports agrégés +DatabaseTable.WEEKLY_REPORTS = Rapports hebdomadaires +DatabaseTable.WEEKLY_REPORT_ENTRIES = Entrées du rapport hebdomadaire +DatabaseTable.DOCUMENTS = Documents +DatabaseTable.EXPORT_CONFIGURATIONS = Configurations d'exportation +DatabaseTable.FEATURE_CONFIGURATIONS = Configurations de fonctionnalité +DatabaseTable.DISEASE_CONFIGURATIONS = Configurations de la maladie +DatabaseTable.DELETION_CONFIGURATIONS = Configurations de suppression +DatabaseTable.SYSTEM_CONFIGURATION_VALUES = Valeurs de configuration système +DatabaseTable.SYSTEM_CONFIGURATION_CATEGORIES = Catégories de configuration système +DatabaseTable.NOTIFIER = Notificateur +DatabaseTable.DRUG_SUSCEPTIBILITY = Sensibilité aux médicaments +DatabaseTable.SPECIAL_CASE_ACCESSES = Accès spéciaux aux cas +DatabaseTable.ENVIRONMENTS = Environnements +DatabaseTable.EVENT_ENVIRONMENTS = Événements → Environnements +DatabaseTable.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATIONS = Événements indésirables suivant les immunisations +DatabaseTable.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_INVESTIGATIONS = Enquêtes sur les événements indésirables suivant l'immunisation +DatabaseTable.ADVERSE_EVENTS = Événements indésirables +DatabaseTable.DOCUMENT_RELATED_ENTITIES = Entités liées aux documents + # DateFilterOption -DateFilterOption.DATE=Par date -DateFilterOption.EPI_WEEK=Par semaine +DateFilterOption.DATE = Par date +DateFilterOption.EPI_WEEK = Par semaine + # DeathPlaceType -DeathPlaceType.COMMUNITY=Communauté -DeathPlaceType.HOSPITAL=Hôpitaux -DeathPlaceType.OTHER=Autres +DeathPlaceType.COMMUNITY = Communauté +DeathPlaceType.HOSPITAL = Hôpitaux +DeathPlaceType.OTHER = Autres + # DefaultUserRole -DefaultUserRole.ADMIN=Admin -DefaultUserRole.CASE_OFFICER=Agent de cas -DefaultUserRole.CASE_SUPERVISOR=Clinicien -DefaultUserRole.COMMUNITY_INFORMANT=Informateur communautaire -DefaultUserRole.COMMUNITY_OFFICER=Officier de la communauté -DefaultUserRole.CONTACT_OFFICER=Agent de contact -DefaultUserRole.CONTACT_SUPERVISOR=Superviseur de contact -DefaultUserRole.DISTRICT_OBSERVER=Observateur départemental -DefaultUserRole.EVENT_OFFICER=Agent d'événement -DefaultUserRole.EXTERNAL_LAB_USER=Agent de laboratoire externe -DefaultUserRole.HOSPITAL_INFORMANT=Informateur hospitalier -DefaultUserRole.IMPORT_USER=Importateur -DefaultUserRole.LAB_USER=Agent de laboratoire -DefaultUserRole.NATIONAL_CLINICIAN=Clinicien National -DefaultUserRole.NATIONAL_OBSERVER=Observateur National -DefaultUserRole.NATIONAL_USER=Utilisateur National -DefaultUserRole.POE_INFORMANT=Informateur PDE -DefaultUserRole.POE_NATIONAL_USER=Utilisateur National PDE -DefaultUserRole.POE_SUPERVISOR=Superviseur PDE -DefaultUserRole.STATE_OBSERVER=Observateur de région -DefaultUserRole.SURVEILLANCE_OFFICER=Agent de surveillance -DefaultUserRole.SURVEILLANCE_SUPERVISOR=Superviseur de surveillance -DefaultUserRole.REST_EXTERNAL_VISITS_USER=Utilisateur de visite externe -DefaultUserRole.SORMAS_TO_SORMAS_CLIENT=Client Sormas à Sormas -DefaultUserRole.ADMIN_SUPERVISOR=Admin superviseur de surveillance -DefaultUserRole.BAG_USER=Utilisateur BAG -DefaultUserRole.ENVIRONMENTAL_SURVEILLANCE_USER=Environmental Surveillance User -DefaultUserRole.Short.ADMIN=Admin -DefaultUserRole.Short.CASE_OFFICER=Caisse désactivée -DefaultUserRole.Short.CASE_SUPERVISOR=Clinicien -DefaultUserRole.Short.CONTACT_OFFICER=ContOff -DefaultUserRole.Short.CONTACT_SUPERVISOR=ContSup -DefaultUserRole.Short.COMMUNITY_INFORMANT=Info comm -DefaultUserRole.Short.DISTRICT_OBSERVER=Obs. dept. -DefaultUserRole.Short.EVENT_OFFICER=Événement désactivé -DefaultUserRole.Short.EXTERNAL_LAB_USER=ExtLabOff -DefaultUserRole.Short.HOSPITAL_INFORMANT=Info. hosp. -DefaultUserRole.Short.IMPORT_USER=UtilisateurImportateur -DefaultUserRole.Short.LAB_USER=LabOff -DefaultUserRole.Short.NATIONAL_CLINICIAN=NatClin -DefaultUserRole.Short.NATIONAL_OBSERVER=NatObs -DefaultUserRole.Short.NATIONAL_USER=NatUser -DefaultUserRole.Short.POE_INFORMANT=Info. PE -DefaultUserRole.Short.POE_NATIONAL_USER=POENat -DefaultUserRole.Short.POE_SUPERVISOR=POESup -DefaultUserRole.Short.STATE_OBSERVER=RegObs -DefaultUserRole.Short.SURVEILLANCE_SUPERVISOR=SurvSup -DefaultUserRole.Short.ADMIN_SUPERVISOR=AdminSup -DefaultUserRole.Short.SURVEILLANCE_OFFICER=SurvOff -DefaultUserRole.Short.REST_EXTERNAL_VISITS_USER=ExtVis -DefaultUserRole.Short.SORMAS_TO_SORMAS_CLIENT=Sormas vers Sormas -DefaultUserRole.Short.BAG_USER=PANIER -DefaultUserRole.Short.ENVIRONMENTAL_SURVEILLANCE_USER=EnvSurv +DefaultUserRole.ADMIN = Admin +DefaultUserRole.CASE_OFFICER = Agent de cas +DefaultUserRole.CASE_SUPERVISOR = Clinicien +DefaultUserRole.COMMUNITY_INFORMANT = Informateur communautaire +DefaultUserRole.COMMUNITY_OFFICER = Officier de la communauté +DefaultUserRole.CONTACT_OFFICER = Agent de contact +DefaultUserRole.CONTACT_SUPERVISOR = Superviseur de contact +DefaultUserRole.DISTRICT_OBSERVER = Observateur départemental +DefaultUserRole.EVENT_OFFICER = Agent d'événement +DefaultUserRole.EXTERNAL_LAB_USER = Agent de laboratoire externe +DefaultUserRole.HOSPITAL_INFORMANT = Informateur hospitalier +DefaultUserRole.IMPORT_USER = Importateur +DefaultUserRole.LAB_USER = Agent de laboratoire +DefaultUserRole.NATIONAL_CLINICIAN = Clinicien National +DefaultUserRole.NATIONAL_OBSERVER = Observateur National +DefaultUserRole.NATIONAL_USER = Utilisateur National +DefaultUserRole.POE_INFORMANT = Informateur PDE +DefaultUserRole.POE_NATIONAL_USER = Utilisateur National PDE +DefaultUserRole.POE_SUPERVISOR = Superviseur PDE +DefaultUserRole.STATE_OBSERVER = Observateur de région +DefaultUserRole.SURVEILLANCE_OFFICER = Agent de surveillance +DefaultUserRole.SURVEILLANCE_SUPERVISOR = Superviseur de surveillance +DefaultUserRole.REST_EXTERNAL_VISITS_USER = Utilisateur de visite externe +DefaultUserRole.SORMAS_TO_SORMAS_CLIENT = Client Sormas à Sormas +DefaultUserRole.ADMIN_SUPERVISOR = Admin superviseur de surveillance +DefaultUserRole.BAG_USER = Utilisateur BAG +DefaultUserRole.ENVIRONMENTAL_SURVEILLANCE_USER = Environmental Surveillance User +DefaultUserRole.Short.ADMIN = Admin +DefaultUserRole.Short.CASE_OFFICER = Caisse désactivée +DefaultUserRole.Short.CASE_SUPERVISOR = Clinicien +DefaultUserRole.Short.CONTACT_OFFICER = ContOff +DefaultUserRole.Short.CONTACT_SUPERVISOR = ContSup +DefaultUserRole.Short.COMMUNITY_INFORMANT = Info comm +DefaultUserRole.Short.DISTRICT_OBSERVER = Obs. dept. +DefaultUserRole.Short.EVENT_OFFICER = Événement désactivé +DefaultUserRole.Short.EXTERNAL_LAB_USER = ExtLabOff +DefaultUserRole.Short.HOSPITAL_INFORMANT = Info. hosp. +DefaultUserRole.Short.IMPORT_USER = UtilisateurImportateur +DefaultUserRole.Short.LAB_USER = LabOff +DefaultUserRole.Short.NATIONAL_CLINICIAN = NatClin +DefaultUserRole.Short.NATIONAL_OBSERVER = NatObs +DefaultUserRole.Short.NATIONAL_USER = NatUser +DefaultUserRole.Short.POE_INFORMANT = Info. PE +DefaultUserRole.Short.POE_NATIONAL_USER = POENat +DefaultUserRole.Short.POE_SUPERVISOR = POESup +DefaultUserRole.Short.STATE_OBSERVER = RegObs +DefaultUserRole.Short.SURVEILLANCE_SUPERVISOR = SurvSup +DefaultUserRole.Short.ADMIN_SUPERVISOR = AdminSup +DefaultUserRole.Short.SURVEILLANCE_OFFICER = SurvOff +DefaultUserRole.Short.REST_EXTERNAL_VISITS_USER = ExtVis +DefaultUserRole.Short.SORMAS_TO_SORMAS_CLIENT = Sormas vers Sormas +DefaultUserRole.Short.BAG_USER = PANIER +DefaultUserRole.Short.ENVIRONMENTAL_SURVEILLANCE_USER = EnvSurv + #DeleteReason -DeletionReason.GDPR=Demande de suppression par la personne concernée conformément au RGPD -DeletionReason.DELETION_REQUEST=Demande de suppression par une autre autorité -DeletionReason.CREATED_WITH_NO_LEGAL_REASON=Entité créée sans motif légal -DeletionReason.TRANSFERRED_RESPONSIBILITY=Responsabilité transférée à une autre autorité -DeletionReason.DUPLICATE_ENTRIES=Suppression des entrées en double -DeletionReason.OTHER_REASON=Autre motif +DeletionReason.GDPR = Demande de suppression par la personne concernée conformément au RGPD +DeletionReason.DELETION_REQUEST = Demande de suppression par une autre autorité +DeletionReason.CREATED_WITH_NO_LEGAL_REASON = Entité créée sans motif légal +DeletionReason.TRANSFERRED_RESPONSIBILITY = Responsabilité transférée à une autre autorité +DeletionReason.DUPLICATE_ENTRIES = Suppression des entrées en double +DeletionReason.OTHER_REASON = Autre motif + # DengueFeverType -DengueFeverType.DENGUE_FEVER=Dengue -DengueFeverType.DENGUE_HEMORRHAGIC_FEVER=Dengue hémorragique -DengueFeverType.DENUGE_SHOCK_SYNDROME=Syndrome de choc de la dengue +DengueFeverType.DENGUE_FEVER = Dengue +DengueFeverType.DENGUE_HEMORRHAGIC_FEVER = Dengue hémorragique +DengueFeverType.DENUGE_SHOCK_SYNDROME = Syndrome de choc de la dengue + # HumanRabiesType -RabiesType.FURIOUS_RABIES=Rage furieuse -RabiesType.PARALYTIC_RABIES=Rage paralytique +RabiesType.FURIOUS_RABIES = Rage furieuse +RabiesType.PARALYTIC_RABIES = Rage paralytique + # Disease -Disease.AFP=Paralysie Flasque Aiguë -Disease.CHOLERA=Cholera -Disease.CONGENITAL_RUBELLA=Rubéole congénitale -Disease.CSM=Méningite (CSM) -Disease.DENGUE=Dengue -Disease.EVD=Maladie à virus Ebola -Disease.GUINEA_WORM=Ver de Guinée -Disease.LASSA=Fièvre de Lassa -Disease.MEASLES=Rougeole -Disease.MONKEYPOX=Mpox -Disease.NEW_INFLUENZA=Grippe (nouveau sous-type) -Disease.UNDEFINED=Pas encore défini -Disease.OTHER=Autre maladie épidémique -Disease.PLAGUE=Peste -Disease.POLIO=Poliomyélite -Disease.UNSPECIFIED_VHF=Autre FHV -Disease.WEST_NILE_FEVER=Fièvre du Nil occidental -Disease.YELLOW_FEVER=Fièvre jaune -Disease.RABIES=Rage humaine -Disease.ANTHRAX=Anthrax -Disease.PNEUMONIA=Pneumonie -Disease.MALARIA=Paludisme -Disease.TYPHOID_FEVER=Fièvre typhoïde -Disease.ACUTE_VIRAL_HEPATITIS=Hépatite virale aiguë -Disease.NON_NEONATAL_TETANUS=Tétanos Maternel -Disease.HIV=VIH -Disease.SCHISTOSOMIASIS=Schistosomiase -Disease.SOIL_TRANSMITTED_HELMINTHS=Helminthes transmis par le sol -Disease.TRYPANOSOMIASIS=Trypanosomiase -Disease.DIARRHEA_DEHYDRATION=Diarrhée avec déshydratation (< 5) -Disease.DIARRHEA_BLOOD=Diarrhée avec / Sang (Shigella) -Disease.SNAKE_BITE=Morsure de serpent -Disease.RUBELLA=Rubéole -Disease.TUBERCULOSIS=Tuberculose -Disease.LEPROSY=Lèpre -Disease.LYMPHATIC_FILARIASIS=Filariose lymphatique -Disease.BURULI_ULCER=Ulcère de Buruli -Disease.PERTUSSIS=Coqueluche -Disease.NEONATAL_TETANUS=Tétanos néonatal -Disease.ONCHOCERCIASIS=Onchocercose -Disease.DIPHTERIA=Diphtérie -Disease.TRACHOMA=Trachome -Disease.YAWS_ENDEMIC_SYPHILIS=Pian et syphilis endémique -Disease.MATERNAL_DEATHS=Décès maternels -Disease.PERINATAL_DEATHS=Morts périnatales -Disease.CORONAVIRUS=COVID-19 +Disease.AFP = Paralysie Flasque Aiguë +Disease.CHOLERA = Cholera +Disease.CONGENITAL_RUBELLA = Rubéole congénitale +Disease.CSM = Méningite (CSM) +Disease.DENGUE = Dengue +Disease.EVD = Maladie à virus Ebola +Disease.GUINEA_WORM = Ver de Guinée +Disease.LASSA = Fièvre de Lassa +Disease.MEASLES = Rougeole +Disease.MONKEYPOX = Mpox +Disease.NEW_INFLUENZA = Grippe (nouveau sous-type) +Disease.UNDEFINED = Pas encore défini +Disease.OTHER = Autre maladie épidémique +Disease.PLAGUE = Peste +Disease.POLIO = Poliomyélite +Disease.UNSPECIFIED_VHF = Autre FHV +Disease.WEST_NILE_FEVER = Fièvre du Nil occidental +Disease.YELLOW_FEVER = Fièvre jaune +Disease.RABIES = Rage humaine +Disease.ANTHRAX = Anthrax +Disease.PNEUMONIA = Pneumonie +Disease.MALARIA = Paludisme +Disease.TYPHOID_FEVER = Fièvre typhoïde +Disease.ACUTE_VIRAL_HEPATITIS = Hépatite virale aiguë +Disease.NON_NEONATAL_TETANUS = Tétanos Maternel +Disease.HIV = VIH +Disease.SCHISTOSOMIASIS = Schistosomiase +Disease.SOIL_TRANSMITTED_HELMINTHS = Helminthes transmis par le sol +Disease.TRYPANOSOMIASIS = Trypanosomiase +Disease.DIARRHEA_DEHYDRATION = Diarrhée avec déshydratation (< 5) +Disease.DIARRHEA_BLOOD = Diarrhée avec / Sang (Shigella) +Disease.SNAKE_BITE = Morsure de serpent +Disease.RUBELLA = Rubéole +Disease.TUBERCULOSIS = Tuberculose +Disease.LEPROSY = Lèpre +Disease.LYMPHATIC_FILARIASIS = Filariose lymphatique +Disease.BURULI_ULCER = Ulcère de Buruli +Disease.PERTUSSIS = Coqueluche +Disease.NEONATAL_TETANUS = Tétanos néonatal +Disease.ONCHOCERCIASIS = Onchocercose +Disease.DIPHTERIA = Diphtérie +Disease.TRACHOMA = Trachome +Disease.YAWS_ENDEMIC_SYPHILIS = Pian et syphilis endémique +Disease.MATERNAL_DEATHS = Décès maternels +Disease.PERINATAL_DEATHS = Morts périnatales +Disease.CORONAVIRUS = COVID-19 Disease.INFLUENZA=Influenza -Disease.INFLUENZA_A=Grippe A -Disease.INFLUENZA_B=Grippe B -Disease.H_METAPNEUMOVIRUS=H. metapneumovirus -Disease.RESPIRATORY_SYNCYTIAL_VIRUS=Virus syncytique respiratoire (RSV) -Disease.PARAINFLUENZA_1_4=Parainfluenza (1-4) -Disease.ADENOVIRUS=Adenovirus -Disease.RHINOVIRUS=Rhinovirus -Disease.ENTEROVIRUS=Enterovirus -Disease.M_PNEUMONIAE=M.pneumoniae -Disease.C_PNEUMONIAE=C.pneumoniae -Disease.ARI=IRA (Infections Respiratoires Aiguës) -Disease.CHIKUNGUNYA=Chikungunya -Disease.POST_IMMUNIZATION_ADVERSE_EVENTS_MILD=Effets indésirables post-immunisation légers -Disease.POST_IMMUNIZATION_ADVERSE_EVENTS_SEVERE=Effets indésirables post-immunisation graves -Disease.FHA=FHA (aménorrhée hypothalamique fonctionnelle) -Disease.Short.AFP=PFA -Disease.Short.CHOLERA=Choléra -Disease.Short.CONGENITAL_RUBELLA=SRC -Disease.Short.CSM=Méningite -Disease.Short.DENGUE=Dengue -Disease.Short.EVD=Ebola -Disease.Short.GUINEA_WORM=Ver de Guinée -Disease.Short.LASSA=Lassa -Disease.Short.MEASLES=Rougeole -Disease.Short.MONKEYPOX=Mpox -Disease.Short.NEW_INFLUENZA=Nouvelle grippe -Disease.Short.UNDEFINED=Non défini -Disease.Short.OTHER=Autres -Disease.Short.PLAGUE=Peste -Disease.Short.POLIO=Polio -Disease.Short.UNSPECIFIED_VHF=FHV -Disease.Short.WEST_NILE_FEVER=Fièvre du Nil occidental -Disease.Short.YELLOW_FEVER=Fièvre jaune -Disease.Short.RABIES=Rage -Disease.Short.ANTHRAX=Anthrax -Disease.Short.PNEUMONIA=Pneumonie -Disease.Short.MALARIA=Paludisme -Disease.Short.TYPHOID_FEVER=Fièvre typhoïde -Disease.Short.ACUTE_VIRAL_HEPATITIS=Hépatite virale aiguë -Disease.Short.NON_NEONATAL_TETANUS=Tétanos Maternel -Disease.Short.HIV=VIH -Disease.Short.SCHISTOSOMIASIS=Schistosomiase -Disease.Short.SOIL_TRANSMITTED_HELMINTHS=Helminthes transmis par le sol -Disease.Short.TRYPANOSOMIASIS=Trypanosomiase -Disease.Short.DIARRHEA_DEHYDRATION=Diarrhée avec déshydratation (< 5) -Disease.Short.DIARRHEA_BLOOD=Diarrhée avec / Sang (Shigella) -Disease.Short.SNAKE_BITE=Morsure de serpent -Disease.Short.RUBELLA=Rubéole -Disease.Short.TUBERCULOSIS=Tuberculose -Disease.Short.LEPROSY=Lèpre -Disease.Short.LYMPHATIC_FILARIASIS=Filariose lymphatique -Disease.Short.BURULI_ULCER=Ulcère de Buruli -Disease.Short.PERTUSSIS=Coqueluche -Disease.Short.NEONATAL_TETANUS=Tétanos néonatal -Disease.Short.ONCHOCERCIASIS=Onchocercose -Disease.Short.DIPHTERIA=Diphtérie -Disease.Short.TRACHOMA=Trachome -Disease.Short.YAWS_ENDEMIC_SYPHILIS=Pian et syphilis endémique -Disease.Short.MATERNAL_DEATHS=Décès maternels -Disease.Short.PERINATAL_DEATHS=Morts périnatales -Disease.Short.CORONAVIRUS=CoV -Disease.Short.INFLUENZA_A=Grippe A -Disease.Short.INFLUENZA_B=Grippe B -Disease.Short.H_METAPNEUMOVIRUS=H. metapneumovirus -Disease.Short.RESPIRATORY_SYNCYTIAL_VIRUS=RSV -Disease.Short.PARAINFLUENZA_1_4=Parainfluenza -Disease.Short.ADENOVIRUS=Adenovirus -Disease.Short.RHINOVIRUS=Rhinovirus -Disease.Short.ENTEROVIRUS=Enterovirus -Disease.Short.M_PNEUMONIAE=M.pneumoniae -Disease.Short.C_PNEUMONIAE=C.pneumoniae -Disease.Short.ARI=ARI -Disease.Short.CHIKUNGUNYA=Chikungunya -Disease.Short.POST_IMMUNIZATION_ADVERSE_EVENTS_MILD=Effets indésirables post-immunisation légers -Disease.Short.POST_IMMUNIZATION_ADVERSE_EVENTS_SEVERE=Effets indésirables post-immunisation graves -Disease.Short.FHA=FHA -DiseaseTransmissionMode.HUMAN_TO_HUMAN=Principalement de l'homme vers l'homme -DiseaseTransmissionMode.ANIMAL=Principalement via un animal -DiseaseTransmissionMode.ENVIRONMENT=Principalement via l'environnement -DiseaseTransmissionMode.FOOD=Principalement par la nourriture -DiseaseTransmissionMode.VECTOR_BORNE=Portée vectorielle principale -DiseaseTransmissionMode.UNKNOWN=Inconnu +Disease.INFLUENZA_A = Grippe A +Disease.INFLUENZA_B = Grippe B +Disease.H_METAPNEUMOVIRUS = H. metapneumovirus +Disease.RESPIRATORY_SYNCYTIAL_VIRUS = Virus syncytique respiratoire (RSV) +Disease.PARAINFLUENZA_1_4 = Parainfluenza (1-4) +Disease.ADENOVIRUS = Adenovirus +Disease.RHINOVIRUS = Rhinovirus +Disease.ENTEROVIRUS = Enterovirus +Disease.M_PNEUMONIAE = M.pneumoniae +Disease.C_PNEUMONIAE = C.pneumoniae +Disease.ARI = IRA (Infections Respiratoires Aiguës) +Disease.CHIKUNGUNYA = Chikungunya +Disease.POST_IMMUNIZATION_ADVERSE_EVENTS_MILD = Effets indésirables post-immunisation légers +Disease.POST_IMMUNIZATION_ADVERSE_EVENTS_SEVERE = Effets indésirables post-immunisation graves +Disease.FHA = FHA (aménorrhée hypothalamique fonctionnelle) +Disease.Short.AFP = PFA +Disease.Short.CHOLERA = Choléra +Disease.Short.CONGENITAL_RUBELLA = SRC +Disease.Short.CSM = Méningite +Disease.Short.DENGUE = Dengue +Disease.Short.EVD = Ebola +Disease.Short.GUINEA_WORM = Ver de Guinée +Disease.Short.LASSA = Lassa +Disease.Short.MEASLES = Rougeole +Disease.Short.MONKEYPOX = Mpox +Disease.Short.NEW_INFLUENZA = Nouvelle grippe +Disease.Short.UNDEFINED = Non défini +Disease.Short.OTHER = Autres +Disease.Short.PLAGUE = Peste +Disease.Short.POLIO = Polio +Disease.Short.UNSPECIFIED_VHF = FHV +Disease.Short.WEST_NILE_FEVER = Fièvre du Nil occidental +Disease.Short.YELLOW_FEVER = Fièvre jaune +Disease.Short.RABIES = Rage +Disease.Short.ANTHRAX = Anthrax +Disease.Short.PNEUMONIA = Pneumonie +Disease.Short.MALARIA = Paludisme +Disease.Short.TYPHOID_FEVER = Fièvre typhoïde +Disease.Short.ACUTE_VIRAL_HEPATITIS = Hépatite virale aiguë +Disease.Short.NON_NEONATAL_TETANUS = Tétanos Maternel +Disease.Short.HIV = VIH +Disease.Short.SCHISTOSOMIASIS = Schistosomiase +Disease.Short.SOIL_TRANSMITTED_HELMINTHS = Helminthes transmis par le sol +Disease.Short.TRYPANOSOMIASIS = Trypanosomiase +Disease.Short.DIARRHEA_DEHYDRATION = Diarrhée avec déshydratation (< 5) +Disease.Short.DIARRHEA_BLOOD = Diarrhée avec / Sang (Shigella) +Disease.Short.SNAKE_BITE = Morsure de serpent +Disease.Short.RUBELLA = Rubéole +Disease.Short.TUBERCULOSIS = Tuberculose +Disease.Short.LEPROSY = Lèpre +Disease.Short.LYMPHATIC_FILARIASIS = Filariose lymphatique +Disease.Short.BURULI_ULCER = Ulcère de Buruli +Disease.Short.PERTUSSIS = Coqueluche +Disease.Short.NEONATAL_TETANUS = Tétanos néonatal +Disease.Short.ONCHOCERCIASIS = Onchocercose +Disease.Short.DIPHTERIA = Diphtérie +Disease.Short.TRACHOMA = Trachome +Disease.Short.YAWS_ENDEMIC_SYPHILIS = Pian et syphilis endémique +Disease.Short.MATERNAL_DEATHS = Décès maternels +Disease.Short.PERINATAL_DEATHS = Morts périnatales +Disease.Short.CORONAVIRUS = CoV +Disease.Short.INFLUENZA_A = Grippe A +Disease.Short.INFLUENZA_B = Grippe B +Disease.Short.H_METAPNEUMOVIRUS = H. metapneumovirus +Disease.Short.RESPIRATORY_SYNCYTIAL_VIRUS = RSV +Disease.Short.PARAINFLUENZA_1_4 = Parainfluenza +Disease.Short.ADENOVIRUS = Adenovirus +Disease.Short.RHINOVIRUS = Rhinovirus +Disease.Short.ENTEROVIRUS = Enterovirus +Disease.Short.M_PNEUMONIAE = M.pneumoniae +Disease.Short.C_PNEUMONIAE = C.pneumoniae +Disease.Short.ARI = ARI +Disease.Short.CHIKUNGUNYA = Chikungunya +Disease.Short.POST_IMMUNIZATION_ADVERSE_EVENTS_MILD = Effets indésirables post-immunisation légers +Disease.Short.POST_IMMUNIZATION_ADVERSE_EVENTS_SEVERE = Effets indésirables post-immunisation graves +Disease.Short.FHA = FHA + +DiseaseTransmissionMode.HUMAN_TO_HUMAN = Principalement de l'homme vers l'homme +DiseaseTransmissionMode.ANIMAL = Principalement via un animal +DiseaseTransmissionMode.ENVIRONMENT = Principalement via l'environnement +DiseaseTransmissionMode.FOOD = Principalement par la nourriture +DiseaseTransmissionMode.VECTOR_BORNE = Portée vectorielle principale +DiseaseTransmissionMode.UNKNOWN = Inconnu + # DocumentRelatedEntityType -DocumentRelatedEntityType.ACTION=Action -DocumentRelatedEntityType.CASE=Cas -DocumentRelatedEntityType.CONTACT=Contact -DocumentRelatedEntityType.EVENT=Évènement -DocumentRelatedEntityType.TRAVEL_ENTRY=Entrées de voyage +DocumentRelatedEntityType.ACTION = Action +DocumentRelatedEntityType.CASE = Cas +DocumentRelatedEntityType.CONTACT = Contact +DocumentRelatedEntityType.EVENT = Évènement +DocumentRelatedEntityType.TRAVEL_ENTRY = Entrées de voyage + # DocumentWorkflow -DocumentWorkflow.QUARANTINE_ORDER_CASE=Modèles de document - Cas -DocumentWorkflow.QUARANTINE_ORDER_CONTACT=Modèles de document pour les contacts -DocumentWorkflow.QUARANTINE_ORDER_EVENT_PARTICIPANT=Modèles de documents Participant à l'événement -DocumentWorkflow.QUARANTINE_ORDER_TRAVEL_ENTRY=Entrée de voyage des modèles de documents -DocumentWorkflow.EVENT_HANDOUT=Modèles de Mémo d'événement -DocumentWorkflow.CASE_EMAIL=Modèles d'e-mail pour les cas -DocumentWorkflow.CONTACT_EMAIL=Modèles d'e-mail pour les contacts -DocumentWorkflow.EVENT_PARTICIPANT_EMAIL=Modèles d'e-mail pour les participants à l'événement -DocumentWorkflow.TRAVEL_ENTRY_EMAIL=Modèles d'e-mail pour les voyageurs arrivant -EducationType.NONE=Pas d'éducation -EducationType.NURSERY=Maternelle -EducationType.PRIMARY=Primaire -EducationType.SECONDARY=Secondaire -EducationType.TERTIARY=Universitaire -EducationType.OTHER=Autres -EntityRelevanceStatus.ACTIVE=Actif -EntityRelevanceStatus.ARCHIVED=Archivé -EntityRelevanceStatus.ALL=Tout +DocumentWorkflow.QUARANTINE_ORDER_CASE = Modèles de document - Cas +DocumentWorkflow.QUARANTINE_ORDER_CONTACT = Modèles de document pour les contacts +DocumentWorkflow.QUARANTINE_ORDER_EVENT_PARTICIPANT = Modèles de documents Participant à l'événement +DocumentWorkflow.QUARANTINE_ORDER_TRAVEL_ENTRY = Entrée de voyage des modèles de documents +DocumentWorkflow.EVENT_HANDOUT = Modèles de Mémo d'événement +DocumentWorkflow.CASE_EMAIL = Modèles d'e-mail pour les cas +DocumentWorkflow.CONTACT_EMAIL = Modèles d'e-mail pour les contacts +DocumentWorkflow.EVENT_PARTICIPANT_EMAIL = Modèles d'e-mail pour les participants à l'événement +DocumentWorkflow.TRAVEL_ENTRY_EMAIL = Modèles d'e-mail pour les voyageurs arrivant + +EducationType.NONE = Pas d'éducation +EducationType.NURSERY = Maternelle +EducationType.PRIMARY = Primaire +EducationType.SECONDARY = Secondaire +EducationType.TERTIARY = Universitaire +EducationType.OTHER = Autres + +EntityRelevanceStatus.ACTIVE = Actif +EntityRelevanceStatus.ARCHIVED = Archivé +EntityRelevanceStatus.ALL = Tout + # EnvironmentInfrastructureDetails -EnvironmentInfrastructureDetails.SEPTIC_TANK=Septic tank -EnvironmentInfrastructureDetails.LATRIN=Latrin -EnvironmentInfrastructureDetails.TOILET=Toilet -EnvironmentInfrastructureDetails.MANHOLE=Bouche d'égout -EnvironmentInfrastructureDetails.WELLS=Wells -EnvironmentInfrastructureDetails.SURFACE_WATER=Surface water -EnvironmentInfrastructureDetails.OPEN_DRAIN=Open drain -EnvironmentInfrastructureDetails.OTHER=Other -EnvironmentInfrastructureDetails.UNKNOWN=Unknown +EnvironmentInfrastructureDetails.SEPTIC_TANK = Septic tank +EnvironmentInfrastructureDetails.LATRIN = Latrin +EnvironmentInfrastructureDetails.TOILET = Toilet +EnvironmentInfrastructureDetails.MANHOLE = Bouche d'égout +EnvironmentInfrastructureDetails.WELLS = Wells +EnvironmentInfrastructureDetails.SURFACE_WATER = Surface water +EnvironmentInfrastructureDetails.OPEN_DRAIN = Open drain +EnvironmentInfrastructureDetails.OTHER = Other +EnvironmentInfrastructureDetails.UNKNOWN = Unknown + # EnvironmentMedia -EnvironmentMedia.WATER=Water -EnvironmentMedia.SOIL_ROCK=Soil or rock -EnvironmentMedia.AIR=Air -EnvironmentMedia.BIOTA=Biota +EnvironmentMedia.WATER = Water +EnvironmentMedia.SOIL_ROCK = Soil or rock +EnvironmentMedia.AIR = Air +EnvironmentMedia.BIOTA = Biota + # EpiCurveGrouping -EpiCurveGrouping.DAY=Jour -EpiCurveGrouping.MONTH=Mois -EpiCurveGrouping.WEEK=Par semaine +EpiCurveGrouping.DAY = Jour +EpiCurveGrouping.MONTH = Mois +EpiCurveGrouping.WEEK = Par semaine + # EpiCurveContactsMode -EpiCurveContactsMode.CONTACT_CLASSIFICATION=Classification de contact -EpiCurveContactsMode.FOLLOW_UP_STATUS=Statut de suivi -EpiCurveContactsMode.FOLLOW_UP_UNTIL=Suivi jusqu’à +EpiCurveContactsMode.CONTACT_CLASSIFICATION = Classification de contact +EpiCurveContactsMode.FOLLOW_UP_STATUS = Statut de suivi +EpiCurveContactsMode.FOLLOW_UP_UNTIL = Suivi jusqu’à + # EpiCurveSurveillanceMode -EpiCurveSurveillanceMode.ALIVE_OR_DEAD=Vivant ou mort -EpiCurveSurveillanceMode.CASE_STATUS=Statut du cas +EpiCurveSurveillanceMode.ALIVE_OR_DEAD = Vivant ou mort +EpiCurveSurveillanceMode.CASE_STATUS = Statut du cas + # EpiWeekFilterOption -EpiWeekFilterOption.LAST_WEEK=Semaine Dernière -EpiWeekFilterOption.SPECIFY_WEEK=Spécifier -EpiWeekFilterOption.THIS_WEEK=Cette semaine +EpiWeekFilterOption.LAST_WEEK = Semaine Dernière +EpiWeekFilterOption.SPECIFY_WEEK = Spécifier +EpiWeekFilterOption.THIS_WEEK = Cette semaine + # EventContactCountMethod -EventContactCountMethod.ALL=Compter tous les contacts -EventContactCountMethod.SOURCE_CASE_IN_EVENT=Compter uniquement les contacts avec le cas source dans l'événement -EventContactCountMethod.BOTH_METHODS=Afficher les deux méthodes +EventContactCountMethod.ALL = Compter tous les contacts +EventContactCountMethod.SOURCE_CASE_IN_EVENT = Compter uniquement les contacts avec le cas source dans l'événement +EventContactCountMethod.BOTH_METHODS = Afficher les deux méthodes + # EventInvestigationStatus EventInvestigationStatus.DISCARDED=Enquête abandonnée EventInvestigationStatus.DONE=Enquête terminée @@ -613,51 +676,58 @@ EventInvestigationStatus.Short.DISCARDED=Abandonné EventInvestigationStatus.Short.DONE=Terminé EventInvestigationStatus.Short.ONGOING=En cours EventInvestigationStatus.Short.PENDING=En attente + # EventStatus -EventStatus.EVENT=Événement -EventStatus.DROPPED=Abandonné -EventStatus.SIGNAL=Signal -EventStatus.SCREENING=Dépistage -EventStatus.CLUSTER=Cluster -EventStatus.Short.EVENT=Événement -EventStatus.Short.DROPPED=Abandonné -EventStatus.Short.SIGNAL=Signal -EventStatus.Short.SCREENING=Dépistage -EventStatus.Short.CLUSTER=Cluster +EventStatus.EVENT = Événement +EventStatus.DROPPED = Abandonné +EventStatus.SIGNAL = Signal +EventStatus.SCREENING = Dépistage +EventStatus.CLUSTER = Cluster +EventStatus.Short.EVENT = Événement +EventStatus.Short.DROPPED = Abandonné +EventStatus.Short.SIGNAL = Signal +EventStatus.Short.SCREENING = Dépistage +EventStatus.Short.CLUSTER = Cluster + # EventManagementStatus -EventManagementStatus.PENDING=En attente -EventManagementStatus.ONGOING=En cours -EventManagementStatus.DONE=A clôturer -EventManagementStatus.CLOSED=Clos +EventManagementStatus.PENDING = En attente +EventManagementStatus.ONGOING = En cours +EventManagementStatus.DONE = A clôturer +EventManagementStatus.CLOSED = Clos + # EventIndentificationSource -EventIdentificationSource.UNKNOWN=Inconnu -EventIdentificationSource.BACKWARD_TRACING=Backward-tracing -EventIdentificationSource.FORWARD_TRACING=Forward-tracing -ExportGroupType.CORE=Donnée principale -ExportGroupType.SENSITIVE=Données personnelles sensibles -ExportGroupType.PERSON=Données personnelles générales -ExportGroupType.HOSPITALIZATION=Données d'hospitalisation -ExportGroupType.EPIDEMIOLOGICAL=Données épidémiologiques -ExportGroupType.VACCINATION=Données de vaccination -ExportGroupType.FOLLOW_UP=Données de suivi -ExportGroupType.ADDITIONAL=Données supplémentaires -ExportGroupType.LOCATION=Données de localisation -ExportGroupType.EVENT=Données de l'événement -ExportGroupType.EVENT_GROUP=Données du groupe d'événements -ExportGroupType.EVENT_SOURCE=Données de la source de l'événement -ExportGroupType.CLINICAL_COURSE=Données clinique -ExportGroupType.THERAPY=Données thérapeutiques -EventSourceType.NOT_APPLICABLE=Non applicable -EventSourceType.MEDIA_NEWS=Médias/Nouvelles -EventSourceType.HOTLINE_PERSON=Hotline/Personne -EventSourceType.MATHEMATICAL_MODEL=Modèle mathématique -EventSourceType.INSTITUTIONAL_PARTNER=Partenaire institutionnel -InstitutionalPartnerType.HEALTH_INSURANCE=Assurance santé -InstitutionalPartnerType.TERRITORIAL_COMMUNITIES=Communautés territoriales -InstitutionalPartnerType.NATIONAL_EDUCATION=Éducation nationale -InstitutionalPartnerType.HEALTH_ESTABLISHMENTS=Établissements de santé -InstitutionalPartnerType.MEDICO_SOCIAL_ESTABLISHMENTS=Etablissements médico-sociaux -InstitutionalPartnerType.OTHER=Autre +EventIdentificationSource.UNKNOWN = Inconnu +EventIdentificationSource.BACKWARD_TRACING = Backward-tracing +EventIdentificationSource.FORWARD_TRACING = Forward-tracing + +ExportGroupType.CORE = Donnée principale +ExportGroupType.SENSITIVE = Données personnelles sensibles +ExportGroupType.PERSON = Données personnelles générales +ExportGroupType.HOSPITALIZATION = Données d'hospitalisation +ExportGroupType.EPIDEMIOLOGICAL = Données épidémiologiques +ExportGroupType.VACCINATION = Données de vaccination +ExportGroupType.FOLLOW_UP = Données de suivi +ExportGroupType.ADDITIONAL = Données supplémentaires +ExportGroupType.LOCATION = Données de localisation +ExportGroupType.EVENT = Données de l'événement +ExportGroupType.EVENT_GROUP = Données du groupe d'événements +ExportGroupType.EVENT_SOURCE = Données de la source de l'événement +ExportGroupType.CLINICAL_COURSE = Données clinique +ExportGroupType.THERAPY = Données thérapeutiques + +EventSourceType.NOT_APPLICABLE = Non applicable +EventSourceType.MEDIA_NEWS = Médias/Nouvelles +EventSourceType.HOTLINE_PERSON = Hotline/Personne +EventSourceType.MATHEMATICAL_MODEL = Modèle mathématique +EventSourceType.INSTITUTIONAL_PARTNER = Partenaire institutionnel + +InstitutionalPartnerType.HEALTH_INSURANCE = Assurance santé +InstitutionalPartnerType.TERRITORIAL_COMMUNITIES = Communautés territoriales +InstitutionalPartnerType.NATIONAL_EDUCATION = Éducation nationale +InstitutionalPartnerType.HEALTH_ESTABLISHMENTS = Établissements de santé +InstitutionalPartnerType.MEDICO_SOCIAL_ESTABLISHMENTS = Etablissements médico-sociaux +InstitutionalPartnerType.OTHER = Autre + ExposureType.WORK=Travail ExposureType.TRAVEL=Voyage ExposureType.SPORT=Sport @@ -669,6 +739,7 @@ ExposureType.BURIAL=Enterrement ExposureType.ANIMAL_CONTACT=Contacts avec les animaux ExposureType.OTHER=Autre ExposureType.UNKNOWN=Inconnu + # FacilityType FacilityType.ASSOCIATION=Structure sportive FacilityType.BAR=Bar @@ -714,22 +785,23 @@ FacilityType.SWIMMING_POOL=Piscine FacilityType.THEATER=Structures culturelles/Théâtre/cinéma/concert/musée etc FacilityType.UNIVERSITY=Université FacilityType.ZOO=Jardin zoologique, parc animalier -FacilityType.RETAIL=Vente au détail -FacilityType.WHOLESALE=Vente en gros -FacilityType.AMBULATORY_SURGERY_FACILITY=Etablissement de chirurgie ambulatoire -FacilityType.DIALYSIS_FACILITY=Établissement de dialyse -FacilityType.DAY_HOSPITAL=Hôpital de jour -FacilityType.MATERNITY_FACILITY=Maternité -FacilityType.MEDICAL_PRACTICE=Cabinet médical -FacilityType.DENTAL_PRACTICE=Cabinet dentaire -FacilityType.OTHER_MEDICAL_PRACTICE=Autres cabinets médicaux -FacilityType.DIAGNOSTIC_PREVENTATIVE_THERAPEUTIC_FACILITY=Etablissement thérapeutique, préventif ou de diagnostique -FacilityType.EMERGENCY_MEDICAL_SERVICES=Services des urgences médicales -FacilityType.ELDERLY_CARE_FACILITY=Établissement pour personnes âgées -FacilityType.DISABLED_PERSON_HABITATION=Etablissement pour personnes en situation de handicap -FacilityType.CARE_RECIPIENT_HABITATION=Résidence du bénéficiaire des soins -FacilityType.VISITING_AMBULATORY_AID=Soins à domicile -FacilityType.AFTER_SCHOOL=Accueil périscolaire +FacilityType.RETAIL = Vente au détail +FacilityType.WHOLESALE = Vente en gros +FacilityType.AMBULATORY_SURGERY_FACILITY = Etablissement de chirurgie ambulatoire +FacilityType.DIALYSIS_FACILITY = Établissement de dialyse +FacilityType.DAY_HOSPITAL = Hôpital de jour +FacilityType.MATERNITY_FACILITY = Maternité +FacilityType.MEDICAL_PRACTICE = Cabinet médical +FacilityType.DENTAL_PRACTICE = Cabinet dentaire +FacilityType.OTHER_MEDICAL_PRACTICE = Autres cabinets médicaux +FacilityType.DIAGNOSTIC_PREVENTATIVE_THERAPEUTIC_FACILITY = Etablissement thérapeutique, préventif ou de diagnostique +FacilityType.EMERGENCY_MEDICAL_SERVICES = Services des urgences médicales +FacilityType.ELDERLY_CARE_FACILITY = Établissement pour personnes âgées +FacilityType.DISABLED_PERSON_HABITATION = Etablissement pour personnes en situation de handicap +FacilityType.CARE_RECIPIENT_HABITATION = Résidence du bénéficiaire des soins +FacilityType.VISITING_AMBULATORY_AID = Soins à domicile +FacilityType.AFTER_SCHOOL = Accueil périscolaire + #FacilityTypeGroup FacilityTypeGroup.ACCOMMODATION=Hébergement FacilityTypeGroup.CARE_FACILITY=Etablissement de soins/service à la personne @@ -740,11 +812,13 @@ FacilityTypeGroup.MEDICAL_FACILITY=Etablissement médical FacilityTypeGroup.RESIDENCE=Résidence FacilityTypeGroup.WORKING_PLACE=Lieu de travail / entreprise FacilityTypeGroup.COMMERCE=Commerce + # FollowUpStartDateType FollowUpStartDateType.SYMPTOM_ONSET_DATE=Date d'apparition du symptôme FollowUpStartDateType.LAST_CONTACT_DATE=date du dernier contact FollowUpStartDateType.EARLIEST_SAMPLE_COLLECTION_DATE=date de collecte de l'échantillon la plus ancienne FollowUpStartDateType.REPORT_DATE=date du rapport + # FollowUpStatus FollowUpStatus.CANCELED=Suivi annulé FollowUpStatus.COMPLETED=Suivi complété @@ -761,6 +835,7 @@ FollowUpStatus.Desc.COMPLETED=Le processus de suivi a été terminé FollowUpStatus.Desc.FOLLOW_UP=Le processus de suivi est en cours d'exécution FollowUpStatus.Desc.LOST=Le processus de suivi n'a pas pu être poursuivi car la personne n'était pas disponible FollowUpStatus.Desc.NO_FOLLOW_UP=Aucun suivi de contact n'est en cours + GatheringType.PARTY=Fête GatheringType.RELIGIOUS=Collecte de Religieux GatheringType.MUSICAL=Chœur/Club de chant/Orchestre @@ -770,21 +845,25 @@ GatheringType.CARNIVAL=Carnaval GatheringType.FAIR=Foire GatheringType.SPORTING_EVENT=Événement sportif GatheringType.OTHER=Autre + HabitationType.MEDICAL=Séjour dans un établissement médical HabitationType.OTHER=Autre + HospitalizationReasonType.REPORTED_DISEASE=Maladie signalée HospitalizationReasonType.ISOLATION=Isolement HospitalizationReasonType.OTHER=Autre motif HospitalizationReasonType.UNKNOWN=Inconnu -HospitalWardType.PEDIATRIC_INPATIENT=Pediatrique-Inpatient -HospitalWardType.NURSERY=Maternelle -HospitalWardType.EPU=EPU -HospitalWardType.CHER=CHER -HospitalWardType.OPD=OPD -HospitalWardType.EYE=Yeux -HospitalWardType.ENT=ENT -HospitalWardType.CARDIOLOGY=Cardiologie -HospitalWardType.OTHER=Autres + +HospitalWardType.PEDIATRIC_INPATIENT = Pediatrique-Inpatient +HospitalWardType.NURSERY = Maternelle +HospitalWardType.EPU = EPU +HospitalWardType.CHER = CHER +HospitalWardType.OPD = OPD +HospitalWardType.EYE = Yeux +HospitalWardType.ENT = ENT +HospitalWardType.CARDIOLOGY = Cardiologie +HospitalWardType.OTHER = Autres + # ImmunizationDateType ImmunizationDateType.FIRST_VACCINATION_DATE=Date de la première vaccination ImmunizationDateType.IMMUNIZATION_END=Fin de la vaccination @@ -792,6 +871,7 @@ ImmunizationDateType.LAST_VACCINATION_DATE=Date de la dernière vaccination ImmunizationDateType.RECOVERY_DATE=Date de récupération ImmunizationDateType.REPORT_DATE=Date du rapport ImmunizationDateType.VALID_UNTIL=Valable jusqu’au + # InvestigationStatus InvestigationStatus.DISCARDED=Enquête abandonnée InvestigationStatus.DONE=Enquête terminée @@ -799,249 +879,277 @@ InvestigationStatus.PENDING=Enquête en attente InvestigationStatus.Short.DISCARDED=Abandonné InvestigationStatus.Short.DONE=Terminé InvestigationStatus.Short.PENDING=En attente + # KindOfInvolvement -KindOfInvolvement.OTHER=Autres -KindOfInvolvement.POTENTIALLY_EXPOSED=Potentiellement exposé -KindOfInvolvement.POTENTIAL_INDEX_CASE=Cas d'index potentiel -Language.EN=Anglais -Language.EN_GM=English (The Gambia) -Language.EN_LR=English (Liberia) -Language.EN_AF=Anglais (Afghanistan) -Language.EN_NG=Anglais (Nigeria) -Language.EN_GH=Anglais (Ghana) -Language.EN_KE=English (Kenya) -Language.FR=Français -Language.DE=Allemand -Language.ES_BO=Español (Bolivia) -Language.ES_EC=Espagnol (Équateur) -Language.ES_CU=Espagnol (Cuba) -Language.FI=Finlande -Language.IT=Italien -Language.DE_CH=Deutsch (Schweiz) -Language.PT_CV=Português (Cabo Verde) -Language.IT_CH=Italiano (Svizzera) -Language.FR_CH=Français (Suisse) -Language.PS=Pachto -Language.FA=Dari -Language.CZ=Tchèque -Language.UR_PK=Ourdou -Language.FR_TN=Français (Tunisie) +KindOfInvolvement.OTHER = Autres +KindOfInvolvement.POTENTIALLY_EXPOSED = Potentiellement exposé +KindOfInvolvement.POTENTIAL_INDEX_CASE = Cas d'index potentiel + +Language.EN = Anglais +Language.EN_GM = English (The Gambia) +Language.EN_LR = English (Liberia) +Language.EN_AF = Anglais (Afghanistan) +Language.EN_NG = Anglais (Nigeria) +Language.EN_GH = Anglais (Ghana) +Language.EN_KE = English (Kenya) +Language.FR = Français +Language.DE = Allemand +Language.ES_BO = Español (Bolivia) +Language.ES_EC = Espagnol (Équateur) +Language.ES_CU = Espagnol (Cuba) +Language.FI = Finlande +Language.IT = Italien +Language.DE_CH = Deutsch (Schweiz) +Language.PT_CV = Português (Cabo Verde) +Language.IT_CH = Italiano (Svizzera) +Language.FR_CH = Français (Suisse) +Language.PS = Pachto +Language.FA = Dari +Language.CZ = Tchèque +Language.UR_PK = Ourdou +Language.FR_TN = Français (Tunisie) + # MapCaseDisplayMode -MapCaseDisplayMode.CASE_ADDRESS=... par domicile -MapCaseDisplayMode.FACILITY=... par établissement -MapCaseDisplayMode.FACILITY_OR_CASE_ADDRESS=... par établissement ou par domicile -MapCaseClassificationOption.ALL_CASES=Afficher tous les cas -MapCaseClassificationOption.CONFIRMED_CASES_ONLY=Afficher uniquement les cas confirmés -MapPeriodType.DAILY=Quotidien -MapPeriodType.WEEKLY=Hebdomadaire -MapPeriodType.MONTHLY=Mensuel -MapPeriodType.YEARLY=Annuel +MapCaseDisplayMode.CASE_ADDRESS = ... par domicile +MapCaseDisplayMode.FACILITY = ... par établissement +MapCaseDisplayMode.FACILITY_OR_CASE_ADDRESS = ... par établissement ou par domicile + +MapCaseClassificationOption.ALL_CASES = Afficher tous les cas +MapCaseClassificationOption.CONFIRMED_CASES_ONLY = Afficher uniquement les cas confirmés + +MapPeriodType.DAILY = Quotidien +MapPeriodType.WEEKLY = Hebdomadaire +MapPeriodType.MONTHLY = Mensuel +MapPeriodType.YEARLY = Annuel + + MeansOfTransport.LOCAL_PUBLIC_TRANSPORT=Transports en commun MeansOfTransport.BUS=Bus MeansOfTransport.FERRY=Navire/Traversier MeansOfTransport.PLANE=Avion MeansOfTransport.TRAIN=Train MeansOfTransport.OTHER=Autres + # MessageSubject -MessageSubject.CASE_CLASSIFICATION_CHANGED=Classification de cas modifiée -MessageSubject.CASE_INVESTIGATION_DONE=Enquête de cas effectuée -MessageSubject.EVENT_PARTICIPANT_CASE_CLASSIFICATION_CONFIRMED=Participant à l'événement identifié comme un cas confirmé %s -MessageSubject.EVENT_PARTICIPANT_RELATED_TO_OTHER_EVENTS=Participant à l'événement lié à d'autres événements -MessageSubject.LAB_RESULT_ARRIVED=Résultat du laboratoire arrivé -MessageSubject.LAB_SAMPLE_SHIPPED=Échantillon de laboratoire expédié -MessageSubject.CONTACT_SYMPTOMATIC=Le contact est devenu symptomatique -MessageSubject.TASK_START=Tâche à démarrer -MessageSubject.TASK_DUE=Tâche en retard -MessageSubject.TASK_UPDATED_ASSIGNEE=Responsable de tâche mis à jour -MessageSubject.VISIT_COMPLETED=Visite de suivi terminée -MessageSubject.DISEASE_CHANGED=Maladie de cas modifiée -MessageSubject.EVENT_GROUP_CREATED=Groupe d'événements créé -MessageSubject.EVENT_ADDED_TO_EVENT_GROUP=Événement ajouté au groupe d'événements -MessageSubject.EVENT_REMOVED_FROM_EVENT_GROUP=Événement retiré du groupe d'événements +MessageSubject.CASE_CLASSIFICATION_CHANGED = Classification de cas modifiée +MessageSubject.CASE_INVESTIGATION_DONE = Enquête de cas effectuée +MessageSubject.EVENT_PARTICIPANT_CASE_CLASSIFICATION_CONFIRMED = Participant à l'événement identifié comme un cas confirmé %s +MessageSubject.EVENT_PARTICIPANT_RELATED_TO_OTHER_EVENTS = Participant à l'événement lié à d'autres événements +MessageSubject.LAB_RESULT_ARRIVED = Résultat du laboratoire arrivé +MessageSubject.LAB_SAMPLE_SHIPPED = Échantillon de laboratoire expédié +MessageSubject.CONTACT_SYMPTOMATIC = Le contact est devenu symptomatique +MessageSubject.TASK_START = Tâche à démarrer +MessageSubject.TASK_DUE = Tâche en retard +MessageSubject.TASK_UPDATED_ASSIGNEE = Responsable de tâche mis à jour +MessageSubject.VISIT_COMPLETED = Visite de suivi terminée +MessageSubject.DISEASE_CHANGED = Maladie de cas modifiée +MessageSubject.EVENT_GROUP_CREATED = Groupe d'événements créé +MessageSubject.EVENT_ADDED_TO_EVENT_GROUP = Événement ajouté au groupe d'événements +MessageSubject.EVENT_REMOVED_FROM_EVENT_GROUP = Événement retiré du groupe d'événements + # Month -Month.JANUARY=Janvier -Month.FEBRUARY=Février -Month.MARCH=Mars -Month.APRIL=Avril -Month.MAY=Mai -Month.JUNE=Juin -Month.JULY=Juillet -Month.AUGUST=Août -Month.SEPTEMBER=Septembre -Month.OCTOBER=Octobre -Month.NOVEMBER=Novembre -Month.DECEMBER=Décembre +Month.JANUARY = Janvier +Month.FEBRUARY = Février +Month.MARCH = Mars +Month.APRIL = Avril +Month.MAY = Mai +Month.JUNE = Juin +Month.JULY = Juillet +Month.AUGUST = Août +Month.SEPTEMBER = Septembre +Month.OCTOBER = Octobre +Month.NOVEMBER = Novembre +Month.DECEMBER = Décembre + # NewCaseDateType -NewCaseDateType.MOST_RELEVANT=La date la plus récente -NewCaseDateType.ONSET=Date de début du symptôme -NewCaseDateType.REPORT=Date du rapport de cas +NewCaseDateType.MOST_RELEVANT = La date la plus récente +NewCaseDateType.ONSET = Date de début du symptôme +NewCaseDateType.REPORT = Date du rapport de cas + # OccupationType # Temporarily necessary for data migration of older systems; can be removed at a later point in time -OccupationType.BUSINESSMAN_WOMAN=Businessman / femme -OccupationType.BUTCHER=Boucher -OccupationType.CHILD=Enfant -OccupationType.FARMER=Fermier -OccupationType.HEALTHCARE_WORKER=Professionnel de santé -OccupationType.HOUSEWIFE=La ménagère -OccupationType.HUNTER_MEAT_TRADER=Chasseur / vendeur de viande de gibier -OccupationType.MINER=Mineur -OccupationType.OTHER=Autres -OccupationType.PUPIL_STUDENT=Élèves / Étudiants -OccupationType.RELIGIOUS_LEADER=Leader religieux -OccupationType.TRADITIONAL_SPIRITUAL_HEALER=Guérisseur traditionnel / spirituel -OccupationType.TRANSPORTER=Transporteur -OccupationType.WORKING_WITH_ANIMALS=Travaille avec des animaux -OccupationType.LABORATORY_STAFF=Personnel de laboratoire -OccupationType.UNKNOWN=Inconnu -OccupationType.AGRICULTURE=A. Agriculture & foresterie, pêches -OccupationType.MINING=B. Mines & carrières -OccupationType.MANUFACTURING=C. Industrie manufacturière /fabrication de biens -OccupationType.ENERGY_SUPPLY=D. Alimentation en énergie -OccupationType.WATER_SUPPLY_AND_WASTE=E. Approvisionnement en eau; évacuation des eaux usées et traitement des déchets -OccupationType.CONSTRUCTION=F. Industrie de la construction / bâtiment -OccupationType.RETAIL_AND_REPAIR_SERVICE=G. Commerce de gros et commerce de détail; services de réparation -OccupationType.TRANSPORT_AND_STORAGE=H. Transport et stockage -OccupationType.ACCOMMODATION_AND_FOOD_SERVICES=I. Hôtels et restaurants / hébergement & gastronomie -OccupationType.INFORMATION_AND_COMMUNICATION=Information, Communication -OccupationType.FINANCE_AND_INSURANCE=K. Finance & Assurance -OccupationType.REAL_ESTATE=L. Immobilier et logement -OccupationType.PROFESSIONAL_SCIENTIFIC_AND_TECHNICAL=M. Service \: freelance, scientifique, technique -OccupationType.ADMINISTRATIVE_AND_SUPPORT=N. Service \: autres activités économiques -OccupationType.PUBLIC_ADMINISTRATION_AND_DEFENCE=O. Administration publique et défense; services sociaux/sécurité -OccupationType.EDUCATION=P. Education & enseignement -OccupationType.HEALTH_AND_SOCIAL=Santé & Services Sociaux -OccupationType.ARTS_ENTERTAINMENT_AND_RECREATION=R. Arts, spectacles et loisirs -OccupationType.SERVICE_OTHER=S. Service \: autre -OccupationType.PRIVATE_HOUSEHOLD=T. Les ménages privés avec le personnel domestique -OccupationType.EXTRATERRITORIAL_ORGANIZATIONS=U. Organisations & organismes extraterritoriaux +OccupationType.BUSINESSMAN_WOMAN = Businessman / femme +OccupationType.BUTCHER = Boucher +OccupationType.CHILD = Enfant +OccupationType.FARMER = Fermier +OccupationType.HEALTHCARE_WORKER = Professionnel de santé +OccupationType.HOUSEWIFE = La ménagère +OccupationType.HUNTER_MEAT_TRADER = Chasseur / vendeur de viande de gibier +OccupationType.MINER = Mineur +OccupationType.OTHER = Autres +OccupationType.PUPIL_STUDENT = Élèves / Étudiants +OccupationType.RELIGIOUS_LEADER = Leader religieux +OccupationType.TRADITIONAL_SPIRITUAL_HEALER = Guérisseur traditionnel / spirituel +OccupationType.TRANSPORTER = Transporteur +OccupationType.WORKING_WITH_ANIMALS = Travaille avec des animaux +OccupationType.LABORATORY_STAFF = Personnel de laboratoire +OccupationType.UNKNOWN = Inconnu + +OccupationType.AGRICULTURE = A. Agriculture & foresterie, pêches +OccupationType.MINING = B. Mines & carrières +OccupationType.MANUFACTURING = C. Industrie manufacturière /fabrication de biens +OccupationType.ENERGY_SUPPLY = D. Alimentation en énergie +OccupationType.WATER_SUPPLY_AND_WASTE = E. Approvisionnement en eau; évacuation des eaux usées et traitement des déchets +OccupationType.CONSTRUCTION = F. Industrie de la construction / bâtiment +OccupationType.RETAIL_AND_REPAIR_SERVICE = G. Commerce de gros et commerce de détail; services de réparation +OccupationType.TRANSPORT_AND_STORAGE = H. Transport et stockage +OccupationType.ACCOMMODATION_AND_FOOD_SERVICES = I. Hôtels et restaurants / hébergement & gastronomie +OccupationType.INFORMATION_AND_COMMUNICATION = Information, Communication +OccupationType.FINANCE_AND_INSURANCE = K. Finance & Assurance +OccupationType.REAL_ESTATE = L. Immobilier et logement +OccupationType.PROFESSIONAL_SCIENTIFIC_AND_TECHNICAL = M. Service \: freelance, scientifique, technique +OccupationType.ADMINISTRATIVE_AND_SUPPORT = N. Service \: autres activités économiques +OccupationType.PUBLIC_ADMINISTRATION_AND_DEFENCE = O. Administration publique et défense; services sociaux/sécurité +OccupationType.EDUCATION = P. Education & enseignement +OccupationType.HEALTH_AND_SOCIAL = Santé & Services Sociaux +OccupationType.ARTS_ENTERTAINMENT_AND_RECREATION = R. Arts, spectacles et loisirs +OccupationType.SERVICE_OTHER = S. Service \: autre +OccupationType.PRIVATE_HOUSEHOLD = T. Les ménages privés avec le personnel domestique +OccupationType.EXTRATERRITORIAL_ORGANIZATIONS = U. Organisations & organismes extraterritoriaux + # PathogenTestResultType -PathogenTestResultType.INDETERMINATE=Indéterminé -PathogenTestResultType.NEGATIVE=Négatif -PathogenTestResultType.PENDING=En attente -PathogenTestResultType.POSITIVE=Positif -PathogenTestResultType.NOT_DONE=Non terminé +PathogenTestResultType.INDETERMINATE = Indéterminé +PathogenTestResultType.NEGATIVE = Négatif +PathogenTestResultType.PENDING = En attente +PathogenTestResultType.POSITIVE = Positif +PathogenTestResultType.NOT_DONE = Non terminé + # PathogenTestType -PathogenTestType.ANTIGEN_DETECTION=Test de détection antigène -PathogenTestType.CULTURE=Culture  -PathogenTestType.DENGUE_FEVER_ANTIBODIES=Anticorps neutralisants de la dengue -PathogenTestType.DENGUE_FEVER_IGM=Anticorps sériques IgM de la dengue -PathogenTestType.DNA_MICROARRAY=Microtableau ADN -PathogenTestType.HISTOPATHOLOGY=Histopathologie -PathogenTestType.IGG_SERUM_ANTIBODY=Anticorps du sérum d'IgG -PathogenTestType.IGM_SERUM_ANTIBODY=Anticorps du sérum d'IgM -PathogenTestType.IGA_SERUM_ANTIBODY=Anticorps du sérum d'IgG -PathogenTestType.ISOLATION=Isolation -PathogenTestType.MICROSCOPY=Microscopie -PathogenTestType.NEUTRALIZING_ANTIBODIES=Anticorps neutralisants -PathogenTestType.OTHER=Autres -PathogenTestType.PCR_RT_PCR=PCR / RT-PCR -PathogenTestType.RAPID_TEST=Test de détection d'antigène (test rapide) -PathogenTestType.WEST_NILE_FEVER_ANTIBODIES=Anticorps neutralisants de la fièvre de l'ouest du Nil -PathogenTestType.WEST_NILE_FEVER_IGM=Anticorps sériques IgM de la fièvre du Nil occidental -PathogenTestType.YELLOW_FEVER_ANTIBODIES=Anticorps neutralisants de la fièvre jaune -PathogenTestType.YELLOW_FEVER_IGM=Anticorps sériques IgM de la fièvre jaune -PathogenTestType.YERSINIA_PESTIS_ANTIGEN=Test d'antigène de Yersinia pestis -PathogenTestType.ANTIBODY_DETECTION=Détection d'anticorps -PathogenTestType.INCUBATION_TIME=Temps d'incubation -PathogenTestType.INDIRECT_FLUORESCENT_ANTIBODY=Anticorps fluorescent indirect (AFI) -PathogenTestType.DIRECT_FLUORESCENT_ANTIBODY=Anticorps Fluorescent Direct (AFD) -PathogenTestType.GRAM_STAIN=Coloration de Gram -PathogenTestType.LATEX_AGGLUTINATION=Test d'agglutination au latex -PathogenTestType.CQ_VALUE_DETECTION=Détection de valeur CQ -PathogenTestType.SEQUENCING=Séquençage -PathogenTestType.TMA=Amplification génique par TMA -PCRTestSpecification.VARIANT_SPECIFIC=Variante spécifique -PCRTestSpecification.N501Y_MUTATION_DETECTION=Détection de mutation N501Y -PersonContactDetailType.PHONE=Téléphone -PersonContactDetailType.EMAIL=Email -PersonContactDetailType.OTHER=Autre -PhoneNumberType.LANDLINE=Téléphone fixe -PhoneNumberType.MOBILE=Portable -PhoneNumberType.WORK=Travail -PhoneNumberType.OTHER=Autre -ExposureRole.PASSENGER=Passager -ExposureRole.STAFF=Personnel -ExposureRole.NURSING_STAFF=Personnel infirmier -ExposureRole.MEDICAL_STAFF=Personnel Médical -ExposureRole.VISITOR=Visiteur -ExposureRole.GUEST=Visiteur -ExposureRole.CUSTOMER=Client -ExposureRole.CONSERVATEE=Conservateur -ExposureRole.PATIENT=Patient -ExposureRole.EDUCATOR=Éducateur -ExposureRole.TRAINEE_TEACHER=Enseignant du stagiaire -ExposureRole.PUPIL=Élève -ExposureRole.STUDENT=Étudiant -ExposureRole.PARENT=Parent -ExposureRole.TEACHER=Enseignant -ExposureRole.UNKNOWN=Inconnu -ExposureRole.OTHER=Autres +PathogenTestType.ANTIGEN_DETECTION = Test de détection antigène +PathogenTestType.CULTURE = Culture  +PathogenTestType.DENGUE_FEVER_ANTIBODIES = Anticorps neutralisants de la dengue +PathogenTestType.DENGUE_FEVER_IGM = Anticorps sériques IgM de la dengue +PathogenTestType.DNA_MICROARRAY = Microtableau ADN +PathogenTestType.HISTOPATHOLOGY = Histopathologie +PathogenTestType.IGG_SERUM_ANTIBODY = Anticorps du sérum d'IgG +PathogenTestType.IGM_SERUM_ANTIBODY = Anticorps du sérum d'IgM +PathogenTestType.IGA_SERUM_ANTIBODY = Anticorps du sérum d'IgG +PathogenTestType.ISOLATION = Isolation +PathogenTestType.MICROSCOPY = Microscopie +PathogenTestType.NEUTRALIZING_ANTIBODIES = Anticorps neutralisants +PathogenTestType.OTHER = Autres +PathogenTestType.PCR_RT_PCR = PCR / RT-PCR +PathogenTestType.RAPID_TEST = Test de détection d'antigène (test rapide) +PathogenTestType.WEST_NILE_FEVER_ANTIBODIES = Anticorps neutralisants de la fièvre de l'ouest du Nil +PathogenTestType.WEST_NILE_FEVER_IGM = Anticorps sériques IgM de la fièvre du Nil occidental +PathogenTestType.YELLOW_FEVER_ANTIBODIES = Anticorps neutralisants de la fièvre jaune +PathogenTestType.YELLOW_FEVER_IGM = Anticorps sériques IgM de la fièvre jaune +PathogenTestType.YERSINIA_PESTIS_ANTIGEN = Test d'antigène de Yersinia pestis +PathogenTestType.ANTIBODY_DETECTION = Détection d'anticorps +PathogenTestType.INCUBATION_TIME = Temps d'incubation +PathogenTestType.INDIRECT_FLUORESCENT_ANTIBODY = Anticorps fluorescent indirect (AFI) +PathogenTestType.DIRECT_FLUORESCENT_ANTIBODY = Anticorps Fluorescent Direct (AFD) +PathogenTestType.GRAM_STAIN = Coloration de Gram +PathogenTestType.LATEX_AGGLUTINATION = Test d'agglutination au latex +PathogenTestType.CQ_VALUE_DETECTION = Détection de valeur CQ +PathogenTestType.SEQUENCING = Séquençage +PathogenTestType.TMA = Amplification génique par TMA + +PCRTestSpecification.VARIANT_SPECIFIC = Variante spécifique +PCRTestSpecification.N501Y_MUTATION_DETECTION = Détection de mutation N501Y + +PersonContactDetailType.PHONE = Téléphone +PersonContactDetailType.EMAIL = Email +PersonContactDetailType.OTHER = Autre + +PhoneNumberType.LANDLINE = Téléphone fixe +PhoneNumberType.MOBILE = Portable +PhoneNumberType.WORK = Travail +PhoneNumberType.OTHER = Autre + +ExposureRole.PASSENGER = Passager +ExposureRole.STAFF = Personnel +ExposureRole.NURSING_STAFF = Personnel infirmier +ExposureRole.MEDICAL_STAFF = Personnel Médical +ExposureRole.VISITOR = Visiteur +ExposureRole.GUEST = Visiteur +ExposureRole.CUSTOMER = Client +ExposureRole.CONSERVATEE = Conservateur +ExposureRole.PATIENT = Patient +ExposureRole.EDUCATOR = Éducateur +ExposureRole.TRAINEE_TEACHER = Enseignant du stagiaire +ExposureRole.PUPIL = Élève +ExposureRole.STUDENT = Étudiant +ExposureRole.PARENT = Parent +ExposureRole.TEACHER = Enseignant +ExposureRole.UNKNOWN = Inconnu +ExposureRole.OTHER = Autres + #SymptomJournalStatus -SymptomJournalStatus.UNREGISTERED=Non enregistré -SymptomJournalStatus.REGISTERED=Enregistré -SymptomJournalStatus.ACCEPTED=Accepté -SymptomJournalStatus.REJECTED=Rejeté -SymptomJournalStatus.DELETED=Supprimé +SymptomJournalStatus.UNREGISTERED = Non enregistré +SymptomJournalStatus.REGISTERED = Enregistré +SymptomJournalStatus.ACCEPTED = Accepté +SymptomJournalStatus.REJECTED = Rejeté +SymptomJournalStatus.DELETED = Supprimé + # PlagueType -PlagueType.BUBONIC=Peste bubonique -PlagueType.PNEUMONIC=Peste Pneumonique -PlagueType.SEPTICAEMIC=Peste septicémique +PlagueType.BUBONIC = Peste bubonique +PlagueType.PNEUMONIC = Peste Pneumonique +PlagueType.SEPTICAEMIC = Peste septicémique + # PersonAddressType -PersonAddressType.HOME=Domicile -PersonAddressType.PLACE_OF_RESIDENCE=Lieu de résidence -PersonAddressType.PLACE_OF_EXPOSURE=Lieu d'exposition -PersonAddressType.PLACE_OF_WORK=Lieu de travail -PersonAddressType.PLACE_OF_ISOLATION=Lieu d'isolement -PersonAddressType.EVENT_LOCATION=Lieu de l’événement -PersonAddressType.OTHER_ADDRESS=Autre Adresse +PersonAddressType.HOME = Domicile +PersonAddressType.PLACE_OF_RESIDENCE = Lieu de résidence +PersonAddressType.PLACE_OF_EXPOSURE = Lieu d'exposition +PersonAddressType.PLACE_OF_WORK = Lieu de travail +PersonAddressType.PLACE_OF_ISOLATION = Lieu d'isolement +PersonAddressType.EVENT_LOCATION = Lieu de l’événement +PersonAddressType.OTHER_ADDRESS = Autre Adresse + # PointOfEntryType -PointOfEntryType.AIRPORT=Aéroport -PointOfEntryType.SEAPORT=Port maritime -PointOfEntryType.GROUND_CROSSING=Frontière terrestre -PointOfEntryType.OTHER=Autres +PointOfEntryType.AIRPORT = Aéroport +PointOfEntryType.SEAPORT = Port maritime +PointOfEntryType.GROUND_CROSSING = Frontière terrestre +PointOfEntryType.OTHER = Autres + # PresentCondition PresentCondition.ALIVE=Vivant PresentCondition.BURIED=Enterré PresentCondition.DEAD=Mort PresentCondition.UNKNOWN=Inconnu + # QuarantineType -QuarantineType.HOME=Domicile -QuarantineType.INSTITUTIONELL=Institutionnel -QuarantineType.NONE=Aucun -QuarantineType.UNKNOWN=Inconnu -QuarantineType.OTHER=Autre -QuarantineType.HOSPITAL=Hôpital -QuarantineType.HOTEL=Hôtel -QuarantineType.ASYLUM_ACCOMMODATION=Logement en Asile +QuarantineType.HOME = Domicile +QuarantineType.INSTITUTIONELL = Institutionnel +QuarantineType.NONE = Aucun +QuarantineType.UNKNOWN = Inconnu +QuarantineType.OTHER = Autre + +QuarantineType.HOSPITAL = Hôpital +QuarantineType.HOTEL = Hôtel +QuarantineType.ASYLUM_ACCOMMODATION = Logement en Asile + # ReportingType -ReportingType.NOT_RAISED=Non soulevé -ReportingType.OTHER=Autre -ReportingType.DOCTOR=Médecin -ReportingType.LABORATORY=Laboratoire -ReportingType.OWN_DETERMINATION=Détermination personnelle -ReportingType.HOSPITAL_OR_STATIONARY_CARE=Soins hospitaliers ou stationnaires -ReportingType.NOT_DETERMINABLE=Indéterminable -ReportingType.FORWARDING=Transférer -ReportingType.COMMUNITY_FACILITY=Etablissement communautaire -ReportingType.COMMUNITY_FACILITY_IFSG_ARTICLE_34=Etablissement communautaire (§ 34 IfSG) +ReportingType.NOT_RAISED = Non soulevé +ReportingType.OTHER = Autre +ReportingType.DOCTOR = Médecin +ReportingType.LABORATORY = Laboratoire +ReportingType.OWN_DETERMINATION = Détermination personnelle +ReportingType.HOSPITAL_OR_STATIONARY_CARE = Soins hospitaliers ou stationnaires +ReportingType.NOT_DETERMINABLE = Indéterminable +ReportingType.FORWARDING = Transférer +ReportingType.COMMUNITY_FACILITY = Etablissement communautaire +ReportingType.COMMUNITY_FACILITY_IFSG_ARTICLE_34 = Etablissement communautaire (§ 34 IfSG) + # RiskLevel -RiskLevel.LOW=Faible risque -RiskLevel.MODERATE=Risque modéré -RiskLevel.HIGH=Risque élevé -RiskLevel.UNKNOWN=Inconnu +RiskLevel.LOW = Faible risque +RiskLevel.MODERATE = Risque modéré +RiskLevel.HIGH = Risque élevé +RiskLevel.UNKNOWN = Inconnu + # SampleMaterial -SampleMaterial.BLOOD=Le sang -SampleMaterial.CEREBROSPINAL_FLUID=Flux de Cerebrospinal -SampleMaterial.CRUST=Croûte -SampleMaterial.NASAL_SWAB=Écouvillon nasal -SampleMaterial.NP_SWAB=Écouvillon nasopharyngé -SampleMaterial.OTHER=Autres -SampleMaterial.RECTAL_SWAB=Écouvillon rectal -SampleMaterial.SERA=Sérum -SampleMaterial.STOOL=Selle -SampleMaterial.THROAT_SWAB=Écouvillon de gorge -SampleMaterial.TISSUE=Tissu -SampleMaterial.URINE=Urine +SampleMaterial.BLOOD = Le sang +SampleMaterial.CEREBROSPINAL_FLUID = Flux de Cerebrospinal +SampleMaterial.CRUST = Croûte +SampleMaterial.NASAL_SWAB = Écouvillon nasal +SampleMaterial.NP_SWAB = Écouvillon nasopharyngé +SampleMaterial.OTHER = Autres +SampleMaterial.RECTAL_SWAB = Écouvillon rectal +SampleMaterial.SERA = Sérum +SampleMaterial.STOOL = Selle +SampleMaterial.THROAT_SWAB = Écouvillon de gorge +SampleMaterial.TISSUE = Tissu +SampleMaterial.URINE = Urine SampleMaterial.CORNEA_PM=Cornea p.m SampleMaterial.SALIVA=Salive SampleMaterial.URINE_PM=Urine p.m @@ -1083,158 +1191,180 @@ ShipmentStatus.Short.SHIPPED=Envoyé SimpleTestResultType.POSITIVE=Positif SimpleTestResultType.NEGATIVE=Negatif SimpleTestResultType.INDETERMINATE=Indéterminé + # SpecimenCondition -SpecimenCondition.ADEQUATE=Conforme -SpecimenCondition.NOT_ADEQUATE=Non conforme +SpecimenCondition.ADEQUATE = Conforme +SpecimenCondition.NOT_ADEQUATE = Non conforme + # StatisticsCaseAttribute -StatisticsCaseAttribute.AGE_INTERVAL_1_YEAR=Stratification de l'âge \: intervalles de 1 an -StatisticsCaseAttribute.AGE_INTERVAL_5_YEARS=Stratification de l'âge \: intervalles de 5 ans -StatisticsCaseAttribute.AGE_INTERVAL_BASIC=Stratification de l'âge \: basique -StatisticsCaseAttribute.AGE_INTERVAL_CHILDREN_COARSE=Stratification de l'âge \: enfants grossiers -StatisticsCaseAttribute.AGE_INTERVAL_CHILDREN_FINE=Stratification de l'âge \: enfants fins -StatisticsCaseAttribute.AGE_INTERVAL_CHILDREN_MEDIUM=Stratification de l'âge \: enfant moyen -StatisticsCaseAttribute.CLASSIFICATION=Classification -StatisticsCaseAttribute.DISEASE=Maladie -StatisticsCaseAttribute.ONSET_TIME=Début -StatisticsCaseAttribute.OUTCOME=Issue -StatisticsCaseAttribute.OUTCOME_TIME=Heure du résultat -StatisticsCaseAttribute.JURISDICTION=Région / District / Communauté / Établissement de santé -StatisticsCaseAttribute.REPORT_TIME=Heure du rapport -StatisticsCaseAttribute.REPORTING_USER_ROLE=Rôle du rapporteur -StatisticsCaseAttribute.SEX=Sexe -StatisticsCaseAttribute.PLACE_OF_RESIDENCE=Lieu de résidence +StatisticsCaseAttribute.AGE_INTERVAL_1_YEAR= Stratification de l'âge \: intervalles de 1 an +StatisticsCaseAttribute.AGE_INTERVAL_5_YEARS= Stratification de l'âge \: intervalles de 5 ans +StatisticsCaseAttribute.AGE_INTERVAL_BASIC= Stratification de l'âge \: basique +StatisticsCaseAttribute.AGE_INTERVAL_CHILDREN_COARSE= Stratification de l'âge \: enfants grossiers +StatisticsCaseAttribute.AGE_INTERVAL_CHILDREN_FINE= Stratification de l'âge \: enfants fins +StatisticsCaseAttribute.AGE_INTERVAL_CHILDREN_MEDIUM= Stratification de l'âge \: enfant moyen +StatisticsCaseAttribute.CLASSIFICATION = Classification +StatisticsCaseAttribute.DISEASE = Maladie +StatisticsCaseAttribute.ONSET_TIME = Début +StatisticsCaseAttribute.OUTCOME = Issue +StatisticsCaseAttribute.OUTCOME_TIME = Heure du résultat +StatisticsCaseAttribute.JURISDICTION = Région / District / Communauté / Établissement de santé +StatisticsCaseAttribute.REPORT_TIME = Heure du rapport +StatisticsCaseAttribute.REPORTING_USER_ROLE = Rôle du rapporteur +StatisticsCaseAttribute.SEX = Sexe +StatisticsCaseAttribute.PLACE_OF_RESIDENCE = Lieu de résidence + # StatisticsCaseAttributeGroup -StatisticsCaseAttributeGroup.CASE=Cas -StatisticsCaseAttributeGroup.PERSON=Personne -StatisticsCaseAttributeGroup.PLACE=Place -StatisticsCaseAttributeGroup.TIME=Heure +StatisticsCaseAttributeGroup.CASE = Cas +StatisticsCaseAttributeGroup.PERSON = Personne +StatisticsCaseAttributeGroup.PLACE = Place +StatisticsCaseAttributeGroup.TIME = Heure + # StatisticsCaseSubAttribute -StatisticsCaseSubAttribute.DATE_RANGE=Intervalle de dates -StatisticsCaseSubAttribute.DISTRICT=Département -StatisticsCaseSubAttribute.EPI_WEEK=Semaine de l’Epi -StatisticsCaseSubAttribute.EPI_WEEK_OF_YEAR=Semaine épi de l'année -StatisticsCaseSubAttribute.MONTH=Mois -StatisticsCaseSubAttribute.MONTH_OF_YEAR=Mois de l'année -StatisticsCaseSubAttribute.QUARTER=Trimestre -StatisticsCaseSubAttribute.QUARTER_OF_YEAR=Trimestre de l'année -StatisticsCaseSubAttribute.REGION=Région -StatisticsCaseSubAttribute.YEAR=Année -StatisticsCaseSubAttribute.COMMUNITY=Communauté -StatisticsCaseSubAttribute.FACILITY=Établissement -StatisticsCaseSubAttribute.PERSON_REGION=Région de la personne -StatisticsCaseSubAttribute.PERSON_DISTRICT=District de la personne -StatisticsCaseSubAttribute.PERSON_COMMUNITY=Communauté de la personne -StatisticsCaseSubAttribute.PERSON_CITY=Ville de la personne -StatisticsCaseSubAttribute.PERSON_POSTCODE=Code postal de la personne -StatisticsCaseSubAttribute.PERSON_ADDRESS=Adresse de la personne +StatisticsCaseSubAttribute.DATE_RANGE = Intervalle de dates +StatisticsCaseSubAttribute.DISTRICT = Département +StatisticsCaseSubAttribute.EPI_WEEK = Semaine de l’Epi +StatisticsCaseSubAttribute.EPI_WEEK_OF_YEAR = Semaine épi de l'année +StatisticsCaseSubAttribute.MONTH = Mois +StatisticsCaseSubAttribute.MONTH_OF_YEAR = Mois de l'année +StatisticsCaseSubAttribute.QUARTER = Trimestre +StatisticsCaseSubAttribute.QUARTER_OF_YEAR = Trimestre de l'année +StatisticsCaseSubAttribute.REGION = Région +StatisticsCaseSubAttribute.YEAR = Année +StatisticsCaseSubAttribute.COMMUNITY = Communauté +StatisticsCaseSubAttribute.FACILITY = Établissement +StatisticsCaseSubAttribute.PERSON_REGION = Région de la personne +StatisticsCaseSubAttribute.PERSON_DISTRICT = District de la personne +StatisticsCaseSubAttribute.PERSON_COMMUNITY = Communauté de la personne +StatisticsCaseSubAttribute.PERSON_CITY = Ville de la personne +StatisticsCaseSubAttribute.PERSON_POSTCODE = Code postal de la personne +StatisticsCaseSubAttribute.PERSON_ADDRESS = Adresse de la personne + # StatisticsVisualizationChartType -StatisticsVisualizationChartType.COLUMN=Colonne -StatisticsVisualizationChartType.LINE=Ligne -StatisticsVisualizationChartType.PIE=Camembert -StatisticsVisualizationChartType.STACKED_COLUMN=Colonne empilée +StatisticsVisualizationChartType.COLUMN = Colonne +StatisticsVisualizationChartType.LINE = Ligne +StatisticsVisualizationChartType.PIE = Camembert +StatisticsVisualizationChartType.STACKED_COLUMN = Colonne empilée + # StatisticsVisualizationElementType -StatisticsVisualizationElementType.COLUMNS=Colonnes -StatisticsVisualizationElementType.Chart.COLUMNS=Axe-X -StatisticsVisualizationElementType.Chart.ROWS=Séries -StatisticsVisualizationElementType.ROWS=Lignes +StatisticsVisualizationElementType.COLUMNS = Colonnes +StatisticsVisualizationElementType.Chart.COLUMNS = Axe-X +StatisticsVisualizationElementType.Chart.ROWS = Séries +StatisticsVisualizationElementType.ROWS = Lignes + # StatisticsVisualizationType -StatisticsVisualizationType.CHART=Diagramme -StatisticsVisualizationMapType.DISTRICTS=Départements -StatisticsVisualizationType.MAP=Carte -StatisticsVisualizationMapType.REGIONS=Régions -StatisticsVisualizationType.TABLE=Tableau -SurveillanceEpiCurveMode.CASE_STATUS=Statut du cas -SurveillanceEpiCurveMode.ALIVE_OR_DEAD=Vivant ou mort +StatisticsVisualizationType.CHART = Diagramme +StatisticsVisualizationMapType.DISTRICTS = Départements +StatisticsVisualizationType.MAP = Carte +StatisticsVisualizationMapType.REGIONS = Régions +StatisticsVisualizationType.TABLE = Tableau + +SurveillanceEpiCurveMode.CASE_STATUS = Statut du cas +SurveillanceEpiCurveMode.ALIVE_OR_DEAD = Vivant ou mort + # SymptomState -SymptomState.NO=Non -SymptomState.UNKNOWN=Inconnu -SymptomState.YES=Oui +SymptomState.NO = Non +SymptomState.UNKNOWN = Inconnu +SymptomState.YES = Oui + # TaskAssignee -TaskAssignee.ALL=Toutes les tâches -TaskAssignee.CURRENT_USER=Tâches qui me sont assignées -TaskAssignee.OTHER_USERS=Tâches que j'ai créées +TaskAssignee.ALL = Toutes les tâches +TaskAssignee.CURRENT_USER = Tâches qui me sont assignées +TaskAssignee.OTHER_USERS = Tâches que j'ai créées + # TaskContext -TaskContext.CASE=Cas -TaskContext.CONTACT=Contact -TaskContext.EVENT=Événement -TaskContext.GENERAL=Général -TaskContext.TRAVEL_ENTRY=Entrée de voyage -TaskContext.ENVIRONMENT=Environment +TaskContext.CASE = Cas +TaskContext.CONTACT = Contact +TaskContext.EVENT = Événement +TaskContext.GENERAL = Général +TaskContext.TRAVEL_ENTRY = Entrée de voyage +TaskContext.ENVIRONMENT = Environment + # TaskDateType -TaskDateType.SUGGESTED_START_DATE=Date de début suggérée -TaskDateType.DUE_DATE=Date d’échéance +TaskDateType.SUGGESTED_START_DATE = Date de début suggérée +TaskDateType.DUE_DATE = Date d’échéance + # TaskPriority -TaskPriority.HIGH=Élevée -TaskPriority.LOW=Basse -TaskPriority.NORMAL=Normale +TaskPriority.HIGH = Élevée +TaskPriority.LOW = Basse +TaskPriority.NORMAL = Normale + # TaskStatus -TaskStatus.DONE=terminé -TaskStatus.NOT_EXECUTABLE=non exécutable -TaskStatus.PENDING=en attente -TaskStatus.IN_PROGRESS=En cours -TaskStatus.REMOVED=supprimé +TaskStatus.DONE = terminé +TaskStatus.NOT_EXECUTABLE = non exécutable +TaskStatus.PENDING = en attente +TaskStatus.IN_PROGRESS = En cours +TaskStatus.REMOVED = supprimé + # TaskType -TaskType.ACTIVE_SEARCH_FOR_OTHER_CASES=recherche active d'autres cas, par exemple dans le foyer ou le lieu de travail -TaskType.ANIMAL_DEPOPULATION=dépeuplement des animaux -TaskType.ANIMAL_TESTING=tests d'animaux -TaskType.CASE_BURIAL=enterrement/ crémation sans danger -TaskType.CASE_INVESTIGATION=enquête de cas -TaskType.CASE_ISOLATION=isolement de cas -TaskType.CASE_MANAGEMENT=gestion de cas -TaskType.CONTACT_FOLLOW_UP=suivi du contact -TaskType.CONTACT_INVESTIGATION=enquête de contact -TaskType.CONTACT_MANAGEMENT=Gestion des contacts -TaskType.CONTACT_TRACING=tracé du contact -TaskType.DAILY_REPORT_GENERATION=générer un rapport quotidien -TaskType.DECONTAMINATION_DISINFECTION_ACTIVITIES=activités de décontamination / désinfection -TaskType.ENVIRONMENTAL_HEALTH_ACTIVITIES=activités de santé environnementale -TaskType.EVENT_INVESTIGATION=enquêter sur l'événement -TaskType.EVENT_CONTINUE_INVESTIGATION=poursuivre l'enquête à la suite d'un changement dans l'événement -TaskType.EVENT_REQUEST_ADDITIONAL_INFORMATION=demander un rapport d'enquête / un résumé / des informations supplémentaires à collecter -TaskType.OTHER=autre tâche décrite dans les commentaires -TaskType.QUARANTINE_MANAGEMENT=Gestion de la quarantaine -TaskType.QUARANTINE_ORDER_SEND=Envoyer une commande de quarantaine -TaskType.QUARANTINE_PLACE=Lieu de quarantaine -TaskType.SAMPLE_COLLECTION=Collection d'échantillons -TaskType.SOURCECASE_TRACING=Suivi du cas source -TaskType.SURVEILLANCE_REPORT_GENERATION=Générer un rapport de surveillance -TaskType.TREATMENT_CENTER_ESTABLISHMENT=Établissement du centre de traitement local -TaskType.VACCINATION_ACTIVITIES=Activités de vaccination -TaskType.WEEKLY_REPORT_GENERATION=Générer un rapport hebdomadaire -TaskType.ENVIRONMENT_INVESTIGATION=environment investigation +TaskType.ACTIVE_SEARCH_FOR_OTHER_CASES = recherche active d'autres cas, par exemple dans le foyer ou le lieu de travail +TaskType.ANIMAL_DEPOPULATION = dépeuplement des animaux +TaskType.ANIMAL_TESTING = tests d'animaux +TaskType.CASE_BURIAL = enterrement/ crémation sans danger +TaskType.CASE_INVESTIGATION = enquête de cas +TaskType.CASE_ISOLATION = isolement de cas +TaskType.CASE_MANAGEMENT = gestion de cas +TaskType.CONTACT_FOLLOW_UP = suivi du contact +TaskType.CONTACT_INVESTIGATION = enquête de contact +TaskType.CONTACT_MANAGEMENT = Gestion des contacts +TaskType.CONTACT_TRACING = tracé du contact +TaskType.DAILY_REPORT_GENERATION = générer un rapport quotidien +TaskType.DECONTAMINATION_DISINFECTION_ACTIVITIES = activités de décontamination / désinfection +TaskType.ENVIRONMENTAL_HEALTH_ACTIVITIES = activités de santé environnementale +TaskType.EVENT_INVESTIGATION = enquêter sur l'événement +TaskType.EVENT_CONTINUE_INVESTIGATION = poursuivre l'enquête à la suite d'un changement dans l'événement +TaskType.EVENT_REQUEST_ADDITIONAL_INFORMATION = demander un rapport d'enquête / un résumé / des informations supplémentaires à collecter +TaskType.OTHER = autre tâche décrite dans les commentaires +TaskType.QUARANTINE_MANAGEMENT = Gestion de la quarantaine +TaskType.QUARANTINE_ORDER_SEND = Envoyer une commande de quarantaine +TaskType.QUARANTINE_PLACE = Lieu de quarantaine +TaskType.SAMPLE_COLLECTION = Collection d'échantillons +TaskType.SOURCECASE_TRACING = Suivi du cas source +TaskType.SURVEILLANCE_REPORT_GENERATION = Générer un rapport de surveillance +TaskType.TREATMENT_CENTER_ESTABLISHMENT = Établissement du centre de traitement local +TaskType.VACCINATION_ACTIVITIES = Activités de vaccination +TaskType.WEEKLY_REPORT_GENERATION = Générer un rapport hebdomadaire +TaskType.ENVIRONMENT_INVESTIGATION = environment investigation + # TemperatureSource TemperatureSource.AXILLARY=Axillaire -TemperatureSource.NON_CONTACT=Sans contact (infrarouge) +TemperatureSource.NON_CONTACT = Sans contact (infrarouge) TemperatureSource.ORAL=Oral TemperatureSource.RECTAL=rectale + #TracingApp -TracingApp.CORONA_WARN_APP=Application d'alerte Corona -TracingApp.OTHER=Autre -TracingApp.UNKNOWN=Inconnu +TracingApp.CORONA_WARN_APP = Application d'alerte Corona +TracingApp.OTHER = Autre +TracingApp.UNKNOWN = Inconnu + # TravelType -TravelType.ABROAD=À l'étranger -TravelType.WITHIN_COUNTRY=Dans le pays +TravelType.ABROAD = À l'étranger +TravelType.WITHIN_COUNTRY = Dans le pays + # TreatmentRoute -TreatmentRoute.ORAL=Oral -TreatmentRoute.IV=IV -TreatmentRoute.RECTAL=Rectale -TreatmentRoute.TOPICAL=Topique -TreatmentRoute.OTHER=Autres +TreatmentRoute.ORAL = Oral +TreatmentRoute.IV = IV +TreatmentRoute.RECTAL = Rectale +TreatmentRoute.TOPICAL = Topique +TreatmentRoute.OTHER = Autres + # TreatmentType -TreatmentType.DRUG_INTAKE=Prise de médicaments -TreatmentType.ORAL_REHYDRATION_SALTS=Sels de réhydratation Oral -TreatmentType.BLOOD_TRANSFUSION=Transfusion sanguine -TreatmentType.RENAL_REPLACEMENT_THERAPY=Thérapie de remplacement rénal -TreatmentType.IV_FLUID_THERAPY=Thérapie liquidienne IV -TreatmentType.OXYGEN_THERAPY=Thérapie de l'oxygène -TreatmentType.INVASIVE_MECHANICAL_VENTILATION=Ventilation mécanique invasive -TreatmentType.VASOPRESSORS_INOTROPES=Vasopresseurs/Inotropes -TreatmentType.OTHER=Autres +TreatmentType.DRUG_INTAKE = Prise de médicaments +TreatmentType.ORAL_REHYDRATION_SALTS = Sels de réhydratation Oral +TreatmentType.BLOOD_TRANSFUSION = Transfusion sanguine +TreatmentType.RENAL_REPLACEMENT_THERAPY = Thérapie de remplacement rénal +TreatmentType.IV_FLUID_THERAPY = Thérapie liquidienne IV +TreatmentType.OXYGEN_THERAPY = Thérapie de l'oxygène +TreatmentType.INVASIVE_MECHANICAL_VENTILATION = Ventilation mécanique invasive +TreatmentType.VASOPRESSORS_INOTROPES = Vasopresseurs/Inotropes +TreatmentType.OTHER = Autres + # Trimester -Trimester.FIRST=Premier -Trimester.SECOND=Seconde -Trimester.THIRD=Troisième -Trimester.UNKNOWN=Inconnu +Trimester.FIRST = Premier +Trimester.SECOND = Seconde +Trimester.THIRD = Troisième +Trimester.UNKNOWN = Inconnu + TypeOfAnimal.BAT=Chauve-souris ou ses excréments TypeOfAnimal.POULTRY=Volaille ou oiseau sauvage TypeOfAnimal.CAMEL=Chameau @@ -1250,240 +1380,243 @@ TypeOfAnimal.RODENT=Rongeur ou ses excréments TypeOfAnimal.FLEA=Puce TypeOfAnimal.TICK=Cocher TypeOfAnimal.OTHER=Autre + # TypeOfDrug -TypeOfDrug.ANTIMICROBIAL=Antimicrobien -TypeOfDrug.ANTIVIRAL=Antiviral -TypeOfDrug.OTHER=Autres +TypeOfDrug.ANTIMICROBIAL = Antimicrobien +TypeOfDrug.ANTIVIRAL = Antiviral +TypeOfDrug.OTHER = Autres + # TypeOfPlace -TypeOfPlace.FACILITY=Établissement -TypeOfPlace.FACILITY_23_IFSG=Etablissement (§ 23 IfSG) -TypeOfPlace.COMMUNITY_FACILITY=Etablissement communautaire (§ 33 IfSG) -TypeOfPlace.FACILITY_36_IFSG=Etablissement (§ 36 IfSG) -TypeOfPlace.FESTIVITIES=Fêtes -TypeOfPlace.HOME=Sphère privée -TypeOfPlace.HOSPITAL=Hôpitaux -TypeOfPlace.MEANS_OF_TRANSPORT=Moyens de transport -TypeOfPlace.OTHER=Autre -TypeOfPlace.PUBLIC_PLACE=Lieu public -TypeOfPlace.UNKNOWN=Inconnu -TypeOfPlace.SCATTERED=Dispersé +TypeOfPlace.FACILITY = Établissement +TypeOfPlace.FACILITY_23_IFSG = Etablissement (§ 23 IfSG) +TypeOfPlace.COMMUNITY_FACILITY = Etablissement communautaire (§ 33 IfSG) +TypeOfPlace.FACILITY_36_IFSG = Etablissement (§ 36 IfSG) +TypeOfPlace.FESTIVITIES = Fêtes +TypeOfPlace.HOME = Sphère privée +TypeOfPlace.HOSPITAL = Hôpitaux +TypeOfPlace.MEANS_OF_TRANSPORT = Moyens de transport +TypeOfPlace.OTHER = Autre +TypeOfPlace.PUBLIC_PLACE = Lieu public +TypeOfPlace.UNKNOWN = Inconnu +TypeOfPlace.SCATTERED = Dispersé + # UserRight -UserRight.CASE_ARCHIVE=Cas archivés -UserRight.CASE_CHANGE_DISEASE=Modifier la maladie de cas -UserRight.CASE_CHANGE_EPID_NUMBER=Modifier le numéro d'épidémie de cas -UserRight.CASE_CLASSIFY=Modifier la classification et l'issue du cas -UserRight.CASE_CREATE=Créer de nouveaux cas -UserRight.CASE_DELETE=Supprimer les cas du système -UserRight.CASE_EDIT=Modifier les cas existants -UserRight.CASE_EXPORT=Exporter des cas de SORMAS -UserRight.CASE_IMPORT=Importer des cas dans SORMAS -UserRight.CASE_INVESTIGATE=Modifier le statut de l'enquête de cas -UserRight.CASE_TRANSFER=Transférer des cas vers une autre région/département/établissement -UserRight.CASE_REFER_FROM_POE=Référez le cas à partir du point d'entrée -UserRight.CASE_RESPONSIBLE=Peut être responsable d'un cas -UserRight.CASE_VIEW=Voir les cas existants -UserRight.CASE_VIEW_ARCHIVED=View archived cases -UserRight.CONTACT_ASSIGN=Attribuer des contacts aux officiers -UserRight.CONTACT_CLASSIFY=Modifier la classification des contacts -UserRight.CONTACT_CONVERT=Créer les cas résultant des contacts -UserRight.CONTACT_CREATE=Créer de nouveaux contacts -UserRight.CONTACT_IMPORT=Importer des contacts -UserRight.CONTACT_DELETE=Supprimer les contacts du système -UserRight.CONTACT_EDIT=Modifier les contacts existants -UserRight.CONTACT_EXPORT=Exporter les contacts de SORMAS -UserRight.CONTACT_RESPONSIBLE=Peut être responsable d'un contact -UserRight.CONTACT_VIEW=Voir les contacts existants -UserRight.CONTACT_VIEW_ARCHIVED=View archived contacts -UserRight.CONTACT_ARCHIVE=Archiver les contacts -UserRight.DASHBOARD_CONTACT_VIEW=Accéder au tableau de bord du superviseur de contacts -UserRight.DASHBOARD_SURVEILLANCE_VIEW=Accéder au tableau de bord du superviseur de surveillance -UserRight.DASHBOARD_SAMPLES_VIEW=Accéder au tableau de bord des échantillons -UserRight.DATABASE_EXPORT_ACCESS=Exporter toute la base de données -UserRight.EVENT_ARCHIVE=Archiver les événements -UserRight.EVENT_CREATE=Créer un nouvel évènement -UserRight.EVENT_EDIT=Modifier des événements existants -UserRight.EVENT_EXPORT=Exporter les événements de SORMAS -UserRight.EVENT_RESPONSIBLE=Peut-être responsable d'un événement -UserRight.EVENT_VIEW=Modifier des événements existants -UserRight.EVENT_VIEW_ARCHIVED=View archived events -UserRight.EVENTPARTICIPANT_CREATE=Créer de nouveaux participants à l'événement -UserRight.EVENTPARTICIPANT_EDIT=Modifier les participants de l'événement existant -UserRight.EVENTPARTICIPANT_ARCHIVE=Archives des participants à l'événement -UserRight.EVENTPARTICIPANT_VIEW=Afficher les participants à l'événement existant -UserRight.EVENTPARTICIPANT_VIEW_ARCHIVED=View archived event participants -UserRight.INFRASTRUCTURE_CREATE=Créer de nouvelles régions/départements/communautés/établissements de santé -UserRight.INFRASTRUCTURE_EDIT=Créer des régions/départements/communautés/établissements de santé -UserRight.INFRASTRUCTURE_VIEW=Voir les régions/départements/communautés/établissements de santé du système -UserRight.INFRASTRUCTURE_VIEW_ARCHIVED=View archived infrastructure data -UserRight.PERFORM_BULK_OPERATIONS=Effectuer des opérations en bloc dans des listes -UserRight.SAMPLE_CREATE=Créer de nouveaux échantillons -UserRight.SAMPLE_EDIT=Modifier les échantillons existants -UserRight.SAMPLE_EXPORT=Exporter les échantillons de SORMAS -UserRight.SAMPLE_DELETE=Supprimer les échantillons du système -UserRight.SAMPLE_SEE_ARCHIVED=Afficher les échantillons archivés -UserRight.SAMPLE_TRANSFER=Transférer des échantillons dans un autre laboratoire -UserRight.SAMPLE_VIEW=Afficher les échantillons existants -UserRight.SAMPLETEST_CREATE=Créer de nouveaux tests d'échantillons -UserRight.SAMPLETEST_EDIT=Modifier les tests d'échantillons existants -UserRight.STATISTICS_EXPORT=Exporter les statistiques détaillées de SORMAS -UserRight.TASK_ASSIGN=Attribuer des tâches aux utilisateurs -UserRight.TASK_CREATE=Créer une nouvelle tâche -UserRight.TASK_EDIT=Modifier les tâches existantes -UserRight.TASK_SEE_ARCHIVED=Afficher les tâches archivées -UserRight.TASK_VIEW=Modifier les tâches existantes -UserRight.TASK_VIEW_ARCHIVED=View archived tasks -UserRight.USER_CREATE=Créer nouvel utilisateur -UserRight.USER_EDIT=Modifier les utilisateurs existants -UserRight.USER_VIEW=Afficher les utilisateurs existants -UserRight.USER_ROLE_EDIT=Modifier les rôles d'utilisateur existants -UserRight.USER_ROLE_DELETE=Supprimer les rôles d'utilisateur du système -UserRight.USER_ROLE_VIEW=Afficher les rôles d'utilisateur existants -UserRight.VISIT_CREATE=Créer une nouvelle visite -UserRight.VISIT_EDIT=Modifier les visites existantes -UserRight.WEEKLYREPORT_CREATE=Créer des rapports hebdomadaires -UserRight.WEEKLYREPORT_VIEW=Voir les rapports hebdomadaires -UserRight.CASE_MERGE=Fusionner les cas -UserRight.PERSON_VIEW=Voir les personnes existantes -UserRight.PERSON_EDIT=Modifier les personnes existantes -UserRight.PERSON_DELETE=Supprimer des personnes du système -UserRight.PERSON_CONTACT_DETAILS_DELETE=Supprimer les coordonnées de la personne -UserRight.SAMPLE_EDIT_NOT_OWNED=Modifier les échantillons signalés par d'autres utilisateurs -UserRight.PATHOGEN_TEST_CREATE=Créer de nouveaux tests de pathogène -UserRight.PATHOGEN_TEST_EDIT=Modifier les tests pathogènes existants -UserRight.PATHOGEN_TEST_DELETE=Supprimer les tests d'agent pathogène du système -UserRight.ADDITIONAL_TEST_VIEW=Voir les tests supplémentaires existants -UserRight.ADDITIONAL_TEST_CREATE=Créer de nouveaux tests supplémentaires -UserRight.ADDITIONAL_TEST_EDIT=Modifier les tests supplémentaires existants -UserRight.ADDITIONAL_TEST_DELETE=Supprimer les tests supplémentaires du système -UserRight.CONTACT_REASSIGN_CASE=Réassigner la casse source des contacts -UserRight.MANAGE_EXTERNAL_SYMPTOM_JOURNAL=Gérer le journal de symptômes externe -UserRight.VISIT_DELETE=Supprimer les visites du système -UserRight.VISIT_EXPORT=Exporter les visites depuis SORMAS -UserRight.TASK_DELETE=Supprimer les tâches du système -UserRight.TASK_EXPORT=Exporter les tâches depuis SORMAS -UserRight.TASK_ARCHIVE=Tâches d'archivage -UserRight.ACTION_CREATE=Créer de nouvelles actions -UserRight.ACTION_DELETE=Supprimer les actions du système -UserRight.ACTION_EDIT=Modifier les actions existantes -UserRight.EVENT_IMPORT=Importer des événements -UserRight.EVENT_DELETE=Supprimer les événements du système -UserRight.EVENTPARTICIPANT_DELETE=Supprimer les participants de l'événement du système -UserRight.EVENTPARTICIPANT_IMPORT=Importer les participants à l'événement -UserRight.SEND_MANUAL_EXTERNAL_MESSAGES=Envoyer des messages externes manuels -UserRight.STATISTICS_ACCESS=Statistiques d'accès -UserRight.MANAGE_PUBLIC_EXPORT_CONFIGURATION=Gérer les configurations d'exportation publiques -UserRight.INFRASTRUCTURE_EXPORT=Exporter les données d'infrastructure depuis SORMAS -UserRight.INFRASTRUCTURE_IMPORT=Importer des données d'infrastructure -UserRight.INFRASTRUCTURE_ARCHIVE=Archiver les données d'infrastructure -UserRight.DASHBOARD_CONTACT_VIEW_TRANSMISSION_CHAINS=Afficher les chaînes de transmission des contacts sur le tableau de bord -UserRight.DASHBOARD_CAMPAIGNS_VIEW=Accéder au tableau de bord des campagnes -UserRight.CASE_CLINICIAN_VIEW=Accéder aux sections de cas concernées par le clinicien -UserRight.THERAPY_VIEW=Voir les thérapies existantes -UserRight.PRESCRIPTION_CREATE=Créer de nouvelles ordonnances -UserRight.PRESCRIPTION_EDIT=Modifier les ordonnances existantes -UserRight.PRESCRIPTION_DELETE=Supprimer les ordonnances du système -UserRight.TREATMENT_CREATE=Créer de nouveaux traitements -UserRight.TREATMENT_EDIT=Modifier les traitements existants -UserRight.TREATMENT_DELETE=Supprimer les traitements du système -UserRight.CLINICAL_COURSE_VIEW=Voir le cours clinique des cas -UserRight.CLINICAL_COURSE_EDIT=Modifier le cours clinique des cas -UserRight.CLINICAL_VISIT_CREATE=Créer de nouvelles visites cliniques -UserRight.CLINICAL_VISIT_EDIT=Modifier les consultations cliniques existantes -UserRight.CLINICAL_VISIT_DELETE=Supprimer les visites cliniques du système -UserRight.PORT_HEALTH_INFO_VIEW=Voir les informations sur la santé du port -UserRight.PORT_HEALTH_INFO_EDIT=Modifier les informations existantes sur la santé du port -UserRight.POPULATION_MANAGE=Gérer les données de la population -UserRight.DOCUMENT_TEMPLATE_MANAGEMENT=Gérer les modèles de document -UserRight.QUARANTINE_ORDER_CREATE=Créer de nouvelles commandes de quarantaine -UserRight.LINE_LISTING_CONFIGURE=Configurer la liste de lignes -UserRight.AGGREGATE_REPORT_VIEW=Créer un nouveau rapport agrégé -UserRight.AGGREGATE_REPORT_EXPORT=Exporter les rapports agrégés depuis SORMAS -UserRight.AGGREGATE_REPORT_EDIT=Modifier les rapports agrégés existants -UserRight.SEE_PERSONAL_DATA_IN_JURISDICTION=Voir les données personnelles dans la juridiction -UserRight.SEE_PERSONAL_DATA_OUTSIDE_JURISDICTION=Voir les données personnelles en dehors de la juridiction -UserRight.SEE_SENSITIVE_DATA_IN_JURISDICTION=Voir les données sensibles dans la juridiction -UserRight.SEE_SENSITIVE_DATA_OUTSIDE_JURISDICTION=Voir les données sensibles hors juridiction -UserRight.CAMPAIGN_VIEW=Voir les campagnes existantes -UserRight.CAMPAIGN_VIEW_ARCHIVED=View archived campaigns -UserRight.CAMPAIGN_EDIT=Modifier les campagnes existantes -UserRight.CAMPAIGN_ARCHIVE=Campagnes archivées -UserRight.CAMPAIGN_DELETE=Supprimer les actions du système -UserRight.CAMPAIGN_FORM_DATA_VIEW=Afficher les données du formulaire de campagne existant -UserRight.CAMPAIGN_FORM_DATA_VIEW_ARCHIVED=View archived campaign form data -UserRight.CAMPAIGN_FORM_DATA_EDIT=Modifier les données du formulaire de campagne existant -UserRight.CAMPAIGN_FORM_DATA_ARCHIVE=Archiver les données du formulaire de campagne -UserRight.CAMPAIGN_FORM_DATA_DELETE=Supprimer les données du formulaire de campagne du système -UserRight.CAMPAIGN_FORM_DATA_EXPORT=Exporter les données du formulaire de campagne depuis SORMAS -UserRight.BAG_EXPORT=Effectuer l'exportation BAG -UserRight.SORMAS_TO_SORMAS_SHARE=Partager des données d'une instance SORMAS à une autre -UserRight.SORMAS_TO_SORMAS_PROCESS=Partages de processus -UserRight.EXTERNAL_SURVEILLANCE_SHARE=Envoyer des données à un outil de surveillance externe -UserRight.EXTERNAL_SURVEILLANCE_DELETE=Supprimer les données dans l'outil de surveillance externe -UserRight.EXTERNAL_MESSAGE_VIEW=Afficher et récupérer des messages -UserRight.EXTERNAL_MESSAGE_PROCESS=Travailler avec les messages -UserRight.EXTERNAL_MESSAGE_PUSH=Push external messages to the system -UserRight.EXTERNAL_MESSAGE_DELETE=Supprimer messages des personnes du système -UserRight.CASE_SHARE=Partagez des cas avec tout le pays -UserRight.IMMUNIZATION_VIEW=Voir les immunisations et vaccinations existantes -UserRight.IMMUNIZATION_VIEW_ARCHIVED=View archived immunizations and vaccinations -UserRight.IMMUNIZATION_CREATE=Créer des nouvelles immunisations et vaccinations -UserRight.IMMUNIZATION_EDIT=Modifier les immunisations et vaccinations existantes -UserRight.IMMUNIZATION_DELETE=Supprimer les immunisations et les vaccinations du système -UserRight.IMMUNIZATION_ARCHIVE=Archiver les vaccinations -UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_VIEW=View existing adverse events following immunization -UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_CREATE=Create new adverse event following immunization -UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_EDIT=Edit existing adverse event following immunization -UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_DELETE=Delete adverse events following immunization from the system -UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_ARCHIVE=Archive adverse events following immunization -UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_EXPORT=Export adverse events following immunization -UserRight.PERSON_EXPORT=Exporter des personnes -UserRight.CONTACT_MERGE=Fusionner les contacts -UserRight.EVENTGROUP_CREATE=Créer de nouveaux groupes d'événements -UserRight.EVENTGROUP_EDIT=Modifier les groupes d'événements existants -UserRight.EVENTGROUP_LINK=Lier des événements à des groupes d'événements -UserRight.EVENTGROUP_ARCHIVE=Archiver des groupes d'événements -UserRight.EVENTGROUP_DELETE=Supprimer des groupes d'événements du système -UserRight.EVENTGROUP_VIEW_ARCHIVED=View archived event groups from the system -UserRight.TRAVEL_ENTRY_MANAGEMENT_ACCESS=Accéder à l'annuaire des entrées de voyage -UserRight.TRAVEL_ENTRY_VIEW=Voir les entrées de voyage existantes -UserRight.TRAVEL_ENTRY_VIEW_ARCHIVED=View archived travel entries -UserRight.TRAVEL_ENTRY_CREATE=Créer de nouvelles entrées de voyage -UserRight.TRAVEL_ENTRY_EDIT=Modifier les entrées de voyage existantes -UserRight.TRAVEL_ENTRY_DELETE=Supprimer les entrées de voyage du système -UserRight.TRAVEL_ENTRY_ARCHIVE=Archiver les entrées de voyage -UserRight.EXPORT_DATA_PROTECTION_DATA=Exporter les données de protection des données -UserRight.OUTBREAK_VIEW=Voir les éclosions -UserRight.OUTBREAK_EDIT=Modifier les éclosions -UserRight.PERFORM_BULK_OPERATIONS_PSEUDONYM=Effectuer une pseudonomisation en masse -UserRight.SORMAS_TO_SORMAS_CLIENT=Client Sormas à Sormas -UserRight.SORMAS_REST=Accéder à Sormas REST -UserRight.EXTERNAL_VISITS=Visites externes -UserRight.SORMAS_UI=Accéder à l'interface utilisateur de Sormas -UserRight.DEV_MODE=Accéder aux options de développement -UserRight.CUSTOMIZABLE_ENUM_MANAGEMENT=Gérer les enums personnalisables -UserRight.DOCUMENT_VIEW=Afficher les documents existants -UserRight.DOCUMENT_UPLOAD=Charger des documents -UserRight.DOCUMENT_DELETE=Supprimer les documents du système -UserRight.PERSON_MERGE=Fusionner des personnes -UserRight.ENVIRONMENT_VIEW=View existing environments -UserRight.ENVIRONMENT_CREATE=Create new environments -UserRight.ENVIRONMENT_EDIT=Edit existing environments -UserRight.ENVIRONMENT_ARCHIVE=Archive environments -UserRight.ENVIRONMENT_VIEW_ARCHIVED=View archived environments -UserRight.ENVIRONMENT_DELETE=Delete environments from the system -UserRight.ENVIRONMENT_IMPORT=Import environments -UserRight.ENVIRONMENT_EXPORT=Export environments -UserRight.ENVIRONMENT_SAMPLE_VIEW=View existing environment samples -UserRight.ENVIRONMENT_SAMPLE_CREATE=Create new environment samples -UserRight.ENVIRONMENT_SAMPLE_EDIT=Edit existing environment samples -UserRight.ENVIRONMENT_SAMPLE_EDIT_DISPATCH=Edit environment samples dispatch information -UserRight.ENVIRONMENT_SAMPLE_EDIT_RECEIVAL=Edit environment samples receival information -UserRight.ENVIRONMENT_SAMPLE_DELETE=Delete environment samples from the system -UserRight.ENVIRONMENT_SAMPLE_IMPORT=Import environment samples -UserRight.ENVIRONMENT_SAMPLE_EXPORT=Export environment samples -UserRight.ENVIRONMENT_PATHOGEN_TEST_CREATE=Create environment sample pathogen tests -UserRight.ENVIRONMENT_PATHOGEN_TEST_EDIT=Edit environment sample pathogen tests -UserRight.ENVIRONMENT_PATHOGEN_TEST_DELETE=Delete environment sample pathogen tests +UserRight.CASE_ARCHIVE = Cas archivés +UserRight.CASE_CHANGE_DISEASE = Modifier la maladie de cas +UserRight.CASE_CHANGE_EPID_NUMBER = Modifier le numéro d'épidémie de cas +UserRight.CASE_CLASSIFY = Modifier la classification et l'issue du cas +UserRight.CASE_CREATE = Créer de nouveaux cas +UserRight.CASE_DELETE = Supprimer les cas du système +UserRight.CASE_EDIT = Modifier les cas existants +UserRight.CASE_EXPORT = Exporter des cas de SORMAS +UserRight.CASE_IMPORT = Importer des cas dans SORMAS +UserRight.CASE_INVESTIGATE = Modifier le statut de l'enquête de cas +UserRight.CASE_TRANSFER = Transférer des cas vers une autre région/département/établissement +UserRight.CASE_REFER_FROM_POE = Référez le cas à partir du point d'entrée +UserRight.CASE_RESPONSIBLE = Peut être responsable d'un cas +UserRight.CASE_VIEW = Voir les cas existants +UserRight.CASE_VIEW_ARCHIVED = View archived cases +UserRight.CONTACT_ASSIGN = Attribuer des contacts aux officiers +UserRight.CONTACT_CLASSIFY = Modifier la classification des contacts +UserRight.CONTACT_CONVERT = Créer les cas résultant des contacts +UserRight.CONTACT_CREATE = Créer de nouveaux contacts +UserRight.CONTACT_IMPORT = Importer des contacts +UserRight.CONTACT_DELETE = Supprimer les contacts du système +UserRight.CONTACT_EDIT = Modifier les contacts existants +UserRight.CONTACT_EXPORT = Exporter les contacts de SORMAS +UserRight.CONTACT_RESPONSIBLE = Peut être responsable d'un contact +UserRight.CONTACT_VIEW = Voir les contacts existants +UserRight.CONTACT_VIEW_ARCHIVED = View archived contacts +UserRight.CONTACT_ARCHIVE = Archiver les contacts +UserRight.DASHBOARD_CONTACT_VIEW = Accéder au tableau de bord du superviseur de contacts +UserRight.DASHBOARD_SURVEILLANCE_VIEW = Accéder au tableau de bord du superviseur de surveillance +UserRight.DASHBOARD_SAMPLES_VIEW = Accéder au tableau de bord des échantillons +UserRight.DATABASE_EXPORT_ACCESS = Exporter toute la base de données +UserRight.EVENT_ARCHIVE = Archiver les événements +UserRight.EVENT_CREATE = Créer un nouvel évènement +UserRight.EVENT_EDIT = Modifier des événements existants +UserRight.EVENT_EXPORT = Exporter les événements de SORMAS +UserRight.EVENT_RESPONSIBLE = Peut-être responsable d'un événement +UserRight.EVENT_VIEW = Modifier des événements existants +UserRight.EVENT_VIEW_ARCHIVED = View archived events +UserRight.EVENTPARTICIPANT_CREATE = Créer de nouveaux participants à l'événement +UserRight.EVENTPARTICIPANT_EDIT = Modifier les participants de l'événement existant +UserRight.EVENTPARTICIPANT_ARCHIVE = Archives des participants à l'événement +UserRight.EVENTPARTICIPANT_VIEW = Afficher les participants à l'événement existant +UserRight.EVENTPARTICIPANT_VIEW_ARCHIVED = View archived event participants +UserRight.INFRASTRUCTURE_CREATE = Créer de nouvelles régions/départements/communautés/établissements de santé +UserRight.INFRASTRUCTURE_EDIT = Créer des régions/départements/communautés/établissements de santé +UserRight.INFRASTRUCTURE_VIEW = Voir les régions/départements/communautés/établissements de santé du système +UserRight.INFRASTRUCTURE_VIEW_ARCHIVED = View archived infrastructure data +UserRight.PERFORM_BULK_OPERATIONS = Effectuer des opérations en bloc dans des listes +UserRight.SAMPLE_CREATE = Créer de nouveaux échantillons +UserRight.SAMPLE_EDIT = Modifier les échantillons existants +UserRight.SAMPLE_EXPORT = Exporter les échantillons de SORMAS +UserRight.SAMPLE_DELETE = Supprimer les échantillons du système +UserRight.SAMPLE_SEE_ARCHIVED = Afficher les échantillons archivés +UserRight.SAMPLE_TRANSFER = Transférer des échantillons dans un autre laboratoire +UserRight.SAMPLE_VIEW = Afficher les échantillons existants +UserRight.SAMPLETEST_CREATE = Créer de nouveaux tests d'échantillons +UserRight.SAMPLETEST_EDIT = Modifier les tests d'échantillons existants +UserRight.STATISTICS_EXPORT = Exporter les statistiques détaillées de SORMAS +UserRight.TASK_ASSIGN = Attribuer des tâches aux utilisateurs +UserRight.TASK_CREATE = Créer une nouvelle tâche +UserRight.TASK_EDIT = Modifier les tâches existantes +UserRight.TASK_SEE_ARCHIVED = Afficher les tâches archivées +UserRight.TASK_VIEW = Modifier les tâches existantes +UserRight.TASK_VIEW_ARCHIVED = View archived tasks +UserRight.USER_CREATE = Créer nouvel utilisateur +UserRight.USER_EDIT = Modifier les utilisateurs existants +UserRight.USER_VIEW = Afficher les utilisateurs existants +UserRight.USER_ROLE_EDIT = Modifier les rôles d'utilisateur existants +UserRight.USER_ROLE_DELETE = Supprimer les rôles d'utilisateur du système +UserRight.USER_ROLE_VIEW = Afficher les rôles d'utilisateur existants +UserRight.VISIT_CREATE = Créer une nouvelle visite +UserRight.VISIT_EDIT = Modifier les visites existantes +UserRight.WEEKLYREPORT_CREATE = Créer des rapports hebdomadaires +UserRight.WEEKLYREPORT_VIEW = Voir les rapports hebdomadaires +UserRight.CASE_MERGE = Fusionner les cas +UserRight.PERSON_VIEW = Voir les personnes existantes +UserRight.PERSON_EDIT = Modifier les personnes existantes +UserRight.PERSON_DELETE = Supprimer des personnes du système +UserRight.PERSON_CONTACT_DETAILS_DELETE = Supprimer les coordonnées de la personne +UserRight.SAMPLE_EDIT_NOT_OWNED = Modifier les échantillons signalés par d'autres utilisateurs +UserRight.PATHOGEN_TEST_CREATE = Créer de nouveaux tests de pathogène +UserRight.PATHOGEN_TEST_EDIT = Modifier les tests pathogènes existants +UserRight.PATHOGEN_TEST_DELETE = Supprimer les tests d'agent pathogène du système +UserRight.ADDITIONAL_TEST_VIEW = Voir les tests supplémentaires existants +UserRight.ADDITIONAL_TEST_CREATE = Créer de nouveaux tests supplémentaires +UserRight.ADDITIONAL_TEST_EDIT = Modifier les tests supplémentaires existants +UserRight.ADDITIONAL_TEST_DELETE = Supprimer les tests supplémentaires du système +UserRight.CONTACT_REASSIGN_CASE = Réassigner la casse source des contacts +UserRight.MANAGE_EXTERNAL_SYMPTOM_JOURNAL = Gérer le journal de symptômes externe +UserRight.VISIT_DELETE = Supprimer les visites du système +UserRight.VISIT_EXPORT = Exporter les visites depuis SORMAS +UserRight.TASK_DELETE = Supprimer les tâches du système +UserRight.TASK_EXPORT = Exporter les tâches depuis SORMAS +UserRight.TASK_ARCHIVE = Tâches d'archivage +UserRight.ACTION_CREATE = Créer de nouvelles actions +UserRight.ACTION_DELETE = Supprimer les actions du système +UserRight.ACTION_EDIT = Modifier les actions existantes +UserRight.EVENT_IMPORT = Importer des événements +UserRight.EVENT_DELETE = Supprimer les événements du système +UserRight.EVENTPARTICIPANT_DELETE = Supprimer les participants de l'événement du système +UserRight.EVENTPARTICIPANT_IMPORT = Importer les participants à l'événement +UserRight.SEND_MANUAL_EXTERNAL_MESSAGES = Envoyer des messages externes manuels +UserRight.STATISTICS_ACCESS = Statistiques d'accès +UserRight.MANAGE_PUBLIC_EXPORT_CONFIGURATION = Gérer les configurations d'exportation publiques +UserRight.INFRASTRUCTURE_EXPORT = Exporter les données d'infrastructure depuis SORMAS +UserRight.INFRASTRUCTURE_IMPORT = Importer des données d'infrastructure +UserRight.INFRASTRUCTURE_ARCHIVE = Archiver les données d'infrastructure +UserRight.DASHBOARD_CONTACT_VIEW_TRANSMISSION_CHAINS = Afficher les chaînes de transmission des contacts sur le tableau de bord +UserRight.DASHBOARD_CAMPAIGNS_VIEW = Accéder au tableau de bord des campagnes +UserRight.CASE_CLINICIAN_VIEW = Accéder aux sections de cas concernées par le clinicien +UserRight.THERAPY_VIEW = Voir les thérapies existantes +UserRight.PRESCRIPTION_CREATE = Créer de nouvelles ordonnances +UserRight.PRESCRIPTION_EDIT = Modifier les ordonnances existantes +UserRight.PRESCRIPTION_DELETE = Supprimer les ordonnances du système +UserRight.TREATMENT_CREATE = Créer de nouveaux traitements +UserRight.TREATMENT_EDIT = Modifier les traitements existants +UserRight.TREATMENT_DELETE = Supprimer les traitements du système +UserRight.CLINICAL_COURSE_VIEW = Voir le cours clinique des cas +UserRight.CLINICAL_COURSE_EDIT = Modifier le cours clinique des cas +UserRight.CLINICAL_VISIT_CREATE = Créer de nouvelles visites cliniques +UserRight.CLINICAL_VISIT_EDIT = Modifier les consultations cliniques existantes +UserRight.CLINICAL_VISIT_DELETE = Supprimer les visites cliniques du système +UserRight.PORT_HEALTH_INFO_VIEW = Voir les informations sur la santé du port +UserRight.PORT_HEALTH_INFO_EDIT = Modifier les informations existantes sur la santé du port +UserRight.POPULATION_MANAGE = Gérer les données de la population +UserRight.DOCUMENT_TEMPLATE_MANAGEMENT = Gérer les modèles de document +UserRight.QUARANTINE_ORDER_CREATE = Créer de nouvelles commandes de quarantaine +UserRight.LINE_LISTING_CONFIGURE = Configurer la liste de lignes +UserRight.AGGREGATE_REPORT_VIEW = Créer un nouveau rapport agrégé +UserRight.AGGREGATE_REPORT_EXPORT = Exporter les rapports agrégés depuis SORMAS +UserRight.AGGREGATE_REPORT_EDIT = Modifier les rapports agrégés existants +UserRight.SEE_PERSONAL_DATA_IN_JURISDICTION = Voir les données personnelles dans la juridiction +UserRight.SEE_PERSONAL_DATA_OUTSIDE_JURISDICTION = Voir les données personnelles en dehors de la juridiction +UserRight.SEE_SENSITIVE_DATA_IN_JURISDICTION = Voir les données sensibles dans la juridiction +UserRight.SEE_SENSITIVE_DATA_OUTSIDE_JURISDICTION = Voir les données sensibles hors juridiction +UserRight.CAMPAIGN_VIEW = Voir les campagnes existantes +UserRight.CAMPAIGN_VIEW_ARCHIVED = View archived campaigns +UserRight.CAMPAIGN_EDIT = Modifier les campagnes existantes +UserRight.CAMPAIGN_ARCHIVE = Campagnes archivées +UserRight.CAMPAIGN_DELETE = Supprimer les actions du système +UserRight.CAMPAIGN_FORM_DATA_VIEW = Afficher les données du formulaire de campagne existant +UserRight.CAMPAIGN_FORM_DATA_VIEW_ARCHIVED = View archived campaign form data +UserRight.CAMPAIGN_FORM_DATA_EDIT = Modifier les données du formulaire de campagne existant +UserRight.CAMPAIGN_FORM_DATA_ARCHIVE = Archiver les données du formulaire de campagne +UserRight.CAMPAIGN_FORM_DATA_DELETE = Supprimer les données du formulaire de campagne du système +UserRight.CAMPAIGN_FORM_DATA_EXPORT = Exporter les données du formulaire de campagne depuis SORMAS +UserRight.BAG_EXPORT = Effectuer l'exportation BAG +UserRight.SORMAS_TO_SORMAS_SHARE = Partager des données d'une instance SORMAS à une autre +UserRight.SORMAS_TO_SORMAS_PROCESS = Partages de processus +UserRight.EXTERNAL_SURVEILLANCE_SHARE = Envoyer des données à un outil de surveillance externe +UserRight.EXTERNAL_SURVEILLANCE_DELETE = Supprimer les données dans l'outil de surveillance externe +UserRight.EXTERNAL_MESSAGE_VIEW = Afficher et récupérer des messages +UserRight.EXTERNAL_MESSAGE_PROCESS = Travailler avec les messages +UserRight.EXTERNAL_MESSAGE_PUSH = Push external messages to the system +UserRight.EXTERNAL_MESSAGE_DELETE = Supprimer messages des personnes du système +UserRight.CASE_SHARE = Partagez des cas avec tout le pays +UserRight.IMMUNIZATION_VIEW = Voir les immunisations et vaccinations existantes +UserRight.IMMUNIZATION_VIEW_ARCHIVED = View archived immunizations and vaccinations +UserRight.IMMUNIZATION_CREATE = Créer des nouvelles immunisations et vaccinations +UserRight.IMMUNIZATION_EDIT = Modifier les immunisations et vaccinations existantes +UserRight.IMMUNIZATION_DELETE = Supprimer les immunisations et les vaccinations du système +UserRight.IMMUNIZATION_ARCHIVE = Archiver les vaccinations +UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_VIEW = View existing adverse events following immunization +UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_CREATE = Create new adverse event following immunization +UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_EDIT = Edit existing adverse event following immunization +UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_DELETE = Delete adverse events following immunization from the system +UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_ARCHIVE = Archive adverse events following immunization +UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_EXPORT = Export adverse events following immunization +UserRight.PERSON_EXPORT = Exporter des personnes +UserRight.CONTACT_MERGE = Fusionner les contacts +UserRight.EVENTGROUP_CREATE = Créer de nouveaux groupes d'événements +UserRight.EVENTGROUP_EDIT = Modifier les groupes d'événements existants +UserRight.EVENTGROUP_LINK = Lier des événements à des groupes d'événements +UserRight.EVENTGROUP_ARCHIVE = Archiver des groupes d'événements +UserRight.EVENTGROUP_DELETE = Supprimer des groupes d'événements du système +UserRight.EVENTGROUP_VIEW_ARCHIVED = View archived event groups from the system +UserRight.TRAVEL_ENTRY_MANAGEMENT_ACCESS = Accéder à l'annuaire des entrées de voyage +UserRight.TRAVEL_ENTRY_VIEW = Voir les entrées de voyage existantes +UserRight.TRAVEL_ENTRY_VIEW_ARCHIVED = View archived travel entries +UserRight.TRAVEL_ENTRY_CREATE = Créer de nouvelles entrées de voyage +UserRight.TRAVEL_ENTRY_EDIT = Modifier les entrées de voyage existantes +UserRight.TRAVEL_ENTRY_DELETE = Supprimer les entrées de voyage du système +UserRight.TRAVEL_ENTRY_ARCHIVE = Archiver les entrées de voyage +UserRight.EXPORT_DATA_PROTECTION_DATA = Exporter les données de protection des données +UserRight.OUTBREAK_VIEW = Voir les éclosions +UserRight.OUTBREAK_EDIT = Modifier les éclosions +UserRight.PERFORM_BULK_OPERATIONS_PSEUDONYM = Effectuer une pseudonomisation en masse +UserRight.SORMAS_TO_SORMAS_CLIENT = Client Sormas à Sormas +UserRight.SORMAS_REST = Accéder à Sormas REST +UserRight.EXTERNAL_VISITS = Visites externes +UserRight.SORMAS_UI = Accéder à l'interface utilisateur de Sormas +UserRight.DEV_MODE = Accéder aux options de développement +UserRight.CUSTOMIZABLE_ENUM_MANAGEMENT = Gérer les enums personnalisables +UserRight.DOCUMENT_VIEW = Afficher les documents existants +UserRight.DOCUMENT_UPLOAD = Charger des documents +UserRight.DOCUMENT_DELETE = Supprimer les documents du système +UserRight.PERSON_MERGE = Fusionner des personnes +UserRight.ENVIRONMENT_VIEW = View existing environments +UserRight.ENVIRONMENT_CREATE = Create new environments +UserRight.ENVIRONMENT_EDIT = Edit existing environments +UserRight.ENVIRONMENT_ARCHIVE = Archive environments +UserRight.ENVIRONMENT_VIEW_ARCHIVED = View archived environments +UserRight.ENVIRONMENT_DELETE = Delete environments from the system +UserRight.ENVIRONMENT_IMPORT = Import environments +UserRight.ENVIRONMENT_EXPORT = Export environments +UserRight.ENVIRONMENT_SAMPLE_VIEW = View existing environment samples +UserRight.ENVIRONMENT_SAMPLE_CREATE = Create new environment samples +UserRight.ENVIRONMENT_SAMPLE_EDIT = Edit existing environment samples +UserRight.ENVIRONMENT_SAMPLE_EDIT_DISPATCH = Edit environment samples dispatch information +UserRight.ENVIRONMENT_SAMPLE_EDIT_RECEIVAL = Edit environment samples receival information +UserRight.ENVIRONMENT_SAMPLE_DELETE = Delete environment samples from the system +UserRight.ENVIRONMENT_SAMPLE_IMPORT = Import environment samples +UserRight.ENVIRONMENT_SAMPLE_EXPORT = Export environment samples +UserRight.ENVIRONMENT_PATHOGEN_TEST_CREATE = Create environment sample pathogen tests +UserRight.ENVIRONMENT_PATHOGEN_TEST_EDIT = Edit environment sample pathogen tests +UserRight.ENVIRONMENT_PATHOGEN_TEST_DELETE = Delete environment sample pathogen tests UserRight.EMAIL_TEMPLATE_MANAGEMENT=Gérer les modèles d'e-mail UserRight.EXTERNAL_EMAIL_SEND=Envoyer des e-mails externes UserRight.EXTERNAL_EMAIL_ATTACH_DOCUMENTS=Joindre des documents aux e-mails externes @@ -1496,215 +1629,216 @@ UserRight.SELF_REPORT_EXPORT=Export self reports UserRight.SELF_REPORT_IMPORT=Import self reports UserRight.SELF_REPORT_PROCESS=Process self reports UserRight.SELF_REPORT_VIEW=View self reports + # UserRight descriptions -UserRight.Desc.CASE_ARCHIVE=Capable d'archiver les cas -UserRight.Desc.CASE_CHANGE_DISEASE=Capable de modifier l'épidémie de cas -UserRight.Desc.CASE_CHANGE_EPID_NUMBER=Capable de modifier le numéro d'épidémie de cas -UserRight.Desc.CASE_CLASSIFY=Modifier la classification et l'issue du cas -UserRight.Desc.CASE_CREATE=En mesure de créer de nouveaux cas -UserRight.Desc.CASE_DELETE=Capable de supprimer des cas du système -UserRight.Desc.CASE_EDIT=Capable de modifier les cas existants -UserRight.Desc.CASE_EXPORT=Capable d'exporter des cas depuis SORMAS -UserRight.Desc.CASE_IMPORT=Capable d'importer des cas dans SORMAS -UserRight.Desc.CASE_INVESTIGATE=Capable de modifier le statut de l'enquête de cas -UserRight.Desc.CASE_TRANSFER=Capable de transférer des cas dans une autre région/district/établissement -UserRight.Desc.CASE_REFER_FROM_POE=Référez le cas à partir du point d'entrée -UserRight.Desc.CASE_RESPONSIBLE=Peut être responsable d'un cas -UserRight.Desc.CASE_VIEW=Capable de voir les cas existants -UserRight.Desc.CASE_VIEW_ARCHIVED=Able to view archived cases -UserRight.Desc.CONTACT_ASSIGN=Capable d'assigner des contacts aux officiers -UserRight.Desc.CONTACT_CLASSIFY=Permet de modifier la classification des contacts -UserRight.Desc.CONTACT_CONVERT=Capable de créer les cas résultant des contacts -UserRight.Desc.CONTACT_CREATE=Capable de créer de nouveaux contacts -UserRight.Desc.CONTACT_IMPORT=Capable d'importer les contacts -UserRight.Desc.CONTACT_DELETE=Capable de supprimer des contacts du système -UserRight.Desc.CONTACT_EDIT=Capable de modifier les contacts existants -UserRight.Desc.CONTACT_EXPORT=Capable d'exporter des contacts depuis SORMAS -UserRight.Desc.CONTACT_RESPONSIBLE=Peut-être responsable d'un contact -UserRight.Desc.CONTACT_VIEW=Capable de voir les contacts existants -UserRight.Desc.CONTACT_VIEW_ARCHIVED=Able to view archived contacts -UserRight.Desc.CONTACT_ARCHIVE=Capable d'archiver les contacts -UserRight.Desc.DASHBOARD_CONTACT_VIEW=Capable d'accéder au tableau de bord du superviseur de contact -UserRight.Desc.DASHBOARD_SURVEILLANCE_VIEW=Capable d'accéder au tableau de bord du superviseur de surveillance -UserRight.Desc.DATABASE_EXPORT_ACCESS=Capable d'exporter toute la base de données -UserRight.Desc.EVENT_ARCHIVE=Capable d'archiver des événements -UserRight.Desc.EVENT_CREATE=Capable de créer de nouveaux événements -UserRight.Desc.EVENT_EDIT=Capable de modifier des événements existants -UserRight.Desc.EVENT_EXPORT=Capable d'exporter des événements depuis SORMAS -UserRight.Desc.EVENT_RESPONSIBLE=Peut être responsable d'un événement -UserRight.Desc.EVENT_VIEW=Capable de voir les événements existants -UserRight.Desc.EVENT_VIEW_ARCHIVED=Able to view archived events -UserRight.Desc.EVENTPARTICIPANT_CREATE=Capable de créer de nouveaux participants à l'événement -UserRight.Desc.EVENTPARTICIPANT_EDIT=Capable de modifier les participants à un événement existant -UserRight.Desc.EVENTPARTICIPANT_ARCHIVE=Capable d'archiver les participants à l'événement -UserRight.Desc.EVENTPARTICIPANT_VIEW=Capable de voir les participants à un événement existant -UserRight.Desc.EVENTPARTICIPANT_VIEW_ARCHIVED=Able to view archived event participants -UserRight.Desc.INFRASTRUCTURE_CREATE=Capable de créer de nouvelles régions/départements/communautés/établissements de santé -UserRight.Desc.INFRASTRUCTURE_EDIT=Capable de modifier de nouvelles régions/départements/communautés/établissements de santé -UserRight.Desc.INFRASTRUCTURE_VIEW=Capable de voir les régions/départements/communautés/établissements de santé du système -UserRight.Desc.INFRASTRUCTURE_VIEW_ARCHIVED=Able to view archived infrastructure data -UserRight.Desc.PERFORM_BULK_OPERATIONS=Capable d'effectuer des opérations en bloc dans les listes -UserRight.Desc.SAMPLE_CREATE=Capable de créer de nouveaux échantillons -UserRight.Desc.SAMPLE_EDIT=Capable d'éditer des échantillons existants -UserRight.Desc.SAMPLE_EXPORT=Capable d'exporter des échantillons de SORMAS -UserRight.Desc.SAMPLE_DELETE=Capable de supprimer des échantillons du système -UserRight.Desc.SAMPLE_TRANSFER=Capable de transférer des échantillons vers un autre laboratoire -UserRight.Desc.SAMPLE_VIEW=Able to view existing samples -UserRight.Desc.SAMPLETEST_CREATE=Capable de créer de nouveaux exemples de tests -UserRight.Desc.SAMPLETEST_EDIT=Capable de modifier des exemples de tests existants -UserRight.Desc.STATISTICS_EXPORT=Capable d'exporter des statistiques détaillées depuis SORMAS -UserRight.Desc.TASK_ASSIGN=Capable d'attribuer des tâches aux utilisateurs -UserRight.Desc.TASK_CREATE=Capable de créer de nouvelles tâches -UserRight.Desc.TASK_EDIT=Capable de modifier des tâches existantes -UserRight.Desc.TASK_VIEW=Capable d'afficher les tâches existantes -UserRight.Desc.TASK_VIEW_ARCHIVED=Able to view archived tasks -UserRight.Desc.TASK_ARCHIVE=Capable d'archiver les tâches -UserRight.Desc.USER_CREATE=Capable de créer de nouveaux utilisateurs -UserRight.Desc.USER_EDIT=Capable de modifier les utilisateurs existants -UserRight.Desc.USER_VIEW=Capable de voir les utilisateurs existants -UserRight.Desc.VISIT_CREATE=Capable de créer de nouvelles visites -UserRight.Desc.VISIT_EDIT=Capable de modifier des visites existantes -UserRight.Desc.WEEKLYREPORT_CREATE=Capable de créer les rapports hebdomadaires -UserRight.Desc.WEEKLYREPORT_VIEW=Capable de voir les rapports hebdomadaires -UserRight.Desc.CASE_MERGE=Capable de fusionner les cas -UserRight.Desc.PERSON_VIEW=Capable de voir les personnes existantes -UserRight.Desc.PERSON_EDIT=Capable de modifier les personnes existantes -UserRight.Desc.PERSON_DELETE=Capable de supprimer des personnes du système -UserRight.Desc.PERSON_CONTACT_DETAILS_DELETE=Capable de supprimer les coordonnées de la personne -UserRight.Desc.SAMPLE_EDIT_NOT_OWNED=Capable de modifier les échantillons signalés par d'autres utilisateurs -UserRight.Desc.PATHOGEN_TEST_CREATE=Capable de créer de nouveaux tests de pathogène -UserRight.Desc.PATHOGEN_TEST_EDIT=Capable de modifier les tests pathogènes existants -UserRight.Desc.PATHOGEN_TEST_DELETE=Capable de supprimer les tests d'agent pathogène du système -UserRight.Desc.ADDITIONAL_TEST_VIEW=Capable de voir les tests supplémentaires existants -UserRight.Desc.ADDITIONAL_TEST_CREATE=Capable de créer de nouveaux tests supplémentaires -UserRight.Desc.ADDITIONAL_TEST_EDIT=Capable de modifier les tests supplémentaires existants -UserRight.Desc.ADDITIONAL_TEST_DELETE=Capable de supprimer les tests supplémentaires du système -UserRight.Desc.CONTACT_REASSIGN_CASE=Capable de réaffecter le cas source des contacts -UserRight.Desc.MANAGE_EXTERNAL_SYMPTOM_JOURNAL=Capable de gérer le journal de symptômes externe -UserRight.Desc.VISIT_DELETE=Capable de supprimer des visites du système -UserRight.Desc.VISIT_EXPORT=Capable d'exporter des visites depuis SORMAS -UserRight.Desc.TASK_DELETE=Capable de supprimer des tâches du système -UserRight.Desc.TASK_EXPORT=Capable d'exporter des tâches depuis SORMAS -UserRight.Desc.ACTION_CREATE=Capable de créer de nouvelles actions -UserRight.Desc.ACTION_DELETE=Capable de supprimer des actions du système -UserRight.Desc.ACTION_EDIT=Capable de modifier les actions existantes -UserRight.Desc.EVENT_IMPORT=Capable d'importer des événements -UserRight.Desc.EVENT_DELETE=Capable de supprimer des événements du système -UserRight.Desc.EVENTPARTICIPANT_DELETE=Capable de supprimer les participants de l'événement du système -UserRight.Desc.EVENTPARTICIPANT_IMPORT=Capable d'importer les participants à l'événement -UserRight.Desc.SEND_MANUAL_EXTERNAL_MESSAGES=Capable d'envoyer des messages externes manuels -UserRight.Desc.STATISTICS_ACCESS=Capable d'accéder aux statistiques -UserRight.Desc.MANAGE_PUBLIC_EXPORT_CONFIGURATION=Capable de gérer les configurations d'exportation publiques -UserRight.Desc.INFRASTRUCTURE_EXPORT=Capable d'exporter les données d'infrastructure depuis SORMAS -UserRight.Desc.INFRASTRUCTURE_IMPORT=Capable d'importer des données d'infrastructure -UserRight.Desc.INFRASTRUCTURE_ARCHIVE=Capable d'archiver des données d'infrastructure -UserRight.Desc.DASHBOARD_CONTACT_VIEW_TRANSMISSION_CHAINS=Capable de voir les chaînes de transmission des contacts sur le tableau de bord -UserRight.Desc.DASHBOARD_CAMPAIGNS_VIEW=Capable d'accéder au tableau de bord des campagnes -UserRight.Desc.CASE_CLINICIAN_VIEW=Capable d'accéder aux sections de cas concernées par le clinicien -UserRight.Desc.THERAPY_VIEW=Capable de voir les thérapies existantes -UserRight.Desc.PRESCRIPTION_CREATE=Capable de créer de nouvelles ordonnances -UserRight.Desc.PRESCRIPTION_EDIT=Capable de modifier les ordonnances existantes -UserRight.Desc.PRESCRIPTION_DELETE=Capable de supprimer les ordonnances du système -UserRight.Desc.TREATMENT_CREATE=Capable de créer de nouveaux traitements -UserRight.Desc.TREATMENT_EDIT=Capable de modifier les traitements existants -UserRight.Desc.TREATMENT_DELETE=Capable de supprimer les traitements du système -UserRight.Desc.CLINICAL_COURSE_VIEW=Capable de voir le cours clinique des cas -UserRight.Desc.CLINICAL_COURSE_EDIT=Capable de modifier le cours clinique des cas -UserRight.Desc.CLINICAL_VISIT_CREATE=Capable de créer de nouvelles visites cliniques -UserRight.Desc.CLINICAL_VISIT_EDIT=Capable de modifier des visites cliniques existantes -UserRight.Desc.CLINICAL_VISIT_DELETE=Capable de supprimer les visites cliniques du système -UserRight.Desc.PORT_HEALTH_INFO_VIEW=Capable de voir les informations sur la santé du port -UserRight.Desc.PORT_HEALTH_INFO_EDIT=Capable de modifier les informations sur la santé du port existantes -UserRight.Desc.POPULATION_MANAGE=Capable de gérer les données de la population -UserRight.Desc.DOCUMENT_TEMPLATE_MANAGEMENT=Capable de gérer les modèles de document -UserRight.Desc.QUARANTINE_ORDER_CREATE=Capable de créer de nouvelles commandes de quarantaine -UserRight.Desc.LINE_LISTING_CONFIGURE=Capable de configurer la liste de lignes -UserRight.Desc.AGGREGATE_REPORT_VIEW=Capable de créer des nouveaux rapports agrégés -UserRight.Desc.AGGREGATE_REPORT_EXPORT=Capable d'exporter les rapports agrégés depuis SORMAS -UserRight.Desc.AGGREGATE_REPORT_EDIT=Capable de modifier les rapports agrégés existants -UserRight.Desc.SEE_PERSONAL_DATA_IN_JURISDICTION=Capable de voir les données personnelles dans la juridiction -UserRight.Desc.SEE_PERSONAL_DATA_OUTSIDE_JURISDICTION=Capable de voir les données personnelles en dehors de la juridiction -UserRight.Desc.SEE_SENSITIVE_DATA_IN_JURISDICTION=Capable de voir les données sensibles dans la juridiction -UserRight.Desc.SEE_SENSITIVE_DATA_OUTSIDE_JURISDICTION=Capable de voir les données sensibles hors juridiction -UserRight.Desc.CAMPAIGN_VIEW=Capable de voir les campagnes existantes -UserRight.Desc.CAMPAIGN_VIEW_ARCHIVED=Able to view archived campaigns -UserRight.Desc.CAMPAIGN_EDIT=Capable de modifier les campagnes existantes -UserRight.Desc.CAMPAIGN_ARCHIVE=Capable d'archiver les campagnes -UserRight.Desc.CAMPAIGN_DELETE=Capable de supprimer des campagnes du système -UserRight.Desc.CAMPAIGN_FORM_DATA_VIEW=Capable de voir les données du formulaire de campagne existant -UserRight.Desc.CAMPAIGN_FORM_DATA_VIEW_ARCHIVED=Able to view archived campaign form data -UserRight.Desc.CAMPAIGN_FORM_DATA_EDIT=Capable de modifier les données du formulaire de campagne existant -UserRight.Desc.CAMPAIGN_FORM_DATA_ARCHIVE=Capable d'archiver les données du formulaire de campagne -UserRight.Desc.CAMPAIGN_FORM_DATA_DELETE=Capable de supprimer les données du formulaire de campagne du système -UserRight.Desc.CAMPAIGN_FORM_DATA_EXPORT=Capable d'exporter les données du formulaire de campagne depuis SORMAS -UserRight.Desc.BAG_EXPORT=Capable d'effectuer l'exportation BAG -UserRight.Desc.SORMAS_TO_SORMAS_SHARE=Les utilisateurs avec ce droit peuvent initier un partage vers une autre instance SORMAS -UserRight.Desc.SORMAS_TO_SORMAS_PROCESS=Seuls les utilisateurs ayant ce droit sont autorisés à voir et à utiliser le répertoire de partage. -UserRight.Desc.EXTERNAL_SURVEILLANCE_SHARE=Permet de partager des cas ou des événements avec des outils de surveillance externes. Pour ce faire, le droit d'utilisateur de modification associé est également nécessaire. -UserRight.Desc.EXTERNAL_SURVEILLANCE_DELETE=Permet de supprimer des cas ou des événements avec des outils de surveillance externes. Pour ce faire, le droit d'utilisateur de modification associé est également nécessaire. -UserRight.Desc.EXTERNAL_MESSAGE_VIEW=Capable de voir et récupérer des messages -UserRight.Desc.EXTERNAL_MESSAGE_PROCESS=Capable de travailler avec les messages -UserRight.Desc.EXTERNAL_MESSAGE_PUSH=Able to push external messages to the system -UserRight.Desc.EXTERNAL_MESSAGE_DELETE=Capable de supprimer les messages -UserRight.Desc.CASE_SHARE=Capable de partager des cas avec tout le pays -UserRight.Desc.IMMUNIZATION_VIEW=Capable de voir les immunisations et vaccinations existantes -UserRight.Desc.IMMUNIZATION_VIEW_ARCHIVED=Able to view arhived immunizations and vaccinations -UserRight.Desc.IMMUNIZATION_CREATE=Capable de créer des nouvelles immunisations et vaccinations -UserRight.Desc.IMMUNIZATION_EDIT=Capable de modifier les immunisations et vaccinations existantes -UserRight.Desc.IMMUNIZATION_DELETE=Capable de supprimer les immunisations et les vaccinations du système -UserRight.Desc.IMMUNIZATION_ARCHIVE=Capable d'archiver les immunisations -UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_VIEW=Able to view existing adverse events following immunization -UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_CREATE=Able to create new adverse event following immunization -UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_EDIT=Able to edit existing adverse events following immunization -UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_DELETE=Able to delete adverse events following immunization from the system -UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_ARCHIVE=Able to archive adverse events following immunization -UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_EXPORT=Able to export adverse events following immunization -UserRight.Desc.PERSON_EXPORT=Capable d'exporter des personnes -UserRight.Desc.CONTACT_MERGE=Capable de fusionner les contacts -UserRight.Desc.EVENTGROUP_CREATE=Capable de créer de nouveaux groupes d'événements -UserRight.Desc.EVENTGROUP_EDIT=Capable de modifier des groupes d'événements existants -UserRight.Desc.EVENTGROUP_LINK=Capable de lier des événements à des groupes d'événements -UserRight.Desc.EVENTGROUP_ARCHIVE=Capable d'archiver des groupes d'événements -UserRight.Desc.EVENTGROUP_DELETE=Capable de supprimer des groupes d'événements du système -UserRight.Desc.EVENTGROUP_VIEW_ARCHIVED=Able to view archived event groups from the system -UserRight.Desc.TRAVEL_ENTRY_MANAGEMENT_ACCESS=Capable d'accéder au répertoire des entrées de voyage -UserRight.Desc.TRAVEL_ENTRY_VIEW=Capable de voir les entrées de voyage existantes -UserRight.Desc.TRAVEL_ENTRY_VIEW_ARCHIVED=Able to view archived travel entries -UserRight.Desc.TRAVEL_ENTRY_CREATE=Capable de créer de nouvelles entrées de voyage -UserRight.Desc.TRAVEL_ENTRY_EDIT=Capable de modifier les entrées de voyage existantes -UserRight.Desc.TRAVEL_ENTRY_DELETE=Capable de supprimer les entrées de voyage du système -UserRight.Desc.TRAVEL_ENTRY_ARCHIVE=Capable d'archiver les entrées de voyage -UserRight.Desc.EXPORT_DATA_PROTECTION_DATA=Capable d'exporter des données de protection des données -UserRight.Desc.OUTBREAK_VIEW=Capable de voir les épidémies -UserRight.Desc.OUTBREAK_EDIT=Capable de modifier les épidémies -UserRight.Desc.PERFORM_BULK_OPERATIONS_PSEUDONYM=Capable d'effectuer une pseudonomisation en masse -UserRight.Desc.SORMAS_TO_SORMAS_CLIENT=Droit d'utilisation technique pour l'interface SORMAS vers SORMAS -UserRight.Desc.SORMAS_REST=Accès à l'interface REST SORMAS -UserRight.Desc.EXTERNAL_VISITS=Capable d'accéder aux points de terminaison REST des visites externes -UserRight.Desc.SORMAS_UI=Accès à l'interface graphique SORMAS -UserRight.Desc.DEV_MODE=Possibilité d'accéder aux options du développeur dans le répertoire de configuration -UserRight.Desc.CUSTOMIZABLE_ENUM_MANAGEMENT=Capable de créer, modifier et supprimer des valeurs personnalisables -UserRight.Desc.DOCUMENT_VIEW=Capable de voir les documents existants -UserRight.Desc.DOCUMENT_UPLOAD=Capable de télécharger des documents -UserRight.Desc.DOCUMENT_DELETE=Capable de supprimer les documents du système -UserRight.Desc.PERSON_MERGE=Capable de fusionner les personnes -UserRight.Desc.ENVIRONMENT_CREATE=Able to create new environments -UserRight.Desc.ENVIRONMENT_EDIT=Able to edit existing environments -UserRight.Desc.ENVIRONMENT_ARCHIVE=Able to archive environments -UserRight.Desc.ENVIRONMENT_DELETE=Able to delete environments from the system -UserRight.Desc.ENVIRONMENT_IMPORT=Able to import environments -UserRight.Desc.ENVIRONMENT_EXPORT=Able to export environments -UserRight.Desc.ENVIRONMENT_SAMPLE_VIEW=Able to view existing environment samples -UserRight.Desc.ENVIRONMENT_SAMPLE_CREATE=Able to create new environment samples -UserRight.Desc.ENVIRONMENT_SAMPLE_EDIT=Able to edit existing environment samples -UserRight.Desc.ENVIRONMENT_SAMPLE_EDIT_DISPATCH=Able to edit environment samples dispatch information -UserRight.Desc.ENVIRONMENT_SAMPLE_EDIT_RECEIVAL=Able to edit environment samples receival information -UserRight.Desc.ENVIRONMENT_SAMPLE_DELETE=Able to delete environment samples from the system -UserRight.Desc.ENVIRONMENT_SAMPLE_IMPORT=Able to import environment samples -UserRight.Desc.ENVIRONMENT_SAMPLE_EXPORT=Able to export environment samples -UserRight.Desc.ENVIRONMENT_PATHOGEN_TEST_CREATE=Able to create environment sample pathogen tests -UserRight.Desc.ENVIRONMENT_PATHOGEN_TEST_EDIT=Able to edit environment sample pathogen tests -UserRight.Desc.ENVIRONMENT_PATHOGEN_TEST_DELETE=Able to delete environment sample pathogen tests +UserRight.Desc.CASE_ARCHIVE = Capable d'archiver les cas +UserRight.Desc.CASE_CHANGE_DISEASE = Capable de modifier l'épidémie de cas +UserRight.Desc.CASE_CHANGE_EPID_NUMBER = Capable de modifier le numéro d'épidémie de cas +UserRight.Desc.CASE_CLASSIFY = Modifier la classification et l'issue du cas +UserRight.Desc.CASE_CREATE = En mesure de créer de nouveaux cas +UserRight.Desc.CASE_DELETE = Capable de supprimer des cas du système +UserRight.Desc.CASE_EDIT = Capable de modifier les cas existants +UserRight.Desc.CASE_EXPORT = Capable d'exporter des cas depuis SORMAS +UserRight.Desc.CASE_IMPORT = Capable d'importer des cas dans SORMAS +UserRight.Desc.CASE_INVESTIGATE = Capable de modifier le statut de l'enquête de cas +UserRight.Desc.CASE_TRANSFER = Capable de transférer des cas dans une autre région/district/établissement +UserRight.Desc.CASE_REFER_FROM_POE = Référez le cas à partir du point d'entrée +UserRight.Desc.CASE_RESPONSIBLE = Peut être responsable d'un cas +UserRight.Desc.CASE_VIEW = Capable de voir les cas existants +UserRight.Desc.CASE_VIEW_ARCHIVED = Able to view archived cases +UserRight.Desc.CONTACT_ASSIGN = Capable d'assigner des contacts aux officiers +UserRight.Desc.CONTACT_CLASSIFY = Permet de modifier la classification des contacts +UserRight.Desc.CONTACT_CONVERT = Capable de créer les cas résultant des contacts +UserRight.Desc.CONTACT_CREATE = Capable de créer de nouveaux contacts +UserRight.Desc.CONTACT_IMPORT = Capable d'importer les contacts +UserRight.Desc.CONTACT_DELETE = Capable de supprimer des contacts du système +UserRight.Desc.CONTACT_EDIT = Capable de modifier les contacts existants +UserRight.Desc.CONTACT_EXPORT = Capable d'exporter des contacts depuis SORMAS +UserRight.Desc.CONTACT_RESPONSIBLE = Peut-être responsable d'un contact +UserRight.Desc.CONTACT_VIEW = Capable de voir les contacts existants +UserRight.Desc.CONTACT_VIEW_ARCHIVED = Able to view archived contacts +UserRight.Desc.CONTACT_ARCHIVE = Capable d'archiver les contacts +UserRight.Desc.DASHBOARD_CONTACT_VIEW = Capable d'accéder au tableau de bord du superviseur de contact +UserRight.Desc.DASHBOARD_SURVEILLANCE_VIEW = Capable d'accéder au tableau de bord du superviseur de surveillance +UserRight.Desc.DATABASE_EXPORT_ACCESS = Capable d'exporter toute la base de données +UserRight.Desc.EVENT_ARCHIVE = Capable d'archiver des événements +UserRight.Desc.EVENT_CREATE = Capable de créer de nouveaux événements +UserRight.Desc.EVENT_EDIT = Capable de modifier des événements existants +UserRight.Desc.EVENT_EXPORT = Capable d'exporter des événements depuis SORMAS +UserRight.Desc.EVENT_RESPONSIBLE = Peut être responsable d'un événement +UserRight.Desc.EVENT_VIEW = Capable de voir les événements existants +UserRight.Desc.EVENT_VIEW_ARCHIVED = Able to view archived events +UserRight.Desc.EVENTPARTICIPANT_CREATE = Capable de créer de nouveaux participants à l'événement +UserRight.Desc.EVENTPARTICIPANT_EDIT = Capable de modifier les participants à un événement existant +UserRight.Desc.EVENTPARTICIPANT_ARCHIVE = Capable d'archiver les participants à l'événement +UserRight.Desc.EVENTPARTICIPANT_VIEW = Capable de voir les participants à un événement existant +UserRight.Desc.EVENTPARTICIPANT_VIEW_ARCHIVED = Able to view archived event participants +UserRight.Desc.INFRASTRUCTURE_CREATE = Capable de créer de nouvelles régions/départements/communautés/établissements de santé +UserRight.Desc.INFRASTRUCTURE_EDIT = Capable de modifier de nouvelles régions/départements/communautés/établissements de santé +UserRight.Desc.INFRASTRUCTURE_VIEW = Capable de voir les régions/départements/communautés/établissements de santé du système +UserRight.Desc.INFRASTRUCTURE_VIEW_ARCHIVED = Able to view archived infrastructure data +UserRight.Desc.PERFORM_BULK_OPERATIONS = Capable d'effectuer des opérations en bloc dans les listes +UserRight.Desc.SAMPLE_CREATE = Capable de créer de nouveaux échantillons +UserRight.Desc.SAMPLE_EDIT = Capable d'éditer des échantillons existants +UserRight.Desc.SAMPLE_EXPORT = Capable d'exporter des échantillons de SORMAS +UserRight.Desc.SAMPLE_DELETE = Capable de supprimer des échantillons du système +UserRight.Desc.SAMPLE_TRANSFER = Capable de transférer des échantillons vers un autre laboratoire +UserRight.Desc.SAMPLE_VIEW = Able to view existing samples +UserRight.Desc.SAMPLETEST_CREATE = Capable de créer de nouveaux exemples de tests +UserRight.Desc.SAMPLETEST_EDIT = Capable de modifier des exemples de tests existants +UserRight.Desc.STATISTICS_EXPORT = Capable d'exporter des statistiques détaillées depuis SORMAS +UserRight.Desc.TASK_ASSIGN = Capable d'attribuer des tâches aux utilisateurs +UserRight.Desc.TASK_CREATE = Capable de créer de nouvelles tâches +UserRight.Desc.TASK_EDIT = Capable de modifier des tâches existantes +UserRight.Desc.TASK_VIEW = Capable d'afficher les tâches existantes +UserRight.Desc.TASK_VIEW_ARCHIVED = Able to view archived tasks +UserRight.Desc.TASK_ARCHIVE = Capable d'archiver les tâches +UserRight.Desc.USER_CREATE = Capable de créer de nouveaux utilisateurs +UserRight.Desc.USER_EDIT = Capable de modifier les utilisateurs existants +UserRight.Desc.USER_VIEW = Capable de voir les utilisateurs existants +UserRight.Desc.VISIT_CREATE = Capable de créer de nouvelles visites +UserRight.Desc.VISIT_EDIT = Capable de modifier des visites existantes +UserRight.Desc.WEEKLYREPORT_CREATE = Capable de créer les rapports hebdomadaires +UserRight.Desc.WEEKLYREPORT_VIEW = Capable de voir les rapports hebdomadaires +UserRight.Desc.CASE_MERGE = Capable de fusionner les cas +UserRight.Desc.PERSON_VIEW = Capable de voir les personnes existantes +UserRight.Desc.PERSON_EDIT = Capable de modifier les personnes existantes +UserRight.Desc.PERSON_DELETE = Capable de supprimer des personnes du système +UserRight.Desc.PERSON_CONTACT_DETAILS_DELETE = Capable de supprimer les coordonnées de la personne +UserRight.Desc.SAMPLE_EDIT_NOT_OWNED = Capable de modifier les échantillons signalés par d'autres utilisateurs +UserRight.Desc.PATHOGEN_TEST_CREATE = Capable de créer de nouveaux tests de pathogène +UserRight.Desc.PATHOGEN_TEST_EDIT = Capable de modifier les tests pathogènes existants +UserRight.Desc.PATHOGEN_TEST_DELETE = Capable de supprimer les tests d'agent pathogène du système +UserRight.Desc.ADDITIONAL_TEST_VIEW = Capable de voir les tests supplémentaires existants +UserRight.Desc.ADDITIONAL_TEST_CREATE = Capable de créer de nouveaux tests supplémentaires +UserRight.Desc.ADDITIONAL_TEST_EDIT = Capable de modifier les tests supplémentaires existants +UserRight.Desc.ADDITIONAL_TEST_DELETE = Capable de supprimer les tests supplémentaires du système +UserRight.Desc.CONTACT_REASSIGN_CASE = Capable de réaffecter le cas source des contacts +UserRight.Desc.MANAGE_EXTERNAL_SYMPTOM_JOURNAL = Capable de gérer le journal de symptômes externe +UserRight.Desc.VISIT_DELETE = Capable de supprimer des visites du système +UserRight.Desc.VISIT_EXPORT = Capable d'exporter des visites depuis SORMAS +UserRight.Desc.TASK_DELETE = Capable de supprimer des tâches du système +UserRight.Desc.TASK_EXPORT = Capable d'exporter des tâches depuis SORMAS +UserRight.Desc.ACTION_CREATE = Capable de créer de nouvelles actions +UserRight.Desc.ACTION_DELETE = Capable de supprimer des actions du système +UserRight.Desc.ACTION_EDIT = Capable de modifier les actions existantes +UserRight.Desc.EVENT_IMPORT = Capable d'importer des événements +UserRight.Desc.EVENT_DELETE = Capable de supprimer des événements du système +UserRight.Desc.EVENTPARTICIPANT_DELETE = Capable de supprimer les participants de l'événement du système +UserRight.Desc.EVENTPARTICIPANT_IMPORT = Capable d'importer les participants à l'événement +UserRight.Desc.SEND_MANUAL_EXTERNAL_MESSAGES = Capable d'envoyer des messages externes manuels +UserRight.Desc.STATISTICS_ACCESS = Capable d'accéder aux statistiques +UserRight.Desc.MANAGE_PUBLIC_EXPORT_CONFIGURATION = Capable de gérer les configurations d'exportation publiques +UserRight.Desc.INFRASTRUCTURE_EXPORT = Capable d'exporter les données d'infrastructure depuis SORMAS +UserRight.Desc.INFRASTRUCTURE_IMPORT = Capable d'importer des données d'infrastructure +UserRight.Desc.INFRASTRUCTURE_ARCHIVE = Capable d'archiver des données d'infrastructure +UserRight.Desc.DASHBOARD_CONTACT_VIEW_TRANSMISSION_CHAINS = Capable de voir les chaînes de transmission des contacts sur le tableau de bord +UserRight.Desc.DASHBOARD_CAMPAIGNS_VIEW = Capable d'accéder au tableau de bord des campagnes +UserRight.Desc.CASE_CLINICIAN_VIEW = Capable d'accéder aux sections de cas concernées par le clinicien +UserRight.Desc.THERAPY_VIEW = Capable de voir les thérapies existantes +UserRight.Desc.PRESCRIPTION_CREATE = Capable de créer de nouvelles ordonnances +UserRight.Desc.PRESCRIPTION_EDIT = Capable de modifier les ordonnances existantes +UserRight.Desc.PRESCRIPTION_DELETE = Capable de supprimer les ordonnances du système +UserRight.Desc.TREATMENT_CREATE = Capable de créer de nouveaux traitements +UserRight.Desc.TREATMENT_EDIT = Capable de modifier les traitements existants +UserRight.Desc.TREATMENT_DELETE = Capable de supprimer les traitements du système +UserRight.Desc.CLINICAL_COURSE_VIEW = Capable de voir le cours clinique des cas +UserRight.Desc.CLINICAL_COURSE_EDIT = Capable de modifier le cours clinique des cas +UserRight.Desc.CLINICAL_VISIT_CREATE = Capable de créer de nouvelles visites cliniques +UserRight.Desc.CLINICAL_VISIT_EDIT = Capable de modifier des visites cliniques existantes +UserRight.Desc.CLINICAL_VISIT_DELETE = Capable de supprimer les visites cliniques du système +UserRight.Desc.PORT_HEALTH_INFO_VIEW = Capable de voir les informations sur la santé du port +UserRight.Desc.PORT_HEALTH_INFO_EDIT = Capable de modifier les informations sur la santé du port existantes +UserRight.Desc.POPULATION_MANAGE = Capable de gérer les données de la population +UserRight.Desc.DOCUMENT_TEMPLATE_MANAGEMENT = Capable de gérer les modèles de document +UserRight.Desc.QUARANTINE_ORDER_CREATE = Capable de créer de nouvelles commandes de quarantaine +UserRight.Desc.LINE_LISTING_CONFIGURE = Capable de configurer la liste de lignes +UserRight.Desc.AGGREGATE_REPORT_VIEW = Capable de créer des nouveaux rapports agrégés +UserRight.Desc.AGGREGATE_REPORT_EXPORT = Capable d'exporter les rapports agrégés depuis SORMAS +UserRight.Desc.AGGREGATE_REPORT_EDIT = Capable de modifier les rapports agrégés existants +UserRight.Desc.SEE_PERSONAL_DATA_IN_JURISDICTION = Capable de voir les données personnelles dans la juridiction +UserRight.Desc.SEE_PERSONAL_DATA_OUTSIDE_JURISDICTION = Capable de voir les données personnelles en dehors de la juridiction +UserRight.Desc.SEE_SENSITIVE_DATA_IN_JURISDICTION = Capable de voir les données sensibles dans la juridiction +UserRight.Desc.SEE_SENSITIVE_DATA_OUTSIDE_JURISDICTION = Capable de voir les données sensibles hors juridiction +UserRight.Desc.CAMPAIGN_VIEW = Capable de voir les campagnes existantes +UserRight.Desc.CAMPAIGN_VIEW_ARCHIVED = Able to view archived campaigns +UserRight.Desc.CAMPAIGN_EDIT = Capable de modifier les campagnes existantes +UserRight.Desc.CAMPAIGN_ARCHIVE = Capable d'archiver les campagnes +UserRight.Desc.CAMPAIGN_DELETE = Capable de supprimer des campagnes du système +UserRight.Desc.CAMPAIGN_FORM_DATA_VIEW = Capable de voir les données du formulaire de campagne existant +UserRight.Desc.CAMPAIGN_FORM_DATA_VIEW_ARCHIVED = Able to view archived campaign form data +UserRight.Desc.CAMPAIGN_FORM_DATA_EDIT = Capable de modifier les données du formulaire de campagne existant +UserRight.Desc.CAMPAIGN_FORM_DATA_ARCHIVE = Capable d'archiver les données du formulaire de campagne +UserRight.Desc.CAMPAIGN_FORM_DATA_DELETE = Capable de supprimer les données du formulaire de campagne du système +UserRight.Desc.CAMPAIGN_FORM_DATA_EXPORT = Capable d'exporter les données du formulaire de campagne depuis SORMAS +UserRight.Desc.BAG_EXPORT = Capable d'effectuer l'exportation BAG +UserRight.Desc.SORMAS_TO_SORMAS_SHARE = Les utilisateurs avec ce droit peuvent initier un partage vers une autre instance SORMAS +UserRight.Desc.SORMAS_TO_SORMAS_PROCESS = Seuls les utilisateurs ayant ce droit sont autorisés à voir et à utiliser le répertoire de partage. +UserRight.Desc.EXTERNAL_SURVEILLANCE_SHARE = Permet de partager des cas ou des événements avec des outils de surveillance externes. Pour ce faire, le droit d'utilisateur de modification associé est également nécessaire. +UserRight.Desc.EXTERNAL_SURVEILLANCE_DELETE = Permet de supprimer des cas ou des événements avec des outils de surveillance externes. Pour ce faire, le droit d'utilisateur de modification associé est également nécessaire. +UserRight.Desc.EXTERNAL_MESSAGE_VIEW = Capable de voir et récupérer des messages +UserRight.Desc.EXTERNAL_MESSAGE_PROCESS = Capable de travailler avec les messages +UserRight.Desc.EXTERNAL_MESSAGE_PUSH = Able to push external messages to the system +UserRight.Desc.EXTERNAL_MESSAGE_DELETE = Capable de supprimer les messages +UserRight.Desc.CASE_SHARE = Capable de partager des cas avec tout le pays +UserRight.Desc.IMMUNIZATION_VIEW = Capable de voir les immunisations et vaccinations existantes +UserRight.Desc.IMMUNIZATION_VIEW_ARCHIVED = Able to view arhived immunizations and vaccinations +UserRight.Desc.IMMUNIZATION_CREATE = Capable de créer des nouvelles immunisations et vaccinations +UserRight.Desc.IMMUNIZATION_EDIT = Capable de modifier les immunisations et vaccinations existantes +UserRight.Desc.IMMUNIZATION_DELETE = Capable de supprimer les immunisations et les vaccinations du système +UserRight.Desc.IMMUNIZATION_ARCHIVE = Capable d'archiver les immunisations +UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_VIEW = Able to view existing adverse events following immunization +UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_CREATE = Able to create new adverse event following immunization +UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_EDIT = Able to edit existing adverse events following immunization +UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_DELETE = Able to delete adverse events following immunization from the system +UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_ARCHIVE = Able to archive adverse events following immunization +UserRight.Desc.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_EXPORT = Able to export adverse events following immunization +UserRight.Desc.PERSON_EXPORT = Capable d'exporter des personnes +UserRight.Desc.CONTACT_MERGE = Capable de fusionner les contacts +UserRight.Desc.EVENTGROUP_CREATE = Capable de créer de nouveaux groupes d'événements +UserRight.Desc.EVENTGROUP_EDIT = Capable de modifier des groupes d'événements existants +UserRight.Desc.EVENTGROUP_LINK = Capable de lier des événements à des groupes d'événements +UserRight.Desc.EVENTGROUP_ARCHIVE = Capable d'archiver des groupes d'événements +UserRight.Desc.EVENTGROUP_DELETE = Capable de supprimer des groupes d'événements du système +UserRight.Desc.EVENTGROUP_VIEW_ARCHIVED = Able to view archived event groups from the system +UserRight.Desc.TRAVEL_ENTRY_MANAGEMENT_ACCESS = Capable d'accéder au répertoire des entrées de voyage +UserRight.Desc.TRAVEL_ENTRY_VIEW = Capable de voir les entrées de voyage existantes +UserRight.Desc.TRAVEL_ENTRY_VIEW_ARCHIVED = Able to view archived travel entries +UserRight.Desc.TRAVEL_ENTRY_CREATE = Capable de créer de nouvelles entrées de voyage +UserRight.Desc.TRAVEL_ENTRY_EDIT = Capable de modifier les entrées de voyage existantes +UserRight.Desc.TRAVEL_ENTRY_DELETE = Capable de supprimer les entrées de voyage du système +UserRight.Desc.TRAVEL_ENTRY_ARCHIVE = Capable d'archiver les entrées de voyage +UserRight.Desc.EXPORT_DATA_PROTECTION_DATA = Capable d'exporter des données de protection des données +UserRight.Desc.OUTBREAK_VIEW = Capable de voir les épidémies +UserRight.Desc.OUTBREAK_EDIT = Capable de modifier les épidémies +UserRight.Desc.PERFORM_BULK_OPERATIONS_PSEUDONYM = Capable d'effectuer une pseudonomisation en masse +UserRight.Desc.SORMAS_TO_SORMAS_CLIENT = Droit d'utilisation technique pour l'interface SORMAS vers SORMAS +UserRight.Desc.SORMAS_REST = Accès à l'interface REST SORMAS +UserRight.Desc.EXTERNAL_VISITS = Capable d'accéder aux points de terminaison REST des visites externes +UserRight.Desc.SORMAS_UI = Accès à l'interface graphique SORMAS +UserRight.Desc.DEV_MODE = Possibilité d'accéder aux options du développeur dans le répertoire de configuration +UserRight.Desc.CUSTOMIZABLE_ENUM_MANAGEMENT = Capable de créer, modifier et supprimer des valeurs personnalisables +UserRight.Desc.DOCUMENT_VIEW = Capable de voir les documents existants +UserRight.Desc.DOCUMENT_UPLOAD = Capable de télécharger des documents +UserRight.Desc.DOCUMENT_DELETE = Capable de supprimer les documents du système +UserRight.Desc.PERSON_MERGE = Capable de fusionner les personnes +UserRight.Desc.ENVIRONMENT_CREATE = Able to create new environments +UserRight.Desc.ENVIRONMENT_EDIT = Able to edit existing environments +UserRight.Desc.ENVIRONMENT_ARCHIVE = Able to archive environments +UserRight.Desc.ENVIRONMENT_DELETE = Able to delete environments from the system +UserRight.Desc.ENVIRONMENT_IMPORT = Able to import environments +UserRight.Desc.ENVIRONMENT_EXPORT = Able to export environments +UserRight.Desc.ENVIRONMENT_SAMPLE_VIEW = Able to view existing environment samples +UserRight.Desc.ENVIRONMENT_SAMPLE_CREATE = Able to create new environment samples +UserRight.Desc.ENVIRONMENT_SAMPLE_EDIT = Able to edit existing environment samples +UserRight.Desc.ENVIRONMENT_SAMPLE_EDIT_DISPATCH = Able to edit environment samples dispatch information +UserRight.Desc.ENVIRONMENT_SAMPLE_EDIT_RECEIVAL = Able to edit environment samples receival information +UserRight.Desc.ENVIRONMENT_SAMPLE_DELETE = Able to delete environment samples from the system +UserRight.Desc.ENVIRONMENT_SAMPLE_IMPORT = Able to import environment samples +UserRight.Desc.ENVIRONMENT_SAMPLE_EXPORT = Able to export environment samples +UserRight.Desc.ENVIRONMENT_PATHOGEN_TEST_CREATE = Able to create environment sample pathogen tests +UserRight.Desc.ENVIRONMENT_PATHOGEN_TEST_EDIT = Able to edit environment sample pathogen tests +UserRight.Desc.ENVIRONMENT_PATHOGEN_TEST_DELETE = Able to delete environment sample pathogen tests UserRight.Desc.EMAIL_TEMPLATE_MANAGEMENT=Capable de gérer les modèles d'e-mail UserRight.Desc.EXTERNAL_EMAIL_SEND=Capable d'envoyer des e-mails externes UserRight.Desc.EXTERNAL_EMAIL_ATTACH_DOCUMENTS=Capable de joindre des documents à des e-mails externes @@ -1717,114 +1851,131 @@ UserRight.Desc.SELF_REPORT_EXPORT=Able to export self reports UserRight.Desc.SELF_REPORT_IMPORT=Able to import self reports UserRight.Desc.SELF_REPORT_PROCESS=Able to process self reports UserRight.Desc.SELF_REPORT_VIEW=Able to view self reports + # UserRightGroup -UserRightGroup.GENERAL=Général -UserRightGroup.DATA_PROTECTION=Protection des données -UserRightGroup.PERSON=Personnes -UserRightGroup.CASE=Surveillance des cas -UserRightGroup.CASE_MANAGEMENT=Gestion de cas -UserRightGroup.PORT_HEALTH=Santé portuaire -UserRightGroup.CONTACT=Surveillance des contacts -UserRightGroup.VISIT=Suivi -UserRightGroup.SAMPLE=Exemple de test -UserRightGroup.IMMUNIZATION=Immunisation -UserRightGroup.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION=Adverse Events Following Immunization -UserRightGroup.TRAVEL_ENTRY=Entrées de voyage -UserRightGroup.TASK=Tâches -UserRightGroup.EVENT=Évènements -UserRightGroup.AGGREGATED_REPORTING=Rapports agrégés -UserRightGroup.CAMPAIGN=Campagnes -UserRightGroup.DASHBOARD=Tableau de bord -UserRightGroup.STATISTICS=Statistiques  -UserRightGroup.EXPORT=Exporter -UserRightGroup.EXTERNAL=Système externe -UserRightGroup.USER=Utilisateurs -UserRightGroup.INFRASTRUCTURE=Infrastructure -UserRightGroup.CONFIGURATION=Configuration -UserRightGroup.DOCUMENT=Documents +UserRightGroup.GENERAL = Général +UserRightGroup.DATA_PROTECTION = Protection des données +UserRightGroup.PERSON = Personnes +UserRightGroup.CASE = Surveillance des cas +UserRightGroup.CASE_MANAGEMENT = Gestion de cas +UserRightGroup.PORT_HEALTH = Santé portuaire +UserRightGroup.CONTACT = Surveillance des contacts +UserRightGroup.VISIT = Suivi +UserRightGroup.SAMPLE = Exemple de test +UserRightGroup.IMMUNIZATION = Immunisation +UserRightGroup.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION = Adverse Events Following Immunization +UserRightGroup.TRAVEL_ENTRY = Entrées de voyage +UserRightGroup.TASK = Tâches +UserRightGroup.EVENT = Évènements +UserRightGroup.AGGREGATED_REPORTING = Rapports agrégés +UserRightGroup.CAMPAIGN = Campagnes +UserRightGroup.DASHBOARD = Tableau de bord +UserRightGroup.STATISTICS = Statistiques  +UserRightGroup.EXPORT = Exporter +UserRightGroup.EXTERNAL = Système externe +UserRightGroup.USER = Utilisateurs +UserRightGroup.INFRASTRUCTURE = Infrastructure +UserRightGroup.CONFIGURATION = Configuration +UserRightGroup.DOCUMENT = Documents UserRightGroup.EXTERNAL_EMAILS=Emails externes -UserRightGroup.ENVIRONMENT=Environments +UserRightGroup.ENVIRONMENT = Environments UserRightGroup.SELF_REPORT=Self Reports + # Vaccination -VaccinationStatus.UNKNOWN=Inconnu -VaccinationStatus.UNVACCINATED=Non vacciné -VaccinationStatus.VACCINATED=Vacciné +VaccinationStatus.UNKNOWN = Inconnu +VaccinationStatus.UNVACCINATED = Non vacciné +VaccinationStatus.VACCINATED = Vacciné + # VaccinationInfoSource -VaccinationInfoSource.ORAL_COMMUNICATION=Communication orale -VaccinationInfoSource.VACCINATION_CARD=Carte de vaccination -VaccinationInfoSource.NO_EVIDENCE=Aucune preuve -VaccinationInfoSource.UNKNOWN=Inconnu +VaccinationInfoSource.ORAL_COMMUNICATION = Communication orale +VaccinationInfoSource.VACCINATION_CARD = Carte de vaccination +VaccinationInfoSource.NO_EVIDENCE = Aucune preuve +VaccinationInfoSource.UNKNOWN = Inconnu + # ValueSeparator -ValueSeparator.DEFAULT=Par défaut (%s) -ValueSeparator.COMMA=Virgule -ValueSeparator.SEMICOLON=Point-virgule -ValueSeparator.TAB=Tabulatrice +ValueSeparator.DEFAULT = Par défaut (%s) +ValueSeparator.COMMA = Virgule +ValueSeparator.SEMICOLON = Point-virgule +ValueSeparator.TAB = Tabulatrice + # ViewMode -ViewMode.NORMAL=Vue normale -ViewMode.SIMPLE=Vue simple -VisitResult.NOT_SYMPTOMATIC=Vu (pas de signes) -VisitResult.SYMPTOMATIC=Vu avec des signes -VisitResult.UNAVAILABLE=Non disponible -VisitResult.UNCOOPERATIVE=Non coopératif -VisitResult.NOT_PERFORMED=Non effectué +ViewMode.NORMAL = Vue normale +ViewMode.SIMPLE = Vue simple + +VisitResult.NOT_SYMPTOMATIC = Vu (pas de signes) +VisitResult.SYMPTOMATIC = Vu avec des signes +VisitResult.UNAVAILABLE = Non disponible +VisitResult.UNCOOPERATIVE = Non coopératif +VisitResult.NOT_PERFORMED = Non effectué + # VisitStatus -VisitStatus.COOPERATIVE=Disponible et coopératif -VisitStatus.UNAVAILABLE=Non disponible -VisitStatus.UNCOOPERATIVE=Disponible, mais non coopératif -VisitStatus.Short.COOPERATIVE=Coopérative -VisitStatus.Short.UNAVAILABLE=Non disponible -VisitStatus.Short.UNCOOPERATIVE=Non coopératif +VisitStatus.COOPERATIVE = Disponible et coopératif +VisitStatus.UNAVAILABLE = Non disponible +VisitStatus.UNCOOPERATIVE = Disponible, mais non coopératif +VisitStatus.Short.COOPERATIVE = Coopérative +VisitStatus.Short.UNAVAILABLE = Non disponible +VisitStatus.Short.UNCOOPERATIVE = Non coopératif + # VisitOrigin -VisitOrigin.USER=Créé par utilisateur -VisitOrigin.EXTERNAL_JOURNAL=Journal des symptômes externes +VisitOrigin.USER = Créé par utilisateur +VisitOrigin.EXTERNAL_JOURNAL = Journal des symptômes externes + # WaterSource -WaterSource.COMMUNITY_BOREHOLE_WELL=Communauté forage/puits -WaterSource.OTHER=Autre -WaterSource.PIPE_NETWORK=Réseau de tuyaux -WaterSource.PRIVATE_BOREHOLE_WELL=Forage privé/puits -WaterSource.STREAM=Cours d'eau +WaterSource.COMMUNITY_BOREHOLE_WELL = Communauté forage/puits +WaterSource.OTHER = Autre +WaterSource.PIPE_NETWORK = Réseau de tuyaux +WaterSource.PRIVATE_BOREHOLE_WELL = Forage privé/puits +WaterSource.STREAM = Cours d'eau + # WaterType -WaterType.WASTEWATER=Wastewater -WaterType.GROUNDWATER=Groundwater -WaterType.SURFACE_WATER=Surface water (lakes, rivers, runoff, etc.) -WaterType.PRECIPITATION=Precipitation (rain or snow) -WaterType.OTHER=Other -WaterType.UNKNOWN=Unknown +WaterType.WASTEWATER = Wastewater +WaterType.GROUNDWATER = Groundwater +WaterType.SURFACE_WATER = Surface water (lakes, rivers, runoff, etc.) +WaterType.PRECIPITATION = Precipitation (rain or snow) +WaterType.OTHER = Other +WaterType.UNKNOWN = Unknown + # WaterUse -WaterUse.DRINKING_HOUSEHOLD_NEEDS=Drinking and household needs -WaterUse.RECREATION=Recreation -WaterUse.INDUSTRY_COMMERCE=Industry and commerce -WaterUse.AGRICULTURE=Agriculture (plants or livestock) -WaterUse.THERMOELECTRICITY_ENERGY=Thermoelectricity/Energy -WaterUse.OTHER=Other -WaterUse.UNKNOWN=Unknown +WaterUse.DRINKING_HOUSEHOLD_NEEDS = Drinking and household needs +WaterUse.RECREATION = Recreation +WaterUse.INDUSTRY_COMMERCE = Industry and commerce +WaterUse.AGRICULTURE = Agriculture (plants or livestock) +WaterUse.THERMOELECTRICITY_ENERGY = Thermoelectricity/Energy +WaterUse.OTHER = Other +WaterUse.UNKNOWN = Unknown + # Work environment -WorkEnvironment.UNKNOWN=Inconnu -WorkEnvironment.OPEN_SPACE_OFFICE=Espace de bureau ouvert -WorkEnvironment.FOOD_SECTOR=Secteur alimentaire -WorkEnvironment.BUILDING_SECTOR=Secteur de construction -WorkEnvironment.LOGISTICS_CENTER=Centre logistique -WorkEnvironment.OTHER=Autres +WorkEnvironment.UNKNOWN = Inconnu +WorkEnvironment.OPEN_SPACE_OFFICE = Espace de bureau ouvert +WorkEnvironment.FOOD_SECTOR = Secteur alimentaire +WorkEnvironment.BUILDING_SECTOR = Secteur de construction +WorkEnvironment.LOGISTICS_CENTER = Centre logistique +WorkEnvironment.OTHER = Autres + # YesNoUnknown -YesNoUnknown.NO=Non -YesNoUnknown.UNKNOWN=Inconnu -YesNoUnknown.YES=Oui +YesNoUnknown.NO = Non +YesNoUnknown.UNKNOWN = Inconnu +YesNoUnknown.YES = Oui + #SamplePurpose -SamplePurpose.EXTERNAL=Tests de laboratoire externes -SamplePurpose.INTERNAL=Tests internes +SamplePurpose.EXTERNAL = Tests de laboratoire externes +SamplePurpose.INTERNAL = Tests internes + #JurisdictionLevel -JurisdictionLevel.NONE=Vide -JurisdictionLevel.NATION=Pays -JurisdictionLevel.REGION=Région -JurisdictionLevel.DISTRICT=Canton -JurisdictionLevel.COMMUNITY=Commune -JurisdictionLevel.HEALTH_FACILITY=Établissement -JurisdictionLevel.LABORATORY=Laboratoire -JurisdictionLevel.POINT_OF_ENTRY=Point d'entrée -JurisdictionLevel.EXTERNAL_LABORATORY=Laboratoire externe +JurisdictionLevel.NONE = Vide +JurisdictionLevel.NATION = Pays +JurisdictionLevel.REGION = Région +JurisdictionLevel.DISTRICT = Canton +JurisdictionLevel.COMMUNITY = Commune +JurisdictionLevel.HEALTH_FACILITY = Établissement +JurisdictionLevel.LABORATORY = Laboratoire +JurisdictionLevel.POINT_OF_ENTRY = Point d'entrée +JurisdictionLevel.EXTERNAL_LABORATORY = Laboratoire externe + #CampaignFormElementImportance -CampaignFormElementImportance.ALL=Toutes les colonnes -CampaignFormElementImportance.IMPORTANT=Important +CampaignFormElementImportance.ALL = Toutes les colonnes +CampaignFormElementImportance.IMPORTANT = Important + SamplingReason.PRESENCE_OF_SYMPTOMS=Présence de symptômes SamplingReason.OUTBREAK=Exposé à une zone d'épidémie SamplingReason.SCREENING=Dépistage @@ -1855,6 +2006,7 @@ EndOfQuarantineReason.ASYMPTOMATIC=Asymptomatique après 10 jours EndOfQuarantineReason.ISOLATED_AS_CASE=Isolé en tant que cas EndOfQuarantineReason.LOST_TO_FOLLOWUP=Perdu au suivi EndOfQuarantineReason.OTHER=Autres + #InfectionSetting InfectionSetting.UNKNOWN=Inconnu InfectionSetting.AMBULATORY=Ambulatoire @@ -1875,6 +2027,7 @@ InfectionSetting.OTHER_STATION=Autre station InfectionSetting.NURSING_HOME=Clinique InfectionSetting.REHAB_FACILITY=Etablissement de Rehabilitation InfectionSetting.OTHER_STATIONARY_FACILITY=Autre établissement hospitalier + SymptomGroup.GENERAL=Général SymptomGroup.RESPIRATORY=Respiratoire SymptomGroup.CARDIOVASCULAR=Cardiovasculaire @@ -1883,6 +2036,7 @@ SymptomGroup.URINARY=Urinaire SymptomGroup.NERVOUS_SYSTEM=Système nerveux SymptomGroup.SKIN=Peau SymptomGroup.OTHER=Autres + #Salutation Salutation.MR=Cher Monsieur Salutation.MRS=Chère Madame @@ -1890,6 +2044,7 @@ Salutation.MR_AND_MRS=Cher monsieur et Madame Salutation.FAMILY=Chère famille Salutation.GUARDIAN_OF_MINOR=Cher gardien d'enfant Salutation.OTHER=Autre + #PersonAssociation PersonAssociation.ALL=Tout PersonAssociation.CASE=Cas @@ -1897,22 +2052,26 @@ PersonAssociation.CONTACT=Contact PersonAssociation.EVENT_PARTICIPANT=Participant à l'événement PersonAssociation.IMMUNIZATION=Immunisation PersonAssociation.TRAVEL_ENTRY=Entrées de voyage -ReinfectionDetail.GENOME_SEQUENCE_PREVIOUS_INFECTION_KNOWN=La séquence de génome du virus provenant d'une infection antérieure du SARS-CoV-2 est connue -ReinfectionDetail.GENOME_SEQUENCE_CURRENT_INFECTION_KNOWN=La séquence du génome du virus de l'infection actuelle par le SRAS-CoV-2 est connue -ReinfectionDetail.GENOME_SEQUENCES_NOT_MATCHING=Les séquences génomiques des virus des infections SARS-CoV-2 précédentes et actuelles ne correspondent pas -ReinfectionDetail.GENOME_COPY_NUMBER_ABOVE_THRESHOLD=Numéro de copie du génome SARS-CoV-2 dans la détection actuelle de PCR >\= 10^6/ml ou Ct valeur < 30 -ReinfectionDetail.GENOME_COPY_NUMBER_BELOW_THRESHOLD=Individu testé positif pour le SARS-CoV-2 par PCR, mais nombre de copies du génome du SARS-CoV-2 dans la détection PCR actuelle < 10^6/ml ou valeur Ct >\= 30, ou les deux inconnus -ReinfectionDetail.ACUTE_RESPIRATORY_ILLNESS_OVERCOME=La personne a surmonté une maladie respiratoire aiguë suite à une infection confirmée par le SRAS-CoV-2 -ReinfectionDetail.PREVIOUS_ASYMPTOMATIC_INFECTION=Une personne avait une infection asymptomatique du SARS-CoV-2 -ReinfectionDetail.TESTED_NEGATIVE_AFTER_PREVIOUS_INFECTION=Une personne a testé de manière concluante négative par PCR au moins une fois après l'infection du SARS-CoV-2 -ReinfectionDetail.LAST_PCR_DETECTION_NOT_RECENT=La dernière détection PCR positive de l'infection précédente a été il y a plus de 3 mois -ReinfectionDetailGroup.GENOME_SEQUENCE= -ReinfectionDetailGroup.PRECEDING_INFECTION=Informations sur l'infection précédente -ReinfectionDetailGroup.REINFECTION_EVALUATION=Plus d'informations sur l'évaluation de la réinfection -ReinfectionDetailGroup.PREVIOUS_INFECTION_COMPLETED=Infection précédente terminée -ReinfectionStatus.CONFIRMED=Réinfection confirmée -ReinfectionStatus.PROBABLE=Réinfection probable -ReinfectionStatus.POSSIBLE=Réinfection possible + +ReinfectionDetail.GENOME_SEQUENCE_PREVIOUS_INFECTION_KNOWN = La séquence de génome du virus provenant d'une infection antérieure du SARS-CoV-2 est connue +ReinfectionDetail.GENOME_SEQUENCE_CURRENT_INFECTION_KNOWN = La séquence du génome du virus de l'infection actuelle par le SRAS-CoV-2 est connue +ReinfectionDetail.GENOME_SEQUENCES_NOT_MATCHING = Les séquences génomiques des virus des infections SARS-CoV-2 précédentes et actuelles ne correspondent pas +ReinfectionDetail.GENOME_COPY_NUMBER_ABOVE_THRESHOLD = Numéro de copie du génome SARS-CoV-2 dans la détection actuelle de PCR >\= 10^6/ml ou Ct valeur < 30 +ReinfectionDetail.GENOME_COPY_NUMBER_BELOW_THRESHOLD = Individu testé positif pour le SARS-CoV-2 par PCR, mais nombre de copies du génome du SARS-CoV-2 dans la détection PCR actuelle < 10^6/ml ou valeur Ct >\= 30, ou les deux inconnus +ReinfectionDetail.ACUTE_RESPIRATORY_ILLNESS_OVERCOME = La personne a surmonté une maladie respiratoire aiguë suite à une infection confirmée par le SRAS-CoV-2 +ReinfectionDetail.PREVIOUS_ASYMPTOMATIC_INFECTION = Une personne avait une infection asymptomatique du SARS-CoV-2 +ReinfectionDetail.TESTED_NEGATIVE_AFTER_PREVIOUS_INFECTION = Une personne a testé de manière concluante négative par PCR au moins une fois après l'infection du SARS-CoV-2 +ReinfectionDetail.LAST_PCR_DETECTION_NOT_RECENT = La dernière détection PCR positive de l'infection précédente a été il y a plus de 3 mois + +ReinfectionDetailGroup.GENOME_SEQUENCE = +ReinfectionDetailGroup.PRECEDING_INFECTION = Informations sur l'infection précédente +ReinfectionDetailGroup.REINFECTION_EVALUATION = Plus d'informations sur l'évaluation de la réinfection +ReinfectionDetailGroup.PREVIOUS_INFECTION_COMPLETED = Infection précédente terminée + +ReinfectionStatus.CONFIRMED = Réinfection confirmée +ReinfectionStatus.PROBABLE = Réinfection probable +ReinfectionStatus.POSSIBLE = Réinfection possible + # Vaccine Vaccine.COMIRNATY=vaccin Pfizer-BioNTech COVID-19 Vaccine.MRNA_1273=Vaccin Moderna COVID-19 @@ -1934,6 +2093,7 @@ Vaccine.LC_16=LC-16 Vaccine.MVA_BN=JYNNEOS Vaccine.UNKNOWN=Inconnu Vaccine.OTHER=Autres + # VaccineManufacturer VaccineManufacturer.BIONTECH_PFIZER=BioNTech/Pfizer VaccineManufacturer.PFIZER=Pfizer @@ -1950,11 +2110,13 @@ VaccineManufacturer.ASTRA_ZENECA_MODERNA=AstraZeneca & Moderna VaccineManufacturer.VALNEVA=Valneva VaccineManufacturer.UNKNOWN=Inconnu VaccineManufacturer.OTHER=Autres + # InfectionPathCertainty InfectionPathCertainty.SUSPECT=Suspect InfectionPathCertainty.PROBABLE=Probable InfectionPathCertainty.CONFIRMED=Confirmé InfectionPathCertainty.UNKNOWN=Inconnu + # HumanTransmissionMode HumanTransmissionMode.FECAL_ORAL_SMEAR_INFECTION=Infection de Fecal-oral/frottis HumanTransmissionMode.PARENTERAL=parentéral @@ -1963,6 +2125,7 @@ HumanTransmissionMode.RESPIRATORY=Respiratoire HumanTransmissionMode.SEXUAL=Sexuel HumanTransmissionMode.CONNATAL=Connatal HumanTransmissionMode.OTHER=Autre + # ParenteralTransmissionMode ParenteralTransmissionMode.INTRAVENOUS_DRUG_USE=Consommation de drogues par voie intraveineuse ParenteralTransmissionMode.HOUSEHOLD_CONTACT=Contact familial @@ -1970,38 +2133,46 @@ ParenteralTransmissionMode.MEDICALLY_ASSOCIATED=Associé médicalement ParenteralTransmissionMode.TATTOOING_PIERCING=Tatouage/piercing ParenteralTransmissionMode.PEDICURE_MANICURE=Pédicure/manucure ParenteralTransmissionMode.OTHER=Autre + # MedicallyAssociatedTransmissionMode MedicallyAssociatedTransmissionMode.OPERATIVE_OR_DIAGNOSTIC_PROCEDURE=Procédure opératoire ou diagnostique MedicallyAssociatedTransmissionMode.BLOOD_PRODUCTS=Produits sanguins MedicallyAssociatedTransmissionMode.ORGAN_TRANSPLANTATION=Transplantation d'organes MedicallyAssociatedTransmissionMode.DIALYSIS=Dialyse MedicallyAssociatedTransmissionMode.INJECTION_FOR_MEDICAL_PURPOSES=Injection à des fins médicales + # ExternalShareDateType -ExternalShareDateType.LAST_EXTERNAL_SURVEILLANCE_TOOL_SHARE=Dernier partage avec l'outil de rapport +ExternalShareDateType.LAST_EXTERNAL_SURVEILLANCE_TOOL_SHARE = Dernier partage avec l'outil de rapport + # ExternalShareStatus ExternalShareStatus.SHARED=Partagé ExternalShareStatus.DELETED=Supprimé + # ExternalMessageStatus ExternalMessageStatus.UNPROCESSED=Non traité ExternalMessageStatus.PROCESSED=Traitement effectué ExternalMessageStatus.FORWARDED=Transféré ExternalMessageStatus.UNCLEAR=Non effacé + # ExternalMessageType ExternalMessageType.LAB_MESSAGE=Message de laboratoire ExternalMessageType.PHYSICIANS_REPORT=Rapport du médecin -ExternalMessageType.SURVEY_RESPONSE=Réponse à un sondage + # ShareRequestDataType -ShareRequestDataType.CASE=Cas -ShareRequestDataType.CONTACT=Contact -ShareRequestDataType.EVENT=Évènement +ShareRequestDataType.CASE = Cas +ShareRequestDataType.CONTACT = Contact +ShareRequestDataType.EVENT = Évènement + # ShareRequestStatus -ShareRequestStatus.PENDING=En attente -ShareRequestStatus.ACCEPTED=Accepté -ShareRequestStatus.REJECTED=Rejeté -ShareRequestStatus.REVOKED=Révoqué +ShareRequestStatus.PENDING = En attente +ShareRequestStatus.ACCEPTED = Accepté +ShareRequestStatus.REJECTED = Rejeté +ShareRequestStatus.REVOKED = Révoqué + # EventCriteriaDateType -EventCriteriaDateType.EVENT_DATE=Date de l'événement -EventCriteriaDateType.REPORT_DATE=Date du rapport +EventCriteriaDateType.EVENT_DATE = Date de l'événement +EventCriteriaDateType.REPORT_DATE = Date du rapport + #EpidemiologicalEvidenceDetail EpidemiologicalEvidenceDetail.STUDY=Étude EpidemiologicalEvidenceDetail.CASE_CONTROL_STUDY=Étude de contrôle de cas @@ -2016,6 +2187,7 @@ EpidemiologicalEvidenceDetail.DIRECT_OCCURENCE=Personne\: les cas étaient en co EpidemiologicalEvidenceDetail.SUSPICION=Suspicion EpidemiologicalEvidenceDetail.EXPRESSED_BY_DISEASED=Exprimé par la personne malade EpidemiologicalEvidenceDetail.EXPRESSED_BY_HEALTH_DEPARTMENT=Exprimé par le service de santé + #LaboratoryDiagnosticEvidenceDetail LaboratoryDiagnosticEvidenceDetail.VERIFICATION_OF_AT_LEAST_TWO_INFECTED=Vérification d'au moins deux personnes infectées ou malades LaboratoryDiagnosticEvidenceDetail.COMPLIANT_PATHOGEN_FINE_TYPING=Typage fin conforme de l'agent pathogène @@ -2024,116 +2196,131 @@ LaboratoryDiagnosticEvidenceDetail.IMPRESSION_TEST=Test d'impression LaboratoryDiagnosticEvidenceDetail.WATER_SAMPLE=Échantillon d'eau LaboratoryDiagnosticEvidenceDetail.OTHER=Autre LaboratoryDiagnosticEvidenceDetail.PATHOGEN_FINE_TYPING_COMPLIANT_WITH_CASE=Typage fin de l'agent pathogène cohérent avec l'un des cas + #ImmunizationStatus -ImmunizationStatus.PENDING=En attente -ImmunizationStatus.ACQUIRED=Acquis -ImmunizationStatus.NOT_ACQUIRED=Non acquis -ImmunizationStatus.EXPIRED=Expiré +ImmunizationStatus.PENDING = En attente +ImmunizationStatus.ACQUIRED = Acquis +ImmunizationStatus.NOT_ACQUIRED = Non acquis +ImmunizationStatus.EXPIRED = Expiré + #ImmunizationManagementStatus -ImmunizationManagementStatus.SCHEDULED=Planifié -ImmunizationManagementStatus.ONGOING=En cours -ImmunizationManagementStatus.COMPLETED=Terminé -ImmunizationManagementStatus.CANCELED=Annulé +ImmunizationManagementStatus.SCHEDULED = Planifié +ImmunizationManagementStatus.ONGOING = En cours +ImmunizationManagementStatus.COMPLETED = Terminé +ImmunizationManagementStatus.CANCELED = Annulé + #MeansOfImmunization -MeansOfImmunization.VACCINATION=Vaccination -MeansOfImmunization.RECOVERY=Récupération -MeansOfImmunization.VACCINATION_RECOVERY=Vaccination/Récupération -MeansOfImmunization.OTHER=Autres +MeansOfImmunization.VACCINATION = Vaccination +MeansOfImmunization.RECOVERY = Récupération +MeansOfImmunization.VACCINATION_RECOVERY = Vaccination/Récupération +MeansOfImmunization.OTHER = Autres + #EnumColumn -EnumColumn.TYPE=Type -EnumColumn.VALUE=Valeur -EnumColumn.CAPTION=Légende -EnumColumn.DESCRIPTION=Description -EnumColumn.SHORT=Courte +EnumColumn.TYPE = Type +EnumColumn.VALUE = Valeur +EnumColumn.CAPTION = Légende +EnumColumn.DESCRIPTION = Description +EnumColumn.SHORT = Courte + #NotificationType -NotificationType.CASE_CLASSIFICATION_CHANGED=Classification de cas modifiée -NotificationType.Desc.CASE_CLASSIFICATION_CHANGED=Envoyé à tous les utilisateurs associés à la région ou à la région responsable d'un cas. -NotificationType.CASE_INVESTIGATION_DONE=Enquête de cas effectuée -NotificationType.Desc.CASE_INVESTIGATION_DONE=Envoyé à tous les utilisateurs associés à la région ou à la région responsable d'un cas. -NotificationType.EVENT_PARTICIPANT_CASE_CLASSIFICATION_CONFIRMED=Confirmation de la classification des cas des participants à l'événement -NotificationType.Desc.EVENT_PARTICIPANT_CASE_CLASSIFICATION_CONFIRMED=Lorsqu'un dossier est défini sur une classification confirmée, celle-ci est envoyée à tous les utilisateurs responsables des événements actifs auxquels la personne du dossier a participé et qui ont eu lieu au plus tôt 30 jours avant la classification du dossier. -NotificationType.EVENT_PARTICIPANT_RELATED_TO_OTHER_EVENTS=Participant à l'événement lié à d'autres événements -NotificationType.Desc.EVENT_PARTICIPANT_RELATED_TO_OTHER_EVENTS=Lorsqu'un nouveau participant à un événement est créé, celui-ci est envoyé à tous les utilisateurs responsables des événements actifs auxquels la personne a également participé et qui ont eu lieu au plus tôt 30 jours auparavant. -NotificationType.CASE_LAB_RESULT_ARRIVED=Le résultat du laboratoire de cas est arrivé -NotificationType.Desc.CASE_LAB_RESULT_ARRIVED=Envoyé à tous les utilisateurs associés à la région ou à la région responsable d'un cas lorsqu'un résultat de test d'agent pathogène est entré ou modifié (non en attente). -NotificationType.CONTACT_LAB_RESULT_ARRIVED=Le résultat du laboratoire de contact est arrivé -NotificationType.Desc.CONTACT_LAB_RESULT_ARRIVED=Envoyé à tous les utilisateurs associés à la région d'un contact lorsqu'un résultat de test pathogène est saisi ou modifié (non en attente). Si le contact n'a pas de région, la région du cas source est utilisée. -NotificationType.EVENT_PARTICIPANT_LAB_RESULT_ARRIVED=Le résultat du laboratoire des participants à l'événement est arrivé -NotificationType.Desc.EVENT_PARTICIPANT_LAB_RESULT_ARRIVED=Envoyé à tous les utilisateurs associés à la région d'un participant à l'événement lorsqu'un résultat de test d'agent pathogène est saisi ou modifié (non en attente). -NotificationType.LAB_SAMPLE_SHIPPED=Échantillon de laboratoire expédié -NotificationType.Desc.LAB_SAMPLE_SHIPPED=Envoyé à tous les utilisateurs d'un laboratoire lorsqu'un échantillon de ce laboratoire est expédié. -NotificationType.CONTACT_SYMPTOMATIC=symptomatique du contact -NotificationType.Desc.CONTACT_SYMPTOMATIC=Envoyé à tous les utilisateurs associés à la région d'un contact lorsqu'une nouvelle visite symptomatique est créée et que le contact était auparavant asymptomatique. Si le contact n'a pas de région, la région du cas source est utilisée. -NotificationType.TASK_START=Démarrage de la tâche -NotificationType.Desc.TASK_START=Envoyé au destinataire d'une tâche et à tous les utilisateurs observateurs lorsque la date de début de la tâche se situe dans les 10 dernières minutes. -NotificationType.TASK_DUE=Tâche due -NotificationType.Desc.TASK_DUE=Envoyé au destinataire d'une tâche et à tous les utilisateurs observateurs lorsque la date d'échéance de la tâche se situe dans les 10 dernières minutes. -NotificationType.TASK_UPDATED_ASSIGNEE=Destinataire de la tâche mis à jour -NotificationType.Desc.TASK_UPDATED_ASSIGNEE=Envoyé à l'ancien et au nouveau destinataire d'une tâche. -NotificationType.CONTACT_VISIT_COMPLETED=Visite de contact terminée -NotificationType.Desc.CONTACT_VISIT_COMPLETED=Envoyé à tous les utilisateurs associés à la région d'un contact et à tous les utilisateurs observateurs lorsqu'une tâche "Suivi de contact" est terminée. Si le contact n'a pas de région, la région du cas source est utilisée. -NotificationType.CASE_DISEASE_CHANGED=Maladie de cas modifiée -NotificationType.Desc.CASE_DISEASE_CHANGED=Envoyé à tous les utilisateurs associés à la région ou à la région responsable d'un cas lorsque la maladie était précédemment définie sur "VHF non spécifiée". -NotificationType.EVENT_GROUP_CREATED=Groupe d'événements créé -NotificationType.Desc.EVENT_GROUP_CREATED=Envoyé à tous les utilisateurs responsables des événements qui font partie d'un groupe d'événements nouvellement créé. -NotificationType.EVENT_ADDED_TO_EVENT_GROUP=Événement ajouté au groupe d'événements -NotificationType.Desc.EVENT_ADDED_TO_EVENT_GROUP=Envoyé à tous les utilisateurs responsables des événements qui font partie du groupe d'événements modifié. -NotificationType.EVENT_REMOVED_FROM_EVENT_GROUP=Événement retiré du groupe d'événements -NotificationType.Desc.EVENT_REMOVED_FROM_EVENT_GROUP=Envoyé à tous les utilisateurs responsables de l'événement supprimé et des événements faisant partie du groupe d'événements modifié. +NotificationType.CASE_CLASSIFICATION_CHANGED = Classification de cas modifiée +NotificationType.Desc.CASE_CLASSIFICATION_CHANGED = Envoyé à tous les utilisateurs associés à la région ou à la région responsable d'un cas. +NotificationType.CASE_INVESTIGATION_DONE = Enquête de cas effectuée +NotificationType.Desc.CASE_INVESTIGATION_DONE = Envoyé à tous les utilisateurs associés à la région ou à la région responsable d'un cas. +NotificationType.EVENT_PARTICIPANT_CASE_CLASSIFICATION_CONFIRMED = Confirmation de la classification des cas des participants à l'événement +NotificationType.Desc.EVENT_PARTICIPANT_CASE_CLASSIFICATION_CONFIRMED = Lorsqu'un dossier est défini sur une classification confirmée, celle-ci est envoyée à tous les utilisateurs responsables des événements actifs auxquels la personne du dossier a participé et qui ont eu lieu au plus tôt 30 jours avant la classification du dossier. +NotificationType.EVENT_PARTICIPANT_RELATED_TO_OTHER_EVENTS = Participant à l'événement lié à d'autres événements +NotificationType.Desc.EVENT_PARTICIPANT_RELATED_TO_OTHER_EVENTS = Lorsqu'un nouveau participant à un événement est créé, celui-ci est envoyé à tous les utilisateurs responsables des événements actifs auxquels la personne a également participé et qui ont eu lieu au plus tôt 30 jours auparavant. +NotificationType.CASE_LAB_RESULT_ARRIVED = Le résultat du laboratoire de cas est arrivé +NotificationType.Desc.CASE_LAB_RESULT_ARRIVED = Envoyé à tous les utilisateurs associés à la région ou à la région responsable d'un cas lorsqu'un résultat de test d'agent pathogène est entré ou modifié (non en attente). +NotificationType.CONTACT_LAB_RESULT_ARRIVED = Le résultat du laboratoire de contact est arrivé +NotificationType.Desc.CONTACT_LAB_RESULT_ARRIVED = Envoyé à tous les utilisateurs associés à la région d'un contact lorsqu'un résultat de test pathogène est saisi ou modifié (non en attente). Si le contact n'a pas de région, la région du cas source est utilisée. +NotificationType.EVENT_PARTICIPANT_LAB_RESULT_ARRIVED = Le résultat du laboratoire des participants à l'événement est arrivé +NotificationType.Desc.EVENT_PARTICIPANT_LAB_RESULT_ARRIVED = Envoyé à tous les utilisateurs associés à la région d'un participant à l'événement lorsqu'un résultat de test d'agent pathogène est saisi ou modifié (non en attente). +NotificationType.LAB_SAMPLE_SHIPPED = Échantillon de laboratoire expédié +NotificationType.Desc.LAB_SAMPLE_SHIPPED = Envoyé à tous les utilisateurs d'un laboratoire lorsqu'un échantillon de ce laboratoire est expédié. +NotificationType.CONTACT_SYMPTOMATIC = symptomatique du contact +NotificationType.Desc.CONTACT_SYMPTOMATIC = Envoyé à tous les utilisateurs associés à la région d'un contact lorsqu'une nouvelle visite symptomatique est créée et que le contact était auparavant asymptomatique. Si le contact n'a pas de région, la région du cas source est utilisée. +NotificationType.TASK_START= Démarrage de la tâche +NotificationType.Desc.TASK_START= Envoyé au destinataire d'une tâche et à tous les utilisateurs observateurs lorsque la date de début de la tâche se situe dans les 10 dernières minutes. +NotificationType.TASK_DUE = Tâche due +NotificationType.Desc.TASK_DUE = Envoyé au destinataire d'une tâche et à tous les utilisateurs observateurs lorsque la date d'échéance de la tâche se situe dans les 10 dernières minutes. +NotificationType.TASK_UPDATED_ASSIGNEE = Destinataire de la tâche mis à jour +NotificationType.Desc.TASK_UPDATED_ASSIGNEE = Envoyé à l'ancien et au nouveau destinataire d'une tâche. +NotificationType.CONTACT_VISIT_COMPLETED = Visite de contact terminée +NotificationType.Desc.CONTACT_VISIT_COMPLETED = Envoyé à tous les utilisateurs associés à la région d'un contact et à tous les utilisateurs observateurs lorsqu'une tâche "Suivi de contact" est terminée. Si le contact n'a pas de région, la région du cas source est utilisée. +NotificationType.CASE_DISEASE_CHANGED = Maladie de cas modifiée +NotificationType.Desc.CASE_DISEASE_CHANGED = Envoyé à tous les utilisateurs associés à la région ou à la région responsable d'un cas lorsque la maladie était précédemment définie sur "VHF non spécifiée". +NotificationType.EVENT_GROUP_CREATED = Groupe d'événements créé +NotificationType.Desc.EVENT_GROUP_CREATED = Envoyé à tous les utilisateurs responsables des événements qui font partie d'un groupe d'événements nouvellement créé. +NotificationType.EVENT_ADDED_TO_EVENT_GROUP = Événement ajouté au groupe d'événements +NotificationType.Desc.EVENT_ADDED_TO_EVENT_GROUP = Envoyé à tous les utilisateurs responsables des événements qui font partie du groupe d'événements modifié. +NotificationType.EVENT_REMOVED_FROM_EVENT_GROUP = Événement retiré du groupe d'événements +NotificationType.Desc.EVENT_REMOVED_FROM_EVENT_GROUP = Envoyé à tous les utilisateurs responsables de l'événement supprimé et des événements faisant partie du groupe d'événements modifié. + #NotificationTypeGroup -NotificationTypeGroup.CASES=Cas -NotificationTypeGroup.CONTACTS=Contacts -NotificationTypeGroup.EVENTS=Évènements -NotificationTypeGroup.SAMPLES=Échantillons -NotificationTypeGroup.TASKS=Tâches +NotificationTypeGroup.CASES = Cas +NotificationTypeGroup.CONTACTS = Contacts +NotificationTypeGroup.EVENTS = Évènements +NotificationTypeGroup.SAMPLES = Échantillons +NotificationTypeGroup.TASKS = Tâches + #S2SOwnershipStatusFilter S2SOwnershipStatusFilter.OWNED=Avec la propriété S2SOwnershipStatusFilter.NOT_OWNED=Pour voir S2SOwnershipStatusFilter.ALL=Tout + #ShareRequestViewType ShareRequestViewType.INCOMING=Entrant ShareRequestViewType.OUTGOING=Sortant + # SampleDashboardFilterDateType SampleDashboardFilterDateType.SAMPLE_DATE_TIME=Date à laquelle l'échantillon a été prélevé SampleDashboardFilterDateType.ASSOCIATED_ENTITY_REPORT_DATE=Date du rapport de l'entité associée SampleDashboardFilterDateType.MOST_RELEVANT=La date la plus récente + #SampleDashboardCustomDiseaseFilter -SampleDashboardCustomDiseaseFilter.NO_DISEASE=Aucune maladie +SampleDashboardCustomDiseaseFilter.NO_DISEASE = Aucune maladie + #SampleShipmentStatus SampleShipmentStatus.SHIPPED=Shipped SampleShipmentStatus.NOT_SHIPPED=Not shipped SampleShipmentStatus.RECEIVED=Received + #Pathogen Customizable enum -Pathogen.CAMPYLOBACTER_JEJUNI=Campylobacter jejuni -Pathogen.ESCHERICHIA_COLI=Escherichia coli -Pathogen.SALMONELLA_SPP=Salmonella spp. -Pathogen.SHIGELLA_SPP=Shigella spp. -Pathogen.VIBRIO_CHOLERAE=Vibrio cholerae -Pathogen.YERSINIA_SPP=Yersinia spp. -Pathogen.SARS_COV_2=SARS-CoV-2 -Pathogen.ADENOVIRUS=Adenovirus -Pathogen.ASTROVIRUS=Astrovirus -Pathogen.COXSACKIE_VIRUS=Coxsackie virus -Pathogen.ECHOVIRUS=Echovirus -Pathogen.HEPATITIS_A_VIRUS=Hepatitis A virus -Pathogen.HEPATITIS_E_VIRUS=Hepatitis E virus -Pathogen.HUMAN_CALICIVIRUS=Human calicivirus -Pathogen.POLIO_VIRUS=Polio virus 2 -Pathogen.REOVIRUS=Reovirus -Pathogen.ROTAVIRUS=Rotavirus -Pathogen.TT_HEPATITIS=TT hepatitis -Pathogen.OTHER=Other +Pathogen.CAMPYLOBACTER_JEJUNI = Campylobacter jejuni +Pathogen.ESCHERICHIA_COLI = Escherichia coli +Pathogen.SALMONELLA_SPP = Salmonella spp. +Pathogen.SHIGELLA_SPP = Shigella spp. +Pathogen.VIBRIO_CHOLERAE = Vibrio cholerae +Pathogen.YERSINIA_SPP = Yersinia spp. +Pathogen.SARS_COV_2 = SARS-CoV-2 +Pathogen.ADENOVIRUS = Adenovirus +Pathogen.ASTROVIRUS = Astrovirus +Pathogen.COXSACKIE_VIRUS = Coxsackie virus +Pathogen.ECHOVIRUS = Echovirus +Pathogen.HEPATITIS_A_VIRUS = Hepatitis A virus +Pathogen.HEPATITIS_E_VIRUS = Hepatitis E virus +Pathogen.HUMAN_CALICIVIRUS = Human calicivirus +Pathogen.POLIO_VIRUS = Polio virus 2 +Pathogen.REOVIRUS = Reovirus +Pathogen.ROTAVIRUS = Rotavirus +Pathogen.TT_HEPATITIS = TT hepatitis +Pathogen.OTHER = Other + # EnvironmentSampleMaterial -EnvironmentSampleMaterial.WATER=Water -EnvironmentSampleMaterial.SOIL=Soil -EnvironmentSampleMaterial.AIR=Air -EnvironmentSampleMaterial.VECTORS=Vectors -EnvironmentSampleMaterial.OTHER=Other +EnvironmentSampleMaterial.WATER = Water +EnvironmentSampleMaterial.SOIL = Soil +EnvironmentSampleMaterial.AIR = Air +EnvironmentSampleMaterial.VECTORS = Vectors +EnvironmentSampleMaterial.OTHER = Other + # WeatherCondition -WeatherCondition.SUNNY=Sunny -WeatherCondition.CLOUDY=Cloudy -WeatherCondition.RAINING=Raining -WeatherCondition.WINDY=Windy +WeatherCondition.SUNNY = Sunny +WeatherCondition.CLOUDY = Cloudy +WeatherCondition.RAINING = Raining +WeatherCondition.WINDY = Windy + #Pathogen Customizable enum # SelfReportType SelfReportType.CASE=Case @@ -2146,15 +2333,18 @@ SelfReportInvestigationStatus.REJECTED=Rejected # SelfReportProcessingStatus SelfReportProcessingStatus.UNPROCESSED=Unprocessed SelfReportProcessingStatus.PROCESSED=Processed + # AefiAgeGroup -AefiAgeGroup.ZERO_TO_ONE=0 < 1 year -AefiAgeGroup.ONE_TO_FIVE=1- 5 years -AefiAgeGroup.FIVE_TO_EIGHTEEN=> 5 years - 18 years -AefiAgeGroup.EIGHTEEN_TO_SIXTY=> 18 years - 60 years -AefiAgeGroup.SIXY_AND_ABOVE=> 60 years +AefiAgeGroup.ZERO_TO_ONE = 0 < 1 year +AefiAgeGroup.ONE_TO_FIVE = 1- 5 years +AefiAgeGroup.FIVE_TO_EIGHTEEN = > 5 years - 18 years +AefiAgeGroup.EIGHTEEN_TO_SIXTY = > 18 years - 60 years +AefiAgeGroup.SIXY_AND_ABOVE = > 60 years + # SeizureType SeizureType.FEBRILE=Febrile SeizureType.AFEBRILE=Afebrile + # SeriousAefiReason SeriousAefiReason.DEATH=Death SeriousAefiReason.LIFE_THREATENING=Life threatening @@ -2162,6 +2352,7 @@ SeriousAefiReason.DISABILITY=Disability SeriousAefiReason.HOSPITALIZATION=Hospitalization SeriousAefiReason.CONGENITAL_ANOMALY=Congenital anomaly SeriousAefiReason.OTHER=Other + # AefiOutcome AefiOutcome.RECOVERING=Recovering AefiOutcome.RECOVERED=Recovered @@ -2169,84 +2360,104 @@ AefiOutcome.RECOVERED_WITH_SEQUELAE=Recovered with sequelae AefiOutcome.NOT_RECOVERED=Not Recovered AefiOutcome.UNKNOWN=Unknown AefiOutcome.DIED=Died + # AefiType AefiType.SERIOUS=Serious AefiType.NON_SERIOUS=Non-serious + # AefiDateType AefiDateType.REPORT_DATE=Date of report AefiDateType.START_DATE=Date of onset AefiDateType.VACCINATION_DATE=Date of vaccination + # AefiDashboardFilterDateType AefiDashboardFilterDateType.REPORT_DATE=Date of report AefiDashboardFilterDateType.START_DATE=Date of onset + # AefiInvestigationDateType AefiInvestigationDateType.REPORT_DATE=Date of report AefiInvestigationDateType.INVESTIGATION_DATE=Date of investigation AefiInvestigationDateType.VACCINATION_DATE=Date of vaccination + # PlaceOfVaccination PlaceOfVaccination.GOVERNMENT_HEALTH_FACILITY=Government health facility PlaceOfVaccination.PRIVATE_HEALTH_FACILITY=Private health facility PlaceOfVaccination.OTHER=Other + # VaccinationActivity VaccinationActivity.CAMPAIGN=Campaign VaccinationActivity.ROUTINE=Routine VaccinationActivity.OTHER=Other + # AefiInvestigationStage AefiInvestigationStage.FIRST=First AefiInvestigationStage.INTERIM=Interim AefiInvestigationStage.FINAL=Final + # VaccinationSite VaccinationSite.FIXED=Fixed VaccinationSite.MOBILE=Mobile VaccinationSite.OUTREACH=Outreach VaccinationSite.OTHER=Other + # PatientStatusAtAefiInvestigation PatientStatusAtAefiInvestigation.DIED=Died PatientStatusAtAefiInvestigation.DISABLED=Disabled PatientStatusAtAefiInvestigation.RECOVERED=Recovering PatientStatusAtAefiInvestigation.RECOVERED_COMPLETELY=Recovered completely PatientStatusAtAefiInvestigation.UNKNOWN=Unknown + # BirthTerm BirthTerm.FULL_TERM=Full-term BirthTerm.PRE_TERM=Pre-term BirthTerm.POST_TERM=Post-term + # DeliveryProcedure DeliveryProcedure.NORMAL=Normal DeliveryProcedure.CAESAREAN=Caesarean DeliveryProcedure.ASSISTED=Assisted (forceps, vacuum etc.) DeliveryProcedure.WITH_COMPLICATION=with complication + # SeriousAefiInfoSource SeriousAefiInfoSource.EXAMINATION=Examination by the investigator SeriousAefiInfoSource.DOCUMENTS=Documents SeriousAefiInfoSource.VERBAL_AUTOPSY=Verbal autopsy SeriousAefiInfoSource.OTHER=Other + # AefiImmunizationPeriod AefiImmunizationPeriod.WITHIN_FIRST_VACCINATIONS=Within the first vaccinations of the session AefiImmunizationPeriod.WITHIN_LAST_VACCINATIONS=Within the last vaccinations of the session AefiImmunizationPeriod.UNKNOWN=Unknown + # AefiVaccinationPeriod AefiVaccinationPeriod.WITHIN_FIRST_FEW_DOSES=Within the first few doses of the vial administered AefiVaccinationPeriod.WITHIN_LAST_DOSES=Within the last doses of the vial administered AefiVaccinationPeriod.UNKNOWN=Unknown + # SyringeType SyringeType.GLASS=Glass SyringeType.DISPOSABLE=Disposable SyringeType.RECYCLED_DISPOSABLE=Recycled disposable SyringeType.OTHER=Other + # VaccineCarrier VaccineCarrier.SHORT_RANGE=Short range VaccineCarrier.LONG_RANGE=Long range VaccineCarrier.OTHER=Other + # AefiInvestigationStatus AefiInvestigationStatus.DONE=Done AefiInvestigationStatus.DISCARDED=Discarded + # AefiCausality AefiCausality.CONFIRMED=Confirmed AefiCausality.INCONCLUSIVE=Inconclusive + # AefiClassification AefiClassification.RELATED_TO_VACCINE_OR_VACCINATION=Related to vaccine or vaccination AefiClassification.COINCIDENTAL_ADVERSE_EVENT=Coincidental adverse event AefiClassification.UNDETERMINED=Undetermined + # AefiClassificationSubType AefiClassificationSubType.VACCINE_PRODUCT_RELATED=Vaccine product related AefiClassificationSubType.VACCINE_QUALITY_DEFECT_RELATED=Vaccine quality defect related diff --git a/sormas-api/src/main/resources/strings.properties b/sormas-api/src/main/resources/strings.properties index f5ead3ec8c5..805ccd3d66f 100644 --- a/sormas-api/src/main/resources/strings.properties +++ b/sormas-api/src/main/resources/strings.properties @@ -15,219 +15,224 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . ############################################################################### + # Any text presented to the user that is not a caption or can be used in # various places (e.g. as part of a larger text or caption) + # General Strings -active=Active -address=Address -all=All -and=and -at=at -between=between -bpm=bpm -by=by -comparedTo=compared to %s -disabled=Disabled -done=Done -edit=Edit -enabled=Enabled -epiWeek=Epi Week -fileName=File Name -forCase=for case -forContact=for contact -forEventParticipant=for event participant -forEnvironment=for environment -inactive=Inactive -inColumn=in column -lastTwoDays=last two days -lastTwoWeeks=last two weeks -lastTwoYears=last two years -lastWeek=last week -lastYear=last year -mmhg=mmHg -no=No -notAnswered=Not answered -of=of -on=on -or=or -pathogenTestDeletedDuringLabMessageConversion=Pathogen test has been deleted during the conversion process of the associated lab message; -pleaseSpecify=Please specify -previousPeriod=previous period -quarantineEnd=Quarantine ends at the end of follow-up -quarterShort=Q -reportedBy=Reported By -reportedOn=Reported on -reportingUser=Reporting user: -step=Step -setTo=Set to -toCase=to case -notSpecified=Not specified -week=Week -weekShort=Wk -year=Year -years=years -yes=Yes -yesterday=yesterday -none=None -total=Total -until=until -min=Min -max=Max -average=Average -month=Month -day=Day -text=Text -number=Number -date=Date -nameOf=Name of %s -uuidOf=UUID of %s -listOf=List of %s -mapOf=Map of <%s , %s> -warning=Warning -notApplicable=Not applicable +active = Active +address = Address +all = All +and = and +at = at +between = between +bpm = bpm +by = by +comparedTo = compared to %s +disabled = Disabled +done = Done +edit = Edit +enabled = Enabled +epiWeek = Epi Week +fileName = File Name +forCase = for case +forContact = for contact +forEventParticipant = for event participant +forEnvironment = for environment +inactive = Inactive +inColumn = in column +lastTwoDays = last two days +lastTwoWeeks = last two weeks +lastTwoYears = last two years +lastWeek = last week +lastYear = last year +mmhg = mmHg +no = No +notAnswered = Not answered +of = of +on = on +or = or +pathogenTestDeletedDuringLabMessageConversion = Pathogen test has been deleted during the conversion process of the associated lab message; +pleaseSpecify = Please specify +previousPeriod = previous period +quarantineEnd = Quarantine ends at the end of follow-up +quarterShort = Q +reportedBy = Reported By +reportedOn = Reported on +reportingUser = Reporting user: +step = Step +setTo = Set to +toCase = to case +notSpecified = Not specified +week = Week +weekShort = Wk +year = Year +years = years +yes = Yes +yesterday = yesterday +none = None +total = Total +until = until +min = Min +max = Max +average = Average +month = Month +day = Day +text = Text +number = Number +date = Date +nameOf = Name of %s +uuidOf = UUID of %s +listOf = List of %s +mapOf = Map of <%s , %s> +warning = Warning +notApplicable = Not applicable + # Aggregate Report -aggregateReportLegend=%s = %s; %s = %s; %s = %s +aggregateReportLegend = %s = %s; %s = %s; %s = %s + # Classification -classificationAllOf=all of -classificationClassificationRules=SORMAS Case Classification Rules -classificationConfirmed=Confirmed Classification -classificationConfirmedNoSymptoms=Confirmed Classification - No symptoms -classificationConfirmedUnknownSymptoms=Confirmed Classification - Unknown symptoms -classificationCriteriaForTestType=for test type -classificationCriteriaForExposureType=for exposure type -classificationCriteriaRestrictedToExposureType=Exposure to -classificationDaysBeforeCaseStart=days before symptom onset/case report date -classificationEventCluster=Case linked to a cluster event -classificationForDisease=for -classificationGeneratedFor=Generated for SORMAS -classificationInfoText=... when the case meets the following requirements:
-classificationInfoNumberText=... when the case meets %s of the following requirements:
-classificationNoneOf=none of -classificationNotWithin=not within -classificationOneNegativeTestResult=One negative lab result -classificationOneOf=one of -classificationOnePositiveTestResult=One positive lab result of -classificationOneOtherPositiveTestResult=One other positive lab result -classificationPersonAged=Person aged -classificationNotACase=Not a case Classification -classificationProbable=Probable Classification -classificationRulesFor=Classification Rules For -classificationSymptomsAllOf=All symptoms -classificationSymptomsAnyOf=Any symptom -classificationSuspect=Possible Classification -classificationYearsOrLess=years or less -classificationYearsOrMore=years or more -classificationLastVaccinationDateWithin=Last vaccination date within +classificationAllOf = all of +classificationClassificationRules = SORMAS Case Classification Rules +classificationConfirmed = Confirmed Classification +classificationConfirmedNoSymptoms = Confirmed Classification - No symptoms +classificationConfirmedUnknownSymptoms = Confirmed Classification - Unknown symptoms +classificationCriteriaForTestType = for test type +classificationCriteriaForExposureType = for exposure type +classificationCriteriaRestrictedToExposureType = Exposure to +classificationDaysBeforeCaseStart = days before symptom onset/case report date +classificationEventCluster = Case linked to a cluster event +classificationForDisease = for +classificationGeneratedFor = Generated for SORMAS +classificationInfoText = ... when the case meets the following requirements:
+classificationInfoNumberText = ... when the case meets %s of the following requirements:
+classificationNoneOf = none of +classificationNotWithin = not within +classificationOneNegativeTestResult = One negative lab result +classificationOneOf = one of +classificationOnePositiveTestResult = One positive lab result of +classificationOneOtherPositiveTestResult = One other positive lab result +classificationPersonAged = Person aged +classificationNotACase = Not a case Classification +classificationProbable = Probable Classification +classificationRulesFor = Classification Rules For +classificationSymptomsAllOf = All symptoms +classificationSymptomsAnyOf = Any symptom +classificationSuspect = Possible Classification +classificationYearsOrLess = years or less +classificationYearsOrMore = years or more +classificationLastVaccinationDateWithin = Last vaccination date within + # Confirmation -close=Close -confirmationAlsoAdjustQuarantine=You have extended the follow-up. Should the end of the quarantine be adjusted accordingly? -confirmationArchiveCampaign=Are you sure you want to archive this campaign? This will not remove it from the system or any statistics, but only hide it from the normal campaign directory. -confirmationArchiveCase=Are you sure you want to archive this case? This will not remove it from the system or any statistics, but only hide it from the normal case directory. -confirmationArchiveCaseWithContacts=Archive related contacts along with the archived case -confirmationDearchiveCaseWithContacts=Dearchive related contacts along with the dearchived case -confirmationArchiveCases=Are you sure you want to archive all %d selected cases? -confirmationArchiveContact=Are you sure you want to archive this contact? This will not remove it from the system or any statistics, but only hide it from the normal contact directory. -confirmationArchiveContacts=Are you sure you want to archive all %d selected contacts? -confirmationArchiveEnvironment=Are you sure you want to archive this environment? This will not remove it from the system or any statistics, but only hide it from the normal environment directory. -confirmationArchiveEnvironments=Are you sure you want to archive all %d selected environments? -confirmationArchiveEvent=Are you sure you want to archive this event? This will not remove it from the system or any statistics, but only hide it from the normal event directory. -confirmationArchiveEvents=Are you sure you want to archive all %d selected events? -confirmationArchiveEventParticipant=Are you sure you want to archive this event participant? This will not remove it from the system or any statistics, but only hide it from the list of event participants. -confirmationArchiveImmunization=Are you sure you want to archive this immunization? This will not remove it from the system or any statistics, but only hide it from the normal immunization directory. -confirmationArchiveAdverseEvent=Are you sure you want to archive this adverse event? This will not remove it from the system or any statistics, but only hide it from the normal adverse events directory. -confirmationArchiveAdverseEventInvestigation=Are you sure you want to archive this adverse event investigation? This will not remove it from the system or any statistics, but only hide it from the normal adverse events investigation directory. -confirmationArchiveTask=Are you sure you want to archive this task? This will not remove it from the system or any statistics, but only hide it from the normal task management. -confirmationArchiveTasks=Are you sure you want to archive all %d selected tasks? -confirmationArchiveTravelEntry=Are you sure you want to archive this travel entry? This will not remove it from the system or any statistics, but only hide it from the normal travel entry directory. -confirmationArchiveEventGroup=Are you sure you want to archive this event group? This will not remove it from the system or any statistics, but only hide it from the normal event group directory. -confirmationCancelFollowUp=Are you sure you want to cancel the follow-up of all %d selected contacts? -confirmationChangeCaseDisease=Really change case disease? -confirmationDearchiveCampaign=Are you sure you want to de-archive this campaign? This will make it appear in the normal campaign directory again. -confirmationDearchiveCase=Are you sure you want to de-archive this case? This will make it appear in the normal case directory again. -confirmationDearchiveCases=Are you sure you want to de-archive all %d selected cases? -confirmationDearchiveContact=Are you sure you want to de-archive this contact? This will make it appear in the normal contact directory again. -confirmationDearchiveContacts=Are you sure you want to de-archive all %d selected contacts? -confirmationDearchiveEnvironment=Are you sure you want to de-archive this environment? This will make it appear in the normal environment directory again. -confirmationDearchiveEnvironments=Are you sure you want to de-archive all %d selected environments? -confirmationDearchiveEvent=Are you sure you want to de-archive this event? This will make it appear in the normal event directory again. -confirmationDearchiveEvents=Are you sure you want to de-archive all %d selected events? -confirmationDearchiveEventParticipant=Are you sure you want to de-archive this event participant? This will make it appear in the normal event participant list again. -confirmationDearchiveEventGroup=Are you sure you want to de-archive this event group? This will make it appear in the normal event group directory again. -confirmationDeleteCases=Are you sure you want to delete all %d selected cases?

If referenced by other data in the system, those references will be removed, which cannot be automatically undone. -confirmationDeleteContacts=Are you sure you want to delete all %d selected contacts?

If referenced by other data in the system, those references will be removed, which cannot be automatically undone. -confirmationDeleteEntities=Are you sure you want to delete all %d selected %s?

If referenced by other data in the system, those references will be removed, which cannot be automatically undone. -confirmationRestoreEntities=Are you sure you want to restore all %d selected %s? -confirmationDeleteEntity=Are you sure you want to delete this %s?

If referenced by other data in the system, those references will be removed, which cannot be automatically undone. -confirmationDeleteEntityWithDetails=Are you sure you want to delete this %s?
%s
If referenced by other data in the system, those references will be removed, which cannot be automatically undone. -confirmationDeleteEventParticipants=Are you sure you want to delete all %d selected event participants?

If referenced by other data in the system, those references will be removed, which cannot be automatically undone. -confirmationDeleteEvents=Are you sure you want to delete all %d selected events?

If referenced by other data in the system, those references will be removed, which cannot be automatically undone. -confirmationDeleteTravelEntries=Are you sure you want to delete all %d selected travel entries?

If referenced by other data in the system, those references will be removed, which cannot be automatically undone. -confirmationDeleteFile=Are you sure you want to delete "%s"? -confirmationDeletePathogenTests=Are you sure you want to delete all %d selected pathogen tests? If referenced by other data in the system, those references will be removed, which cannot be automatically undone. -confirmationDeletePrescriptions=Are you sure you want to delete all %d selected prescriptions? -confirmationDeleteSamples=Are you sure you want to delete all %d selected samples? If referenced by other data in the system, those references will be removed, which cannot be automatically undone. -confirmationDeleteTasks=Are you sure you want to delete all %d selected tasks? -confirmationDeleteTreatments=Are you sure you want to delete all %d selected treatments? -confirmationDeleteVisits=Are you sure you want to delete all %d selected visits? -confirmationDeletePrescriptionWithTreatment=The prescriptions you want to delete are linked to treatments. Do you want to delete the prescriptions alone or together with the linked treatments? -confirmationDeleteUserRole=Are you sure you want to remove this user role, used by %d users? -confirmationLostToFollowUp=Are you sure you want to set the follow-up of all %d selected contacts to lost to follow-up? -confirmationPickCaseAndDeleteOther=Are you sure that the case you did not select is a duplicate of this case? The case you did not select and all contacts, samples, tasks and other data linked to it will be deleted. -confirmationPickContactAndDeleteOther=Are you sure that the contact you did not select is a duplicate of this contact? The contact you did not select and all samples, tasks and other data linked to it will be deleted. -confirmationMergeCaseAndDeleteOther=Are you sure that the case you did not select is a duplicate of this case? The case you selected will be updated with information from the case you did not select, and the latter will then be deleted. -confirmationMergeContactAndDeleteOther=Are you sure that the contact you did not select is a duplicate of this contact? The contact you selected will be updated with information from the contact you did not select, and the latter will then be deleted. -confirmationUpdateCompleteness=Are you sure you want to update the completeness values of all cases in the list? This might take some time. -confirmationEnterBulkEditMode=There are currently more than %d items in the list. It is recommended to use some filters first because entering bulk edit mode with this many items might slow down your system. Do you still want to proceed? -confirmationDisableAllLineListingRegion=Are you sure you want to disable line listing for this disease? Line listing will be canceled for all districts. -confirmationDisableAllLineListingNational=Are you sure you want to disable line listing for this disease? Line listing will be canceled for all districts in all regions. -confirmationArchiveArea=Are you sure you want to archive this area? -confirmationDearchiveArea=Are you sure you want to de-archive this area? -confirmationArchiveContinent=Are you sure you want to archive this continent? -confirmationDearchiveContinent=Are you sure you want to de-archive this continent? -confirmationArchiveSubcontinent=Are you sure you want to archive this subcontinent? -confirmationDearchiveSubcontinent=Are you sure you want to de-archive this subcontinent? -confirmationArchiveCountry=Are you sure you want to archive this country? -confirmationDearchiveCountry=Are you sure you want to de-archive this country? -confirmationArchiveRegion=Are you sure you want to archive this region? -confirmationDearchiveRegion=Are you sure you want to de-archive this region? -confirmationArchiveDistrict=Are you sure you want to archive this district? -confirmationDearchiveDistrict=Are you sure you want to de-archive this district? -confirmationArchiveCommunity=Are you sure you want to archive this community? -confirmationDearchiveCommunity=Are you sure you want to de-archive this community? -confirmationArchiveFacility=Are you sure you want to archive this facility? -confirmationDearchiveFacility=Are you sure you want to de-archive this facility? -confirmationArchiveLaboratory=Are you sure you want to archive this laboratory? -confirmationDearchiveLaboratory=Are you sure you want to de-archive this laboratory? -confirmationArchivePointOfEntry=Are you sure you want to archive this point of entry? -confirmationDearchivePointOfEntry=Are you sure you want to de-archive this point of entry? -confirmationArchiveAreas=Are you sure you want to archive all %d selected areas? -confirmationDearchiveAreas=Are you sure you want to de-archive all %d selected areas? -confirmationArchiveContinents=Are you sure you want to archive all %d selected continents? -confirmationDearchiveContinents=Are you sure you want to de-archive all %d selected continents? -confirmationArchiveSubcontinents=Are you sure you want to archive all %d selected subcontinents? -confirmationDearchiveSubcontinents=Are you sure you want to de-archive all %d selected subcontinents? -confirmationArchiveCountries=Are you sure you want to archive all %d selected countries? -confirmationDearchiveCountries=Are you sure you want to de-archive all %d selected countries? -confirmationArchiveRegions=Are you sure you want to archive all %d selected regions? -confirmationDearchiveRegions=Are you sure you want to de-archive all %d selected regions? -confirmationArchiveDistricts=Are you sure you want to archive all %d selected districts? -confirmationDearchiveDistricts=Are you sure you want to de-archive all %d selected districts? -confirmationArchiveCommunities=Are you sure you want to archive all %d selected communities? -confirmationDearchiveCommunities=Are you sure you want to de-archive all %d selected communities? -confirmationArchiveFacilities=Are you sure you want to archive all %d selected facilities? -confirmationDearchiveFacilities=Are you sure you want to de-archive all %d selected facilities? -confirmationDearchiveImmunization=Are you sure you want to de-archive this immunization? This will make it appear in the normal immunization directory again. -confirmationDearchiveAdverseEvent=Are you sure you want to de-archive this adverse event? This will make it appear in the normal adverse events directory again. -confirmationDearchiveAdverseEventInvestigation=Are you sure you want to de-archive this adverse event investigation? This will make it appear in the normal adverse events investigation directory again. -confirmationArchiveLaboratories=Are you sure you want to archive all %d selected laboratories? -confirmationDearchiveLaboratories=Are you sure you want to de-archive all %d selected laboratories? -confirmationDearchiveTask=Are you sure you want to de-archive this task? This will make it appear in the normal task directory again. -confirmationDearchiveTasks=Are you sure you want to de-archive all %d selected tasks? -confirmationDearchiveTravelEntry=Are you sure you want to de-archive this travel entry? This will make it appear in the normal travel entry directory again. -confirmationArchivePointsOfEntry=Are you sure you want to archive all %d selected points of entry? -confirmationDearchivePointsOfEntry=Are you sure you want to de-archive all %d selected points of entry? -confirmationContactSourceCaseDiscardUnsavedChanges=Changing or removing the source case of a contact will discard all unsaved changes you have made to the contact. Are you sure you want to continue? -confirmationRemoveUserAsOfficer=The user roles of this user have changed. Saving this user will remove it from any case or contact that they are assigned to as surveillance officer or contact officer. Do you still want to save the user? +close = Close +confirmationAlsoAdjustQuarantine = You have extended the follow-up. Should the end of the quarantine be adjusted accordingly? +confirmationArchiveCampaign = Are you sure you want to archive this campaign? This will not remove it from the system or any statistics, but only hide it from the normal campaign directory. +confirmationArchiveCase = Are you sure you want to archive this case? This will not remove it from the system or any statistics, but only hide it from the normal case directory. +confirmationArchiveCaseWithContacts = Archive related contacts along with the archived case +confirmationDearchiveCaseWithContacts = Dearchive related contacts along with the dearchived case +confirmationArchiveCases = Are you sure you want to archive all %d selected cases? +confirmationArchiveContact = Are you sure you want to archive this contact? This will not remove it from the system or any statistics, but only hide it from the normal contact directory. +confirmationArchiveContacts = Are you sure you want to archive all %d selected contacts? +confirmationArchiveEnvironment = Are you sure you want to archive this environment? This will not remove it from the system or any statistics, but only hide it from the normal environment directory. +confirmationArchiveEnvironments = Are you sure you want to archive all %d selected environments? +confirmationArchiveEvent = Are you sure you want to archive this event? This will not remove it from the system or any statistics, but only hide it from the normal event directory. +confirmationArchiveEvents = Are you sure you want to archive all %d selected events? +confirmationArchiveEventParticipant = Are you sure you want to archive this event participant? This will not remove it from the system or any statistics, but only hide it from the list of event participants. +confirmationArchiveImmunization = Are you sure you want to archive this immunization? This will not remove it from the system or any statistics, but only hide it from the normal immunization directory. +confirmationArchiveAdverseEvent = Are you sure you want to archive this adverse event? This will not remove it from the system or any statistics, but only hide it from the normal adverse events directory. +confirmationArchiveAdverseEventInvestigation = Are you sure you want to archive this adverse event investigation? This will not remove it from the system or any statistics, but only hide it from the normal adverse events investigation directory. +confirmationArchiveTask = Are you sure you want to archive this task? This will not remove it from the system or any statistics, but only hide it from the normal task management. +confirmationArchiveTasks = Are you sure you want to archive all %d selected tasks? +confirmationArchiveTravelEntry = Are you sure you want to archive this travel entry? This will not remove it from the system or any statistics, but only hide it from the normal travel entry directory. +confirmationArchiveEventGroup = Are you sure you want to archive this event group? This will not remove it from the system or any statistics, but only hide it from the normal event group directory. +confirmationCancelFollowUp = Are you sure you want to cancel the follow-up of all %d selected contacts? +confirmationChangeCaseDisease = Really change case disease? +confirmationDearchiveCampaign = Are you sure you want to de-archive this campaign? This will make it appear in the normal campaign directory again. +confirmationDearchiveCase = Are you sure you want to de-archive this case? This will make it appear in the normal case directory again. +confirmationDearchiveCases = Are you sure you want to de-archive all %d selected cases? +confirmationDearchiveContact = Are you sure you want to de-archive this contact? This will make it appear in the normal contact directory again. +confirmationDearchiveContacts = Are you sure you want to de-archive all %d selected contacts? +confirmationDearchiveEnvironment = Are you sure you want to de-archive this environment? This will make it appear in the normal environment directory again. +confirmationDearchiveEnvironments = Are you sure you want to de-archive all %d selected environments? +confirmationDearchiveEvent = Are you sure you want to de-archive this event? This will make it appear in the normal event directory again. +confirmationDearchiveEvents = Are you sure you want to de-archive all %d selected events? +confirmationDearchiveEventParticipant = Are you sure you want to de-archive this event participant? This will make it appear in the normal event participant list again. +confirmationDearchiveEventGroup = Are you sure you want to de-archive this event group? This will make it appear in the normal event group directory again. +confirmationDeleteCases = Are you sure you want to delete all %d selected cases?

If referenced by other data in the system, those references will be removed, which cannot be automatically undone. +confirmationDeleteContacts = Are you sure you want to delete all %d selected contacts?

If referenced by other data in the system, those references will be removed, which cannot be automatically undone. +confirmationDeleteEntities = Are you sure you want to delete all %d selected %s?

If referenced by other data in the system, those references will be removed, which cannot be automatically undone. +confirmationRestoreEntities = Are you sure you want to restore all %d selected %s? +confirmationDeleteEntity = Are you sure you want to delete this %s?

If referenced by other data in the system, those references will be removed, which cannot be automatically undone. +confirmationDeleteEntityWithDetails = Are you sure you want to delete this %s?
%s
If referenced by other data in the system, those references will be removed, which cannot be automatically undone. +confirmationDeleteEventParticipants = Are you sure you want to delete all %d selected event participants?

If referenced by other data in the system, those references will be removed, which cannot be automatically undone. +confirmationDeleteEvents = Are you sure you want to delete all %d selected events?

If referenced by other data in the system, those references will be removed, which cannot be automatically undone. +confirmationDeleteTravelEntries = Are you sure you want to delete all %d selected travel entries?

If referenced by other data in the system, those references will be removed, which cannot be automatically undone. +confirmationDeleteFile = Are you sure you want to delete "%s"? +confirmationDeletePathogenTests = Are you sure you want to delete all %d selected pathogen tests? If referenced by other data in the system, those references will be removed, which cannot be automatically undone. +confirmationDeletePrescriptions = Are you sure you want to delete all %d selected prescriptions? +confirmationDeleteSamples = Are you sure you want to delete all %d selected samples? If referenced by other data in the system, those references will be removed, which cannot be automatically undone. +confirmationDeleteTasks = Are you sure you want to delete all %d selected tasks? +confirmationDeleteTreatments = Are you sure you want to delete all %d selected treatments? +confirmationDeleteVisits = Are you sure you want to delete all %d selected visits? +confirmationDeletePrescriptionWithTreatment = The prescriptions you want to delete are linked to treatments. Do you want to delete the prescriptions alone or together with the linked treatments? +confirmationDeleteUserRole = Are you sure you want to remove this user role, used by %d users? +confirmationLostToFollowUp = Are you sure you want to set the follow-up of all %d selected contacts to lost to follow-up? +confirmationPickCaseAndDeleteOther = Are you sure that the case you did not select is a duplicate of this case? The case you did not select and all contacts, samples, tasks and other data linked to it will be deleted. +confirmationPickContactAndDeleteOther = Are you sure that the contact you did not select is a duplicate of this contact? The contact you did not select and all samples, tasks and other data linked to it will be deleted. +confirmationMergeCaseAndDeleteOther = Are you sure that the case you did not select is a duplicate of this case? The case you selected will be updated with information from the case you did not select, and the latter will then be deleted. +confirmationMergeContactAndDeleteOther = Are you sure that the contact you did not select is a duplicate of this contact? The contact you selected will be updated with information from the contact you did not select, and the latter will then be deleted. +confirmationUpdateCompleteness = Are you sure you want to update the completeness values of all cases in the list? This might take some time. +confirmationEnterBulkEditMode = There are currently more than %d items in the list. It is recommended to use some filters first because entering bulk edit mode with this many items might slow down your system. Do you still want to proceed? +confirmationDisableAllLineListingRegion = Are you sure you want to disable line listing for this disease? Line listing will be canceled for all districts. +confirmationDisableAllLineListingNational = Are you sure you want to disable line listing for this disease? Line listing will be canceled for all districts in all regions. +confirmationArchiveArea = Are you sure you want to archive this area? +confirmationDearchiveArea = Are you sure you want to de-archive this area? +confirmationArchiveContinent = Are you sure you want to archive this continent? +confirmationDearchiveContinent = Are you sure you want to de-archive this continent? +confirmationArchiveSubcontinent = Are you sure you want to archive this subcontinent? +confirmationDearchiveSubcontinent = Are you sure you want to de-archive this subcontinent? +confirmationArchiveCountry = Are you sure you want to archive this country? +confirmationDearchiveCountry = Are you sure you want to de-archive this country? +confirmationArchiveRegion = Are you sure you want to archive this region? +confirmationDearchiveRegion = Are you sure you want to de-archive this region? +confirmationArchiveDistrict = Are you sure you want to archive this district? +confirmationDearchiveDistrict = Are you sure you want to de-archive this district? +confirmationArchiveCommunity = Are you sure you want to archive this community? +confirmationDearchiveCommunity = Are you sure you want to de-archive this community? +confirmationArchiveFacility = Are you sure you want to archive this facility? +confirmationDearchiveFacility = Are you sure you want to de-archive this facility? +confirmationArchiveLaboratory = Are you sure you want to archive this laboratory? +confirmationDearchiveLaboratory = Are you sure you want to de-archive this laboratory? +confirmationArchivePointOfEntry = Are you sure you want to archive this point of entry? +confirmationDearchivePointOfEntry = Are you sure you want to de-archive this point of entry? +confirmationArchiveAreas = Are you sure you want to archive all %d selected areas? +confirmationDearchiveAreas = Are you sure you want to de-archive all %d selected areas? +confirmationArchiveContinents = Are you sure you want to archive all %d selected continents? +confirmationDearchiveContinents = Are you sure you want to de-archive all %d selected continents? +confirmationArchiveSubcontinents = Are you sure you want to archive all %d selected subcontinents? +confirmationDearchiveSubcontinents = Are you sure you want to de-archive all %d selected subcontinents? +confirmationArchiveCountries = Are you sure you want to archive all %d selected countries? +confirmationDearchiveCountries = Are you sure you want to de-archive all %d selected countries? +confirmationArchiveRegions = Are you sure you want to archive all %d selected regions? +confirmationDearchiveRegions = Are you sure you want to de-archive all %d selected regions? +confirmationArchiveDistricts = Are you sure you want to archive all %d selected districts? +confirmationDearchiveDistricts = Are you sure you want to de-archive all %d selected districts? +confirmationArchiveCommunities = Are you sure you want to archive all %d selected communities? +confirmationDearchiveCommunities = Are you sure you want to de-archive all %d selected communities? +confirmationArchiveFacilities = Are you sure you want to archive all %d selected facilities? +confirmationDearchiveFacilities = Are you sure you want to de-archive all %d selected facilities? +confirmationDearchiveImmunization = Are you sure you want to de-archive this immunization? This will make it appear in the normal immunization directory again. +confirmationDearchiveAdverseEvent = Are you sure you want to de-archive this adverse event? This will make it appear in the normal adverse events directory again. +confirmationDearchiveAdverseEventInvestigation = Are you sure you want to de-archive this adverse event investigation? This will make it appear in the normal adverse events investigation directory again. +confirmationArchiveLaboratories = Are you sure you want to archive all %d selected laboratories? +confirmationDearchiveLaboratories = Are you sure you want to de-archive all %d selected laboratories? +confirmationDearchiveTask = Are you sure you want to de-archive this task? This will make it appear in the normal task directory again. +confirmationDearchiveTasks = Are you sure you want to de-archive all %d selected tasks? +confirmationDearchiveTravelEntry = Are you sure you want to de-archive this travel entry? This will make it appear in the normal travel entry directory again. +confirmationArchivePointsOfEntry = Are you sure you want to archive all %d selected points of entry? +confirmationDearchivePointsOfEntry = Are you sure you want to de-archive all %d selected points of entry? +confirmationContactSourceCaseDiscardUnsavedChanges = Changing or removing the source case of a contact will discard all unsaved changes you have made to the contact. Are you sure you want to continue? +confirmationRemoveUserAsOfficer = The user roles of this user have changed. Saving this user will remove it from any case or contact that they are assigned to as surveillance officer or contact officer. Do you still want to save the user? confirmationExtendQuarantine=Are you sure you want to extend the quarantine? confirmationReduceQuarantine=Are you sure you want to reduce the quarantine? confirmationExtendFollowUp=Would you also want the follow-up period to be extended accordingly? @@ -236,176 +241,178 @@ confirmationRemoveGridRowMessage=Are you sure you want to remove this row? confirmationRemoveGridRowConfirm=Yes confirmationRemoveGridRowCancel=No confirmationSetMissingGeoCoordinates=This action will fill in geo coordinates for every person which has an address given, but no geo coordinates entered. Please be aware that this action affects all persons in your jurisdiction, regardless of the filters set below. Warning: Depending on the number of persons, this method might take quite long. -confirmationLocationFacilityAddressOverride=The selected facility has location details that are different from the ones you are currently editing. Do you want to overwrite them with those from the facility? +confirmationLocationFacilityAddressOverride = The selected facility has location details that are different from the ones you are currently editing. Do you want to overwrite them with those from the facility? confirmationCancelExternalFollowUpPopup=Are you sure you want to cancel external follow-ups in the eDiary? -confirmationUnlinkCaseFromEvent=Are you sure you want to unlink this case from this event? -confirmationUnlinkEventFromEnvironment=Are you sure you want to unlink this event from this environment? -confirmationUnlinkEnvironmentFromEvent=Are you sure you want to unlink this environment from this event? -confirmationDeleteExternalMessages=Are you sure you want to delete all %d selected messages? -confirmationUnclearExternalMessage=Are you sure you want to mark this message as unclear? -confirmationManuallyForwardedExternalMessage=Are you sure you want to mark this message as forwarded? +confirmationUnlinkCaseFromEvent = Are you sure you want to unlink this case from this event? +confirmationUnlinkEventFromEnvironment = Are you sure you want to unlink this event from this environment? +confirmationUnlinkEnvironmentFromEvent = Are you sure you want to unlink this environment from this event? +confirmationDeleteExternalMessages = Are you sure you want to delete all %d selected messages? +confirmationUnclearExternalMessage = Are you sure you want to mark this message as unclear? +confirmationManuallyForwardedExternalMessage = Are you sure you want to mark this message as forwarded? confirmationManualDeleteCoreEntity=You are about to mark this data for deletion. If referenced by other data in the system, those references will be removed, which cannot be automatically undone. -confirmationFetchExternalMessages=Another user seems to be fetching messages at the moment. If you choose to proceed, this may result in duplicate messages. Are you sure you want to proceed? -confirmationRejectSormasToSormasShareRequest=Are you sure you want to reject the share request? -confirmationEnableUsers=Are you sure you want to enable all %d selected users? -confirmationDisableUsers=Are you sure you want to disable all %d selected users? -confirmationRevokeSormasToSormasShareRequest=Are you sure you want to revoke the share request? -confirmationSinceExternalMessages=This is the first time messages will be fetched. Do you want to select the start date from which to fetch messages? If you select no, all messages will be retrieved. +confirmationFetchExternalMessages = Another user seems to be fetching messages at the moment. If you choose to proceed, this may result in duplicate messages. Are you sure you want to proceed? +confirmationRejectSormasToSormasShareRequest = Are you sure you want to reject the share request? +confirmationEnableUsers = Are you sure you want to enable all %d selected users? +confirmationDisableUsers = Are you sure you want to disable all %d selected users? +confirmationRevokeSormasToSormasShareRequest = Are you sure you want to revoke the share request? +confirmationSinceExternalMessages = This is the first time messages will be fetched. Do you want to select the start date from which to fetch messages? If you select no, all messages will be retrieved. confirmationSeeAllPersons=Are you sure you want to search persons for all association types? This could result in a slow response. -confirmationExternalMessageCorrection=This message contains corrections to a previous one.
Do you want process those corrections from this message? -confirmationVaccinationStatusUpdate=Deleting this vaccination has lead to at least one case no longer having a valid vaccination. Do you want to remove the vaccination status from all affected cases? -confirmExternalMessageCorrectionThrough=No other new or changed information could automatically be determined from the message. Do you want to manually add or edit more information? -confirmationDeleteCaseContacts=Do you also want to delete all contacts of this case? -confirmationCancelBulkAction=Do you really want to cancel the bulk operation? The operation will be stopped after the current batch has been processed. +confirmationExternalMessageCorrection = This message contains corrections to a previous one.
Do you want process those corrections from this message? +confirmationVaccinationStatusUpdate = Deleting this vaccination has lead to at least one case no longer having a valid vaccination. Do you want to remove the vaccination status from all affected cases? +confirmExternalMessageCorrectionThrough = No other new or changed information could automatically be determined from the message. Do you want to manually add or edit more information? +confirmationDeleteCaseContacts = Do you also want to delete all contacts of this case? +confirmationCancelBulkAction = Do you really want to cancel the bulk operation? The operation will be stopped after the current batch has been processed. + # Entities entityAction=Action entityActions=Actions -entityActivityAsCase=Activity as Case +entityActivityAsCase = Activity as Case entityAdditionalTest=Additional test entityAdditionalTests=Additional tests -entityAggregateReports=Aggregate Reports -entityAreas=Areas +entityAggregateReports = Aggregate Reports +entityAreas = Areas entityAutomaticSoftDeletion=Entity was automatically deleted -entityBagCases=BAG cases -entityBagContacts=BAG contacts +entityBagCases = BAG cases +entityBagContacts = BAG contacts entityBurial=Burial entityCampaign=Campaign -entityCampaignData=Campaign Data +entityCampaignData = Campaign Data entityCampaignDataForm=campaign data form -entityCampaignFormData=Campaign form data -entityCampaignFormMeta=Campaign form meta +entityCampaignFormData = Campaign form data +entityCampaignFormMeta = Campaign form meta entityCampaigns=Campaigns entityCase=Case -entityCaseManagement=Case management -entityCaseVisits=Case visits +entityCaseManagement = Case management +entityCaseVisits = Case visits entityCases=Cases entityClinicalVisit=Clinical assessment entityClinicalVisits=Clinical assessments -entityCommunities=Communities +entityCommunities = Communities entityContact=Contact -entityContactFollowUps=Contact follow ups -entityContactVisits=Contact visits +entityContactFollowUps = Contact follow ups +entityContactVisits = Contact visits entityContacts=Contacts entityContinents=Continents -entityCountries=Countries -entityCustomizableEnumValues=Customizable enum values -entityDataDictionary=Data dictionary -entityDataProtectionDictionary=Data protection dictionary -entityDiseaseClassifications=Disease classifications -entityDiseaseConfigurations=Disease configurations +entityCountries = Countries +entityCustomizableEnumValues = Customizable enum values +entityDataDictionary= Data dictionary +entityDataProtectionDictionary= Data protection dictionary +entityDiseaseClassifications = Disease classifications +entityDiseaseConfigurations = Disease configurations entityDistrict=District entityDistricts=Districts entityDocuments=Documents -entityEnvironment=Environment -entityEnvironmentSample=Environment sample -entityEnvironmentSamples=Environment samples -entityEnvironments=Environments +entityEnvironment = Environment +entityEnvironmentSample = Environment sample +entityEnvironmentSamples = Environment samples +entityEnvironments = Environments entityEvent=Event -entityEventActions=Events actions +entityEventActions = Events actions entityEventGroup=Event group entityEventGroups=Event groups entityEventParticipant=Event participant entityEventParticipants=Event participants entityEvents=Events -entityExposure=Exposure -entityExternalMessages=External messages -entityFacilities=Facilities -entityFeatureConfigurations=Feature configurations -entityGathering=Social event -entityImmunization=Immunization -entityImmunizations=Immunizations -entityOutbreaks=Outbreaks -entityPathogenTests=Pathogen tests -entityPersonContactDetail=Person contact details -entityPersons=Persons -entityPointsOfEntry=Points of entry -entityPrescription=Prescription -entityPrescriptions=Prescriptions -entityQuarantineOrder=Quarantine Order -entityRegion=Region -entityRegions=Regions -entitySample=Sample -entitySamples=Samples -entitySelfReport=Self report -entitySelfReports=Self Reports -entityStatistics=Statistics +entityExposure = Exposure +entityExternalMessages = External messages +entityFacilities = Facilities +entityFeatureConfigurations = Feature configurations +entityGathering = Social event +entityImmunization = Immunization +entityImmunizations = Immunizations +entityOutbreaks = Outbreaks +entityPathogenTests = Pathogen tests +entityPersonContactDetail = Person contact details +entityPersons = Persons +entityPointsOfEntry = Points of entry +entityPrescription = Prescription +entityPrescriptions = Prescriptions +entityQuarantineOrder = Quarantine Order +entityRegion = Region +entityRegions = Regions +entitySample = Sample +entitySamples = Samples +entitySelfReport = Self report +entitySelfReports = Self Reports +entityStatistics = Statistics entitySubcontinents=Subcontinents -entityTask=Task -entityTasks=Tasks -entityTravelEntries=Travel Entries -entityTravelEntry=Travel entry -entityTreatment=Treatment -entityTreatments=Treatments -entityUser=User -entityUserRoles=User roles -entityUsers=Users -entityVaccinations=Vaccinations -entityVisits=Visits -entityWeeklyReports=Weekly reports -entityOutbreaks=Outbreaks -entityCustomizableEnumValues=Customizable enum values -entityCampaignFormMeta=Campaign form meta -entityCampaignFormData=Campaign form data -entityAdverseEvent=Adverse event -entityAdverseEvents=Adverse events -entityAdverseEventInvestigation=Adverse event investigation -entityAdverseEventInvestigations=Adverse event investigations -entityEpipulseExport=Epipulse export +entityTask = Task +entityTasks = Tasks +entityTravelEntries = Travel Entries +entityTravelEntry = Travel entry +entityTreatment = Treatment +entityTreatments = Treatments +entityUser = User +entityUserRoles = User roles +entityUsers = Users +entityVaccinations = Vaccinations +entityVisits = Visits +entityWeeklyReports = Weekly reports +entityOutbreaks = Outbreaks +entityCustomizableEnumValues = Customizable enum values +entityCampaignFormMeta = Campaign form meta +entityCampaignFormData = Campaign form data +entityAdverseEvent = Adverse event +entityAdverseEvents = Adverse events +entityAdverseEventInvestigation = Adverse event investigation +entityAdverseEventInvestigations = Adverse event investigations +entityEpipulseExport = Epipulse export + # Error Messages errorAccessDenied=You do not have the required rights to view this page. errorEntityOutdated=The data could not be saved because it has been changed in the meantime. errorFieldValidationFailed=Please check the entered data. At least one field has errors. errorIntegerFieldValidationFailed=Please check the entered data. At least one of the fields where an integer was expected contains something else. -errorLabResultsAdapterNotFound=The external lab results adapter could not be found. Please make sure it is installed in your system and specified properly in your sormas.properties. +errorLabResultsAdapterNotFound = The external lab results adapter could not be found. Please make sure it is installed in your system and specified properly in your sormas.properties. errorNoAccessToWeb=Your user account does not have access to the web application errorNotRequiredRights=You do not have the required rights to perform this action. -errorOccurred=An error has occurred -errorProblemOccurred=A problem has occurred -errorViewNotFound=You tried to navigate to a view (%s) that does not exist. -errorWasReported=An unexpected error occurred. Please contact your supervisor or administrator and inform them about it. -errorInvalidValue=Invalid value -errorCaseDuplicateDeletion=The duplicate case could not be deleted due to an internal error. -errorCaseMerging=The cases could not be merged due to an internal error. -errorContactDuplicateDeletion=The duplicate contact could not be deleted due to an internal error. -errorContactMerging=The contacts could not be merged due to an internal error. -errorSormasToSormasShare=The data could not be shared due to some errors. -errorSormasToSormasRequestToken=Could not request token. -errorSormasToSormasServerAccess=The selected health department is not configured. Please contact an admin and tell them about this issue. -errorSormasToSormasSend=Unexpected error occurred while sharing. Please contact an admin and tell them about this issue. -errorSormasToSormasConnection=Connection refused by the target health department. -errorSormasToSormasDataMissing=Share request data is missing -errorSormasToSormasResult=Unexpected error occurred while getting share result. Please contact the recipient health department and tell them about this issue. Please also contact your admin and tell them about this issue. -errorSormasToSormasCertNotGenerated=Sormas to sormas certificate is not yet generated. Please contact an admin and tell them about this issue. -errorSormasToSormasEncrypt=Could not encrypt the data. Please contact an admin and tell them about this issue. -errorSormasToSormasDecrypt=Could not decrypt the shared data. Please contact an admin and tell them about this issue. -unexpectedErrorSormasToSormasAccept=The share request could not be marked as accepted on the source system.

The following error occurred: %s.

Please contact your admin and the admin of the source system and tell them about this issue. -errorSormasToSormasAccept=The share request could not be accepted. -errorSormasToSormasDeleteFromExternalSurveillanceTool=Failed to delete entities from external surveillance tool. -errorSormasToSormasInvalidRequestMethod=Invalid HTTP verb used -errorSormasToSormasLoadShares=Failed to load shares -errorSormasToSormasRequestProcessed=The request is already processed. -errorSormasToSormasShareContactWithoutCase=You can not share this contact because you need a source case. Please link the contact to a case. -errorSormasToSormasShareContactWithUnsharedSourceCase=If you want to share this contact, you have to send the associated case first to the same target system.
Please note that you can send the case and exclude personal data. -errorSormasToSormasAcceptContactsWithoutCaseShared=The contact %s cannot be accepted, because it was sent without a case. Please reject the contact and ask the source system to send the linked case first. -errorSormasToSormasAcceptContactsBeforeAcceptSourceCase=The contact %s cannot be accepted, because the contact belongs to a case that has not yet been accepted. Please accept the linked case first.
It is shared within the request %s. -errorSormasToSormasExistingPendingRequest=There is already a pending request to the same organization. Please revoke it before sending a new one. -errorSormasToSormasSharequestNotFound=The share request could not be found. It was either revoked by the source system or it has been rejected by someone else. -errorQuarantineOnlySupportedEntities=Quarantine can only be issued for cases, contacts, event participants and travel entries. -errorQuarantineBulkOnlySupportedEntities=Bulk quarantine can only be issued for cases, contacts, event participants. -errorCreatingTemplateDirectory=Could not create template directory. -errorDeletingDocumentTemplate=Error deleting document template -errorDeletingDocument=Error deleting document -errorDocumentGeneration=Error while generating document: %s -errorDocumentGenerationMultipleDiseasses=The selected entries has different diseases. -errorIllegalFilename=Illegal file name: %s -errorFileNotFound=File '%s' not found -errorReadingTemplate=Error reading template '%s' -errorReadingDocument=Error reading document '%s' -errorProcessingTemplate=Error processing template. +errorOccurred = An error has occurred +errorProblemOccurred = A problem has occurred +errorViewNotFound = You tried to navigate to a view (%s) that does not exist. +errorWasReported = An unexpected error occurred. Please contact your supervisor or administrator and inform them about it. +errorInvalidValue = Invalid value +errorCaseDuplicateDeletion = The duplicate case could not be deleted due to an internal error. +errorCaseMerging = The cases could not be merged due to an internal error. +errorContactDuplicateDeletion = The duplicate contact could not be deleted due to an internal error. +errorContactMerging = The contacts could not be merged due to an internal error. +errorSormasToSormasShare = The data could not be shared due to some errors. +errorSormasToSormasRequestToken = Could not request token. +errorSormasToSormasServerAccess = The selected health department is not configured. Please contact an admin and tell them about this issue. +errorSormasToSormasSend = Unexpected error occurred while sharing. Please contact an admin and tell them about this issue. +errorSormasToSormasConnection = Connection refused by the target health department. +errorSormasToSormasDataMissing = Share request data is missing +errorSormasToSormasResult = Unexpected error occurred while getting share result. Please contact the recipient health department and tell them about this issue. Please also contact your admin and tell them about this issue. +errorSormasToSormasCertNotGenerated = Sormas to sormas certificate is not yet generated. Please contact an admin and tell them about this issue. +errorSormasToSormasEncrypt = Could not encrypt the data. Please contact an admin and tell them about this issue. +errorSormasToSormasDecrypt = Could not decrypt the shared data. Please contact an admin and tell them about this issue. +unexpectedErrorSormasToSormasAccept = The share request could not be marked as accepted on the source system.

The following error occurred: %s.

Please contact your admin and the admin of the source system and tell them about this issue. +errorSormasToSormasAccept = The share request could not be accepted. +errorSormasToSormasDeleteFromExternalSurveillanceTool = Failed to delete entities from external surveillance tool. +errorSormasToSormasInvalidRequestMethod = Invalid HTTP verb used +errorSormasToSormasLoadShares = Failed to load shares +errorSormasToSormasRequestProcessed = The request is already processed. +errorSormasToSormasShareContactWithoutCase = You can not share this contact because you need a source case. Please link the contact to a case. +errorSormasToSormasShareContactWithUnsharedSourceCase = If you want to share this contact, you have to send the associated case first to the same target system.
Please note that you can send the case and exclude personal data. +errorSormasToSormasAcceptContactsWithoutCaseShared = The contact %s cannot be accepted, because it was sent without a case. Please reject the contact and ask the source system to send the linked case first. +errorSormasToSormasAcceptContactsBeforeAcceptSourceCase = The contact %s cannot be accepted, because the contact belongs to a case that has not yet been accepted. Please accept the linked case first.
It is shared within the request %s. +errorSormasToSormasExistingPendingRequest = There is already a pending request to the same organization. Please revoke it before sending a new one. +errorSormasToSormasSharequestNotFound = The share request could not be found. It was either revoked by the source system or it has been rejected by someone else. +errorQuarantineOnlySupportedEntities = Quarantine can only be issued for cases, contacts, event participants and travel entries. +errorQuarantineBulkOnlySupportedEntities = Bulk quarantine can only be issued for cases, contacts, event participants. +errorCreatingTemplateDirectory = Could not create template directory. +errorDeletingDocumentTemplate = Error deleting document template +errorDeletingDocument = Error deleting document +errorDocumentGeneration = Error while generating document: %s +errorDocumentGenerationMultipleDiseasses = The selected entries has different diseases. +errorIllegalFilename = Illegal file name: %s +errorFileNotFound = File '%s' not found +errorReadingTemplate = Error reading template '%s' +errorReadingDocument = Error reading document '%s' +errorProcessingTemplate = Error processing template. errorUploadGeneratedDocument=Could not upload the generated document. errorUploadGeneratedDocumentExceedsFileSizeLimit=Cannot upload the generated document because it exceeds the file size limit configured in the system. -errorTemplateFileCorrupt=The template file is corrupt. -errorWritingTemplate=Could not write template file. +errorTemplateFileCorrupt = The template file is corrupt. +errorWritingTemplate = Could not write template file. errorCampaignDiagramTotalsCalculationError=At least part of the percentage values for the diagram '%s' could not be calculated. Please check the diagram definitions for errors. errorNoPopulationDataLocations=No population data was found for the following locations: %s errorNoPopulationDataFound=There is no population data available. Switching to absolute data view @@ -415,452 +422,447 @@ errorExternalSurveillanceToolNonCoronavirusCase=Could not send the selected case errorExternalSurveillanceToolCasesNotSharable=%d of the selected %d cases can not be sent to the external reporting tool.
Please make sure that all of the cases below are owned and allowed to be shared with the external reporting tool. Then, re-try sending or only send the ones that can be sent. errorExternalSurveillanceToolNonClusterEvent=Could not send the selected events to the reporting tool because the event %s is not a %s cluster. errorExternalSurveillanceToolEventNotOwned=%d of the selected events can not be sent to the external reporting tool.
Please make sure that all of the events below are owned. Then, re-try sending or only send the ones that can be sent. -errorEventFromAnotherJurisdiction=The event is related to a jurisdiction you don't have access to -errorEventsFromAnotherJurisdiction=At least one of the selected events is related to a jurisdiction you don't have access to -errorEventUnlinkEventGroupFromAnotherJurisdiction=The event group has an event related to a jurisdiction you don't have access to -errorCaseNotEditable=The case is not editable anymore -errorCaseNotEditableOutsideJurisdiction=The case outside the user's jurisdiction can not be edited -errorEntityNotEditable=This entity is not editable anymore -errorCampaignNotEditable=This campaign is not editable anymore -errorContactNotEditable=The contact is not editable anymore -errorContactNotEditableOutsideJurisdiction=The contact outside the user's jurisdiction can not be edited -errorEventNotEditable=This event is not editable any more -errorEventParticipantNotEditable=This event participant is not editable any more -errorSampleNotEditable=This sample is not editable any more -errorImmunizationNotEditable=This immunization is not editable any more -errorForbidden=You do not have the necessary user rights to perform this action -errorNoRightsForChangingField=You have no rights for changing %s -errorNoRightsForChangingMultipleFields=You have no rights for changing %s and related fields -errorNotFound=The requested entity was not found -errorDeleteUserRoleUsedAlone=Cannot delete user role, because the following users would remain without a user role:

%s

Please give them a different role and re-try to delete this one. -errorSurveillanceReportNotEditable=This report is not editable any more -errorEnvironmentSampleNotEditable=This environment sample is not editable anymore -errorEnvironmentSampleNoDispatchRight=You do not have the necessary user right to change the dispatch status of this environment sample -errorEnvironmentSampleNoReceivalRight=You do not have the necessary user right to change the receival status of this environment sample -errorSendingExternalEmail=Email could not be sent. Please contact an admin and notify them about this problem. +errorEventFromAnotherJurisdiction = The event is related to a jurisdiction you don't have access to +errorEventsFromAnotherJurisdiction = At least one of the selected events is related to a jurisdiction you don't have access to +errorEventUnlinkEventGroupFromAnotherJurisdiction = The event group has an event related to a jurisdiction you don't have access to +errorCaseNotEditable = The case is not editable anymore +errorCaseNotEditableOutsideJurisdiction = The case outside the user's jurisdiction can not be edited +errorEntityNotEditable = This entity is not editable anymore +errorCampaignNotEditable = This campaign is not editable anymore +errorContactNotEditable = The contact is not editable anymore +errorContactNotEditableOutsideJurisdiction = The contact outside the user's jurisdiction can not be edited +errorEventNotEditable = This event is not editable any more +errorEventParticipantNotEditable = This event participant is not editable any more +errorSampleNotEditable = This sample is not editable any more +errorImmunizationNotEditable = This immunization is not editable any more +errorForbidden = You do not have the necessary user rights to perform this action +errorNoRightsForChangingField = You have no rights for changing %s +errorNoRightsForChangingMultipleFields = You have no rights for changing %s and related fields +errorNotFound = The requested entity was not found +errorDeleteUserRoleUsedAlone = Cannot delete user role, because the following users would remain without a user role:

%s

Please give them a different role and re-try to delete this one. +errorSurveillanceReportNotEditable = This report is not editable any more +errorEnvironmentSampleNotEditable = This environment sample is not editable anymore +errorEnvironmentSampleNoDispatchRight = You do not have the necessary user right to change the dispatch status of this environment sample +errorEnvironmentSampleNoReceivalRight = You do not have the necessary user right to change the receival status of this environment sample +errorSendingExternalEmail = Email could not be sent. Please contact an admin and notify them about this problem. errorExternalEmailAttachmentCannotEncrypt=Can't send email with attachments. The person has no national health id or primary phone number to send the password to or the SMS service is not set up in the system. -errorAdverseEventNotEditable=This adverse event is not editable anymore -errorAdverseEventInvestigationNotEditable=This adverse event investigation is not editable anymore +errorAdverseEventNotEditable = This adverse event is not editable anymore +errorAdverseEventInvestigationNotEditable = This adverse event investigation is not editable anymore errorExternalEmailMissingPersonEmailAddress=This person does not have an email address errorDocumentTemplateWorkflowChangeNotAllowed=The workflow of this document template cannot be changed. errorSurveyTokenNotAvailable=There is no available survey token for this survey. + # headings -headingAccessDenied=Access denied -headingActivityAsCase=Activity as Case -headingAdditionalTests=Additional tests -headingAllContacts=All Contacts -headingAnimalContacts=Animal Contacts -headingArchiveCampaign=Archive Campaign -headingArchiveCase=Archive case -headingArchiveContact=Archive contact -headingArchiveEnvironment=Archive environment -headingArchiveEvent=Archive event -headingArchiveEventParticipant=Archive event participant -headingArchiveEventGroup=Archive event group -headingArchiveImmunization=Archive immunization -headingArchiveAdverseEvent=Archive adverse event -headingArchiveAdverseEventInvestigation=Archive adverse event investigation -headingArchiveTravelEntry=Archive travel entry -headingAutomaticVaccinationStatusDetermination=Automatic Vaccination Status Determination -headingCampaignBasics=Campaign basics -headingCampaignData=Campaign data -headingCampaignDashboard=Campaign dashboard -headingCaseData=Case data +headingAccessDenied = Access denied +headingActivityAsCase = Activity as Case +headingAdditionalTests = Additional tests +headingAllContacts = All Contacts +headingAnimalContacts = Animal Contacts +headingArchiveCampaign = Archive Campaign +headingArchiveCase = Archive case +headingArchiveContact = Archive contact +headingArchiveEnvironment = Archive environment +headingArchiveEvent = Archive event +headingArchiveEventParticipant = Archive event participant +headingArchiveEventGroup = Archive event group +headingArchiveImmunization = Archive immunization +headingArchiveAdverseEvent = Archive adverse event +headingArchiveAdverseEventInvestigation = Archive adverse event investigation +headingArchiveTravelEntry = Archive travel entry +headingAutomaticVaccinationStatusDetermination = Automatic Vaccination Status Determination +headingCampaignBasics = Campaign basics +headingCampaignData = Campaign data +headingCampaignDashboard = Campaign dashboard +headingCaseData = Case data headingCaseFatalityRate=Case Fatality Rate -headingCaseFound=Case found -headingCaseImport=Case Import -headingCaseNotifiedBy=Notified by -headingPointOfEntryImport=Point of Entry Import -headingCaseStatusMap=Case Status Map -headingCasesDeleted=Cases deleted -headingCasesNotDeleted=None of the cases were deleted -headingCasesNotRestored=None of the cases were restored -headingCaseConversion=Conversion to case -headingChangeCaseDisease=Change case disease -headingCasesGuide=Guide: Case Directory -headingChangePathogenTestResult=Change pathogen test result -headingClinicalMeasurements=Clinical measurements -headingClinicalVisitsDeleted=Clinical assessments deleted -headingComplications=Complications -headingClinicalPresentation=Clinical Presentation -headingConfirmArchiving=Confirm archiving -headingConfirmDearchiving=Confirm de-archiving -headingConfirmDeletion=Confirm Deletion -headingConfirmMerging=Confirm Merging -headingConfirmUpdateCompleteness=Update completeness values -headingContactData=Contact data -headingContactsArchived=Contacts archived -headingContactsDearchived=Contacts de-archived -headingConfirmEnabling=Confirm enabling -headingConfirmDisabling=Confirm disabling -headingUnderFollowUp=Under Follow-up -headingContactInformation=Contact information -headingContactMap=Contact Map -headingContactsDeleted=Contacts deleted -headingContactsNotDeleted=None of the contacts were deleted -headingContactsNotLinked=None of the contacts were linked -headingCasesNotLinked=None of the cases were linked -headingContactsNotRestored== None of the contacts were restored -headingCreateAdditionalTest=Create new additional test results -headingCreateEntry=Create entry -headingCreateNewAction=Create new action -headingCreateNewAggregateReport=Create a new aggregated report -headingCreateNewCampaign=Create new campaign -headingCreateNewCase=Create new case -headingCreateNewCaseIssue=Case creation issue -headingCreateNewClinicalVisit=Create new clinical assessment -headingCreateNewContact=Create new contact -headingCreateNewContactIssue=Contact creation issue -headingSearchSample=Sample search issue +headingCaseFound = Case found +headingCaseImport = Case Import +headingCaseNotifiedBy = Notified by +headingPointOfEntryImport = Point of Entry Import +headingCaseStatusMap = Case Status Map +headingCasesDeleted = Cases deleted +headingCasesNotDeleted = None of the cases were deleted +headingCasesNotRestored = None of the cases were restored +headingCaseConversion = Conversion to case +headingChangeCaseDisease = Change case disease +headingCasesGuide = Guide: Case Directory +headingChangePathogenTestResult = Change pathogen test result +headingClinicalMeasurements = Clinical measurements +headingClinicalVisitsDeleted = Clinical assessments deleted +headingComplications = Complications +headingClinicalPresentation = Clinical Presentation +headingConfirmArchiving = Confirm archiving +headingConfirmDearchiving = Confirm de-archiving +headingConfirmDeletion = Confirm Deletion +headingConfirmMerging = Confirm Merging +headingConfirmUpdateCompleteness = Update completeness values +headingContactData = Contact data +headingContactsArchived = Contacts archived +headingContactsDearchived = Contacts de-archived +headingConfirmEnabling = Confirm enabling +headingConfirmDisabling = Confirm disabling +headingUnderFollowUp = Under Follow-up +headingContactInformation = Contact information +headingContactMap = Contact Map +headingContactsDeleted = Contacts deleted +headingContactsNotDeleted = None of the contacts were deleted +headingContactsNotLinked = None of the contacts were linked +headingCasesNotLinked = None of the cases were linked +headingContactsNotRestored = = None of the contacts were restored +headingCreateAdditionalTest = Create new additional test results +headingCreateEntry = Create entry +headingCreateNewAction = Create new action +headingCreateNewAggregateReport = Create a new aggregated report +headingCreateNewCampaign = Create new campaign +headingCreateNewCase = Create new case +headingCreateNewCaseIssue = Case creation issue +headingCreateNewClinicalVisit = Create new clinical assessment +headingCreateNewContact = Create new contact +headingCreateNewContactIssue = Contact creation issue +headingSearchSample = Sample search issue headingCreateNewTravelEntry=Create new travel entry -headingCreateNewEnvironment=Create new environment -headingCreateNewEvent=Create new event -headingCreateNewEventParticipant=Add new event participant -headingCreateNewEventGroup=Create new event group -headingCreateNewFacility=Create new facility -headingCreateNewImmunization=Create new immunization -headingCreateNewPerson=Create new person -headingCreateNewPrescription=Create new prescription -headingCreateNewSample=Create new sample -headingCreateNewSurvey=Create new survey -headingCreateNewTask=Create new task -headingCreateNewTaskQuestion=Create new task? -headingCreateNewTreatment=Create new treatment -headingCreateNewUser=Create new user -headingCreateNewUserRole=Create new user role -headingCreateNewVisit=Create new visit -headingCreateNewEnvironmentSample=Create new environment sample -headingCreatePathogenTestResult=Create new pathogen test result -headingDatabaseExportFailed=Database export failed -headingDearchiveCampaign=De-Archive campaign -headingDearchiveCase=De-Archive case -headingDearchiveContact=De-Archive contact -headingDearchiveEnvironment=De-Archive environment -headingDearchiveEvent=De-Archive event -headingDearchiveEventParticipant=De-Archive event participant -headingDearchiveEventGroup=De-Archive event group -headingDearchiveImmunization=De-Archive immunization -headingDearchiveAdverseEvent=De-Archive adverse event -headingDearchiveAdverseEventInvestigation=De-Archive adverse event investigation -headingDearchiveTravelEntry=De-Archive travel entry -headingDefineOutbreakDistricts=Define which districts currently are affected by an outbreak. -headingDeleteConfirmation=Confirm deletion -headingRestoreConfirmation=Confirm restoration -headingDoseCount=Dose Count -headingDownloadDocumentTemplateGuide=Download the SORMAS Document Template Guide -headingDownloadEmailTemplateGuide=Download the SORMAS Email Template Guide -headingDownloadImportTemplate=Download the Import Template -headingDownloadErrorReport=Download Error Report -headingDownloadImportGuide=Download the SORMAS Import Guide and Data Dictionary -headingEditAction=Edit action -headingEditAdditionalTest=Edit additional test results -headingEditAggregateReport=Edit aggregated report -headingEditAssignee=Edit assignee -headingEditCampaign=Edit campaign -headingEditCases=Edit cases -headingEditClinicalVisit=Edit clinical assessment -headingEditContacts=Edit contacts -headingEditEventParticipant=Edit person -headingEditEvents=Edit events -headingEditPathogenTestResult=Edit pathogen test result -headingEditPrescription=Edit prescription -headingEditTask=Edit task -headingEditTreatment=Edit treatment -headingEditUser=Edit user -headingEditVaccination=Edit vaccination -headingEditVisit=Edit visit -headingEditCountry=Edit country -headingEditContinent=Edit continent -headingEditSample=Edit sample -headingEditSubcontinent=Edit subcontinent -headingEntitiesNotArchived=None of the entities were archived -headingEntitiesNotDearchived=None of the entities were dearchived -headingEntitiesNotEdited=None of the entities were edited -headingEntitiesNotSent=None of the entities were sent -headingEnvironmentalExposure=Environmental Exposure -headingEpiCurve=Epidemiological Curve -headingErrorReportNotAvailable=Error report not available -headingEventData=Event data -headingEventGroupData=Event group data -headingEventParticipantsDeleted=Event participants deleted -headingEventParticipantsNotDeleted=None of the event participants were deleted -headingEventParticipantsNotRestored=None of the event participants were restored -headingEventParticipantResponsibleJurisdictionUpdated=Event participant jurisdiction update -headingEventJurisdictionUpdated=Event jurisdiction update -headingEventsDeleted=Events deleted -headingEventsNotLinked=None of the events were linked -headingEventsNotDeleted=None of the events were deleted -headingEventsNotRestored=None of the events were restored -headingExportFailed=Export failed +headingCreateNewEnvironment = Create new environment +headingCreateNewEvent = Create new event +headingCreateNewEventParticipant = Add new event participant +headingCreateNewEventGroup = Create new event group +headingCreateNewFacility = Create new facility +headingCreateNewImmunization = Create new immunization +headingCreateNewPerson = Create new person +headingCreateNewPrescription = Create new prescription +headingCreateNewSample = Create new sample +headingCreateNewSurvey = Create new survey +headingCreateNewTask = Create new task +headingCreateNewTaskQuestion = Create new task? +headingCreateNewTreatment = Create new treatment +headingCreateNewUser = Create new user +headingCreateNewUserRole = Create new user role +headingCreateNewVisit = Create new visit +headingCreateNewEnvironmentSample = Create new environment sample +headingCreatePathogenTestResult = Create new pathogen test result +headingDatabaseExportFailed = Database export failed +headingDearchiveCampaign = De-Archive campaign +headingDearchiveCase = De-Archive case +headingDearchiveContact = De-Archive contact +headingDearchiveEnvironment = De-Archive environment +headingDearchiveEvent = De-Archive event +headingDearchiveEventParticipant = De-Archive event participant +headingDearchiveEventGroup = De-Archive event group +headingDearchiveImmunization = De-Archive immunization +headingDearchiveAdverseEvent = De-Archive adverse event +headingDearchiveAdverseEventInvestigation = De-Archive adverse event investigation +headingDearchiveTravelEntry = De-Archive travel entry +headingDefineOutbreakDistricts = Define which districts currently are affected by an outbreak. +headingDeleteConfirmation = Confirm deletion +headingRestoreConfirmation = Confirm restoration +headingDoseCount = Dose Count +headingDownloadDocumentTemplateGuide = Download the SORMAS Document Template Guide +headingDownloadEmailTemplateGuide = Download the SORMAS Email Template Guide +headingDownloadImportTemplate = Download the Import Template +headingDownloadErrorReport = Download Error Report +headingDownloadImportGuide = Download the SORMAS Import Guide and Data Dictionary +headingEditAction = Edit action +headingEditAdditionalTest = Edit additional test results +headingEditAggregateReport = Edit aggregated report +headingEditAssignee = Edit assignee +headingEditCampaign = Edit campaign +headingEditCases = Edit cases +headingEditClinicalVisit = Edit clinical assessment +headingEditContacts = Edit contacts +headingEditEventParticipant = Edit person +headingEditEvents = Edit events +headingEditPathogenTestResult = Edit pathogen test result +headingEditPrescription = Edit prescription +headingEditTask = Edit task +headingEditTreatment = Edit treatment +headingEditUser = Edit user +headingEditVaccination = Edit vaccination +headingEditVisit = Edit visit +headingEditCountry = Edit country +headingEditContinent = Edit continent +headingEditSample = Edit sample +headingEditSubcontinent = Edit subcontinent +headingEntitiesNotArchived = None of the entities were archived +headingEntitiesNotDearchived = None of the entities were dearchived +headingEntitiesNotEdited = None of the entities were edited +headingEntitiesNotSent = None of the entities were sent +headingEnvironmentalExposure = Environmental Exposure +headingEpiCurve = Epidemiological Curve +headingErrorReportNotAvailable = Error report not available +headingEventData = Event data +headingEventGroupData = Event group data +headingEventParticipantsDeleted = Event participants deleted +headingEventParticipantsNotDeleted = None of the event participants were deleted +headingEventParticipantsNotRestored = None of the event participants were restored +headingEventParticipantResponsibleJurisdictionUpdated = Event participant jurisdiction update +headingEventJurisdictionUpdated = Event jurisdiction update +headingEventsDeleted = Events deleted +headingEventsNotLinked = None of the events were linked +headingEventsNotDeleted = None of the events were deleted +headingEventsNotRestored = None of the events were restored +headingExportFailed = Export failed headingFatalities=Fatalities -headingFileExists=Duplicate File -headingFilters=Filters -headingStoppedFollowUp=Stopped Follow-up -headingFollowUpStatus=Follow-up status -headingHealthConditions=Pre-existing conditions -headingHospitalization=Current Hospitalization -headingProphylaxisLoc=Prophylaxis Details -headingPreviousHospitalizations=Previous Hospitalizations -headingImportCaseContacts=Import Case Contacts -headingImportCases=Import Cases -headingImportCommunities=Import Communities -headingImportContacts=Import Contacts -headingImportCampaign=Import campaign form data -headingImportCsvFile=Import CSV File -headingImportDistricts=Import Districts -headingImportError=Import error -headingImportEvent=Import events -headingImportEventParticipant=Import event participants -headingImportedCaseInfo=Imported Case Information -headingImportedPersonInfo=Imported Person Information -headingImportFailed=Import failed -headingImportFacilities=Import Facilities -headingImportPointsOfEntry=Import Points of Entry -headingImportPopulationData=Import Population Data -headingImportContinents=Import Continents -headingImportSubcontinents=Import subcontinents -headingImportCountries=Import Countries -headingImportAllCountries=Import Default Countries -headingImportAllContinents=Import Default Continents -headingImportAllSubcontinents=Import Default Subcontinents -headingImportAreas=Import Areas -headingImmunizationSelection=Immunization Selection -headingImportRegions=Import Regions -headingImportTravelEntries=Import Travel Entries -headingImportEnvironments=Import Environments -headingImportSelfReports=Import Self Reports -headingIncorrectDateRange=Incorrect date range -headingInformationSource=Source of Information -headingInfrastructureLocked=Infrastructure locked -headingIntroduction=Introduction -headingLaboratorySample=Laboratory sample +headingFileExists = Duplicate File +headingFilters = Filters +headingStoppedFollowUp = Stopped Follow-up +headingFollowUpStatus = Follow-up status +headingHealthConditions = Pre-existing conditions +headingHospitalization = Current Hospitalization +headingProphylaxisLoc = Prophylaxis Details +headingPreviousHospitalizations = Previous Hospitalizations +headingImportCaseContacts = Import Case Contacts +headingImportCases = Import Cases +headingImportCommunities = Import Communities +headingImportContacts = Import Contacts +headingImportCampaign = Import campaign form data +headingImportCsvFile = Import CSV File +headingImportDistricts = Import Districts +headingImportError = Import error +headingImportEvent = Import events +headingImportEventParticipant = Import event participants +headingImportedCaseInfo = Imported Case Information +headingImportedPersonInfo = Imported Person Information +headingImportFailed = Import failed +headingImportFacilities = Import Facilities +headingImportPointsOfEntry = Import Points of Entry +headingImportPopulationData = Import Population Data +headingImportContinents = Import Continents +headingImportSubcontinents = Import subcontinents +headingImportCountries = Import Countries +headingImportAllCountries = Import Default Countries +headingImportAllContinents = Import Default Continents +headingImportAllSubcontinents = Import Default Subcontinents +headingImportAreas = Import Areas +headingImmunizationSelection = Immunization Selection +headingImportRegions= Import Regions +headingImportTravelEntries = Import Travel Entries +headingImportEnvironments = Import Environments +headingImportSelfReports = Import Self Reports +headingIncorrectDateRange = Incorrect date range +headingInformationSource = Source of Information +headingInfrastructureLocked = Infrastructure locked +headingIntroduction = Introduction +headingLaboratorySample = Laboratory sample headingLastReportedDistrict=Last reported district -headingLineListing=Line listing -headingLineListingImport=Line listing import -headingLocation=Location -headingLoginFailed=Login failed -headingMaternalHistory=Maternal history -headingMedicalInformation=Additional medical information -headingMissingDateFilter=Missing date filter +headingLineListing = Line listing +headingLineListingImport = Line listing import +headingLocation = Location +headingLoginFailed = Login failed +headingMaternalHistory = Maternal history +headingMedicalInformation = Additional medical information +headingMissingDateFilter = Missing date filter externalMessageMultipleSampleReports=Multiple samples -headingMyTasks=My Tasks -headingNewAccount=New account -headingNewCases=New Cases -headingNewEvents=New Events -headingNewPassword=New password -headingNewTestResults=New Test Results -headingNoCasesSelected=No cases selected -headingNoClinicalVisitsSelected=No clinical assessments selected -headingNoContactsSelected=No contacts selected -headingNoEnvironmentSelected=No environment selected -headingNoEventParticipantsSelected=No event participants selected -headingNoEventsSelected=No events selected -headingNoTravelEntriesSelected=No travel entries selected -headingNoImmunizationsSelected=No immunizations selected -headingNoFile=No file -headingNoPathogenTestsSelected=No pathogen tests selected -headingNoPrescriptionsSelected=No prescriptions selected -headingNoSamplesSelected=No samples selected -headingNoTasksSelected=No tasks selected -headingNoTreatmentsSelected=No treatments selected -headingNoVisitsSelected=No visits selected -headingNoUsersSelected=No users selected +headingMyTasks = My Tasks +headingNewAccount = New account +headingNewCases = New Cases +headingNewEvents = New Events +headingNewPassword = New password +headingNewTestResults = New Test Results +headingNoCasesSelected = No cases selected +headingNoClinicalVisitsSelected = No clinical assessments selected +headingNoContactsSelected = No contacts selected +headingNoEnvironmentSelected = No environment selected +headingNoEventParticipantsSelected = No event participants selected +headingNoEventsSelected = No events selected +headingNoTravelEntriesSelected = No travel entries selected +headingNoImmunizationsSelected = No immunizations selected +headingNoFile = No file +headingNoPathogenTestsSelected = No pathogen tests selected +headingNoPrescriptionsSelected = No prescriptions selected +headingNoSamplesSelected = No samples selected +headingNoTasksSelected = No tasks selected +headingNoTreatmentsSelected = No treatments selected +headingNoVisitsSelected = No visits selected +headingNoUsersSelected = No users selected headingOutbreakDistricts=Outbreak Districts -headingOutbreakIn=Outbreak in -headingPathogenTestsDeleted=Pathogen tests deleted -headingPaperFormDates=Reception dates of paper form -headingPersonData=Person data -headingPersonInformation=Person information -headingPersonOccupation=Occupation & education -headingPerinatalDetails=Perinatal details -headingPickEventGroup=Pick event group -headingPickEventParticipants=Pick or merge event participants -headingPickEventParticipantsIncompleteSelection=Incomplete selection -headingPickOrCreateCase=Pick or Create a Case -headingPickOrCreatePerson=Pick or create person -headingMergePersonError=Merge person error -headingMergeDuplicateEventParticipantSamePersonSameEvent=Duplicate event participants found -headingPickOrMergePerson=Pick or merge person -headingPickOrMergePersonConfirmation=Pick or merge person confirmation -headingSelectPerson=Select person -headingPickOrCreateEvent=Pick or create event -headingPickOrCreateEventGroup=Pick or create event group -headingPickOrCreateEntry=Pick or create entry -headingPickOrCreateImmunization=Pick or create immunization -headingPickOrCreatePathogenTest=Pick or create pathogen test -headingPickOrCreateSample=Pick or create sample -headingPickOrCreateEnvironment=Pick or create environment -headingPointOfEntryInformation=Point of entry information -headingPrescriptionsDeleted=Prescriptions deleted -headingRecovery=Recovery -headingReferSample=Refer sample to another laboratory -headingRequestedAdditionalTests=Requested additional tests: -headingRequestedPathogenTests=Requested pathogen tests: +headingOutbreakIn = Outbreak in +headingPathogenTestsDeleted = Pathogen tests deleted +headingPaperFormDates = Reception dates of paper form +headingPersonData = Person data +headingPersonInformation = Person information +headingPersonOccupation = Occupation & education +headingPerinatalDetails = Perinatal details +headingPickEventGroup = Pick event group +headingPickEventParticipants = Pick or merge event participants +headingPickEventParticipantsIncompleteSelection = Incomplete selection +headingPickOrCreateCase = Pick or Create a Case +headingPickOrCreatePerson = Pick or create person +headingMergePersonError = Merge person error +headingMergeDuplicateEventParticipantSamePersonSameEvent = Duplicate event participants found +headingPickOrMergePerson = Pick or merge person +headingPickOrMergePersonConfirmation = Pick or merge person confirmation +headingSelectPerson = Select person +headingPickOrCreateEvent = Pick or create event +headingPickOrCreateEventGroup = Pick or create event group +headingPickOrCreateEntry = Pick or create entry +headingPickOrCreateImmunization = Pick or create immunization +headingPickOrCreatePathogenTest = Pick or create pathogen test +headingPickOrCreateSample = Pick or create sample +headingPickOrCreateEnvironment = Pick or create environment +headingPointOfEntryInformation = Point of entry information +headingPrescriptionsDeleted = Prescriptions deleted +headingRecovery = Recovery +headingReferSample = Refer sample to another laboratory +headingRequestedAdditionalTests = Requested additional tests: +headingRequestedPathogenTests = Requested pathogen tests: headingResponsibleJurisdiction=Responsible jurisdiction -headingResults=Results -headingSamplesDeleted=Samples deleted -headingSamplesNotDeleted=None of the samples were deleted -headingSamplesNotRestored=None of the samples were restored -headingSaveNotification=Save notification +headingResults = Results +headingSamplesDeleted = Samples deleted +headingSamplesNotDeleted = None of the samples were deleted +headingSamplesNotRestored = None of the samples were restored +headingSaveNotification = Save notification headingSecurityAlert=Security Alert -headingSelectCampaign=Select a campaign -headingSetOutbreakStatus=Set status of all districts: -headingShowExternalMessage=Message -headingSurveyResponseDetails=Survey Response Details -headingSurveyResponseFailures=Processing Failures -headingSurveyResponseCorrectAndReprocess=Correct Survey Response Failures -messageSurveyResponseAllFieldsApplied=All fields were applied successfully. -messageSurveyResponseNotYetProcessed=Survey response has not been processed yet. -messageSurveyResponseReprocessed=Survey response has been reprocessed. -headingSelfReportSideComponent=Self reports -headingSignsAndSymptoms=Clinical Signs and Symptoms -headingSimilarImmunization=Similar immunizaton -headingSimilarPerson=There are other persons with similar national health Id -headingSyncUsers=Sync Users -headingTasksDeleted=Tasks deleted -headingTasksNotDeleted=None of the tasks were deleted -headingTemplateNotAvailable=Template not available -headingTests=Pathogen tests -headingTransferCase=Transfer case -headingTravelEntryData=Travel entry data -headingTravelEntriesDeleted=Travel entries deleted -headingTravelEntriesNotDeleted=None of the travel entries were deleted -headingTravelEntriesNotRestored=None of the travel entries were restored -headingReferCaseFromPointOfEntry=Refer case from point of entry -headingTreatments=Executed treatments -headingTreatmentsDeleted=Treatments deleted -headingUpdatePassword=Update password -headingUploadSuccess=Upload Successful -headingUserData=User data -headingVaccination=Vaccination -headingViewNotFound=The view could not be found -headingViewPathogenTestResult=View pathogen test result -headingViewPrescription=View prescription -headingViewAdditionalTest=View additional test results -headingViewClinicalVisit=View clinical assessment -headingViewSurveillanceReport=Report view -headingViewTask=View task -headingViewTreatment=View treatment -headingViewVaccination=View vaccination -headingViewVisit=View visit -headingVisits=Visits -headingVisitsDeleted=Visits deleted -headingVisitsNotCancelled=None of the follow-up visits were cancelled -headingVisitsNotDeleted=None of the visits were deleted -headingVisitsNotSetToLost=None of the follow-up visits were set to lost -headingVisualization=Visualization -headingWrongFileType=Wrong file type -headingWaterUse=Use of water -headingMissingEpiWeekFilter=Missing epi week filter -headingMergeGuide=Guide: Merging Duplicate Cases -headingContactMergeGuide=Guide: Merging Duplicate Contacts +headingSelectCampaign = Select a campaign +headingSetOutbreakStatus = Set status of all districts: +headingShowExternalMessage = Message +headingSelfReportSideComponent = Self reports +headingSignsAndSymptoms = Clinical Signs and Symptoms +headingSimilarImmunization = Similar immunizaton +headingSimilarPerson = There are other persons with similar national health Id +headingSyncUsers = Sync Users +headingTasksDeleted = Tasks deleted +headingTasksNotDeleted = None of the tasks were deleted +headingTemplateNotAvailable = Template not available +headingTests = Pathogen tests +headingTransferCase = Transfer case +headingTravelEntryData = Travel entry data +headingTravelEntriesDeleted = Travel entries deleted +headingTravelEntriesNotDeleted = None of the travel entries were deleted +headingTravelEntriesNotRestored = None of the travel entries were restored +headingReferCaseFromPointOfEntry = Refer case from point of entry +headingTreatments = Executed treatments +headingTreatmentsDeleted = Treatments deleted +headingUpdatePassword = Update password +headingUploadSuccess = Upload Successful +headingUserData = User data +headingVaccination = Vaccination +headingViewNotFound = The view could not be found +headingViewPathogenTestResult = View pathogen test result +headingViewPrescription = View prescription +headingViewAdditionalTest = View additional test results +headingViewClinicalVisit = View clinical assessment +headingViewSurveillanceReport = Report view +headingViewTask = View task +headingViewTreatment = View treatment +headingViewVaccination = View vaccination +headingViewVisit = View visit +headingVisits = Visits +headingVisitsDeleted = Visits deleted +headingVisitsNotCancelled= None of the follow-up visits were cancelled +headingVisitsNotDeleted = None of the visits were deleted +headingVisitsNotSetToLost= None of the follow-up visits were set to lost +headingVisualization = Visualization +headingWrongFileType = Wrong file type +headingWaterUse = Use of water +headingMissingEpiWeekFilter = Missing epi week filter +headingMergeGuide = Guide: Merging Duplicate Cases +headingContactMergeGuide = Guide: Merging Duplicate Contacts # %d: 1 or 2; %s: Person name -headingComparisonCase=Case %d: %s -headingCaseComparison=Case Comparison -headingConfirmChoice=Confirm Your Choice -headingHowToMergeCases=How to Merge Cases -headingHowToMergeContacts=How to Merge Contacts -headingExplanationOfTerms=Explanation of Terms -headingCompleteness=Completeness -headingDataImport=Data import -headingDisableLineListing=Disable Line Listing? -headingEditLineListing=Edit Line Listing -headingInvalidDateEntered=Invalid Date Entered -headingDearchivingNotPossible=De-archiving not possible -headingNoRowsSelected=No rows selected -headingUserSettings=User Settings -headingContactsPerCase=Contacts per Case -headingQuarantineForCases=Quarantine data for cases -headingCasesResultingFromContacts=Cases resulting from contacts -headingcasesWithReferenceDefinitionFulfilled=Cases with reference definition fulfilled -headingCasesInQuarantine=Cases in Quarantine -headingCasesPlacedInQuarantine=Cases placed in Quarantine -headingCasesRestored=Cases restored -headingContactsRestored=Contacts restored -headingEventsRestored=Events restored -headingEventParticipantsRestored=Event participants restored -headingImmunizationsDeleted=Immunizations deleted -headingImmunizationsNotDeleted=None of the immunizations were deleted -headingImmunizationsNotRestored=None of the immunizations were restored -headingImmunizationsRestored=Immunizations restored -headingSamplesRestored=Samples restored -headingTravelEntriesRestored=Travel entries restored -headingContactsInQuarantine=Contacts in Quarantine -headingContactsPlacedInQuarantine=Contacts placed in Quarantine -headingContactsCancelFollowUp=Confirm canceling follow-up for contacts -headingContactsLostToFollowUp=Confirm setting contacts to lost to follow-up -headingPickOrCreateContact=Pick or create contact -headingNewSourceCases=New Cases not Previously Known to Be Contacts -headingNoCaseFound=No case found -headingNoEventFound=No event found -headingEventNotDeleted=Event not deleted -headingSomeCasesNotRestored=Some cases were not restored -headingSomeContactsNotRestored=Some contacts were not restored -headingSomeEntitiesNotArchived=Some entities were not archived -headingSomeEntitiesNotDearchived=Some entities were not dearchived -headingSomeEntitiesNotDeleted=Some entities were not deleted -headingSomeEntitiesNotEdited=Some entities were not edited -headingSomeEnvironmentSamplesNotRestored=Some environment samples were not restored -headingSomeEventParticipantsNotRestored=Some event participants were not restored -headingSomeEventsNotLinked=Some events were not linked -headingSomeEventsNotRestored=Some events were not restored -headingSomeImmunizationsNotRestored=Some immunizations were not restored -headingSomeSamplesNotRestored=Some samples were not restored -headingSomeTravelEntriesNotRestored=Some travel entries were not restored -headingSomeUsersNotDisabled=Some users were not disabled -headingSomeUsersNotEnabled=Some users were not enabled -headingSomeVisitsNotCancelled=Some follow-up visits were not cancelled -headingSomeVisitsNotSetToLost=Some follow-up visits were not set to lost -headingContactConfirmationRequired=Contact confirmation required -headingContactConversionFollowUpCommentLarge=Follow up comment will exceed the max characters allowed -headingSelectSourceCase=Select Source Case -headingRemoveCaseFromContact=Remove Case from Contact -headingStatusDetermination=Status Determination -headingDiscardUnsavedChanges=Discard Unsaved Changes -headingGenerateCases=Generate Cases -headingGenerateContacts=Generate Contacts -headingContactDataNotComplete=Contact data is not complete -headingSymptomJournalAccountCreation=PIA -headingSaveUser=Save User -headingCreateCampaignDataForm=New %s -headingExtendQuarantine=Extend quarantine -headingReduceQuarantine=Reduce quarantine -headingAdjustQuarantine=Adjust quarantine -headingExtendFollowUp=Extend follow-up period -headingExposureInvestigation=Exposure Investigation -headingEpiDataSourceCaseContacts=Contacts with Source Case -headingExposureDetails=Exposure Details -headingEpiConclusion=Conclusion -headingClusterType=Cluster Type -headingAnimalContactDetails=Animal Contact Details -headingBurialDetails=Burial Details -headingCampaignFormDataDuplicateNew=New Campaign Form Data -headingCampaignFormDataDuplicateExisting=Existing Campaign Form Data -headingCampaignFormDataAlreadyExisting=Campaign Form Data Already Existing -headingActivityAsCaseDetails=Activity as Case Details -headingUnlinkCaseFromEvent=Unlink case from event -headingUnlinkEventFromEnvironment=Unlink event from environment -headingUnlinkEnvironmentFromEvent=Unlink environment from event -headingUpdatePersonContactDetails=Update existing person contact details -headingEventGroupLinkEventIssue=Issue while linking events to event group -headingEventGroupUnlinkEventIssue=Issue while unlinking events to event group -headingExportUserRightsFailed=Export user rights failed -headingExternalMessageDownload=Download message -headingNoExternalMessagesSelected=No messages selected -headingExternalMessagesDeleted=Messages deleted -headingExternalMessagesNotDeleted=None of the external messages were deleted -headingExternalMessageCorrection=Correction message -headingExternalMessageProcessSample=Process sample and test reports -headingExternalMessageSampleInformation=Sample information -headingExternalMessageExistingPathogenTests=Existing pathogen tests -headingExternalMessageNewPathogenTests=New pathogen tests -headingFetchExternalMessages=Fetch new messages -headingCaution=Caution -headingUnavailableTaskEdition=Unavailable task edition -headingUsersNotDisabled=None of the users were disabled -headingUsersNotEnabled=None of the users were enabled -headingDeleteVaccinations=Remove immunization vaccinations -headingDocumentCreated=Document created +headingComparisonCase = Case %d: %s +headingCaseComparison = Case Comparison +headingConfirmChoice = Confirm Your Choice +headingHowToMergeCases = How to Merge Cases +headingHowToMergeContacts = How to Merge Contacts +headingExplanationOfTerms = Explanation of Terms +headingCompleteness = Completeness +headingDataImport = Data import +headingDisableLineListing = Disable Line Listing? +headingEditLineListing = Edit Line Listing +headingInvalidDateEntered = Invalid Date Entered +headingDearchivingNotPossible = De-archiving not possible +headingNoRowsSelected = No rows selected +headingUserSettings = User Settings +headingContactsPerCase = Contacts per Case +headingQuarantineForCases = Quarantine data for cases +headingCasesResultingFromContacts = Cases resulting from contacts +headingcasesWithReferenceDefinitionFulfilled = Cases with reference definition fulfilled +headingCasesInQuarantine = Cases in Quarantine +headingCasesPlacedInQuarantine = Cases placed in Quarantine +headingCasesRestored = Cases restored +headingContactsRestored = Contacts restored +headingEventsRestored = Events restored +headingEventParticipantsRestored = Event participants restored +headingImmunizationsDeleted = Immunizations deleted +headingImmunizationsNotDeleted = None of the immunizations were deleted +headingImmunizationsNotRestored = None of the immunizations were restored +headingImmunizationsRestored = Immunizations restored +headingSamplesRestored = Samples restored +headingTravelEntriesRestored = Travel entries restored +headingContactsInQuarantine = Contacts in Quarantine +headingContactsPlacedInQuarantine = Contacts placed in Quarantine +headingContactsCancelFollowUp = Confirm canceling follow-up for contacts +headingContactsLostToFollowUp = Confirm setting contacts to lost to follow-up +headingPickOrCreateContact = Pick or create contact +headingNewSourceCases = New Cases not Previously Known to Be Contacts +headingNoCaseFound = No case found +headingNoEventFound = No event found +headingEventNotDeleted = Event not deleted +headingSomeCasesNotRestored = Some cases were not restored +headingSomeContactsNotRestored = Some contacts were not restored +headingSomeEntitiesNotArchived= Some entities were not archived +headingSomeEntitiesNotDearchived = Some entities were not dearchived +headingSomeEntitiesNotDeleted= Some entities were not deleted +headingSomeEntitiesNotEdited = Some entities were not edited +headingSomeEnvironmentSamplesNotRestored = Some environment samples were not restored +headingSomeEventParticipantsNotRestored = Some event participants were not restored +headingSomeEventsNotLinked = Some events were not linked +headingSomeEventsNotRestored = Some events were not restored +headingSomeImmunizationsNotRestored = Some immunizations were not restored +headingSomeSamplesNotRestored = Some samples were not restored +headingSomeTravelEntriesNotRestored = Some travel entries were not restored +headingSomeUsersNotDisabled = Some users were not disabled +headingSomeUsersNotEnabled= Some users were not enabled +headingSomeVisitsNotCancelled= Some follow-up visits were not cancelled +headingSomeVisitsNotSetToLost= Some follow-up visits were not set to lost +headingContactConfirmationRequired = Contact confirmation required +headingContactConversionFollowUpCommentLarge = Follow up comment will exceed the max characters allowed +headingSelectSourceCase = Select Source Case +headingRemoveCaseFromContact = Remove Case from Contact +headingStatusDetermination = Status Determination +headingDiscardUnsavedChanges = Discard Unsaved Changes +headingGenerateCases = Generate Cases +headingGenerateContacts = Generate Contacts +headingContactDataNotComplete = Contact data is not complete +headingSymptomJournalAccountCreation = PIA +headingSaveUser = Save User +headingCreateCampaignDataForm = New %s +headingExtendQuarantine = Extend quarantine +headingReduceQuarantine = Reduce quarantine +headingAdjustQuarantine = Adjust quarantine +headingExtendFollowUp = Extend follow-up period +headingExposureInvestigation = Exposure Investigation +headingEpiDataSourceCaseContacts = Contacts with Source Case +headingExposureDetails = Exposure Details +headingEpiConclusion = Conclusion +headingClusterType = Cluster Type +headingAnimalContactDetails = Animal Contact Details +headingBurialDetails = Burial Details +headingCampaignFormDataDuplicateNew = New Campaign Form Data +headingCampaignFormDataDuplicateExisting = Existing Campaign Form Data +headingCampaignFormDataAlreadyExisting = Campaign Form Data Already Existing +headingActivityAsCaseDetails = Activity as Case Details +headingUnlinkCaseFromEvent = Unlink case from event +headingUnlinkEventFromEnvironment = Unlink event from environment +headingUnlinkEnvironmentFromEvent = Unlink environment from event +headingUpdatePersonContactDetails = Update existing person contact details +headingEventGroupLinkEventIssue = Issue while linking events to event group +headingEventGroupUnlinkEventIssue = Issue while unlinking events to event group +headingExportUserRightsFailed = Export user rights failed +headingExternalMessageDownload = Download message +headingNoExternalMessagesSelected = No messages selected +headingExternalMessagesDeleted = Messages deleted +headingExternalMessagesNotDeleted = None of the external messages were deleted +headingExternalMessageCorrection = Correction message +headingExternalMessageProcessSample = Process sample and test reports +headingExternalMessageSampleInformation = Sample information +headingExternalMessageExistingPathogenTests = Existing pathogen tests +headingExternalMessageNewPathogenTests = New pathogen tests +headingFetchExternalMessages = Fetch new messages +headingCaution = Caution +headingUnavailableTaskEdition = Unavailable task edition +headingUsersNotDisabled = None of the users were disabled +headingUsersNotEnabled = None of the users were enabled +headingDeleteVaccinations = Remove immunization vaccinations +headingDocumentCreated = Document created headingConfirmUnclearLabMessage=Confirm unclear headingConfirmManuallyForwardedLabMessage=Confirm forwarded headingUpdateCaseWithNewDiseaseVariant=Update case disease variant @@ -868,8 +870,8 @@ headingRejectSormasToSormasShareRequest=Reject share request headingRevokeSormasToSormasShareRequest=Revoke share request headingSormasToSormasCantShareContactWithoutCase=Can not share contact headingSormasToSormasCanAcceptContactsWithoutCase=Can not accept contact(s) -headingSormasToSormasDuplicateDetection=Potential duplicates detected -headingSormasToSormasShareRequestNotFound=Share request not found +headingSormasToSormasDuplicateDetection = Potential duplicates detected +headingSormasToSormasShareRequestNotFound = Share request not found headingShareRequestDetails=Share request details headingShareRequestCases=Cases headingShareRequestContacts=Contacts @@ -877,41 +879,41 @@ headingShareRequestEvents=Events headingShareRequestEventParticipants=Event participants headingCaseResponsibleJurisidction=Responsible jurisdiction headingSeeAllPersons=See persons for all association types -headingPlaceOfStayInHospital=Place of stay in hospital -headingCurrentHospitalization=Current hospitalization -headingCorrectPerson=Correct person data -headingPreviousPersonInformation=Previous person information -headingUpdatedPersonInformation=Updated person information -headingCorrectSample=Correct sample data -headingPreviousSampleInformation=Previous sample information -headingUpdatedSampleInformation=Updated sample information -headingCorrectPathogenTest=Correct pathogent test data -headingPreviousPathogenTestInformation=Previous pathogen test information -headingUpdatedPathogenTestInformation=Updated pathogen test information -headingLabMessageCorrectionThrough=No more changes found -headingDeleteContacts=Delete contacts -headingProcessPhysiciansReport=Process message -headingDeleteUserRoleNotPossible=Cannot delete user role -headingSaveUserNotPossible=Cannot save user -immunizationVaccinationHeading=Vaccination -immunizationRecoveryHeading=Recovery -headingAutomaticDeletionStarted=Automatic deletion started -headingBulkOperationProgress=Bulk operation progress -headingBulkEmailWrongFileType=Allowed file types in attachments -headingBulkEmailMaxAttachedFiles=Maximum allowed number of attached files -headingSomeContactsAlreadyInEvent=Some contacts are already linked -headingSomeCasesAlreadyInEvent=Some cases are already linked -headingEnvironmentJurisdictionUpdated=Environment location update -headingNoEnvironmentSamplesSelected=No environment samples selected -headingEnvironmentSamplesDeleted=Environment samples deleted -headingEnvironmentSamplesNotDeleted=None of the environment samples were deleted -headingEnvironmentSamplesNotRestored=None of the environment samples were restored -headingEnvironmentSamplesRestored=Environment samples restored -headingLaboratoryEnvironmentSample=Laboratory sample -headingEnvironmentSampleMeasurements=Sample measurements -headingEnvironmentSampleLocation=Location of sampling site -headingEnvironmentSampleManagement=Sample management -headingEnvironmentSampleRequestedPathogenTests=Requested pathogens to be tested +headingPlaceOfStayInHospital = Place of stay in hospital +headingCurrentHospitalization = Current hospitalization +headingCorrectPerson = Correct person data +headingPreviousPersonInformation = Previous person information +headingUpdatedPersonInformation = Updated person information +headingCorrectSample = Correct sample data +headingPreviousSampleInformation = Previous sample information +headingUpdatedSampleInformation = Updated sample information +headingCorrectPathogenTest = Correct pathogent test data +headingPreviousPathogenTestInformation = Previous pathogen test information +headingUpdatedPathogenTestInformation = Updated pathogen test information +headingLabMessageCorrectionThrough = No more changes found +headingDeleteContacts = Delete contacts +headingProcessPhysiciansReport = Process message +headingDeleteUserRoleNotPossible = Cannot delete user role +headingSaveUserNotPossible = Cannot save user +immunizationVaccinationHeading = Vaccination +immunizationRecoveryHeading = Recovery +headingAutomaticDeletionStarted = Automatic deletion started +headingBulkOperationProgress = Bulk operation progress +headingBulkEmailWrongFileType = Allowed file types in attachments +headingBulkEmailMaxAttachedFiles = Maximum allowed number of attached files +headingSomeContactsAlreadyInEvent = Some contacts are already linked +headingSomeCasesAlreadyInEvent = Some cases are already linked +headingEnvironmentJurisdictionUpdated = Environment location update +headingNoEnvironmentSamplesSelected = No environment samples selected +headingEnvironmentSamplesDeleted = Environment samples deleted +headingEnvironmentSamplesNotDeleted = None of the environment samples were deleted +headingEnvironmentSamplesNotRestored = None of the environment samples were restored +headingEnvironmentSamplesRestored = Environment samples restored +headingLaboratoryEnvironmentSample = Laboratory sample +headingEnvironmentSampleMeasurements = Sample measurements +headingEnvironmentSampleLocation = Location of sampling site +headingEnvironmentSampleManagement = Sample management +headingEnvironmentSampleRequestedPathogenTests = Requested pathogens to be tested headingLimitedDiseases=Disease restrictions headingExternalEmailSend=Send email headingExternalEmailDetails=Email details @@ -936,231 +938,232 @@ headingCaseSurveyDetails=Survey details headingSurveyGenerateDocument=Generate document headingSurveySendDocument=Send document headingErrorSendingExternalEmail=Error sending email -headingImportSurveyTokens=Import Survey Tokens -headingImportSurveyTokenResponses=Import Survey Token Responses -headingDrugSusceptibility=Drug Susceptibility -headingDiagnosisCriteria=Diagnosis Criteria -subheadingDiagnosisCriteria=Note: Diagnosis criteria information is gotten from pathogen testing details +headingImportSurveyTokens = Import Survey Tokens +headingImportSurveyTokenResponses = Import Survey Token Responses +headingDrugSusceptibility = Drug Susceptibility +headingDiagnosisCriteria = Diagnosis Criteria +subheadingDiagnosisCriteria = Note: Diagnosis criteria information is gotten from pathogen testing details headingGisDashboardMap=Combined status map headingLocalisation=Localisation + # Info texts -infoActivityAsCaseInvestigation=Please document ALL relevant activities after infection: -infoAddTestsToSample=To add a test result to this sample, it has to be marked as received first. -infoArchivedCases=Cases are automatically archived after %d days without changes to the data. -infoArchivedContacts=Contacts are automatically archived after %d days without changes to the data. -infoArchivedEvents=Events are automatically archived after %d days without changes to the data. -infoArchivedEventParticipants=Event participants are automatically archived after %d days without changes to the data. -infoArchivedTravelEntries=Travel entries are automatically archived after %d days without changes to the data. -infoAssigneeMissingEmail=The user assigned to this task does not have an e-mail address provided, and will therefore not be notified. -infoObserverMissingEmail=At least one of the observers of this task does not have an e-mail address provided, and will therefore not be notified. -infoAssigneeMissingEmailOrPhoneNumber=The user assigned to this task does not have an e-mail address nor a phone number provided, and will therefore not be notified. -infoAutomaticDeletion=Deletion scheduled for %s -infoAutomaticDeletionTooltip=Deletion scheduled for %s
%s: %s
Deletion period: %s -infoAutomaticDeletionTooltipDays=%s days -infoAutomaticDeletionTooltipMonths=%s months -infoAutomaticDeletionTooltipYears=%s years -infoObserverMissingEmailOrPhoneNumber=At least one of the observers of this task does not have an e-mail address nor a phone number provided, and will therefore not be notified. -infoBasicExport=Export the columns and rows that are shown in the table below. -infoCanceledBy=Canceled by %s using bulk action -infoCaseDate=By default, cases are filtered by the most relevant date available:
  • Symptom onset date
  • Case report date
This means that, when a case e.g. has a symptom onset date, only this date will be taken into account when searching the list for cases in the specified date range. You can specify a date type in the dropdown menu to instead specifically filter by this date.

Example: Case A has been created this week and therefore has a report date that lies in this week as well. However, Case A also has a symptom onset date that is set to last week (because it has been entered retrospectively). By default, when \"Most relevant date\" is selected and you have set the filter to only display cases of this week, Case A will not appear in the list because its symptom onset date lies in the previous week. For the case to appear in the list, you need to select \"Case report date\" which will result in only the report date being considered when filtering the list. -infoCaseIncidence="Case incidence proportion" means the number of cases per 100,000 inhabitants. You can check the map key to see the thresholds that define how the districts are colorized. -infoCaseMap=If cases are shown by home address and there are no GPS coordinates available for it, the coordinates of the location where the case has been reported are used instead. -infoCheckProbableInfectionEnvironment=This checkbox should be checked if you are sure that this exposure was the most probable infection environment for this case. Only one exposure can be marked as the probable infection environment at the same time, and that exposure will be transmitted to SurvNet. -infoContactDashboard=All Dashboard elements that display general information about contacts use the follow-up period of the respective contact, starting with the contact report date. -infoConvertToCaseContacts=There are %s additional %s contacts of this person that do not have a resulting case set. Do you want to set the case you have just created as the resulting case of some or all of these contacts as well? -infoConvertToCaseContactsAndEventParticipants=There are %s additional %s contacts and %s additional %s event participants of this person that do not have a resulting case set. Do you want to set the case you have just created as the resulting case of some or all of these contacts and event participants as well? -infoConvertToCaseEventParticipants=There are %s additional %s event participants of this person that do not have a resulting case set. Do you want to set the case you have just created as the resulting case of some or all of these event participants as well? -infoConvertToCaseSelect=Please select the contacts and event participants for which you want to set the created case as the resulting case. -infoCreateEntry=The database contains no entry that seems to be similar to the details of the lab message.

Select one of the options and click on the Confirm button to create a new entry for the person.

If you are unsure, you can discard this window and cancel the process. -infoDashboardIncidence=Thresholds are calculated using quartiles. -infoDatabaseExportTables=Please select the database tables you want to export. -infoDefineOutbreaks=Click on a button to define which districts of the region currently have an outbreak of a specific disease. -infoDetailedExport=Export the rows that are shown in the table below with an extended set of columns. This may take a while. -infoDeterminedVaccinationStatusExplanation=The vaccination status is automatically determined from immunization records at the time of the case report. -infoDeterminedVaccinationStatusReadOnly=This field is read-only because the determined vaccination status feature is enabled. The vaccination status is automatically computed from immunization data. -infoCaseManagementExport=Export the rows that are shown in the table below with a customized set of columns that are relevant for the case management process. This may take a while. -infoDisplayNetworkDiagram=Please maximize to view the disease transmission chains -infoDocumentAlreadyExists=A Document with filename "%s" already exists. Are you sure you want to upload? -infoDocumentAlreadyExistsCannotUploadAnotherOne=A Document with filename "%s" already exists. You cannot upload a second one with the same name. -infoDocumentOverride=A Document with filename "%s" already exists. Overwrite? -infoDontShareCheckboxAlreadyShared=Case was already shared. It can not be set to don't share with external reporting tool. -infoDoseCountFromNumberOfDoses=Uses the number of doses if available -infoDoseCountFromVaccinationEntries=Otherwise counts the number of vaccination entries -infoDownloadDocumentTemplateImportGuide=If this is your first time uploading document templates to SORMAS, we strongly recommend to read the document template guide first. -infoDownloadEmailTemplateImportGuide=If this is your first time uploading email templates to SORMAS, we strongly recommend to read the email template guide first. -infoDownloadExport=The export is being prepared. This may take a while.
You can close this dialog after the download has completed. -infoDownloadCaseImportTemplate=You can use this template .csv file to bring your data into a format SORMAS can read. Please do this every time you import data, never use a file you have downloaded before. -infoDownloadImportTemplate=You can use this template .csv file to bring your data into a format SORMAS can read. Please do this every time you import data, never use a file you have downloaded before. -infoDownloadErrorReport=If there were any rows that could not be imported, you will be offered a .csv file containing all these rows as well as the error descriptions. -infoDownloadImportGuide=If this is your first time importing data into SORMAS, we strongly recommend to read the import guide first. -infoEventParticipantAlreadyExisting=For this person, an event participant already exists in this event. You can either continue with this event participant or go back to the event selection. -infoEventResponsibleUserFilter=The responsible user filter requires a region to be selected in the region filter. -infoExistingImmunizationPeriod=Immunization period of existing immunization -infoExpectedFollowUpUntilDateCase=The expected follow-up until date for this case is based on its %s (%s) -infoExpectedFollowUpUntilDateContact=The expected follow-up until date for this contact is based on its %s (%s) -infoExportNoFilters=Warning: No filters have been selected. Export may take a while. -infoFacilityCsvImport=Name of a configured facility (requires FacilityType), OTHER_FACILITY (requires FacilityType and FacilityDetails) or NO_FACILITY -infoFacilityNeedsDistrict=Please define a district in order to select a facility. -infoImmunizationPeriod=Immunization period of this immunization -infoImmunizationStatusAcquired=Only immunizations with acquired status are considered -infoImmunizationValidFromClosest=Selects the immunization with the valid from date closest to (but not after) the case report date -infoImmunizationValidUntilNotBefore=valid until date must not be before the case report date -infoImportAllCountries=This will import all countries which are currently WHO members. You will receive a notification when the import process has finished. -infoImportAllContinents=This will import all default continents. You will receive a notification when the import process has finished. -infoImportAllSubcontinents=This will import all default subcontinents. You will receive a notification when the import process has finished. -infoImportCsvFile=Depending on the amount of rows you want to import, this may take a while. You will receive a notification when the import process has finished. -infoImportInfrastructureAllowOverwrite=Select this option if existing data should be overwritten with data from the import file. If an existing entry (based on the name or ISO/UNO-Code if available ) is found, all data will be updated with the content of the import file (if available). If no existing entry is found, a new one will be created. -infoImportProcess=%d rows are being imported. The import process might take a while.
You will be able to review and solve any errors after the import process has been completed. -infoImportSimilarity=One of the cases you tried to import is similar to an already existing case in the SORMAS database. Please check whether the case to import is a duplicate of any of the cases in the list and, if so, select that case and confirm. -infoLostToFollowUpBy=Set to lost to follow-up by %s using bulk action -infoNoAdditionalTests=No additional tests have been created for this sample -infoNoCasesFoundStatistics=No cases have been found for the selected filters and visualization options. -infoNoDiseaseSelected=Please select a disease to display the immunization overview. -infoCaseIncidenceNotPossible=The following regions have missing population data:

%s.

As a result, case incidence cannot be calculated and case counts are displayed instead. -infoCaseIncidenceMissingPopulationData=The following regions and/or districts have missing population data:

%s.

Incidence proportion cannot be calculated for these regions and/or districts. -infoCaseIncidenceIncompatible=No population data is available for communities and facilities. Case incidence cannot be calculated and case counts are displayed instead. If you want to view case incidence, please remove any community and facilitiy filters and groupings. -infoNoPathogenTests=No pathogen tests have been created for this sample -infoPickOrCreateCase=There are existing cases in the database that seem very similar to the one you are about to create. Please have a look at the list of existing cases and verify that the case you want to create is not a duplicate of one of them. If you find a case that is most likely the same as yours, please click on it in the list and confirm. -infoPickOrCreateCaseNewCase=Newly added case information -infoPickOrCreateImmunization=The system already contains at least one immunization for %s for this person and means of immunization that overlaps with the specified immunziation period. Please compare the most recent existing immunization with the one you created and decide whether to discard the new immunization, use its information to update the existing one, or create it anyway. -infoPickOrCreateImmunizationExisting=Existing immunization information -infoPickOrCreateImmunizationNew=Newly added immunization information -infoPickOrCreatePathogenTest=The database already contains at least one pathogen test that belongs to the sample.

Please look through the lists of pathogen tests. If you feel certain that one matches the lab message details, select it and click on the Confirm button. Otherwise, click on Create new sample to create a new sample for the entry.

If you are unsure, you can discard this window and cancel the process. -infoPickOrCreateSample=Please choose one of the options below.

The list of matching samples contains samples in the database that seem to be similar to the details of the lab message (if any).
The list of different samples contains samples related to the entry you chose, but not similar to the details of the lab message (if any).
You can also create a new sample.

If you are unsure, you can discard this window and cancel the process. -infoSampleAdditionalTesting=Please tick every type of additional test you would like to be performed on this sample. -infoSampleExport=Export the samples of all cases displayed in the table rows with an extended set of columns. This may take a while. -infoSamplePathogenTesting=Please tick every type of pathogen test you would like to be performed on this sample. -infoSimilarImmunization=The system already contains at least one immunization for %s for this person and means of immunization that overlaps with the specified immunization period. Do you still want to update the start and end date or go back and adjust your changes? -infoStatisticsDisclaimer=All statistics on this page are aggregated data of the whole country. This includes cases you might not have read and write access to and therefore are not visible in the case directory. -infoStatisticsFilter=Add filters to restrict the aggregated data.
If you use multiple filters, only cases that pass all restrictions will be aggregated. -infoStatisticsResults=Click the "Generate" button to create a new table, map or chart. -infoSurveillanceDashboard=All Dashboard elements that display cases (the "New Cases" statistics, the Epidemiological Curve and the Case Status Map) use the onset date of the first symptom for the date/epi week filter. If this date is not available, the date of report is used instead. +infoActivityAsCaseInvestigation = Please document ALL relevant activities after infection: +infoAddTestsToSample = To add a test result to this sample, it has to be marked as received first. +infoArchivedCases = Cases are automatically archived after %d days without changes to the data. +infoArchivedContacts = Contacts are automatically archived after %d days without changes to the data. +infoArchivedEvents = Events are automatically archived after %d days without changes to the data. +infoArchivedEventParticipants = Event participants are automatically archived after %d days without changes to the data. +infoArchivedTravelEntries = Travel entries are automatically archived after %d days without changes to the data. +infoAssigneeMissingEmail = The user assigned to this task does not have an e-mail address provided, and will therefore not be notified. +infoObserverMissingEmail = At least one of the observers of this task does not have an e-mail address provided, and will therefore not be notified. +infoAssigneeMissingEmailOrPhoneNumber = The user assigned to this task does not have an e-mail address nor a phone number provided, and will therefore not be notified. +infoAutomaticDeletion = Deletion scheduled for %s +infoAutomaticDeletionTooltip = Deletion scheduled for %s
%s: %s
Deletion period: %s +infoAutomaticDeletionTooltipDays = %s days +infoAutomaticDeletionTooltipMonths = %s months +infoAutomaticDeletionTooltipYears = %s years +infoObserverMissingEmailOrPhoneNumber = At least one of the observers of this task does not have an e-mail address nor a phone number provided, and will therefore not be notified. +infoBasicExport = Export the columns and rows that are shown in the table below. +infoCanceledBy = Canceled by %s using bulk action +infoCaseDate = By default, cases are filtered by the most relevant date available:
  • Symptom onset date
  • Case report date
This means that, when a case e.g. has a symptom onset date, only this date will be taken into account when searching the list for cases in the specified date range. You can specify a date type in the dropdown menu to instead specifically filter by this date.

Example: Case A has been created this week and therefore has a report date that lies in this week as well. However, Case A also has a symptom onset date that is set to last week (because it has been entered retrospectively). By default, when \"Most relevant date\" is selected and you have set the filter to only display cases of this week, Case A will not appear in the list because its symptom onset date lies in the previous week. For the case to appear in the list, you need to select \"Case report date\" which will result in only the report date being considered when filtering the list. +infoCaseIncidence = "Case incidence proportion" means the number of cases per 100,000 inhabitants. You can check the map key to see the thresholds that define how the districts are colorized. +infoCaseMap = If cases are shown by home address and there are no GPS coordinates available for it, the coordinates of the location where the case has been reported are used instead. +infoCheckProbableInfectionEnvironment = This checkbox should be checked if you are sure that this exposure was the most probable infection environment for this case. Only one exposure can be marked as the probable infection environment at the same time, and that exposure will be transmitted to SurvNet. +infoContactDashboard = All Dashboard elements that display general information about contacts use the follow-up period of the respective contact, starting with the contact report date. +infoConvertToCaseContacts = There are %s additional %s contacts of this person that do not have a resulting case set. Do you want to set the case you have just created as the resulting case of some or all of these contacts as well? +infoConvertToCaseContactsAndEventParticipants = There are %s additional %s contacts and %s additional %s event participants of this person that do not have a resulting case set. Do you want to set the case you have just created as the resulting case of some or all of these contacts and event participants as well? +infoConvertToCaseEventParticipants = There are %s additional %s event participants of this person that do not have a resulting case set. Do you want to set the case you have just created as the resulting case of some or all of these event participants as well? +infoConvertToCaseSelect = Please select the contacts and event participants for which you want to set the created case as the resulting case. +infoCreateEntry = The database contains no entry that seems to be similar to the details of the lab message.

Select one of the options and click on the Confirm button to create a new entry for the person.

If you are unsure, you can discard this window and cancel the process. +infoDashboardIncidence = Thresholds are calculated using quartiles. +infoDatabaseExportTables = Please select the database tables you want to export. +infoDefineOutbreaks = Click on a button to define which districts of the region currently have an outbreak of a specific disease. +infoDetailedExport = Export the rows that are shown in the table below with an extended set of columns. This may take a while. +infoDeterminedVaccinationStatusExplanation = The vaccination status is automatically determined from immunization records at the time of the case report. +infoDeterminedVaccinationStatusReadOnly = This field is read-only because the determined vaccination status feature is enabled. The vaccination status is automatically computed from immunization data. +infoCaseManagementExport = Export the rows that are shown in the table below with a customized set of columns that are relevant for the case management process. This may take a while. +infoDisplayNetworkDiagram = Please maximize to view the disease transmission chains +infoDocumentAlreadyExists = A Document with filename "%s" already exists. Are you sure you want to upload? +infoDocumentAlreadyExistsCannotUploadAnotherOne = A Document with filename "%s" already exists. You cannot upload a second one with the same name. +infoDocumentOverride = A Document with filename "%s" already exists. Overwrite? +infoDontShareCheckboxAlreadyShared = Case was already shared. It can not be set to don't share with external reporting tool. +infoDoseCountFromNumberOfDoses = Uses the number of doses if available +infoDoseCountFromVaccinationEntries = Otherwise counts the number of vaccination entries +infoDownloadDocumentTemplateImportGuide = If this is your first time uploading document templates to SORMAS, we strongly recommend to read the document template guide first. +infoDownloadEmailTemplateImportGuide = If this is your first time uploading email templates to SORMAS, we strongly recommend to read the email template guide first. +infoDownloadExport = The export is being prepared. This may take a while.
You can close this dialog after the download has completed. +infoDownloadCaseImportTemplate = You can use this template .csv file to bring your data into a format SORMAS can read. Please do this every time you import data, never use a file you have downloaded before. +infoDownloadImportTemplate = You can use this template .csv file to bring your data into a format SORMAS can read. Please do this every time you import data, never use a file you have downloaded before. +infoDownloadErrorReport = If there were any rows that could not be imported, you will be offered a .csv file containing all these rows as well as the error descriptions. +infoDownloadImportGuide = If this is your first time importing data into SORMAS, we strongly recommend to read the import guide first. +infoEventParticipantAlreadyExisting = For this person, an event participant already exists in this event. You can either continue with this event participant or go back to the event selection. +infoEventResponsibleUserFilter = The responsible user filter requires a region to be selected in the region filter. +infoExistingImmunizationPeriod = Immunization period of existing immunization +infoExpectedFollowUpUntilDateCase = The expected follow-up until date for this case is based on its %s (%s) +infoExpectedFollowUpUntilDateContact = The expected follow-up until date for this contact is based on its %s (%s) +infoExportNoFilters = Warning: No filters have been selected. Export may take a while. +infoFacilityCsvImport = Name of a configured facility (requires FacilityType), OTHER_FACILITY (requires FacilityType and FacilityDetails) or NO_FACILITY +infoFacilityNeedsDistrict = Please define a district in order to select a facility. +infoImmunizationPeriod = Immunization period of this immunization +infoImmunizationStatusAcquired = Only immunizations with acquired status are considered +infoImmunizationValidFromClosest = Selects the immunization with the valid from date closest to (but not after) the case report date +infoImmunizationValidUntilNotBefore = valid until date must not be before the case report date +infoImportAllCountries = This will import all countries which are currently WHO members. You will receive a notification when the import process has finished. +infoImportAllContinents = This will import all default continents. You will receive a notification when the import process has finished. +infoImportAllSubcontinents = This will import all default subcontinents. You will receive a notification when the import process has finished. +infoImportCsvFile = Depending on the amount of rows you want to import, this may take a while. You will receive a notification when the import process has finished. +infoImportInfrastructureAllowOverwrite = Select this option if existing data should be overwritten with data from the import file. If an existing entry (based on the name or ISO/UNO-Code if available ) is found, all data will be updated with the content of the import file (if available). If no existing entry is found, a new one will be created. +infoImportProcess = %d rows are being imported. The import process might take a while.
You will be able to review and solve any errors after the import process has been completed. +infoImportSimilarity = One of the cases you tried to import is similar to an already existing case in the SORMAS database. Please check whether the case to import is a duplicate of any of the cases in the list and, if so, select that case and confirm. +infoLostToFollowUpBy = Set to lost to follow-up by %s using bulk action +infoNoAdditionalTests = No additional tests have been created for this sample +infoNoCasesFoundStatistics = No cases have been found for the selected filters and visualization options. +infoNoDiseaseSelected = Please select a disease to display the immunization overview. +infoCaseIncidenceNotPossible = The following regions have missing population data:

%s.

As a result, case incidence cannot be calculated and case counts are displayed instead. +infoCaseIncidenceMissingPopulationData = The following regions and/or districts have missing population data:

%s.

Incidence proportion cannot be calculated for these regions and/or districts. +infoCaseIncidenceIncompatible = No population data is available for communities and facilities. Case incidence cannot be calculated and case counts are displayed instead. If you want to view case incidence, please remove any community and facilitiy filters and groupings. +infoNoPathogenTests = No pathogen tests have been created for this sample +infoPickOrCreateCase = There are existing cases in the database that seem very similar to the one you are about to create. Please have a look at the list of existing cases and verify that the case you want to create is not a duplicate of one of them. If you find a case that is most likely the same as yours, please click on it in the list and confirm. +infoPickOrCreateCaseNewCase = Newly added case information +infoPickOrCreateImmunization = The system already contains at least one immunization for %s for this person and means of immunization that overlaps with the specified immunziation period. Please compare the most recent existing immunization with the one you created and decide whether to discard the new immunization, use its information to update the existing one, or create it anyway. +infoPickOrCreateImmunizationExisting = Existing immunization information +infoPickOrCreateImmunizationNew = Newly added immunization information +infoPickOrCreatePathogenTest = The database already contains at least one pathogen test that belongs to the sample.

Please look through the lists of pathogen tests. If you feel certain that one matches the lab message details, select it and click on the Confirm button. Otherwise, click on Create new sample to create a new sample for the entry.

If you are unsure, you can discard this window and cancel the process. +infoPickOrCreateSample = Please choose one of the options below.

The list of matching samples contains samples in the database that seem to be similar to the details of the lab message (if any).
The list of different samples contains samples related to the entry you chose, but not similar to the details of the lab message (if any).
You can also create a new sample.

If you are unsure, you can discard this window and cancel the process. +infoSampleAdditionalTesting = Please tick every type of additional test you would like to be performed on this sample. +infoSampleExport = Export the samples of all cases displayed in the table rows with an extended set of columns. This may take a while. +infoSamplePathogenTesting = Please tick every type of pathogen test you would like to be performed on this sample. +infoSimilarImmunization = The system already contains at least one immunization for %s for this person and means of immunization that overlaps with the specified immunization period. Do you still want to update the start and end date or go back and adjust your changes? +infoStatisticsDisclaimer = All statistics on this page are aggregated data of the whole country. This includes cases you might not have read and write access to and therefore are not visible in the case directory. +infoStatisticsFilter = Add filters to restrict the aggregated data.
If you use multiple filters, only cases that pass all restrictions will be aggregated. +infoStatisticsResults = Click the "Generate" button to create a new table, map or chart. +infoSurveillanceDashboard = All Dashboard elements that display cases (the "New Cases" statistics, the Epidemiological Curve and the Case Status Map) use the onset date of the first symptom for the date/epi week filter. If this date is not available, the date of report is used instead. infoCampaignsDashboard=All Dashboard elements that display campaign diagrams. infoUploadDocumentTemplate=Select a "%s"-Document Template you would like to upload. -infoUserEmail=Used to send E-Mail notifications. -infoUserPhoneNumber=Used to send SMS notifications. Needs to contain country code. -infoVaccinationDoseCount=Determines dose count from immunization records (one dose or two doses) -infoWeeklyReportsView=Number of officer/informant reports is the total number of reports that were submitted by the officers/informants associated with the displayed region or officer this week.

Percentage is the percentage of officers/informants that submitted their report for the respective week.

Number of officers/informants zero reports is the amount of zero reports, i.e. submitted reports with no cases. These are included in the total number of reports.

Officer/Informant report submission is either the date the report has been submitted at or a hint that no report has been submitted for this week yet. -infoMergingExplanation=This view is designed to assist you in detecting and merging duplicate cases. Cases are always displayed as pairs, the case with the earlier creation date being on top.

You can use the creation date filter to only view potential duplicates that were created in a specific time period. The creation date is automatically generated when a case is entered into SORMAS and can not be changed by users. Therefore, once you have reviewed all duplicates from a specific time period in the past, you will never have to do it again as there will be no new cases created during this time frame.

Please note that most likely not all displayed cases are actual duplicates. There is the potential for false positives, so please thoroughly review the cases before merging them! In addition to the information provided in the table, you can also click on the IDs of the cases to open them in a new tab. Keep in mind that it is much worse to falsely merge unique cases together than to have some duplicates in the system. -infoContactMergingExplanation=This view is designed to assist you in detecting and merging duplicate contacts. Contacts are always displayed as pairs, the contact with the earlier creation date being on top.

You can use the creation date filter to only view potential duplicates that were created in a specific time period. The creation date is automatically generated when a contact is entered into SORMAS and can not be changed by users. Therefore, once you have reviewed all duplicates from a specific time period in the past, you will never have to do it again as there will be no new contacts created during this time frame.

Please note that most likely not all displayed contacts are actual duplicates. There is the potential for false positives, so please thoroughly review the contacts before merging them! In addition to the information provided in the table, you can also click on the IDs of the contacts to open them in a new tab. Keep in mind that it is much worse to falsely merge unique contacts together than to have some duplicates in the system. -infoMergingMergeDescription=Choose this option only if you are sure that the two cases are the same! You should click on this button next to the case with the most recent or more complete information. Click on the IDs of the cases to open them in new tabs in order to view all their data. When the case you chose is missing information that is present in the other case, it will be updated. Also, contacts, samples, tasks and case management information will be transfered. Afterwards, the case you did not choose will be deleted. -infoContactMergingMergeDescription=Choose this option only if you are sure that the two contacts are the same! You should click on this button next to the contact with the most recent or more complete information. Click on the IDs of the contacts to open them in new tabs in order to view all their data. When the contact you chose is missing information that is present in the other contact, it will be updated. Also, samples, tasks and contact management information will be transfered. Afterwards, the contact you did not choose will be deleted. -infoMergingPickDescription=Clicking on this button will simply delete the case that was not picked. However, no information will be copied to the case that remains active. All contacts, samples and tasks will be lost as well. Choose this option if you are sure that both cases are the same, but the other case has not been updated with any information that needs to be transfered to the one that remains active. -infoContactMergingPickDescription=Clicking on this button will simply delete the contact that was not picked. However, no information will be copied to the contact that remains active. All samples and tasks will be lost as well. Choose this option if you are sure that both contacts are the same, but the other contact has not been updated with any information that needs to be transfered to the one that remains active. -infoMergingHideDescription=Choose this option if you are not sure whether the two cases are the same or if you know that they are not. This will hide the case pair from the list. Please note that, when you refresh the view or come back to it later, it will re-appear as long as you don't choose a different time period in the creation date filter. -infoContactMergingHideDescription=Choose this option if you are not sure whether the two contacts are the same or if you know that they are not. This will hide the contact pair from the list. Please note that, when you refresh the view or come back to it later, it will re-appear as long as you don't choose a different time period in the creation date filter. -infoPersonMergeDescription=Please select one of the persons below as the leading person. You have the following options to continue.
Merge: Data of the discarded person will be linked and/or added to the remaining person but not overwritten. You will not be able to undo this action.
Pick: Data of the remaining person will not be changed and the data of the other person will be discarded. However, entities linked to the discarded person will be linked to the remaining person. You will not be able to undo this action. -infoPersonMergeConfirmation=Are you certain you want to do this? The action is not reversible. -infoPersonMergeConfirmationBothShared=The persons you want to merge both have shared entities via S2S. If you merge these persons, the synchronization will be broken for the person who is not the leading one and the associated entities. Please discuss with your administrator if you would like to do this and verify which of the two persons you would like to have as the leading person.
Are you certain you want to do this? The action is not reversible. -infoPersonMergeSharedMustLead=Please note, you cannot choose this person as a leading person because then the synchronization of S2S would break.\nPlease select the other person as leading person -infoPickEventParticipantsForPersonMerge=The selected persons both have one event participant in at least one event. Merging the persons would lead to duplicate event participants.
For each event, please select one of the event participants below as the leading event participant.
'Merge': The discarded event participant will be removed from the event. Its associated entities and information will be linked and/or added to the remaining event participant, but not overwritten. You will not be able to undo this action.
'Pick': The discarded event participant will be removed from the event. Its associated entities and information will not be linked and/or added to the remaining event participant. You will not be able to undo this action. -infoPickorMergeEventParticipantDuplicateEventParticipantByPersonByEvent=One of the selected persons has multiple active or archived event participants in the same event(s).
Please review the events with the UUIDs presented below and delete duplicate event participants or ask a supervisor to do so in order to be able to merge these persons. -infoPersonMergeConfirmationForNonSimilarPersons=The two selected persons do not match the similarity requirements used by SORMAS to detect duplicate persons. Please ensure that the selected persons are indeed identical and supposed to be merged before proceeding. -infoHowToMergeCases=You can choose between two options when reviewing potentially duplicate cases: -infoHowToMergeContacts=You can choose between two options when reviewing potentially duplicate contacts: -infoCalculateCompleteness=The Calculate Completeness button on top can be used to calculate the completeness values for all cases in the table. This is only necessary if there are cases in the list that do not yet have a completeness value. Normally, this value is automatically updated whenever the details of a case or one of its contacts or samples change. -infoContactCalculateCompleteness=The Calculate Completeness button on top can be used to calculate the completeness values for all contacts in the table. This is only necessary if there are contacts in the list that do not yet have a completeness value. Normally, this value is automatically updated whenever the details of a contact or one of its samples change. -infoCaseCompleteness=Completeness is a measurement of how much vital data has already been entered into the case. This is composed of the following, weighted by their importance:
  • Has the case been classified?
  • Has the case been investigated?
  • Has at least one sample been taken?
  • Has at least one symptom been documented?
  • Has at least one contact been created?
  • Is there an outcome for the case?
  • Does the case have a birth date or age?
  • Does the case have a sex?
  • Has an onset date been specified?
-infoContactCompleteness=Completeness is a measurement of how much vital data has already been entered into the contact. This is composed of the following, weighted by their importance:
  • Has the contact been classified?
  • Has the contact status been modified?
  • Has at least one sample been taken?
  • Does the contact has a last contact date specified?
  • Does the contact have a sex?
  • Does the contact have its relation specified?
  • Does the contact have a category specified?
  • Does the contact have its birthdate specified?
-infoCompletenessMerge=You can use this measurement to get an idea about which case you should use as the one that remains active when merging. However, please make sure that you still have a detailed look at both cases to avoid mistakes. -infoContactCompletenessMerge=You can use this measurement to get an idea about which contact you should use as the one that remains active when merging. However, please make sure that you still have a detailed look at both contacts to avoid mistakes. -infoMergeIgnoreRegion=Selecting this option excludes the region as a criteria for detecting duplicates. Merging and picking are deactivated here because the probability of a real duplicate beyond region boundaries is very low. If a real duplicate is detected, this case can be deleted manually via the case directory. -infoContactMergeIgnoreRegion=Selecting this option excludes the region as a criteria for detecting duplicates. Merging and picking are deactivated here because the probability of a real duplicate beyond region boundaries is very low. If a real duplicate is detected, this contact can be deleted manually via the contact directory. -infoCustomExport=In this view, you can create and save export configurations with customized sets of columns. Saving these configurations allows you to quickly export only the information that you're interested, without having to manually edit the resulting CSV file afterwards. Please click on the blue export button next to one of your configurations or create a new configuration by using the button to the right. -infoEditExportConfiguration=Each of the checkboxes below represents a column in the export file. Please select all the columns you want to appear in your customized export and deselect those that you don't require. -infoPopulationDataView=Use one of the buttons below to manage population data for regions and districts within SORMAS. If you want to edit the data, please use the export function, copy the data you want to change into the import template, edit it, and import the template file containing the changed data. -infoPopulationCollectionDate=Please indicate the date the population data you want to import was collected on. If you only know the year, please choose the 1st of January of that year. -infoPopulationReferenceYear=The case incidence proportions are calculated by either projecting the population data to %s, which is the maximum year that was selected in the filters, or by taking the original population data if the maximum selected year is before the year the population data was collected in. -infoLineListingConfigurationRegion=Line listing is enabled for all districts listed next to the disease. Click on the Edit line listing button below a disease name to configure line listing for all districts. -infoLineListingConfigurationNation=Click on a region to open a detailed view with line listing information for all its districts. Click on the Edit line listing button below a disease to configure line listing for all regions. +infoUserEmail = Used to send E-Mail notifications. +infoUserPhoneNumber = Used to send SMS notifications. Needs to contain country code. +infoVaccinationDoseCount = Determines dose count from immunization records (one dose or two doses) +infoWeeklyReportsView = Number of officer/informant reports is the total number of reports that were submitted by the officers/informants associated with the displayed region or officer this week.

Percentage is the percentage of officers/informants that submitted their report for the respective week.

Number of officers/informants zero reports is the amount of zero reports, i.e. submitted reports with no cases. These are included in the total number of reports.

Officer/Informant report submission is either the date the report has been submitted at or a hint that no report has been submitted for this week yet. +infoMergingExplanation = This view is designed to assist you in detecting and merging duplicate cases. Cases are always displayed as pairs, the case with the earlier creation date being on top.

You can use the creation date filter to only view potential duplicates that were created in a specific time period. The creation date is automatically generated when a case is entered into SORMAS and can not be changed by users. Therefore, once you have reviewed all duplicates from a specific time period in the past, you will never have to do it again as there will be no new cases created during this time frame.

Please note that most likely not all displayed cases are actual duplicates. There is the potential for false positives, so please thoroughly review the cases before merging them! In addition to the information provided in the table, you can also click on the IDs of the cases to open them in a new tab. Keep in mind that it is much worse to falsely merge unique cases together than to have some duplicates in the system. +infoContactMergingExplanation = This view is designed to assist you in detecting and merging duplicate contacts. Contacts are always displayed as pairs, the contact with the earlier creation date being on top.

You can use the creation date filter to only view potential duplicates that were created in a specific time period. The creation date is automatically generated when a contact is entered into SORMAS and can not be changed by users. Therefore, once you have reviewed all duplicates from a specific time period in the past, you will never have to do it again as there will be no new contacts created during this time frame.

Please note that most likely not all displayed contacts are actual duplicates. There is the potential for false positives, so please thoroughly review the contacts before merging them! In addition to the information provided in the table, you can also click on the IDs of the contacts to open them in a new tab. Keep in mind that it is much worse to falsely merge unique contacts together than to have some duplicates in the system. +infoMergingMergeDescription = Choose this option only if you are sure that the two cases are the same! You should click on this button next to the case with the most recent or more complete information. Click on the IDs of the cases to open them in new tabs in order to view all their data. When the case you chose is missing information that is present in the other case, it will be updated. Also, contacts, samples, tasks and case management information will be transfered. Afterwards, the case you did not choose will be deleted. +infoContactMergingMergeDescription = Choose this option only if you are sure that the two contacts are the same! You should click on this button next to the contact with the most recent or more complete information. Click on the IDs of the contacts to open them in new tabs in order to view all their data. When the contact you chose is missing information that is present in the other contact, it will be updated. Also, samples, tasks and contact management information will be transfered. Afterwards, the contact you did not choose will be deleted. +infoMergingPickDescription = Clicking on this button will simply delete the case that was not picked. However, no information will be copied to the case that remains active. All contacts, samples and tasks will be lost as well. Choose this option if you are sure that both cases are the same, but the other case has not been updated with any information that needs to be transfered to the one that remains active. +infoContactMergingPickDescription = Clicking on this button will simply delete the contact that was not picked. However, no information will be copied to the contact that remains active. All samples and tasks will be lost as well. Choose this option if you are sure that both contacts are the same, but the other contact has not been updated with any information that needs to be transfered to the one that remains active. +infoMergingHideDescription = Choose this option if you are not sure whether the two cases are the same or if you know that they are not. This will hide the case pair from the list. Please note that, when you refresh the view or come back to it later, it will re-appear as long as you don't choose a different time period in the creation date filter. +infoContactMergingHideDescription = Choose this option if you are not sure whether the two contacts are the same or if you know that they are not. This will hide the contact pair from the list. Please note that, when you refresh the view or come back to it later, it will re-appear as long as you don't choose a different time period in the creation date filter. +infoPersonMergeDescription = Please select one of the persons below as the leading person. You have the following options to continue.
Merge: Data of the discarded person will be linked and/or added to the remaining person but not overwritten. You will not be able to undo this action.
Pick: Data of the remaining person will not be changed and the data of the other person will be discarded. However, entities linked to the discarded person will be linked to the remaining person. You will not be able to undo this action. +infoPersonMergeConfirmation = Are you certain you want to do this? The action is not reversible. +infoPersonMergeConfirmationBothShared = The persons you want to merge both have shared entities via S2S. If you merge these persons, the synchronization will be broken for the person who is not the leading one and the associated entities. Please discuss with your administrator if you would like to do this and verify which of the two persons you would like to have as the leading person.
Are you certain you want to do this? The action is not reversible. +infoPersonMergeSharedMustLead = Please note, you cannot choose this person as a leading person because then the synchronization of S2S would break.\nPlease select the other person as leading person +infoPickEventParticipantsForPersonMerge = The selected persons both have one event participant in at least one event. Merging the persons would lead to duplicate event participants.
For each event, please select one of the event participants below as the leading event participant.
'Merge': The discarded event participant will be removed from the event. Its associated entities and information will be linked and/or added to the remaining event participant, but not overwritten. You will not be able to undo this action.
'Pick': The discarded event participant will be removed from the event. Its associated entities and information will not be linked and/or added to the remaining event participant. You will not be able to undo this action. +infoPickorMergeEventParticipantDuplicateEventParticipantByPersonByEvent = One of the selected persons has multiple active or archived event participants in the same event(s).
Please review the events with the UUIDs presented below and delete duplicate event participants or ask a supervisor to do so in order to be able to merge these persons. +infoPersonMergeConfirmationForNonSimilarPersons = The two selected persons do not match the similarity requirements used by SORMAS to detect duplicate persons. Please ensure that the selected persons are indeed identical and supposed to be merged before proceeding. +infoHowToMergeCases = You can choose between two options when reviewing potentially duplicate cases: +infoHowToMergeContacts = You can choose between two options when reviewing potentially duplicate contacts: +infoCalculateCompleteness = The Calculate Completeness button on top can be used to calculate the completeness values for all cases in the table. This is only necessary if there are cases in the list that do not yet have a completeness value. Normally, this value is automatically updated whenever the details of a case or one of its contacts or samples change. +infoContactCalculateCompleteness = The Calculate Completeness button on top can be used to calculate the completeness values for all contacts in the table. This is only necessary if there are contacts in the list that do not yet have a completeness value. Normally, this value is automatically updated whenever the details of a contact or one of its samples change. +infoCaseCompleteness = Completeness is a measurement of how much vital data has already been entered into the case. This is composed of the following, weighted by their importance:
  • Has the case been classified?
  • Has the case been investigated?
  • Has at least one sample been taken?
  • Has at least one symptom been documented?
  • Has at least one contact been created?
  • Is there an outcome for the case?
  • Does the case have a birth date or age?
  • Does the case have a sex?
  • Has an onset date been specified?
+infoContactCompleteness = Completeness is a measurement of how much vital data has already been entered into the contact. This is composed of the following, weighted by their importance:
  • Has the contact been classified?
  • Has the contact status been modified?
  • Has at least one sample been taken?
  • Does the contact has a last contact date specified?
  • Does the contact have a sex?
  • Does the contact have its relation specified?
  • Does the contact have a category specified?
  • Does the contact have its birthdate specified?
+infoCompletenessMerge = You can use this measurement to get an idea about which case you should use as the one that remains active when merging. However, please make sure that you still have a detailed look at both cases to avoid mistakes. +infoContactCompletenessMerge = You can use this measurement to get an idea about which contact you should use as the one that remains active when merging. However, please make sure that you still have a detailed look at both contacts to avoid mistakes. +infoMergeIgnoreRegion = Selecting this option excludes the region as a criteria for detecting duplicates. Merging and picking are deactivated here because the probability of a real duplicate beyond region boundaries is very low. If a real duplicate is detected, this case can be deleted manually via the case directory. +infoContactMergeIgnoreRegion = Selecting this option excludes the region as a criteria for detecting duplicates. Merging and picking are deactivated here because the probability of a real duplicate beyond region boundaries is very low. If a real duplicate is detected, this contact can be deleted manually via the contact directory. +infoCustomExport = In this view, you can create and save export configurations with customized sets of columns. Saving these configurations allows you to quickly export only the information that you're interested, without having to manually edit the resulting CSV file afterwards. Please click on the blue export button next to one of your configurations or create a new configuration by using the button to the right. +infoEditExportConfiguration = Each of the checkboxes below represents a column in the export file. Please select all the columns you want to appear in your customized export and deselect those that you don't require. +infoPopulationDataView = Use one of the buttons below to manage population data for regions and districts within SORMAS. If you want to edit the data, please use the export function, copy the data you want to change into the import template, edit it, and import the template file containing the changed data. +infoPopulationCollectionDate = Please indicate the date the population data you want to import was collected on. If you only know the year, please choose the 1st of January of that year. +infoPopulationReferenceYear = The case incidence proportions are calculated by either projecting the population data to %s, which is the maximum year that was selected in the filters, or by taking the original population data if the maximum selected year is before the year the population data was collected in. +infoLineListingConfigurationRegion = Line listing is enabled for all districts listed next to the disease. Click on the Edit line listing button below a disease name to configure line listing for all districts. +infoLineListingConfigurationNation = Click on a region to open a detailed view with line listing information for all its districts. Click on the Edit line listing button below a disease to configure line listing for all regions. # 1st %s: disease name; 2nd %s: region name -infoLineListingConfigurationRegionEdit=You're editing the regional line listing configuration for %s in %s. +infoLineListingConfigurationRegionEdit = You're editing the regional line listing configuration for %s in %s. # %s: disease name -infoLineListingConfigurationNationEdit=You're editing the country-wide line listing configuration for %s. -infoNoNetworkDiagram=Please select a disease above to view the disease transmission chains. -infoOtherImmunization=Other means of immunization (e.g., experimental treatments) -infoSyncUsers=Sync SORMAS users' data to the External Authentication Provider configured.
The sync is one way only SORMAS -> Authentication Provider.
Passwords are not updated for users which already exist in the External Authentication Provider -infoSpecificCaseSearch=Use the text field below to search for a specific case in the whole country. You can search by case ID, external ID or epid number. Click on "Search Case" when you're done to open the case if the search was successful. If more than one case is found, the case with the latest report date will be opened. -infoSpecificEventSearch=Use the text field below to search for a specific event in the whole country. You can search by case ID or person ID. Click on "Search Event" when you're done to open the event if the search was successful.

If more than one event is found, the event with the latest report date will be opened. -infoSearchCaseForContact=Use the text field below to search for any case in the system you have access to. You can search by name, case ID, external ID or epid number. When you're done, click on "Search Case" to see a list of all cases that match the text that you've entered. Select a case in this list and click on "Confirm" to use the selected case as the contact's source case. -infoNoSourceCaseSelected=Please select the source case for this contact, if known -infoNoSourceCaseSelectedLineListing=Please select the source case, if known -infoContactCreationSourceCase=Selected source case:
%s -infoSelectOrCreateContact=The database already contains at least one contact that seems to be very similar to the details of the created contact.

Please look through the list of contacts. If you feel certain that one matches your contact, select it and click on the Save button. Otherwise, click on Create new contact to create a new contact for the person.

If you are unsure, you can discard this window and cancel the contact creation process. -infoSelectOrCreateContactImport=The database already contains at least one contact that seems to be very similar to the details of the imported contact.

Please look through the list of contacts. If you feel certain that one matches your contact, select it and click on the Save button. Otherwise, click on Create new contact to create a new contact for the person.

If you are unsure, you can discard this window to remove the contact from the current import. -infoSelectOrCreateEntry=The database already contains at least one entry that seems to be very similar to the details of the external message.

Please look through the lists of entries. If you feel certain that one matches the external message details, select it and click on the Confirm button. Otherwise, select one of the other options to create a new entry for the person.

If you are unsure, you can discard this window and cancel the process. -infoSelectOrCreatePersonForContact=The database already contains at least one person that seems to be very similar to the personal details of the created contact.

Please look through the list of persons. If you feel certain that one of those persons matches your contact person, select it and click on the Save button. Otherwise, click on Create New Person to create a new person for your contact.

If you are unsure, you can discard this window and cancel the contact creation process. -infoSelectOrCreatePersonForImmunization=The database already contains at least one person that seems to be very similar to the personal details of the created immunization.

Please look through the list of persons. If you feel certain that one of those persons matches your immunization person, select it and click on the Save button. Otherwise, click on Create New Person to create a new person for your immunization.

If you are unsure, you can discard this window and cancel the immunization creation process. -infoSelectOrCreatePersonForImport=The database already contains at least one person that seems to be very similar to the personal details of the imported entry.

Please look through the list of persons. If you feel certain that one of those persons matches the person of the imported entry, select it and click on the Save button. Otherwise, click on Create New Person to create a new person.

If you are unsure, you can discard this window to remove the entry from the current import. -infoSelectOrCreatePersonForEventParticipant=The database already contains at least one person that seems to be very similar to the personal details of the created event participant.

Please look through the list of persons. If you feel certain that one of those persons matches your event person, select it and click on the Save button. Otherwise, click on Create New Person to create a new event person for your event.

If you are unsure, you can discard this window and cancel the event participant creation process. -infoSelectOrCreatePersonForLabMessage=The database already contains at least one person that seems to be very similar to the personal details of the external message.

Please look through the list of persons. If you feel certain that one of those persons matches the external message person, select it and click on the Confirm button. Otherwise, click on Create New Person to create a new person for the message.

If you are unsure, you can discard this window and cancel the process. -infoSelectOrCreatePersonForLabMessageWithoutMatches=A person closely matching the person details of the external message could not automatically be determined.

You can manually search for matches, or you can create a new person. Once you selected an option, continue via the Confirm button.

If you are unsure, you can discard this window and cancel the process. -infoSkipOrOverrideDuplicateCampaignFormDataImport=The database already contains a dataset for the form %s in the campaign %s for the specified community and date. Please have a look at the details for the existing dataset and choose Skip if you want to keep the existing data or Overwrite if you want to replace the existing data with the data you have imported. -pseudonymizedCasesSelectedWarning=For the bulked-edited cases you have only limited access to the sensitive data. For those cases the value you put into "Place Description" will be ignored. -pseudonymizedEntitiesSelectedWarning=You only have limited access to some of the selected entities. Please deselect pseudonymized entities to continue. -infoPickOrCreateEventForCase=The list below contains all existing events having the same disease as the current case. Please check whether the event this case belongs to is already on this list or create a new one if it isn't. -infoPickOrCreateEventForCases=The list below contains all existing events having the same disease as the selected cases. Please check whether the event these cases belongs to is already on this list or create a new one if it isn't. -infoPickOrCreateEventForContact=The list below contains all existing events having the same disease as the current contact. Please check whether the event this contact belongs to is already on this list or create a new one if it isn't. -infoPickOrCreateEventForContacts=The list below contains all existing events having the same disease as the selected contacts. Please check whether the event these contacts belongs to is already on this list or create a new one if it isn't. -infoPickOrCreateEventForLabMessage=The list below contains all existing events having the same disease as the lab message. Please check whether the event the new event participant belongs to is already on this list or create a new one if it isn't. -infoPickOrCreateSuperordinateEventForEvent=The list below contains all existing events with an event date and the same disease as the current event. Please check whether the superordinate event for this event is already on this list or create a new one if it isn't. -infoPickOrCreateEnvironmentForEvent=The list below contains all existing environments with reported date. Please check whether the environement for this event is already on this list or create a new one if it isn't. -infoPickOrCreateEventGroupForEvent=The list below contains all existing event groups. Please check whether the event group this event belongs to is already on this list or create a new one if it isn't. -infoSelectOrCreatePersonForCase=The database already contains at least one person that seems to be very similar to the personal details of the created case.

Please look through the list of persons. If you feel certain that one of those persons matches your case person, select them and click on the Save button. Otherwise, click on Create New Person to create a new person for your case.

If you are unsure, you can discard this window and cancel the case creation process. -infoSearchPerson=Use the filters below to search for any person in the system you have access to, based on: First Name, Last Name, Person UUID,External ID, External Token. When you're done click on "Search" to see a list of persons that match the text that you have entered. Select person in the list and click on "Confirm" to choose the selected person. -infoContactsViewRegionDistrictFilter=When you select a region and/or district filter, the contact directory is primarily filtered by the responsible region and district of the contacts. If these are not filled in, the region and district of the contact's source case are used instead. -infoDeveloperOptions=You can use the controls below to generate dummy cases and contacts based on the selected restraints. Please note that generating a lot of data at once might take some time.
Generated data is neither fully deterministic, nor fully random, and intended for testing and demonstration purposes only. -infoDeveloperOptionsContactGeneration=When generating contacts, the generator will pick random existing cases as source. Please make sure the case database is not empty before generating contacts. -infoDeveloperOptionsSeedUsage=Using the seed will create identical datasets, provided the starting conditions (configuration & database) are also identical -infoCreateNewSampleDiscardsChangesCase=Creating a new sample will discard all unsaved changes made to this case -infoCreateNewSampleDiscardsChangesContact=Creating a new sample will discard all unsaved changes made to this contact -infoCreateNewSampleDiscardsChangesEventParticipant=Creating a new sample will discard all unsaved changes made to this event participant -infoUsageOfEditableCampaignGrids=You can edit the campaign data and dashboard definitions by clicking inside one of the cells in the grid, and you can reorder the dashboard elements by dragging and dropping the grid rows -infoSaveOfTask=Saving this task will discard any unsaved changes made to the case. -populationDataByArea=Population data by Area -populationDataByRegion=Population data by Region -populationDataByCommunity=No population data available for communities -populationDataByDistrict=Population data by District -infoExposureInvestigation=Please document ALL relevant direct exposures (e.g. attended gatherings, travels, animal contacts, etc.) during the incubation period: -giardiaInfoExposureInvestigation=Please consider 25 days before the onset of the symptoms -infoExposureInvestigationContacts=Please document information about the exposure that led to this contact: -infoEpiDataFieldsHint=Please indicate if any of the following is relevant for the patient during the incubation period: -infoEpiDataSourceCaseContacts=Please indicate ALL contacts with potential source cases during the incubation period: -infoNoSourceCase=No source case -infoCreateNewContactDiscardsChanges=Creating a new contact will discard all unsaved changes made to this case -infoExposuresInfectionEnvironmentHint=This exposure is marked as the probable infection environment. -infoExposuresRiskAreaHint=This exposure took place in a risk area. -infoUserSyncProcess=%d users are being synced to the External Authentication Provider. The import process might take a while.
You will be able to review and solve any errors after the import process has been completed. +infoLineListingConfigurationNationEdit = You're editing the country-wide line listing configuration for %s. +infoNoNetworkDiagram = Please select a disease above to view the disease transmission chains. +infoOtherImmunization = Other means of immunization (e.g., experimental treatments) +infoSyncUsers = Sync SORMAS users' data to the External Authentication Provider configured.
The sync is one way only SORMAS -> Authentication Provider.
Passwords are not updated for users which already exist in the External Authentication Provider +infoSpecificCaseSearch = Use the text field below to search for a specific case in the whole country. You can search by case ID, external ID or epid number. Click on "Search Case" when you're done to open the case if the search was successful. If more than one case is found, the case with the latest report date will be opened. +infoSpecificEventSearch = Use the text field below to search for a specific event in the whole country. You can search by case ID or person ID. Click on "Search Event" when you're done to open the event if the search was successful.

If more than one event is found, the event with the latest report date will be opened. +infoSearchCaseForContact = Use the text field below to search for any case in the system you have access to. You can search by name, case ID, external ID or epid number. When you're done, click on "Search Case" to see a list of all cases that match the text that you've entered. Select a case in this list and click on "Confirm" to use the selected case as the contact's source case. +infoNoSourceCaseSelected = Please select the source case for this contact, if known +infoNoSourceCaseSelectedLineListing = Please select the source case, if known +infoContactCreationSourceCase = Selected source case:
%s +infoSelectOrCreateContact = The database already contains at least one contact that seems to be very similar to the details of the created contact.

Please look through the list of contacts. If you feel certain that one matches your contact, select it and click on the Save button. Otherwise, click on Create new contact to create a new contact for the person.

If you are unsure, you can discard this window and cancel the contact creation process. +infoSelectOrCreateContactImport = The database already contains at least one contact that seems to be very similar to the details of the imported contact.

Please look through the list of contacts. If you feel certain that one matches your contact, select it and click on the Save button. Otherwise, click on Create new contact to create a new contact for the person.

If you are unsure, you can discard this window to remove the contact from the current import. +infoSelectOrCreateEntry = The database already contains at least one entry that seems to be very similar to the details of the external message.

Please look through the lists of entries. If you feel certain that one matches the external message details, select it and click on the Confirm button. Otherwise, select one of the other options to create a new entry for the person.

If you are unsure, you can discard this window and cancel the process. +infoSelectOrCreatePersonForContact = The database already contains at least one person that seems to be very similar to the personal details of the created contact.

Please look through the list of persons. If you feel certain that one of those persons matches your contact person, select it and click on the Save button. Otherwise, click on Create New Person to create a new person for your contact.

If you are unsure, you can discard this window and cancel the contact creation process. +infoSelectOrCreatePersonForImmunization = The database already contains at least one person that seems to be very similar to the personal details of the created immunization.

Please look through the list of persons. If you feel certain that one of those persons matches your immunization person, select it and click on the Save button. Otherwise, click on Create New Person to create a new person for your immunization.

If you are unsure, you can discard this window and cancel the immunization creation process. +infoSelectOrCreatePersonForImport = The database already contains at least one person that seems to be very similar to the personal details of the imported entry.

Please look through the list of persons. If you feel certain that one of those persons matches the person of the imported entry, select it and click on the Save button. Otherwise, click on Create New Person to create a new person.

If you are unsure, you can discard this window to remove the entry from the current import. +infoSelectOrCreatePersonForEventParticipant = The database already contains at least one person that seems to be very similar to the personal details of the created event participant.

Please look through the list of persons. If you feel certain that one of those persons matches your event person, select it and click on the Save button. Otherwise, click on Create New Person to create a new event person for your event.

If you are unsure, you can discard this window and cancel the event participant creation process. +infoSelectOrCreatePersonForLabMessage = The database already contains at least one person that seems to be very similar to the personal details of the external message.

Please look through the list of persons. If you feel certain that one of those persons matches the external message person, select it and click on the Confirm button. Otherwise, click on Create New Person to create a new person for the message.

If you are unsure, you can discard this window and cancel the process. +infoSelectOrCreatePersonForLabMessageWithoutMatches = A person closely matching the person details of the external message could not automatically be determined.

You can manually search for matches, or you can create a new person. Once you selected an option, continue via the Confirm button.

If you are unsure, you can discard this window and cancel the process. +infoSkipOrOverrideDuplicateCampaignFormDataImport = The database already contains a dataset for the form %s in the campaign %s for the specified community and date. Please have a look at the details for the existing dataset and choose Skip if you want to keep the existing data or Overwrite if you want to replace the existing data with the data you have imported. +pseudonymizedCasesSelectedWarning = For the bulked-edited cases you have only limited access to the sensitive data. For those cases the value you put into "Place Description" will be ignored. +pseudonymizedEntitiesSelectedWarning = You only have limited access to some of the selected entities. Please deselect pseudonymized entities to continue. +infoPickOrCreateEventForCase = The list below contains all existing events having the same disease as the current case. Please check whether the event this case belongs to is already on this list or create a new one if it isn't. +infoPickOrCreateEventForCases = The list below contains all existing events having the same disease as the selected cases. Please check whether the event these cases belongs to is already on this list or create a new one if it isn't. +infoPickOrCreateEventForContact = The list below contains all existing events having the same disease as the current contact. Please check whether the event this contact belongs to is already on this list or create a new one if it isn't. +infoPickOrCreateEventForContacts = The list below contains all existing events having the same disease as the selected contacts. Please check whether the event these contacts belongs to is already on this list or create a new one if it isn't. +infoPickOrCreateEventForLabMessage = The list below contains all existing events having the same disease as the lab message. Please check whether the event the new event participant belongs to is already on this list or create a new one if it isn't. +infoPickOrCreateSuperordinateEventForEvent = The list below contains all existing events with an event date and the same disease as the current event. Please check whether the superordinate event for this event is already on this list or create a new one if it isn't. +infoPickOrCreateEnvironmentForEvent = The list below contains all existing environments with reported date. Please check whether the environement for this event is already on this list or create a new one if it isn't. +infoPickOrCreateEventGroupForEvent = The list below contains all existing event groups. Please check whether the event group this event belongs to is already on this list or create a new one if it isn't. +infoSelectOrCreatePersonForCase = The database already contains at least one person that seems to be very similar to the personal details of the created case.

Please look through the list of persons. If you feel certain that one of those persons matches your case person, select them and click on the Save button. Otherwise, click on Create New Person to create a new person for your case.

If you are unsure, you can discard this window and cancel the case creation process. +infoSearchPerson = Use the filters below to search for any person in the system you have access to, based on: First Name, Last Name, Person UUID,External ID, External Token. When you're done click on "Search" to see a list of persons that match the text that you have entered. Select person in the list and click on "Confirm" to choose the selected person. +infoContactsViewRegionDistrictFilter = When you select a region and/or district filter, the contact directory is primarily filtered by the responsible region and district of the contacts. If these are not filled in, the region and district of the contact's source case are used instead. +infoDeveloperOptions = You can use the controls below to generate dummy cases and contacts based on the selected restraints. Please note that generating a lot of data at once might take some time.
Generated data is neither fully deterministic, nor fully random, and intended for testing and demonstration purposes only. +infoDeveloperOptionsContactGeneration = When generating contacts, the generator will pick random existing cases as source. Please make sure the case database is not empty before generating contacts. +infoDeveloperOptionsSeedUsage = Using the seed will create identical datasets, provided the starting conditions (configuration & database) are also identical +infoCreateNewSampleDiscardsChangesCase = Creating a new sample will discard all unsaved changes made to this case +infoCreateNewSampleDiscardsChangesContact = Creating a new sample will discard all unsaved changes made to this contact +infoCreateNewSampleDiscardsChangesEventParticipant = Creating a new sample will discard all unsaved changes made to this event participant +infoUsageOfEditableCampaignGrids = You can edit the campaign data and dashboard definitions by clicking inside one of the cells in the grid, and you can reorder the dashboard elements by dragging and dropping the grid rows +infoSaveOfTask = Saving this task will discard any unsaved changes made to the case. +populationDataByArea = Population data by Area +populationDataByRegion = Population data by Region +populationDataByCommunity = No population data available for communities +populationDataByDistrict = Population data by District +infoExposureInvestigation = Please document ALL relevant direct exposures (e.g. attended gatherings, travels, animal contacts, etc.) during the incubation period: +giardiaInfoExposureInvestigation = Please consider 25 days before the onset of the symptoms +infoExposureInvestigationContacts = Please document information about the exposure that led to this contact: +infoEpiDataFieldsHint = Please indicate if any of the following is relevant for the patient during the incubation period: +infoEpiDataSourceCaseContacts = Please indicate ALL contacts with potential source cases during the incubation period: +infoNoSourceCase = No source case +infoCreateNewContactDiscardsChanges = Creating a new contact will discard all unsaved changes made to this case +infoExposuresInfectionEnvironmentHint = This exposure is marked as the probable infection environment. +infoExposuresRiskAreaHint = This exposure took place in a risk area. +infoUserSyncProcess = %d users are being synced to the External Authentication Provider. The import process might take a while.
You will be able to review and solve any errors after the import process has been completed. infoNoSubordinateEvents=No subordinate events infoNoSuperordinateEvent=No superordinate event infoNoEventGroups=No event groups -infoMergeFiltersHint=Calculating and displaying potential duplicates may take a lot of time under specific circumstances. It is recommended to use the filters on top of this view to reduce the number of rows that have to be compared at the same time, e.g. by choosing a narrow creation date interval and a low result count limit. If the potential duplicates are loading fast, extending these values should be safe.

In order to avoid performance issues when entering this view, potential duplicates are only loaded once you click on "Confirm Filters". -infoPlaceOfStayInHospital=Please select a hospital as the place of stay. If the case is not currently admitted to a hospital as an inpatient, please document hospitalizations under previous hospitalizations. -infoMoreDetailsAboutHospitalization=For adding more details about the hospitalization, go to the hospitalization tab. -infoCountryNotEditableEventParticipantsWithoutJurisdiction=Changing the country is not permitted because at least one event participant in this event does not have a responsible region and/or responsible district set. -infoContactAlreadyConvertedToCase=This contact has already been converted to a case. Please add new visits to the case instead. -infoSearchPersonOnDependentForm=Search for another person -infoTasksWithMultipleJurisdictionsSelected=You have selected tasks connected to different jurisdictions, or that are connected to data that does not have facility or point of entry information. Only users on %s level or above will be selectable as assignees. -infoNoAccessToPersonEntities=You don't have the necessary user rights to view any entries associated with persons. -infoDashboardFinalLaboratoryResult=When a case has multiple samples, only the final laboratory result of the sample with the latest sample collection date is considered. -infoBulkProcess=%d selected entries are currently being processed. This may take a while. The progress will be updated for each 20 entries that have been processed. -infoBulkProcessFinished=All selected entries have been processed!
You can now close this window. -infoBulkProcessFinishedWithIneligibleItems=Bulk process has been successfully completed!
However, some of the selected entries could not be processed, because they were not eligible. -infoBulkProcessFinishedWithoutSuccess=Bulk process finished without success!
None of the entries were successfully processed! -infoBulkProcessFinishedWithSkips=Bulk process has been successfully completed!
However, some of the selected entries could not be processed, most likely because they were outside your jurisdiction, already archived or not eligible. -infoBulkProcessFinishedWithSkipsOutsideJurisdictionOrNotEligible=Bulk process has been successfully completed!
However, some of the selected entries could not be processed, most likely because they were outside your jurisdiction or not eligible. -infoBulkProcessNoEligibleEntries=Bulk process has been cancelled because there are no eligible entries for this operation! -infoBulkProcessCancelled=Bulk process has been cancelled!
All selected entries up until this point have been processed. You can now close this window. All not yet processed entries will still be selected. -infoBulkUnresponsiveWindowHint=Hint: If the progress bar seems to be unresponsive and no progress is visible after a while, try to click this popup window or resize your browser window. -infoNoEnvironmentSamples=No samples have been created for this environment -infoRecoveryNaturalImmunity=Natural immunity from recovering from the disease +infoMergeFiltersHint = Calculating and displaying potential duplicates may take a lot of time under specific circumstances. It is recommended to use the filters on top of this view to reduce the number of rows that have to be compared at the same time, e.g. by choosing a narrow creation date interval and a low result count limit. If the potential duplicates are loading fast, extending these values should be safe.

In order to avoid performance issues when entering this view, potential duplicates are only loaded once you click on "Confirm Filters". +infoPlaceOfStayInHospital = Please select a hospital as the place of stay. If the case is not currently admitted to a hospital as an inpatient, please document hospitalizations under previous hospitalizations. +infoMoreDetailsAboutHospitalization = For adding more details about the hospitalization, go to the hospitalization tab. +infoCountryNotEditableEventParticipantsWithoutJurisdiction = Changing the country is not permitted because at least one event participant in this event does not have a responsible region and/or responsible district set. +infoContactAlreadyConvertedToCase = This contact has already been converted to a case. Please add new visits to the case instead. +infoSearchPersonOnDependentForm = Search for another person +infoTasksWithMultipleJurisdictionsSelected = You have selected tasks connected to different jurisdictions, or that are connected to data that does not have facility or point of entry information. Only users on %s level or above will be selectable as assignees. +infoNoAccessToPersonEntities = You don't have the necessary user rights to view any entries associated with persons. +infoDashboardFinalLaboratoryResult = When a case has multiple samples, only the final laboratory result of the sample with the latest sample collection date is considered. +infoBulkProcess = %d selected entries are currently being processed. This may take a while. The progress will be updated for each 20 entries that have been processed. +infoBulkProcessFinished = All selected entries have been processed!
You can now close this window. +infoBulkProcessFinishedWithIneligibleItems = Bulk process has been successfully completed!
However, some of the selected entries could not be processed, because they were not eligible. +infoBulkProcessFinishedWithoutSuccess = Bulk process finished without success!
None of the entries were successfully processed! +infoBulkProcessFinishedWithSkips = Bulk process has been successfully completed!
However, some of the selected entries could not be processed, most likely because they were outside your jurisdiction, already archived or not eligible. +infoBulkProcessFinishedWithSkipsOutsideJurisdictionOrNotEligible = Bulk process has been successfully completed!
However, some of the selected entries could not be processed, most likely because they were outside your jurisdiction or not eligible. +infoBulkProcessNoEligibleEntries = Bulk process has been cancelled because there are no eligible entries for this operation! +infoBulkProcessCancelled = Bulk process has been cancelled!
All selected entries up until this point have been processed. You can now close this window. All not yet processed entries will still be selected. +infoBulkUnresponsiveWindowHint = Hint: If the progress bar seems to be unresponsive and no progress is visible after a while, try to click this popup window or resize your browser window. +infoNoEnvironmentSamples = No samples have been created for this environment +infoRecoveryNaturalImmunity = Natural immunity from recovering from the disease infoRestrictDiseasesDescription=Mark all diseases that the user is supposed to have access to -infoNoCustomizableEnumTranslations=Click on the + button below to add translations to this customizable enum value. -infoCustomizableEnumConfigurationInfo=Customizable enums are value sets that can be customized in order to react to the individual needs of your country or a specific epidemiological situation. The table on this screen contains all customizable enum values in the database. Each value is associated with a data type, e.g. disease variants or occupation types. Some of these data types have default values that are automatically added to the database when SORMAS is set up or new data types are added to the system.

You can add new enum values or edit existing ones, add translations for languages supported by SORMAS, select the diseases that the value should be visible for (by default, customizable enum values are visible for all diseases), and configure additional properties.

Properties are used to further control the behaviour of customizable enum values. E.g. the "has details" property that is supported by most enum values toggles whether selecting this enum value would bring up an additional text field that users can add more information to. -infoNoImmunizationAdverseEvents=No adverse events have been created for this immunization -infoAefiSelectPrimarySuspectVaccine=The list below contains all vaccinations of the immunization. Please select the suspect vaccination related to this adverse event. -infoArchivedAefiEntries=Adverse event entries are automatically archived after %d days without changes to the data. -infoNoAefiInvestigations=No investigations have been created for this adverse event +infoNoCustomizableEnumTranslations = Click on the + button below to add translations to this customizable enum value. +infoCustomizableEnumConfigurationInfo = Customizable enums are value sets that can be customized in order to react to the individual needs of your country or a specific epidemiological situation. The table on this screen contains all customizable enum values in the database. Each value is associated with a data type, e.g. disease variants or occupation types. Some of these data types have default values that are automatically added to the database when SORMAS is set up or new data types are added to the system.

You can add new enum values or edit existing ones, add translations for languages supported by SORMAS, select the diseases that the value should be visible for (by default, customizable enum values are visible for all diseases), and configure additional properties.

Properties are used to further control the behaviour of customizable enum values. E.g. the "has details" property that is supported by most enum values toggles whether selecting this enum value would bring up an additional text field that users can add more information to. +infoNoImmunizationAdverseEvents = No adverse events have been created for this immunization +infoAefiSelectPrimarySuspectVaccine = The list below contains all vaccinations of the immunization. Please select the suspect vaccination related to this adverse event. +infoArchivedAefiEntries = Adverse event entries are automatically archived after %d days without changes to the data. +infoNoAefiInvestigations = No investigations have been created for this adverse event infoHeadingAefiDashboardMap=Adverse events are shown using the GPS coordinate of the facility or person's home address. infoNoSurveys=There are no surveys created or sent for this case infoSurveyResponseReceived=Response received @@ -1168,59 +1171,60 @@ infoSurveyResponseNotReceived=No response received yet infoNoDiseaseConfigurationAgeGroups=Click on the + button below to add age groups to this disease configuration. infoExternalMessageHospitalizationFacilityMissing=The external message contains a hospitalization entry without a hospital name.\nThe processing can continue but the hospital facility will not be set. infoExternalMessageHospitalizationMissingHospital=Hospital facility missing for hospital '%s'.\nPlease contact your system administrator to configure the hospital facility. + # Messages -messageActionOutsideJurisdictionDeletionDenied=The action outside user's jurisdiction cannot be deleted -messageActivateAccount=Account has to be activated -messageAdditionalTestDeleted=Additional test deleted -messageAdditionalTestSaved=Additional test saved -messageAggregateReportFound=Attention: Duplicate reports have been found for the above criteria. Diseases marked with red already have reports. -messageAggregateReportDelete=Do you want to delete the selected aggregate report? -messageAggregateReportExpiredAgeGroups=Age groups marked "Expired" are based on existing data for an age group that is no longer used. -messageAggregatedReportEpiWeekFilterNotFilled=The epiWeek filter is not filled correctly -messageAllCasesAlreadyInEvent=All cases are already linked to the selected event. -messageAllCasesLinkedToEvent=All cases have been linked to the selected event. -messageAllContactsAlreadyInEvent=All contacts are already linked to the selected event. -messageAllContactsLinkedToEvent=All contacts have been linked to the selected event. -messageAlreadyEventParticipant=The person you have selected is already defined as an event participant of this event. -messageAnimalContactsHint=Please indicate an answer regarding ALL animals (live or dead) the person had direct exposure to (e.g. hunt, touch, eat) during the incubation period. -messageArchiveUndoneReasonMandatory=Please add a reason for de-archiving -messageCampaignArchived=Campaign has been archived -messageCampaignCreated=New campaign created -messageCampaignDearchived=Campaign has been de-archived -messageCampaignDeleted=Campaign deleted -messageCampaignFormOutsideJurisdictionDeletionDenied=The campaign form outside user's jurisdiction cannot be deleted -messageCampaignSaved=Campaign saved -messageCampaignFormSaved=%s saved -messageCaseArchived=Case has been archived -messageCaseCreated=New case created -messageCaseDearchived=Case has been de-archived -messageCaseDuplicateDeleted=The duplicate case has been deleted. -messageCaseIncidenceUnsupportedAgeGroup=Case incidence proportion can only be generated for 5 year intervals. Please remove all other age stratification filters and visualization groupings. -messageCaseReferredFromPoe=Case has been referred to the specified facility +messageActionOutsideJurisdictionDeletionDenied = The action outside user's jurisdiction cannot be deleted +messageActivateAccount = Account has to be activated +messageAdditionalTestDeleted = Additional test deleted +messageAdditionalTestSaved = Additional test saved +messageAggregateReportFound = Attention: Duplicate reports have been found for the above criteria. Diseases marked with red already have reports. +messageAggregateReportDelete = Do you want to delete the selected aggregate report? +messageAggregateReportExpiredAgeGroups = Age groups marked "Expired" are based on existing data for an age group that is no longer used. +messageAggregatedReportEpiWeekFilterNotFilled = The epiWeek filter is not filled correctly +messageAllCasesAlreadyInEvent = All cases are already linked to the selected event. +messageAllCasesLinkedToEvent = All cases have been linked to the selected event. +messageAllContactsAlreadyInEvent = All contacts are already linked to the selected event. +messageAllContactsLinkedToEvent = All contacts have been linked to the selected event. +messageAlreadyEventParticipant = The person you have selected is already defined as an event participant of this event. +messageAnimalContactsHint = Please indicate an answer regarding ALL animals (live or dead) the person had direct exposure to (e.g. hunt, touch, eat) during the incubation period. +messageArchiveUndoneReasonMandatory = Please add a reason for de-archiving +messageCampaignArchived = Campaign has been archived +messageCampaignCreated = New campaign created +messageCampaignDearchived = Campaign has been de-archived +messageCampaignDeleted = Campaign deleted +messageCampaignFormOutsideJurisdictionDeletionDenied = The campaign form outside user's jurisdiction cannot be deleted +messageCampaignSaved = Campaign saved +messageCampaignFormSaved = %s saved +messageCaseArchived = Case has been archived +messageCaseCreated = New case created +messageCaseDearchived = Case has been de-archived +messageCaseDuplicateDeleted = The duplicate case has been deleted. +messageCaseIncidenceUnsupportedAgeGroup = Case incidence proportion can only be generated for 5 year intervals. Please remove all other age stratification filters and visualization groupings. +messageCaseReferredFromPoe = Case has been referred to the specified facility messageCaseRelationToEventWithoutDisease=It is not possible to link a case to an event if the disease of the event has not been set -messageCaseSaved=Case saved -messageCaseSavedClassificationChanged=Case saved. The classification was automatically changed to %s. -messageCaseTransfered=Case has been transfered to another facility -messageCaseOutsideJurisdictionDeletionDenied=The case outside user's jurisdiction cannot be deleted -messageCasesDeleted=All selected eligible cases have been deleted -messageCasesMerged=Cases merged and duplicate case deleted. -messageCasesRestored=All selected cases have been restored -messageContactsRestored=All selected contacts have been restored -messageEventsRestored=All selected events have been restored -messageEventParticipantsRestored=All selected event participants have been restored -messageImmunizationsDeleted=All selected eligible immunizations have been deleted -messageImmunizationsRestored=All selected immunizations have been restored -messageSamplesRestored=All selected samples have been restored -messageTravelEntriesRestored=All selected travel entries have been restored -messageChangePathogenTestResult=The result of this pathogen test differs from the current overall pathogen test result of the sample. Do you want to update its result to %s? -messageCheckInputData=Please check the input data -messageClinicalCourseSaved=Clinical course saved -messageClinicalVisitCreated=Clinical assessment created -messageClinicalVisitSaved=Clinical assessment saved -messageClinicalVisitsDeleted=All selected clinical assessments have been deleted -messageCloneCaseWithNewDisease=You have just created a positive pathogen test result for a different disease. Do you want SORMAS to automatically generate a new case with this new disease? All information from this case will be copied to the new case. -messageUpdateCaseWithNewDiseaseVariant=You have saved a positive pathogen test of a different disease variant than the variant specified in the case. Do you want to update the disease variant of the case? The case's current disease variant is %s, the pathogen test's disease variant is %s. -messageCompletenessValuesUpdated=Completeness values have been updated. +messageCaseSaved = Case saved +messageCaseSavedClassificationChanged = Case saved. The classification was automatically changed to %s. +messageCaseTransfered = Case has been transfered to another facility +messageCaseOutsideJurisdictionDeletionDenied = The case outside user's jurisdiction cannot be deleted +messageCasesDeleted = All selected eligible cases have been deleted +messageCasesMerged = Cases merged and duplicate case deleted. +messageCasesRestored = All selected cases have been restored +messageContactsRestored = All selected contacts have been restored +messageEventsRestored = All selected events have been restored +messageEventParticipantsRestored = All selected event participants have been restored +messageImmunizationsDeleted = All selected eligible immunizations have been deleted +messageImmunizationsRestored = All selected immunizations have been restored +messageSamplesRestored = All selected samples have been restored +messageTravelEntriesRestored = All selected travel entries have been restored +messageChangePathogenTestResult = The result of this pathogen test differs from the current overall pathogen test result of the sample. Do you want to update its result to %s? +messageCheckInputData = Please check the input data +messageClinicalCourseSaved = Clinical course saved +messageClinicalVisitCreated = Clinical assessment created +messageClinicalVisitSaved = Clinical assessment saved +messageClinicalVisitsDeleted = All selected clinical assessments have been deleted +messageCloneCaseWithNewDisease = You have just created a positive pathogen test result for a different disease. Do you want SORMAS to automatically generate a new case with this new disease? All information from this case will be copied to the new case. +messageUpdateCaseWithNewDiseaseVariant = You have saved a positive pathogen test of a different disease variant than the variant specified in the case. Do you want to update the disease variant of the case? The case's current disease variant is %s, the pathogen test's disease variant is %s. +messageCompletenessValuesUpdated = Completeness values have been updated. messageConfirmCaseAfterPathogenTest=The final laboratory result of the sample the saved pathogen test belongs to is positive. However, the case cannot be automatically classified as a confirmed case because it is missing some information. Do you want to set the case classification to confirmed anyway? messageConvertContactToCase=You have just saved a positive laboratory result for the contact disease. Do you want to create a case for the contact person? The case will be set as the resulting case of this contact, and the final laboratory result of the sample will automatically be set to positive. messageConvertContactToCaseDifferentDiseases=You have just saved a positive laboratory result for a different disease than the contact disease. Do you want to create a case with this disease for the contact person? The case will not be set as the resulting case of this contact. @@ -1228,397 +1232,398 @@ messageConvertEventParticipantToCase=You have just saved a positive laboratory r messageConvertEventParticipantToCaseDifferentDiseases=You have just saved a positive laboratory result for a different disease than the event disease. Do you want to create a case with this disease for the event participant person? The case will not be linked to the event participant. messageConvertEventParticipantToCaseNoDisease=You have just saved a positive laboratory result for an event with no disease. Do you want to create a case with this disease for the event participant person? The final laboratory result of the sample will automatically be set to positive but the case will not be linked to the event participant. messageContactCreated=New contact created -messageContactArchived=Contact has been archived -messageContactDearchived=Contact has been de-archived -messageContactSaved=Contact data saved -messageContactsDeleted=All selected eligible contacts have been deleted -messageContactOutsideJurisdictionDeletionDenied=The contact outside user's jurisdiction cannot be deleted -messageContactDuplicateDeleted=The duplicate contact has been deleted. -messageContactsMerged=Contacts merged and duplicate contact deleted. -messageCopyPassword=Please copy this password, it is shown only once. -messageCountCasesAlreadyInEvent=%s cases were already linked to the event, all others were linked. -messageCountContactsAlreadyInEvent=%s contacts were already linked to the event -messageCountEnvironmentSamplesNotRestored=%s environment samples not restored. UUIDs of samples not restored: %s -messageCreateCollectionTask=You have set the specimen condition to not adequate.
Do you want to create a new sample collection task? -messageDatabaseExportFailed=Please contact an admin and notify them about this problem -messageEntryCreated=Entry created -messageEpiDataHint=Please indicate if any of the following is relevant for the patient during the incubation period. -messageEpidNumberWarning=The entered epid number is already used by another case. Please assign a new epid number to this or the other case. -messageCaseExternalTokenWarning=The entered external token is already used by another case. Please assign a new external token to this or the other case. -messageCaseFound=A case that matches the entered search term has been found and linked to current immunization -messageCaseFoundNoValidPathogenTest=A case that matches the entered search term has been found however no valid pathogen tests on the case found -messageContactExternalTokenWarning=The entered external token is already used by another contact. Please assign a new external token to this or the other contact. -messageEventExternalTokenWarning=The entered external token is already used by another event. Please assign a new external token to this or the other event. -messagePersonExternalTokenWarning=The entered external token is already used by another person. Please assign a new external token to this or the other person. -messageErrorReportNotAvailable=The error report file is not available. Please contact an admin and tell them about this issue. -messageEventArchived=Event has been archived -messageEventGroupArchived=Event group has been archived -messageEventCreated=New event created -messageEventGroupCreated=New event group created -messageEventLinkedAsSuperordinate=The selected event was successfully linked to this event as its superordinate event -messageEventLinkedAsSubordinate=The selected event was successfully linked to this event as a subordinate event -messageEnvironmentLinkedToEvent=The selected environment was successfully linked to this event. -messageEnvironmentAlreadyLinkedToEvent=The selected environment was already linked to this event. -messageEventLinkedToGroup=The selected event was successfully linked to this event group -messageEventsLinkedToGroup=The selected events have been successfully linked to this event group -messageEventOutsideJurisdictionDeletionDenied=The event outside user's jurisdiction cannot be deleted -messageEventSuperordinateEventUnlinked=The link between this event and its superordinate event was successfully removed -messageEventSubordinateEventUnlinked=The link between this event and its subordinate event was successfully removed -messageEventParticipationUnlinked=The link between this case and the event was successfully removed -messageEventUnlinkedFromEventGroup=The link between this event and the event group was successfully removed -messageEventUnlinked=The link between this environment and the event was successfully removed -messageEventUnlinkedFromEnvironment=The link between this event and the environment was successfully removed -messageEventDearchived=Event has been de-archived -messageEventGroupDearchived=Event group has been de-archived -messageEventParticipantArchived=Event participant has been archived -messageEventParticipantDearchived=Event participant has been de-archived -messageEventParticipantCreated=New person created -messageEventParticipantSaved=Person data saved -messageEventParticipantOutsideJurisdictionDeletionDenied=The event participant outside user's jurisdiction cannot be deleted -messageEventParticipantsDeleted=All selected eligible event participants have been deleted -messageEventParticipantResponsibleJurisdictionUpdated=Changing or removing the responsible jurisdiction of this event participant could make you lose access to its personal details and/or disallow you to edit it in the future. Are you sure you want to proceed? +messageContactArchived = Contact has been archived +messageContactDearchived = Contact has been de-archived +messageContactSaved = Contact data saved +messageContactsDeleted = All selected eligible contacts have been deleted +messageContactOutsideJurisdictionDeletionDenied = The contact outside user's jurisdiction cannot be deleted +messageContactDuplicateDeleted = The duplicate contact has been deleted. +messageContactsMerged = Contacts merged and duplicate contact deleted. +messageCopyPassword = Please copy this password, it is shown only once. +messageCountCasesAlreadyInEvent = %s cases were already linked to the event, all others were linked. +messageCountContactsAlreadyInEvent = %s contacts were already linked to the event +messageCountEnvironmentSamplesNotRestored = %s environment samples not restored. UUIDs of samples not restored: %s +messageCreateCollectionTask = You have set the specimen condition to not adequate.
Do you want to create a new sample collection task? +messageDatabaseExportFailed = Please contact an admin and notify them about this problem +messageEntryCreated = Entry created +messageEpiDataHint = Please indicate if any of the following is relevant for the patient during the incubation period. +messageEpidNumberWarning = The entered epid number is already used by another case. Please assign a new epid number to this or the other case. +messageCaseExternalTokenWarning = The entered external token is already used by another case. Please assign a new external token to this or the other case. +messageCaseFound = A case that matches the entered search term has been found and linked to current immunization +messageCaseFoundNoValidPathogenTest = A case that matches the entered search term has been found however no valid pathogen tests on the case found +messageContactExternalTokenWarning = The entered external token is already used by another contact. Please assign a new external token to this or the other contact. +messageEventExternalTokenWarning = The entered external token is already used by another event. Please assign a new external token to this or the other event. +messagePersonExternalTokenWarning = The entered external token is already used by another person. Please assign a new external token to this or the other person. +messageErrorReportNotAvailable = The error report file is not available. Please contact an admin and tell them about this issue. +messageEventArchived = Event has been archived +messageEventGroupArchived = Event group has been archived +messageEventCreated = New event created +messageEventGroupCreated = New event group created +messageEventLinkedAsSuperordinate = The selected event was successfully linked to this event as its superordinate event +messageEventLinkedAsSubordinate = The selected event was successfully linked to this event as a subordinate event +messageEnvironmentLinkedToEvent = The selected environment was successfully linked to this event. +messageEnvironmentAlreadyLinkedToEvent = The selected environment was already linked to this event. +messageEventLinkedToGroup = The selected event was successfully linked to this event group +messageEventsLinkedToGroup = The selected events have been successfully linked to this event group +messageEventOutsideJurisdictionDeletionDenied = The event outside user's jurisdiction cannot be deleted +messageEventSuperordinateEventUnlinked = The link between this event and its superordinate event was successfully removed +messageEventSubordinateEventUnlinked = The link between this event and its subordinate event was successfully removed +messageEventParticipationUnlinked = The link between this case and the event was successfully removed +messageEventUnlinkedFromEventGroup = The link between this event and the event group was successfully removed +messageEventUnlinked = The link between this environment and the event was successfully removed +messageEventUnlinkedFromEnvironment = The link between this event and the environment was successfully removed +messageEventDearchived = Event has been de-archived +messageEventGroupDearchived = Event group has been de-archived +messageEventParticipantArchived = Event participant has been archived +messageEventParticipantDearchived = Event participant has been de-archived +messageEventParticipantCreated = New person created +messageEventParticipantSaved = Person data saved +messageEventParticipantOutsideJurisdictionDeletionDenied = The event participant outside user's jurisdiction cannot be deleted +messageEventParticipantsDeleted = All selected eligible event participants have been deleted +messageEventParticipantResponsibleJurisdictionUpdated = Changing or removing the responsible jurisdiction of this event participant could make you lose access to its personal details and/or disallow you to edit it in the future. Are you sure you want to proceed? messageEventParticipantToCaseWithoutEventDisease=It is not possible to create cases from an event participant if the disease of the event has not been set messageEventParticipantToContactWithoutEventDisease=It is not possible to create a contact from an event participant if the disease of the event has not been set messageSampleSearchWithDisease=It is not possible to search for environment samples by disease. -messageEventJurisdictionUpdated=Changing or removing the jurisdiction of this event could make you lose access to its personal details and/or disallow you to edit it in the future. Are you sure you want to proceed? -messageEventSaved=Event data saved -messageEventGroupSaved=Event group data saved -messageEventsDeleted=All selected eligible events have been deleted -messageEventsSentToSurvnet=All selected events have been sent to SurvNet -messageCountCasesNotArchivedExternalReason=%s cases not archived because the communication with the reporting tool failed: %s -messageCountCasesNotDearchivedExternalReason=%s cases not dearchived because the communication with the reporting tool failed: %s -messageCountCasesNotDeleted=%s cases not deleted: %s -messageCountCasesNotDeletedAccessDeniedReason=%s cases not deleted because they are not in jurisdiction or owned: %s -messageCountCasesNotDeletedExternalReason=%s cases not deleted because the communication with the reporting tool failed: %s -messageCountCasesNotDeletedSormasToSormasReason=%s cases not deleted because of failed attempt to revoke pending share request(s): %s -messageCountCasesNotLinkableAccessDeniedReason=%s cases not linked because the case is not editable anymore or the user is missing the rights: %s -messageCountCasesNotRestored=%s cases not restored. UUIDs of cases not restored: %s -messageCountContactsNotDeleted=%s contacts not deleted: %s -messageCountContactsNotDeletedAccessDeniedReason=%s contacts not deleted because they are not in jurisdiction or owned: %s -messageCountContactsNotDeletedSormasToSormasReason=%s contacts not deleted because of failed attempt to revoke pending share request(s): %s -messageCountContactsNotLinkableAccessDeniedReason=%s contacts not linked because the contact is not editable anymore or the user is missing the rights: %s -messageCountContactsNotRestored=%s contacts not restored. UUIDs of contact not restored: %s -messageCountEntitiesNotArchived=%s entities can not be archived: %s -messageCountEntitiesNotArchivedAccessDeniedReason=%s infrastructure entities can not be archived because the entities are used in other infrastructure data: %s -messageCountEntitiesNotDearchived=%s entities can not be dearchived: %s -messageCountEntitiesNotDearchivedAccessDeniedReason=%s infrastructure entities can not be dearchived because the entities have archived parent infrastructure: %s -messageCountEntitiesNotEdited=%s entities can not be edited because they are in a different jurisdiction or were already archived.: %s -messageCountEntitiesNotEditedAccessDeniedReason=%s entities not edited because the entity is not editable anymore: %s -messageCountEntitiesNotSent=%s entities can not be sent to the reporting tool: %s -messageCountEntitiesNotSentAccessDeniedReason=%s entities can not be sent to the reporting tool because the user does not have the proper rights: %s -messageCountEntitiesNotSentExternalReason=%s entities can not be sent to the reporting tool because the communication with the reporting tool failed: %s -messageCountEventsNotArchivedExternalReason=%s events not archived because the communication with the reporting tool failed: %s -messageCountEventsNotDearchivedExternalReason=%s events not dearchived because the communication with the reporting tool failed: %s -messageCountEventsNotLinked=%s events can not be linked or they are already linked to the event group: %s -messageCountEventsNotLinkedAccessDeniedReason=%s events can not be linked to the event group because it's not allowed to link events from another region to an event group.: %s -messageCountEventsNotRestored=%s events not restored. UUIDs of events not restored: %s -messageCountEventParticipantsNotDeleted=%s event participants not deleted: %s -messageCountEventParticipantsNotDeletedAccessDeniedReason=%s event participants not deleted because they are not in jurisdiction or owned: %s -messageCountEventParticipantsNotRestored=%s event participants not restored. UUIDs of event participants not restored: %s -messageCountExternalMessagesNotDeleted=%s external messages not deleted: %s -messageCountImmunizationsNotDeleted=%s immunizations not deleted: %s -messageCountImmunizationsNotDeletedAccessDeniedReason=%s immunizations not deleted because they are not in jurisdiction or owned: %s -messageCountImmunizationsNotRestored=%s immunizations not restored. UUIDs of immunizations not restored: %s -messageCountSamplesNotDeleted=%s samples not deleted: %s -messageCountSamplesNotRestored=%s samples not restored. UUIDs of samples not restored: %s -messageCountTasksNotDeleted=%s tasks not deleted: %s -messageCountTasksNotDeletedAccessDeniedReason=%s tasks not deleted because they are not in jurisdiction or owned: %s -messageCountTravelEntriesNotDeleted=%s travel entries not deleted: %s -messageCountTravelEntriesNotDeletedAccessDeniedReason=%s travel entries not deleted because they are not in jurisdiction or owned: %s -messageCountTravelEntriesNotRestored=%s travel entries not restored. UUIDs of travel entries not restored: %s -messageCountUsersNotDisabled=%s users not disabled: %s -messageCountUsersNotEnabled=%s users not enabled: %s -messageCountVisitsNotCancelled=%s follow-up visits not cancelled: %s -messageCountVisitsNotCancelledAccessDeniedReason=%s follow-up visits not cancelled because the contact is not editable anymore or is outside the user's jurisdiction: %s -messageCountVisitsNotDeleted=%s visits not deleted: %s -messageCountVisitsNotDeletedAccessDeniedReason=%s visits not deleted because they are not in jurisdiction or owned: %s -messageCountVisitsNotSetToLost=%s follow-up visits not set to lost: %s -messageCountVisitsNotSetToLostAccessDeniedReason=%s follow-up visits not set to lost because the contact is not editable anymore or is outside the user's jurisdiction: %s -messageCountEventsNotDeleted=%s events not deleted: %s -messageCountEventsNotDeletedAccessDeniedReason=%s events not deleted because they are not in jurisdiction or owned: %s -messageCountEventsNotDeletedExternalReason=%s events not deleted because the communication with the reporting tool failed: %s -messageEventsNotDeletedLinkedEntitiesReason=No events that contain event participants linked will be deleted. Please remove the event participants from the event in order to be able to delete it. -messageCountEventsNotDeletedSormasToSormasReason=%s events not deleted because of failed attempt to revoke pending share request(s): %s -messageExportFailed=There was an error preventing the data to be exported. Please contact an admin and inform them about this issue. -messageExportConfigurationDeleted=Export configuration deleted -messageExportConfigurationSaved=Export configuration saved -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, philosophical, political, religious data, union opinions, sexual life or orientation, ethnic origin, offenses, convictions, security measures, criminal record ... or any other data that is not related to public health surveillance. -messageGdprCheck=I have read this information, please don't show this window again -messageImmunizationArchived=Immunization has been archived -messageImmunizationDearchived=Immunization has been de-archived -messageImmunizationOutsideJurisdictionDeletionDenied=The immunization outside user's jurisdiction cannot be deleted -messageImmunizationSaved=Immunization data saved. -messageImmunizationSavedVaccinationStatusUpdated=Immunization data saved. The vaccination status of matching cases, contacts, and event participants of the immunization person has been updated to vaccinated. -messageAdverseEventArchived=Adverse event has been archived -messageAdverseEventDearchived=Adverse event has been de-archived -messageAdverseEventInvestigationArchived=Adverse event investigation has been archived -messageAdverseEventInvestigationDearchived=Adverse event investigation has been de-archived -messageImportCanceled=Import canceled!
The import has been canceled. All already processed rows have been successfully imported. You can now close this window. -messageImportCanceledErrors=Import canceled!
The import has been canceled. Some of the already processed rows could not be imported due to malformed data.
Please close this window and download the error report. -messageImportError=Could not import file. -messageImportExtensionDoesNotMatchContent=The file extension does not match the file content. Please check the file extension. -messageImportFileTypeNotAllowed=This file type is not allowed. -messageImportFailed=The import failed due to a critical error. Please contact your admin and inform them about this issue. -messageImportFailedFull=Import failed!
The import failed due to a critical error. Please contact your admin and inform them about this issue. -messageImportInvalidColumn=Invalid column!
The column "%s" is not part of the imported data type or one of its connected entities. Please remove it from the .csv file and upload it again. -messageImportPartiallySuccessful=Import partially successful!
The import has been partially successful, but some of the rows could not be imported due to malformed data.
Please close this window and download the error report. -messageImportPartiallySuccessfulWithSkips=Import partially successful!
The import has been partially successful, but some of the rows could not be imported due to malformed data, and some were skipped.
Please close this window and download the error report. -messageImportSuccessful=Import successful!
All rows have been imported. You can now close this window. -messageImportSuccessfulWithSkips=Import successful!
The import has been successful, but some of the rows were skipped. You can now close this window. -messageUploadSuccessful=Upload successful! You can now close this window. -messageIncompleteGpsCoordinates=GPS coordinates are incomplete -messageIncorrectDateRange=Date from is after date to -messageExternalMessagesAssigned=The assignee has been changed for all selected messages -messageLoginFailed=Please check your username and password and try again -messageMissingCases=Please generate some cases before generating contacts -messageMissingDateFilter=Please fill in both date filter fields -messageMissingEpiWeekFilter=Please fill in both epi week filter fields +messageEventJurisdictionUpdated = Changing or removing the jurisdiction of this event could make you lose access to its personal details and/or disallow you to edit it in the future. Are you sure you want to proceed? +messageEventSaved = Event data saved +messageEventGroupSaved = Event group data saved +messageEventsDeleted = All selected eligible events have been deleted +messageEventsSentToSurvnet = All selected events have been sent to SurvNet +messageCountCasesNotArchivedExternalReason = %s cases not archived because the communication with the reporting tool failed: %s +messageCountCasesNotDearchivedExternalReason = %s cases not dearchived because the communication with the reporting tool failed: %s +messageCountCasesNotDeleted = %s cases not deleted: %s +messageCountCasesNotDeletedAccessDeniedReason = %s cases not deleted because they are not in jurisdiction or owned: %s +messageCountCasesNotDeletedExternalReason = %s cases not deleted because the communication with the reporting tool failed: %s +messageCountCasesNotDeletedSormasToSormasReason = %s cases not deleted because of failed attempt to revoke pending share request(s): %s +messageCountCasesNotLinkableAccessDeniedReason = %s cases not linked because the case is not editable anymore or the user is missing the rights: %s +messageCountCasesNotRestored = %s cases not restored. UUIDs of cases not restored: %s +messageCountContactsNotDeleted = %s contacts not deleted: %s +messageCountContactsNotDeletedAccessDeniedReason = %s contacts not deleted because they are not in jurisdiction or owned: %s +messageCountContactsNotDeletedSormasToSormasReason = %s contacts not deleted because of failed attempt to revoke pending share request(s): %s +messageCountContactsNotLinkableAccessDeniedReason = %s contacts not linked because the contact is not editable anymore or the user is missing the rights: %s +messageCountContactsNotRestored = %s contacts not restored. UUIDs of contact not restored: %s +messageCountEntitiesNotArchived = %s entities can not be archived: %s +messageCountEntitiesNotArchivedAccessDeniedReason = %s infrastructure entities can not be archived because the entities are used in other infrastructure data: %s +messageCountEntitiesNotDearchived = %s entities can not be dearchived: %s +messageCountEntitiesNotDearchivedAccessDeniedReason = %s infrastructure entities can not be dearchived because the entities have archived parent infrastructure: %s +messageCountEntitiesNotEdited = %s entities can not be edited because they are in a different jurisdiction or were already archived.: %s +messageCountEntitiesNotEditedAccessDeniedReason = %s entities not edited because the entity is not editable anymore: %s +messageCountEntitiesNotSent = %s entities can not be sent to the reporting tool: %s +messageCountEntitiesNotSentAccessDeniedReason = %s entities can not be sent to the reporting tool because the user does not have the proper rights: %s +messageCountEntitiesNotSentExternalReason = %s entities can not be sent to the reporting tool because the communication with the reporting tool failed: %s +messageCountEventsNotArchivedExternalReason = %s events not archived because the communication with the reporting tool failed: %s +messageCountEventsNotDearchivedExternalReason = %s events not dearchived because the communication with the reporting tool failed: %s +messageCountEventsNotLinked = %s events can not be linked or they are already linked to the event group: %s +messageCountEventsNotLinkedAccessDeniedReason = %s events can not be linked to the event group because it's not allowed to link events from another region to an event group.: %s +messageCountEventsNotRestored = %s events not restored. UUIDs of events not restored: %s +messageCountEventParticipantsNotDeleted = %s event participants not deleted: %s +messageCountEventParticipantsNotDeletedAccessDeniedReason = %s event participants not deleted because they are not in jurisdiction or owned: %s +messageCountEventParticipantsNotRestored = %s event participants not restored. UUIDs of event participants not restored: %s +messageCountExternalMessagesNotDeleted = %s external messages not deleted: %s +messageCountImmunizationsNotDeleted = %s immunizations not deleted: %s +messageCountImmunizationsNotDeletedAccessDeniedReason = %s immunizations not deleted because they are not in jurisdiction or owned: %s +messageCountImmunizationsNotRestored = %s immunizations not restored. UUIDs of immunizations not restored: %s +messageCountSamplesNotDeleted = %s samples not deleted: %s +messageCountSamplesNotRestored = %s samples not restored. UUIDs of samples not restored: %s +messageCountTasksNotDeleted = %s tasks not deleted: %s +messageCountTasksNotDeletedAccessDeniedReason = %s tasks not deleted because they are not in jurisdiction or owned: %s +messageCountTravelEntriesNotDeleted = %s travel entries not deleted: %s +messageCountTravelEntriesNotDeletedAccessDeniedReason = %s travel entries not deleted because they are not in jurisdiction or owned: %s +messageCountTravelEntriesNotRestored = %s travel entries not restored. UUIDs of travel entries not restored: %s +messageCountUsersNotDisabled = %s users not disabled: %s +messageCountUsersNotEnabled = %s users not enabled: %s +messageCountVisitsNotCancelled = %s follow-up visits not cancelled: %s +messageCountVisitsNotCancelledAccessDeniedReason = %s follow-up visits not cancelled because the contact is not editable anymore or is outside the user's jurisdiction: %s +messageCountVisitsNotDeleted = %s visits not deleted: %s +messageCountVisitsNotDeletedAccessDeniedReason = %s visits not deleted because they are not in jurisdiction or owned: %s +messageCountVisitsNotSetToLost = %s follow-up visits not set to lost: %s +messageCountVisitsNotSetToLostAccessDeniedReason = %s follow-up visits not set to lost because the contact is not editable anymore or is outside the user's jurisdiction: %s +messageCountEventsNotDeleted = %s events not deleted: %s +messageCountEventsNotDeletedAccessDeniedReason = %s events not deleted because they are not in jurisdiction or owned: %s +messageCountEventsNotDeletedExternalReason = %s events not deleted because the communication with the reporting tool failed: %s +messageEventsNotDeletedLinkedEntitiesReason = No events that contain event participants linked will be deleted. Please remove the event participants from the event in order to be able to delete it. +messageCountEventsNotDeletedSormasToSormasReason = %s events not deleted because of failed attempt to revoke pending share request(s): %s +messageExportFailed = There was an error preventing the data to be exported. Please contact an admin and inform them about this issue. +messageExportConfigurationDeleted = Export configuration deleted +messageExportConfigurationSaved = Export configuration saved +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, philosophical, political, religious data, union opinions, sexual life or orientation, ethnic origin, offenses, convictions, security measures, criminal record ... or any other data that is not related to public health surveillance. +messageGdprCheck = I have read this information, please don't show this window again +messageImmunizationArchived = Immunization has been archived +messageImmunizationDearchived = Immunization has been de-archived +messageImmunizationOutsideJurisdictionDeletionDenied = The immunization outside user's jurisdiction cannot be deleted +messageImmunizationSaved = Immunization data saved. +messageImmunizationSavedVaccinationStatusUpdated = Immunization data saved. The vaccination status of matching cases, contacts, and event participants of the immunization person has been updated to vaccinated. +messageAdverseEventArchived = Adverse event has been archived +messageAdverseEventDearchived = Adverse event has been de-archived +messageAdverseEventInvestigationArchived = Adverse event investigation has been archived +messageAdverseEventInvestigationDearchived = Adverse event investigation has been de-archived +messageImportCanceled = Import canceled!
The import has been canceled. All already processed rows have been successfully imported. You can now close this window. +messageImportCanceledErrors = Import canceled!
The import has been canceled. Some of the already processed rows could not be imported due to malformed data.
Please close this window and download the error report. +messageImportError = Could not import file. +messageImportExtensionDoesNotMatchContent = The file extension does not match the file content. Please check the file extension. +messageImportFileTypeNotAllowed = This file type is not allowed. +messageImportFailed = The import failed due to a critical error. Please contact your admin and inform them about this issue. +messageImportFailedFull = Import failed!
The import failed due to a critical error. Please contact your admin and inform them about this issue. +messageImportInvalidColumn = Invalid column!
The column "%s" is not part of the imported data type or one of its connected entities. Please remove it from the .csv file and upload it again. +messageImportPartiallySuccessful = Import partially successful!
The import has been partially successful, but some of the rows could not be imported due to malformed data.
Please close this window and download the error report. +messageImportPartiallySuccessfulWithSkips = Import partially successful!
The import has been partially successful, but some of the rows could not be imported due to malformed data, and some were skipped.
Please close this window and download the error report. +messageImportSuccessful = Import successful!
All rows have been imported. You can now close this window. +messageImportSuccessfulWithSkips = Import successful!
The import has been successful, but some of the rows were skipped. You can now close this window. +messageUploadSuccessful = Upload successful! You can now close this window. +messageIncompleteGpsCoordinates = GPS coordinates are incomplete +messageIncorrectDateRange = Date from is after date to +messageExternalMessagesAssigned = The assignee has been changed for all selected messages +messageLoginFailed = Please check your username and password and try again +messageMissingCases = Please generate some cases before generating contacts +messageMissingDateFilter = Please fill in both date filter fields +messageMissingEpiWeekFilter = Please fill in both epi week filter fields messageMultipleSampleReports=This message references multiple samples. You will be guided through the creation of the number of referenced samples.
Note that potential sample duplicates can be prevented by selecting the existing or previously selected sample in the respective 'pick or create sample' windows. -messageNoCasesSelected=You have not selected any cases -messageNoClinicalVisitsSelected=You have not selected any clinical assessments -messageNoContactsSelected=You have not selected any contacts -messageNoCsvFile=You have not selected a file to upload. Please select a .csv file containing the data you want to import from your computer. -messageNoDocumentTemplateUploadFile=You have not selected a file to upload. Please select a .docx template file you want to import from your computer. -messageNoDocumentUploadFile=You have not selected a file to upload. Please select a file you want to import from your computer. -messageNoEligibleEntityForEditing=None of the selected entities are eligible for editing -messageNoEligibleEventForDeletionSelected=None of the selected events are eligible for deletion -messageNoEligibleVisitForCancellation=None of the follow-up visits were eligible for cancellation -messageNoEligibleVisitForSettingToLost=None of the follow-up visits were eligible for setting to lost -messageNoEnvironmentsSelected=You have not selected any environments -messageNoEventParticipantsSelected=You have not selected any event participants -messageNoEventsSelected=You have not selected any events -messageNoImmunizationsSelected=You have not selected any immunizations -messageNoTravelEntriesSelected=You have not selected any travel entries -messageNoPathogenTestsSelected=You have not selected any pathogen tests -messageNoPrescriptionsSelected=You have not selected any prescriptions -messageNoSamplesSelected=You have not selected any samples -messageNoTasksSelected=You have not selected any tasks -messageNoTreatmentsSelected=You have not selected any treatments -messageNoVisitsSelected=You have not selected any visits -messageNoUsersSelected=You have not selected any users -messageNoUserSelected=No user has been selected -messageOutbreakSaved=Outbreak information saved -messagePasswordReset=User's password was reset -messagePasswordResetEmailLink=A link to reset the password was sent to the user's email -messagePathogenTestSaved=Pathogen test saved. The classification of its associated case was automatically changed to %s. -messagePathogenTestSavedShort=Pathogen test saved -messagePathogenTestsSavedShort=Pathogen tests saved -messagePathogenTestsDeleted=All selected pathogen tests have been deleted -messagePersonSaved=Person data saved -messagePersonSavedClassificationChanged=Person data saved. The classification of at least one case associated with this person was automatically changed to %s. -messagePersonMergedAddressDescription=Adopted from discarded person during merge -messagePersonMergeNoEventParticipantRights=The merge process requires merging of event participants from the same event. You don't have user rights to process this type of merge. -messagePickEventParticipantsIncompleteSelection=Please select an event participant from each duplicate group -messagePlagueTypeChange=The symptoms selected match the clinical criteria for %s. The plague type is set to %s for this case. -messagePrescriptionCreated=Prescription created -messagePrescriptionSaved=Prescription saved -messagePrescriptionsDeleted=All selected prescriptions have been deleted -messageRelatedSampleFound=The sample referenced in this lab message seems to already exist.
Do you want to directly open that sample? There were no processed related lab messages found. -messageRelatedSampleAndLabMessagesFound=A lab message with the same report ID was already processed. It is related to a sample also referenced in this lab message.
Do you want to directly open that sample? -messageSampleErrors=There are errors in the sample form. Please fix them and save the sample before referring it to another laboratory. -messageSampleSaved=Sample data saved -messageSamplesDeleted=All selected eligible samples have been deleted -messageSpecifyColumnAttribute=Please specify the column attribute you have chosen for the visualization -messageSpecifyFilterAttributes=Please specify all selected filter attributes and sub attributes -messageSpecifyRowAttribute=Please specify the row attribute you have chosen for the visualization -messageSymptomsHint=Please tick an answer for ALL symptoms indicating if they occurred at any point in time during this illness: -messageSymptomsVisitHint=Please tick an answer for ALL symptoms indicating if they were present at the time of this visit: -messageTaskArchived=The task has been archived -messageTasksEdited=All tasks have been edited -messageTaskDearchived=The task has been de-archived -messageTasksDeleted=All selected eligible tasks have been deleted -messageTemplateNotAvailable=The template file is not available. Please contact an admin and tell them about this issue. -messageTravelEntryOutsideJurisdictionDeletionDenied=The travel entry outside user's jurisdiction cannot be deleted -messageTravelEntrySaved=Travel entry data saved -messageTravelEntryArchived=Travel entry has been archived -messageTravelEntryDearchived=Travel entry has been de-archived -messageTravelEntryPOEFilledBySystem=[System] Automatically filled point of entry -messageTravelEntriesDeleted=All selected eligible travel entries have been deleted -messageTreatmentCreated=Treatment created -messageTreatmentSaved=Treatment saved -messageTreatmentsDeleted=All selected treatments have been deleted -messageUnknownFilterAttributeForPopulationData=Displaying case incidence proportion for unknown sex or age group is not possible. Please remove the respective values from your filters. -messageDeletionUnsupportedByExternalJournalWarning=The external journal has not yet provided a function to unregister persons from within SORMAS. Please manually delete the person from the external journal. -messageExternalJournalDidNotProvideMessage=The external journal did not provide a message. -messageDiseaseNotSpecifiedInLabMessage=The disease of the external message could not automatically be determined. Please manually verify that this message is about a disease to be dealt with in SORMAS. -messageUserRoleCombination=cannot be combined with -messageUserRoleSaved=User role saved -messageVaccinationOutsideJurisdictionDeletionDenied=The vaccination outside user's jurisdiction cannot be deleted -messageVisitsDeleted=All selected eligible visits have been deleted -messageVisitsWithWrongStatusNotCancelled=Follow-up visits with CANCELLED or NO FOLLOW-UP status can not be cancelled -messageVisitsWithWrongStatusNotSetToLost=Follow-up visits with NO FOLLOW-UP status can not be set to lost -messageWrongFileType=Please provide a .csv file containing the data you want to import. It's recommended to use the import template file as a starting point. +messageNoCasesSelected = You have not selected any cases +messageNoClinicalVisitsSelected = You have not selected any clinical assessments +messageNoContactsSelected = You have not selected any contacts +messageNoCsvFile = You have not selected a file to upload. Please select a .csv file containing the data you want to import from your computer. +messageNoDocumentTemplateUploadFile = You have not selected a file to upload. Please select a .docx template file you want to import from your computer. +messageNoDocumentUploadFile = You have not selected a file to upload. Please select a file you want to import from your computer. +messageNoEligibleEntityForEditing = None of the selected entities are eligible for editing +messageNoEligibleEventForDeletionSelected = None of the selected events are eligible for deletion +messageNoEligibleVisitForCancellation = None of the follow-up visits were eligible for cancellation +messageNoEligibleVisitForSettingToLost = None of the follow-up visits were eligible for setting to lost +messageNoEnvironmentsSelected = You have not selected any environments +messageNoEventParticipantsSelected = You have not selected any event participants +messageNoEventsSelected = You have not selected any events +messageNoImmunizationsSelected = You have not selected any immunizations +messageNoTravelEntriesSelected = You have not selected any travel entries +messageNoPathogenTestsSelected = You have not selected any pathogen tests +messageNoPrescriptionsSelected = You have not selected any prescriptions +messageNoSamplesSelected = You have not selected any samples +messageNoTasksSelected = You have not selected any tasks +messageNoTreatmentsSelected = You have not selected any treatments +messageNoVisitsSelected = You have not selected any visits +messageNoUsersSelected = You have not selected any users +messageNoUserSelected = No user has been selected +messageOutbreakSaved = Outbreak information saved +messagePasswordReset = User's password was reset +messagePasswordResetEmailLink = A link to reset the password was sent to the user's email +messagePathogenTestSaved = Pathogen test saved. The classification of its associated case was automatically changed to %s. +messagePathogenTestSavedShort = Pathogen test saved +messagePathogenTestsSavedShort = Pathogen tests saved +messagePathogenTestsDeleted = All selected pathogen tests have been deleted +messagePersonSaved = Person data saved +messagePersonSavedClassificationChanged = Person data saved. The classification of at least one case associated with this person was automatically changed to %s. +messagePersonMergedAddressDescription = Adopted from discarded person during merge +messagePersonMergeNoEventParticipantRights = The merge process requires merging of event participants from the same event. You don't have user rights to process this type of merge. +messagePickEventParticipantsIncompleteSelection = Please select an event participant from each duplicate group +messagePlagueTypeChange = The symptoms selected match the clinical criteria for %s. The plague type is set to %s for this case. +messagePrescriptionCreated = Prescription created +messagePrescriptionSaved = Prescription saved +messagePrescriptionsDeleted = All selected prescriptions have been deleted +messageRelatedSampleFound = The sample referenced in this lab message seems to already exist.
Do you want to directly open that sample? There were no processed related lab messages found. +messageRelatedSampleAndLabMessagesFound = A lab message with the same report ID was already processed. It is related to a sample also referenced in this lab message.
Do you want to directly open that sample? +messageSampleErrors = There are errors in the sample form. Please fix them and save the sample before referring it to another laboratory. +messageSampleSaved = Sample data saved +messageSamplesDeleted = All selected eligible samples have been deleted +messageSpecifyColumnAttribute = Please specify the column attribute you have chosen for the visualization +messageSpecifyFilterAttributes = Please specify all selected filter attributes and sub attributes +messageSpecifyRowAttribute = Please specify the row attribute you have chosen for the visualization +messageSymptomsHint = Please tick an answer for ALL symptoms indicating if they occurred at any point in time during this illness: +messageSymptomsVisitHint = Please tick an answer for ALL symptoms indicating if they were present at the time of this visit: +messageTaskArchived = The task has been archived +messageTasksEdited = All tasks have been edited +messageTaskDearchived = The task has been de-archived +messageTasksDeleted = All selected eligible tasks have been deleted +messageTemplateNotAvailable = The template file is not available. Please contact an admin and tell them about this issue. +messageTravelEntryOutsideJurisdictionDeletionDenied = The travel entry outside user's jurisdiction cannot be deleted +messageTravelEntrySaved = Travel entry data saved +messageTravelEntryArchived = Travel entry has been archived +messageTravelEntryDearchived = Travel entry has been de-archived +messageTravelEntryPOEFilledBySystem = [System] Automatically filled point of entry +messageTravelEntriesDeleted = All selected eligible travel entries have been deleted +messageTreatmentCreated = Treatment created +messageTreatmentSaved = Treatment saved +messageTreatmentsDeleted = All selected treatments have been deleted +messageUnknownFilterAttributeForPopulationData = Displaying case incidence proportion for unknown sex or age group is not possible. Please remove the respective values from your filters. +messageDeletionUnsupportedByExternalJournalWarning = The external journal has not yet provided a function to unregister persons from within SORMAS. Please manually delete the person from the external journal. +messageExternalJournalDidNotProvideMessage = The external journal did not provide a message. +messageDiseaseNotSpecifiedInLabMessage = The disease of the external message could not automatically be determined. Please manually verify that this message is about a disease to be dealt with in SORMAS. +messageUserRoleCombination = cannot be combined with +messageUserRoleSaved = User role saved +messageVaccinationOutsideJurisdictionDeletionDenied = The vaccination outside user's jurisdiction cannot be deleted +messageVisitsDeleted = All selected eligible visits have been deleted +messageVisitsWithWrongStatusNotCancelled = Follow-up visits with CANCELLED or NO FOLLOW-UP status can not be cancelled +messageVisitsWithWrongStatusNotSetToLost = Follow-up visits with NO FOLLOW-UP status can not be set to lost +messageWrongFileType = Please provide a .csv file containing the data you want to import. It's recommended to use the import template file as a starting point. messageWrongTemplateFileType=For %s, please provide a .%s file. -messageLineListingDisabled=Line listing has been disabled -messageLineListingSaved=Line listing configuration saved -messageNoEndDate=no end date -messageInvalidDatesLineListing=There are invalid dates in at least one of the line listing configurations. Please make sure that all entered dates are in the present or future and try again. -messageAreaArchived=Area has been archived -messageAreaDearchived=Area has been de-archived -messageContinentArchived=Continent has been archived -messageContinentDearchived=Continent has been de-archived -messageSubcontinentArchived=Subcontinent has been archived -messageSubcontinentDearchived=Subcontinent has been de-archived -messageCountryArchived=Country has been archived -messageCountryDearchived=Country has been de-archived -messageRegionArchived=Region has been archived -messageRegionDearchived=Region has been de-archived -messageDistrictArchived=District has been archived -messageDistrictDearchived=District has been de-archived -messageCommunityArchived=Community has been archived -messageCommunityDearchived=Community has been de-archived -messageFacilityArchived=Facility has been archived -messageFacilityDearchived=Facility has been de-archived -messageLaboratoryArchived=Laboratory has been archived -messageLaboratoryDearchived=Laboratory has been de-archived -messagePointOfEntryArchived=Point of entry has been archived -messagePointOfEntryDearchived=Point of entry has been de-archived -messageAreaArchivingNotPossible=This area can not be archived because it is still used in other infrastructure data. Please archive any region in this area first. -messageContinentArchivingNotPossible=This continent can not be archived because it is still used in other infrastructure data. Please archive any subcontinent in this continent first. -messageSubcontinentArchivingNotPossible=This subcontinent can not be archived because it is still used in other infrastructure data. Please archive any country in this subcontinent first. -messageRegionArchivingNotPossible=This region can not be archived because it is still used in other infrastructure data. Please archive any district, facility, laboratory and point of entry in this region first. -messageDistrictArchivingNotPossible=This district can not be archived because it is still used in other infrastructure data. Please archive any community, facility, laboratory and point of entry in this district first. -messageCommunityArchivingNotPossible=This community can not be archived because it is still used in other infrastructure data. Please archive any facility and laboratory in this community first. -messageCountryDearchivingNotPossible=This country can not be de-archived because its subcontinent is still archived. Please de-archive its subcontinent first. -messageSubcontinentDearchivingNotPossible=This subcontinent can not be de-archived because its continent is still archived. Please de-archive its continent first. -messageDistrictDearchivingNotPossible=This district can not be de-archived because its region is still archived. Please de-archive its region first. -messageCommunityDearchivingNotPossible=This community can not be de-archived because its district or region are still archived. Please de-archive its district and region first. -messageFacilityDearchivingNotPossible=This facility can not be de-archived because its community, district or region are still archived. Please de-archive its community, district and region first. -messageLaboratoryDearchivingNotPossible=This laboratory can not be de-archived because its community, district or region are still archived. Please de-archive its community, district and region first. -messagePointOfEntryDearchivingNotPossible=This point of entry can not be de-archived because its district or region are still archived. Please de-archive its district and region first. -messageLaboratoriesDearchivingNotPossible=At least one of the selected laboratories can not be de-archived because its community, district or region are still archived. Please de-archive the communities, districts and regions of all selected laboratories first. -messageNoRowsSelected=You have not selected any rows -messageAreasArchived=All selected areas have been archived -messageAreasDearchived=All selected areas have been de-archived -messageContinentsArchived=All selected continents have been archived -messageContinentsDearchived=All selected continents have been de-archived -messageSubcontinentsArchived=All selected subcontinents have been archived -messageSubcontinentsDearchived=All selected subcontinents have been de-archived -messageSurveySaved=Survey saved -messageSurveyTokenSaved=Survey token saved -messageSurveyTokenDelete=Are you sure you want to delete this Survey token?

Along with the survey token you want to delete, the associated document will also be deleted -messageSurveyCreated=Survey created -messageSurveyNoDocumentTemplate=No document template has been set for this survey -messageSurveyNoEmailTemplate=No email template has been set for this survey -messageSurveyNoTokens=No unassigned tokens have been found for this survey -messageCountriesArchived=All selected countries have been archived -messageCountriesDearchived=All selected regions have been de-archived -messageRegionsArchived=All selected regions have been archived -messageRegionsDearchived=All selected regions have been de-archived -messageDistrictsArchived=All selected districts have been archived -messageDistrictsDearchived=All selected districts have been de-archived -messageCommunitiesArchived=All selected communities have been archived -messageCommunitiesDearchived=All selected communities have been de-archived -messageFacilitiesArchived=All selected facilities have been archived -messageFacilitiesDearchived=All selected facilities have been de-archived -messageLaboratoriesArchived=All selected laboratories have been archived -messageLaboratoriesDearchived=All selected laboratories have been de-archived -messagePointsOfEntryArchived=All selected points of entry have been archived -messagePointsOfEntryDearchived=All selected points of entry have been de-archived -messageForwardedExternalMessageFound=There exists at least one other message with the same report id that was forwarded. Do you want continue processing this message? -messageNoCaseFound=No case could be found that matches the entered search term. -messageNoCaseFoundToLinkImmunization=There is no case that matches the search criteria and link conditions. -messageNoEventFound=No event could be found that matches the entered search term. -messageContactToCaseConfirmationRequired=You can only convert contacts to cases that have been confirmed. Please confirm and save this contact before creating a case for its contact person. -messageContactConversionFollowUpCommentLarge=Performing this action will automatically cancel follow-up and append the following message to the follow-up comment:

%s

The maximum length of the follow-up comment field would be exceeded by appending this message. Please choose whether you want to cancel the action, reduce the length of the follow-up comment and try it again, or omit the message displayed above. -messageContactConversionFollowUpCommentLargeAdjustComment=Adjust comment -messageContactConversionFollowUpCommentLargeOmitMessage=Omit message -messageContactCaseRemoved=The source case has been removed from this contact -messageContactCaseChanged=The source case of the contact has been changed -messageSampleOpened=Opened sample found for search string -messageSystemConfigurationValueSaved=System configuration value saved -messageSystemFollowUpCanceled=[System] Follow-up automatically canceled because contact was converted to a case -messageSystemFollowUpCanceledByDropping=[System] Follow-up automatically canceled because contact was dropped -messageSetContactRegionAndDistrict=Please choose a responsible region and responsible district and save the contact before removing the source case. -messageAllCampaignFormsValid=All campaign forms have been successfully validated -messageEnterSms=Please enter your SMS message here: -messageSelectedPeriodTooLong=You have selected a time period that exceeds the maximum number of days. Please make sure that the selected time period does not exceed %d days. -messagePersonAlreadyEventParticipant=The case person already is an event participant in the selected event. This case has been linked to the selected event. -messageThisPersonAlreadyEventParticipant=This person already is an event participant in the selected event. -messageThisEventAlreadyLinkedToEnvironment=This event is already linked to the selected environment. -messagePersonAddedAsEventParticipant=The new event participant was created. -messagePersonListAddedAsEventPerticipants=New event participants were created from person list submitted -messagePersonAlreadyCaseInEvent=This case is already linked to the selected event. -messagePersonContactDetailsPrimaryDuplicate=There already are primary contact details of this type recorded for this person. Do you want to set these contact details as the primary contact details instead? -messageUserSyncCanceled=Sync canceled!
The sync has been canceled. All already processed users have been successfully synced. You can now close this window. -messageUserSyncCanceledErrors=Sync canceled!
The sync has been canceled. Some of the already processed users could not be synced due to malformed data.
Please close this window and download the error report. -messageUserSyncFailedFull=Sync failed!
The sync failed due to a critical error. Please contact your admin and inform them about this issue. -messageUserSyncPartiallySuccessful=Sync partially successful!
The sync has been successful, but some of the users could not be synced due to malformed data.
Please close this window and download the error report. -messageUserSyncSuccessful=Sync successful!
All users have been synced. You can now close this window. -messageUserRightsExportFailed=Please contact an admin and notify them about this problem -messageNoExternalMessagesSelected=You have not selected any messages -messageExternalLabResultsAdapterNotFound=The external lab results adapter could not be found. This probably means you system is not configured correctly. Please contact you system administrator. -messageExternalMessagesEligibleForDeletion=Only unprocessed messages can be deleted -messageExternalMessagesDeleted=All selected eligible messages have been deleted -messageQuarantineOrderDocumentCreated=Quarantine order document has been created -messageUnavailableTaskEditionDueToDifferentDistricts=Task edition is not available if they are related to different districts -messageUsersEnabled=All selected users have been enabled -messageUsersDisabled=All selected users have been disabled -messageDontShareWithReportingToolWarning=This case is actively prevented from being sent to the external reporting tool -messageBulkCasesWithDifferentDiseasesSelected=You have selected cases with different diseases. Some bulk edit options might be unavailable. -messageBulkContactsWithDifferentDiseasesSelected=You have selected contacts with different diseases. Some bulk edit options might be unavailable. -messageBulkDontShareWithReportingToolWarning=The cases will be prevented from being sent to the external reporting tool -messageBulkLinkEventHint=All selected cases will be linked to the selected event if they are not linked to it already -messageInfrastructureLocked=Infrastructure data is locked and cannot be added/edited/imported/de-archived -messageDeleteImmunizationVaccinations=Changing the means of immunization will delete all vaccinations that have been added to this immunization. Are you sure you want to proceed with the change? -messageDeleteReasonNotFilled=Please choose a reason for deletion -messageOtherDeleteReasonNotFilled=Please add a reason for deletion -messageVaccinationNotRelevantForCase=This vaccination is not relevant for this case because the vaccination date is set after the symptom onset date or case report date. -messageVaccinationNoDateNotRelevantForCase=This vaccination is not relevant for this case because it does not have a vaccination date. -messageVaccinationNotRelevantForContact=This vaccination is not relevant for this contact because the vaccination date is set after the last contact date or contact report date. -messageVaccinationNoDateNotRelevantForContact=This vaccination is not relevant for this contact because it does not have a vaccination date. -messageVaccinationNotRelevantForEventParticipant=This vaccination is not relevant for this event participant because the vaccination date is after the event date or event report date. -messageVaccinationNoDateNotRelevantForEventParticipant=This vaccination is not relevant for this event participant because it does not have a vaccination date. -messageAcceptRequestToNavigate=The request is not yet accepted. You have to accept it first to be able to navigate there. -messageEntityNotFound=The %s was not found in the system. -messageEntitiesNotEditable=There are no entities which are allowed to be edited -messageSormasToSormasSimilarCaseFound=There is at least one similar case in your system. If you accept the request the case maybe will be in your system as a duplicate.
If so, you should consolidate the cases after accepting.
Please make sure that you use the accepted case for this purpose. -messageSormasToSormasSimilarConvertedCaseFound=There is at least one similar case in your system. If you accept the request the case maybe will be in your system as a duplicate.
If so, you should consolidate the cases after accepting.
After consolidating the cases, it may be necessary to perform a manual conversion of some contacts to the accepted case.
Please make sure that you use the accepted case for this purpose. -messageSormasToSormasSimilarContactToCaseFound=There is at least one similar contact in your system.
After accepting the request, it may be necessary to perform a manual conversion of those contacts to the accepted case. -messageSormasToSormasSimilarContactFound=There is at least one similar contact in your system. If you accept the request the contact maybe will be in your system as a duplicate.
If so, you should consolidate the contacts after accepting.
Please make sure that you use the accepted contact for this purpose. -messageSormasToSormasSimilarConvertedContactFound=There is at least one similar contact in your system. If you accept the request the contact maybe will be in your system as a duplicate.
If so, you should consolidate the contacts after accepting.
After consolidating the contacts, it may be necessary to perform a manual conversion of the accepted contact.
Please make sure that you use the accepted contact for this purpose. -messageSormasToSormasSimilarCaseToContactFound=There is at least one similar case in your system.
After accepting the request, it may be necessary to perform a manual conversion of the accepted contacts. -messageSormasToSormasSimilarPersonFound=There is at least one similar person in your system. If you accept the request the case/contact maybe will create a person in your system as a duplicate.
Please check this after accepting. -messageDeleteWithPendingShareRequest=There is a pending share request. With a deletion, the share request will be revoked and deleted. -messageCannotMergeMoreThanTwoPersons=You need to select two persons for merge! -messageAutomaticDeletionStarted=Automatic deletion has been started and will be executed in the background. Please note that, depending on the amount of data that is deleted, this process can take some time. -messageUserRoleUnusableForLogin=Users with only this role will not be able to login because the role does not have Access Sormas UI nor Access Sormas REST right -messageUserRoleHasNoRights=This user role has no rights. Please select at least one right. -messageEntriesEdited=All entries have been edited -messageAllEntitiesArchived=All selected entries have been archived -messageAllEntitiesDearchived=All selected entries have been dearchived -messageAllEventsAlreadyLinkedToGroup=All the selected events were already linked to the event group. -messageEnvironmentCreated=Environment created -messageEnvironmentSaved=Environment saved -messageEnvironmentArchived=Environment has been archived -messageEnvironmentDearchived=Environment has been de-archived -messageEnvironmentSampleOutsideJurisdictionDeletionDenied=The environment sample outside user's jurisdiction cannot be deleted -messageEnvironmentJurisdictionUpdated=Changing the location of this environment could make you lose access to its details and/or disallow you to edit in the future. Are you sure you want to proceed? -messageNoEnvironmentSamplesSelected=You have not selected any environment samples -messageEnvironmentSamplesDeleted=All selected eligible environment samples have been deleted -messageCountEnvironmentSamplesNotDeleted=%s environment samples not deleted: %s -messageCountEnvironmentSamplesNotDeletedAccessDeniedReason=%s environment samples not deleted because they are not in jurisdiction or owned: %s -messageEnvironmentSamplesRestored=All selected environment samples have been restored -messageEnvironmentSampleSaved=Environment sample saved -messageRestoreNotPossibleAlreadyInEvent=Event participant can't be restored because the person already has another active event participant in this event -messageDuplicateEnvironmentFound=A similar environment already exists in the database (UUID: %s) -messageBulkEmailsSentToAllSelectedEntities=Emails sent to all selected entities -messageBulkEmailsNotSentToToEntites=Ineligible entities -headingBulkEmailsSomeNotSent=Some emails from the bulk selection were not sent -headingBulkEmailsNoProcessedEntities=No email has been sent -messageBulkEmailsNoEligible=Not eligible email addresses -messageBulkEmailsFinishedWithSkips=For some entities the email has not been sent -messageBulkEmailsFinishedWithoutSuccess=No email has been sent -messageBulkEmailsCountNotProcessed=%s of entities have not been processed: %s +messageLineListingDisabled = Line listing has been disabled +messageLineListingSaved = Line listing configuration saved +messageNoEndDate = no end date +messageInvalidDatesLineListing = There are invalid dates in at least one of the line listing configurations. Please make sure that all entered dates are in the present or future and try again. +messageAreaArchived = Area has been archived +messageAreaDearchived = Area has been de-archived +messageContinentArchived = Continent has been archived +messageContinentDearchived = Continent has been de-archived +messageSubcontinentArchived = Subcontinent has been archived +messageSubcontinentDearchived = Subcontinent has been de-archived +messageCountryArchived = Country has been archived +messageCountryDearchived = Country has been de-archived +messageRegionArchived = Region has been archived +messageRegionDearchived = Region has been de-archived +messageDistrictArchived = District has been archived +messageDistrictDearchived = District has been de-archived +messageCommunityArchived = Community has been archived +messageCommunityDearchived = Community has been de-archived +messageFacilityArchived = Facility has been archived +messageFacilityDearchived = Facility has been de-archived +messageLaboratoryArchived = Laboratory has been archived +messageLaboratoryDearchived = Laboratory has been de-archived +messagePointOfEntryArchived = Point of entry has been archived +messagePointOfEntryDearchived = Point of entry has been de-archived +messageAreaArchivingNotPossible = This area can not be archived because it is still used in other infrastructure data. Please archive any region in this area first. +messageContinentArchivingNotPossible = This continent can not be archived because it is still used in other infrastructure data. Please archive any subcontinent in this continent first. +messageSubcontinentArchivingNotPossible = This subcontinent can not be archived because it is still used in other infrastructure data. Please archive any country in this subcontinent first. +messageRegionArchivingNotPossible = This region can not be archived because it is still used in other infrastructure data. Please archive any district, facility, laboratory and point of entry in this region first. +messageDistrictArchivingNotPossible = This district can not be archived because it is still used in other infrastructure data. Please archive any community, facility, laboratory and point of entry in this district first. +messageCommunityArchivingNotPossible = This community can not be archived because it is still used in other infrastructure data. Please archive any facility and laboratory in this community first. +messageCountryDearchivingNotPossible = This country can not be de-archived because its subcontinent is still archived. Please de-archive its subcontinent first. +messageSubcontinentDearchivingNotPossible = This subcontinent can not be de-archived because its continent is still archived. Please de-archive its continent first. +messageDistrictDearchivingNotPossible = This district can not be de-archived because its region is still archived. Please de-archive its region first. +messageCommunityDearchivingNotPossible = This community can not be de-archived because its district or region are still archived. Please de-archive its district and region first. +messageFacilityDearchivingNotPossible = This facility can not be de-archived because its community, district or region are still archived. Please de-archive its community, district and region first. +messageLaboratoryDearchivingNotPossible = This laboratory can not be de-archived because its community, district or region are still archived. Please de-archive its community, district and region first. +messagePointOfEntryDearchivingNotPossible = This point of entry can not be de-archived because its district or region are still archived. Please de-archive its district and region first. +messageLaboratoriesDearchivingNotPossible = At least one of the selected laboratories can not be de-archived because its community, district or region are still archived. Please de-archive the communities, districts and regions of all selected laboratories first. +messageNoRowsSelected = You have not selected any rows +messageAreasArchived = All selected areas have been archived +messageAreasDearchived = All selected areas have been de-archived +messageContinentsArchived = All selected continents have been archived +messageContinentsDearchived = All selected continents have been de-archived +messageSubcontinentsArchived = All selected subcontinents have been archived +messageSubcontinentsDearchived = All selected subcontinents have been de-archived +messageSurveySaved = Survey saved +messageSurveyTokenSaved = Survey token saved +messageSurveyTokenDelete = Are you sure you want to delete this Survey token?

Along with the survey token you want to delete, the associated document will also be deleted +messageSurveyCreated = Survey created +messageSurveyNoDocumentTemplate = No document template has been set for this survey +messageSurveyNoEmailTemplate = No email template has been set for this survey +messageSurveyNoTokens = No unassigned tokens have been found for this survey +messageCountriesArchived = All selected countries have been archived +messageCountriesDearchived = All selected regions have been de-archived +messageRegionsArchived = All selected regions have been archived +messageRegionsDearchived = All selected regions have been de-archived +messageDistrictsArchived = All selected districts have been archived +messageDistrictsDearchived = All selected districts have been de-archived +messageCommunitiesArchived = All selected communities have been archived +messageCommunitiesDearchived = All selected communities have been de-archived +messageFacilitiesArchived = All selected facilities have been archived +messageFacilitiesDearchived = All selected facilities have been de-archived +messageLaboratoriesArchived = All selected laboratories have been archived +messageLaboratoriesDearchived = All selected laboratories have been de-archived +messagePointsOfEntryArchived = All selected points of entry have been archived +messagePointsOfEntryDearchived = All selected points of entry have been de-archived +messageForwardedExternalMessageFound = There exists at least one other message with the same report id that was forwarded. Do you want continue processing this message? +messageNoCaseFound = No case could be found that matches the entered search term. +messageNoCaseFoundToLinkImmunization = There is no case that matches the search criteria and link conditions. +messageNoEventFound = No event could be found that matches the entered search term. +messageContactToCaseConfirmationRequired = You can only convert contacts to cases that have been confirmed. Please confirm and save this contact before creating a case for its contact person. +messageContactConversionFollowUpCommentLarge = Performing this action will automatically cancel follow-up and append the following message to the follow-up comment:

%s

The maximum length of the follow-up comment field would be exceeded by appending this message. Please choose whether you want to cancel the action, reduce the length of the follow-up comment and try it again, or omit the message displayed above. +messageContactConversionFollowUpCommentLargeAdjustComment = Adjust comment +messageContactConversionFollowUpCommentLargeOmitMessage = Omit message +messageContactCaseRemoved = The source case has been removed from this contact +messageContactCaseChanged = The source case of the contact has been changed +messageSampleOpened = Opened sample found for search string +messageSystemConfigurationValueSaved = System configuration value saved +messageSystemFollowUpCanceled = [System] Follow-up automatically canceled because contact was converted to a case +messageSystemFollowUpCanceledByDropping = [System] Follow-up automatically canceled because contact was dropped +messageSetContactRegionAndDistrict = Please choose a responsible region and responsible district and save the contact before removing the source case. +messageAllCampaignFormsValid = All campaign forms have been successfully validated +messageEnterSms = Please enter your SMS message here: +messageSelectedPeriodTooLong = You have selected a time period that exceeds the maximum number of days. Please make sure that the selected time period does not exceed %d days. +messagePersonAlreadyEventParticipant = The case person already is an event participant in the selected event. This case has been linked to the selected event. +messageThisPersonAlreadyEventParticipant = This person already is an event participant in the selected event. +messageThisEventAlreadyLinkedToEnvironment = This event is already linked to the selected environment. +messagePersonAddedAsEventParticipant = The new event participant was created. +messagePersonListAddedAsEventPerticipants = New event participants were created from person list submitted +messagePersonAlreadyCaseInEvent = This case is already linked to the selected event. +messagePersonContactDetailsPrimaryDuplicate = There already are primary contact details of this type recorded for this person. Do you want to set these contact details as the primary contact details instead? +messageUserSyncCanceled = Sync canceled!
The sync has been canceled. All already processed users have been successfully synced. You can now close this window. +messageUserSyncCanceledErrors = Sync canceled!
The sync has been canceled. Some of the already processed users could not be synced due to malformed data.
Please close this window and download the error report. +messageUserSyncFailedFull = Sync failed!
The sync failed due to a critical error. Please contact your admin and inform them about this issue. +messageUserSyncPartiallySuccessful = Sync partially successful!
The sync has been successful, but some of the users could not be synced due to malformed data.
Please close this window and download the error report. +messageUserSyncSuccessful = Sync successful!
All users have been synced. You can now close this window. +messageUserRightsExportFailed = Please contact an admin and notify them about this problem +messageNoExternalMessagesSelected = You have not selected any messages +messageExternalLabResultsAdapterNotFound = The external lab results adapter could not be found. This probably means you system is not configured correctly. Please contact you system administrator. +messageExternalMessagesEligibleForDeletion = Only unprocessed messages can be deleted +messageExternalMessagesDeleted = All selected eligible messages have been deleted +messageQuarantineOrderDocumentCreated = Quarantine order document has been created +messageUnavailableTaskEditionDueToDifferentDistricts = Task edition is not available if they are related to different districts +messageUsersEnabled = All selected users have been enabled +messageUsersDisabled = All selected users have been disabled +messageDontShareWithReportingToolWarning = This case is actively prevented from being sent to the external reporting tool +messageBulkCasesWithDifferentDiseasesSelected = You have selected cases with different diseases. Some bulk edit options might be unavailable. +messageBulkContactsWithDifferentDiseasesSelected = You have selected contacts with different diseases. Some bulk edit options might be unavailable. +messageBulkDontShareWithReportingToolWarning = The cases will be prevented from being sent to the external reporting tool +messageBulkLinkEventHint = All selected cases will be linked to the selected event if they are not linked to it already +messageInfrastructureLocked = Infrastructure data is locked and cannot be added/edited/imported/de-archived +messageDeleteImmunizationVaccinations = Changing the means of immunization will delete all vaccinations that have been added to this immunization. Are you sure you want to proceed with the change? +messageDeleteReasonNotFilled = Please choose a reason for deletion +messageOtherDeleteReasonNotFilled = Please add a reason for deletion +messageVaccinationNotRelevantForCase = This vaccination is not relevant for this case because the vaccination date is set after the symptom onset date or case report date. +messageVaccinationNoDateNotRelevantForCase = This vaccination is not relevant for this case because it does not have a vaccination date. +messageVaccinationNotRelevantForContact = This vaccination is not relevant for this contact because the vaccination date is set after the last contact date or contact report date. +messageVaccinationNoDateNotRelevantForContact = This vaccination is not relevant for this contact because it does not have a vaccination date. +messageVaccinationNotRelevantForEventParticipant = This vaccination is not relevant for this event participant because the vaccination date is after the event date or event report date. +messageVaccinationNoDateNotRelevantForEventParticipant = This vaccination is not relevant for this event participant because it does not have a vaccination date. +messageAcceptRequestToNavigate = The request is not yet accepted. You have to accept it first to be able to navigate there. +messageEntityNotFound = The %s was not found in the system. +messageEntitiesNotEditable = There are no entities which are allowed to be edited +messageSormasToSormasSimilarCaseFound = There is at least one similar case in your system. If you accept the request the case maybe will be in your system as a duplicate.
If so, you should consolidate the cases after accepting.
Please make sure that you use the accepted case for this purpose. +messageSormasToSormasSimilarConvertedCaseFound = There is at least one similar case in your system. If you accept the request the case maybe will be in your system as a duplicate.
If so, you should consolidate the cases after accepting.
After consolidating the cases, it may be necessary to perform a manual conversion of some contacts to the accepted case.
Please make sure that you use the accepted case for this purpose. +messageSormasToSormasSimilarContactToCaseFound = There is at least one similar contact in your system.
After accepting the request, it may be necessary to perform a manual conversion of those contacts to the accepted case. +messageSormasToSormasSimilarContactFound = There is at least one similar contact in your system. If you accept the request the contact maybe will be in your system as a duplicate.
If so, you should consolidate the contacts after accepting.
Please make sure that you use the accepted contact for this purpose. +messageSormasToSormasSimilarConvertedContactFound = There is at least one similar contact in your system. If you accept the request the contact maybe will be in your system as a duplicate.
If so, you should consolidate the contacts after accepting.
After consolidating the contacts, it may be necessary to perform a manual conversion of the accepted contact.
Please make sure that you use the accepted contact for this purpose. +messageSormasToSormasSimilarCaseToContactFound = There is at least one similar case in your system.
After accepting the request, it may be necessary to perform a manual conversion of the accepted contacts. +messageSormasToSormasSimilarPersonFound = There is at least one similar person in your system. If you accept the request the case/contact maybe will create a person in your system as a duplicate.
Please check this after accepting. +messageDeleteWithPendingShareRequest = There is a pending share request. With a deletion, the share request will be revoked and deleted. +messageCannotMergeMoreThanTwoPersons = You need to select two persons for merge! +messageAutomaticDeletionStarted = Automatic deletion has been started and will be executed in the background. Please note that, depending on the amount of data that is deleted, this process can take some time. +messageUserRoleUnusableForLogin = Users with only this role will not be able to login because the role does not have Access Sormas UI nor Access Sormas REST right +messageUserRoleHasNoRights = This user role has no rights. Please select at least one right. +messageEntriesEdited = All entries have been edited +messageAllEntitiesArchived = All selected entries have been archived +messageAllEntitiesDearchived = All selected entries have been dearchived +messageAllEventsAlreadyLinkedToGroup = All the selected events were already linked to the event group. +messageEnvironmentCreated = Environment created +messageEnvironmentSaved = Environment saved +messageEnvironmentArchived = Environment has been archived +messageEnvironmentDearchived = Environment has been de-archived +messageEnvironmentSampleOutsideJurisdictionDeletionDenied = The environment sample outside user's jurisdiction cannot be deleted +messageEnvironmentJurisdictionUpdated = Changing the location of this environment could make you lose access to its details and/or disallow you to edit in the future. Are you sure you want to proceed? +messageNoEnvironmentSamplesSelected = You have not selected any environment samples +messageEnvironmentSamplesDeleted = All selected eligible environment samples have been deleted +messageCountEnvironmentSamplesNotDeleted = %s environment samples not deleted: %s +messageCountEnvironmentSamplesNotDeletedAccessDeniedReason = %s environment samples not deleted because they are not in jurisdiction or owned: %s +messageEnvironmentSamplesRestored = All selected environment samples have been restored +messageEnvironmentSampleSaved = Environment sample saved +messageRestoreNotPossibleAlreadyInEvent = Event participant can't be restored because the person already has another active event participant in this event +messageDuplicateEnvironmentFound = A similar environment already exists in the database (UUID: %s) +messageBulkEmailsSentToAllSelectedEntities = Emails sent to all selected entities +messageBulkEmailsNotSentToToEntites = Ineligible entities +headingBulkEmailsSomeNotSent = Some emails from the bulk selection were not sent +headingBulkEmailsNoProcessedEntities = No email has been sent +messageBulkEmailsNoEligible = Not eligible email addresses +messageBulkEmailsFinishedWithSkips = For some entities the email has not been sent +messageBulkEmailsFinishedWithoutSuccess = No email has been sent +messageBulkEmailsCountNotProcessed = %s of entities have not been processed: %s messageBulkEmailsCountNotProcessedExternalReason=%s entities could not be processed due to external reasons: %s messageBulkEmailsCountNotProcessedAccessDenied=%s entities could not be processed due to access denied: %s messageBulkEmailTooManySelectedAtachments=You can add max %s attachments. First %s files selected will be considered. The rest will be discarded. -messageBulkEmailWrongAttachmentExtension=The file %s you are trying to attach
does not have one of the accepted extensions: %s -messageBulkEmailMaxAttachedFiles=max %s files are allowed for attachment +messageBulkEmailWrongAttachmentExtension = The file %s you are trying to attach
does not have one of the accepted extensions: %s +messageBulkEmailMaxAttachedFiles = max %s files are allowed for attachment + messageCasePersonHasNoEmail=Case person has no email address specified messageContactPersonHasNoEmail=Contact person has no email address specified messageEventParticipantPersonHasNoEmail=Event participant person has no email address specified @@ -1628,7 +1633,7 @@ messageNoExternalEmailToContactSent=No email sent to contact person messageNoExternalEmailToEventParticipantSent=No email sent to event participant person messageNoExternalEmailToTravelEntrySent=No email sent to travel entry person messageExternalEmailNoAttachments=No attachments -messageCustomizableEnumValueSaved=Customizable enum value saved +messageCustomizableEnumValueSaved = Customizable enum value saved messageExternalEmailAttachmentPassword=Please use this password to open the documents sent to you via email from SORMAS: %s messageExternalEmailAttachmentNotAvailableInfo=Attaching documents is disabled because encryption would not be possible. To encrypt documents, the person needs to have either a national health ID specified, or a primary mobile phone number set with SMS sending set up on this system. messageAdverseEventSaved=Adverse event saved @@ -1638,166 +1643,171 @@ messageSyncUsersFromAuthProviderConfigurationError=Syncing users from authentica messageCountriesExcludedFromDataProtection=Countries excluded from data protection for this field: messageChangingCaseOutcome=Changing this information will also affect the associated person. messageReviewChangesAndConfirm=Please review the changes and confirm them: -messageChangingPersonPresentCondition=Changing this information will also affect the associated cases. -messageDiseaseConfigurationSaved=Disease configuration saved +messageChangingPersonPresentCondition = Changing this information will also affect the associated cases. +messageDiseaseConfigurationSaved = Disease configuration saved + # Notifications -notificationCaseClassificationChanged=The classification of case %s has changed to %s. -notificationCaseInvestigationDone=The investigation of case %s has been done. -notificationEventParticipantCaseClassificationConfirmed=A person that was an event participant in the event %s was identified as a confirmed %s case %s. Please check if an explicit link should be created between the event participant and the case. -notificationContactSymptomatic=The contact %s of case %s has become symptomatic. -notificationContactWithoutCaseSymptomatic=The contact %s has become symptomatic. -notificationDiseaseChanged=The disease of case %s has changed from %s to %s. Please review all related cases and see if their diseases need to be changed as well. -notificationLabResultArrived=%s pathogen test result has arrived for %s case %s. Test type: %s. Tested disease: %s. -notificationLabResultArrivedContact=%s pathogen test result has arrived for %s contact %s. Test type: %s. Tested disease: %s. -notificationLabResultArrivedEventParticipant=%s pathogen test result has arrived for %s event participant %s. Test type: %s. Tested disease: %s. -notificationLabResultArrivedEventParticipantNoDisease=%s pathogen test result has arrived for %s event participant %s. Test type: %s. -notificationLabSampleShipped=A new sample (sample code: %s) for case %s is being shipped to your laboratory. -notificationLabSampleShippedShort=A new sample for case %s is being shipped to your laboratory. -notificationLabSampleShippedShortForContact=A new sample for contact %s is being shipped to your laboratory. -notificationLabSampleShippedShortForEventParticipant=A new sample for event participant %s is being shipped to your laboratory. -notificationPersonsUpdated=Updated %d Person(s) -notificationTaskObserverInformation=You are assigned as an observer to this task. -notificationTaskDueGeneral=Your %s task is overdue. -notificationTaskDueSpecific=Your %s task for %s is overdue. -notificationTaskStartGeneral=Your %s task should be started today. -notificationTaskStartSpecific=Your %s task for %s should be started today. -notificationTaskAssociatedCaseLink=Link to the associated case: %s -notificationTaskAssociatedContactLink=Link to the associated contact: %s -notificationTaskAssociatedEventLink=Link to the associated event: %s -notificationTaskAssociatedTravelEntryLink=Link to the associated travel entry: %s -notificationTaskAssociatedEnvironmentLink=Link to the associated environment entry: %s -notificationTaskGeneralUpdatedAssigneeUserSource=Your %s task has been assigned to another user. You are no longer in charge of this task. -notificationTaskGeneralUpdatedAssigneeUserTarget=A(n) %s task has been assigned to you. -notificationTaskSpecificUpdatedAssigneeUserSource=Your %s task for %s has been assigned to another user. You are no longer in charge of this task. -notificationTaskSpecificUpdatedAssigneeUserTarget=A(n) %s task for %s has been assigned to you. -notificationVisitCompleted=A follow-up visit for contact %s assigned to user %s has been completed. -notificationEventParticipantRelatedToOtherEvents=The Person %s newly added as Participant %s to Event %s (responsible user: %s) by %s is also related to these Events :\n%s -notificationEventWithResponsibleUserLine=Event %s (responsible user: %s) -notificationSmsSent=Message sent -notificationEventGroupCreated=Event Group %s (%s) created by %s.\n\n%s -notificationEventAddedToEventGroup=%s added to Event Group %s (%s) by %s .\n\n%s -notificationEventRemovedFromEventGroup=%s removed from Event Group %s (%s) by %s .\n\n%s -notificationEventGroupSummary=Here is a summary of the Events now contained in the Event Group:\n%s -notificationEventGroupSummaryEmpty=This event group is empty. -notificationExternalEmailSent=Email message sent. +notificationCaseClassificationChanged = The classification of case %s has changed to %s. +notificationCaseInvestigationDone = The investigation of case %s has been done. +notificationEventParticipantCaseClassificationConfirmed = A person that was an event participant in the event %s was identified as a confirmed %s case %s. Please check if an explicit link should be created between the event participant and the case. +notificationContactSymptomatic = The contact %s of case %s has become symptomatic. +notificationContactWithoutCaseSymptomatic = The contact %s has become symptomatic. +notificationDiseaseChanged = The disease of case %s has changed from %s to %s. Please review all related cases and see if their diseases need to be changed as well. +notificationLabResultArrived = %s pathogen test result has arrived for %s case %s. Test type: %s. Tested disease: %s. +notificationLabResultArrivedContact = %s pathogen test result has arrived for %s contact %s. Test type: %s. Tested disease: %s. +notificationLabResultArrivedEventParticipant = %s pathogen test result has arrived for %s event participant %s. Test type: %s. Tested disease: %s. +notificationLabResultArrivedEventParticipantNoDisease = %s pathogen test result has arrived for %s event participant %s. Test type: %s. +notificationLabSampleShipped = A new sample (sample code: %s) for case %s is being shipped to your laboratory. +notificationLabSampleShippedShort = A new sample for case %s is being shipped to your laboratory. +notificationLabSampleShippedShortForContact = A new sample for contact %s is being shipped to your laboratory. +notificationLabSampleShippedShortForEventParticipant = A new sample for event participant %s is being shipped to your laboratory. +notificationPersonsUpdated = Updated %d Person(s) +notificationTaskObserverInformation = You are assigned as an observer to this task. +notificationTaskDueGeneral = Your %s task is overdue. +notificationTaskDueSpecific = Your %s task for %s is overdue. +notificationTaskStartGeneral = Your %s task should be started today. +notificationTaskStartSpecific = Your %s task for %s should be started today. +notificationTaskAssociatedCaseLink = Link to the associated case: %s +notificationTaskAssociatedContactLink = Link to the associated contact: %s +notificationTaskAssociatedEventLink = Link to the associated event: %s +notificationTaskAssociatedTravelEntryLink = Link to the associated travel entry: %s +notificationTaskAssociatedEnvironmentLink = Link to the associated environment entry: %s +notificationTaskGeneralUpdatedAssigneeUserSource = Your %s task has been assigned to another user. You are no longer in charge of this task. +notificationTaskGeneralUpdatedAssigneeUserTarget = A(n) %s task has been assigned to you. +notificationTaskSpecificUpdatedAssigneeUserSource = Your %s task for %s has been assigned to another user. You are no longer in charge of this task. +notificationTaskSpecificUpdatedAssigneeUserTarget = A(n) %s task for %s has been assigned to you. +notificationVisitCompleted = A follow-up visit for contact %s assigned to user %s has been completed. +notificationEventParticipantRelatedToOtherEvents = The Person %s newly added as Participant %s to Event %s (responsible user: %s) by %s is also related to these Events :\n%s +notificationEventWithResponsibleUserLine = Event %s (responsible user: %s) +notificationSmsSent = Message sent +notificationEventGroupCreated = Event Group %s (%s) created by %s.\n\n%s +notificationEventAddedToEventGroup = %s added to Event Group %s (%s) by %s .\n\n%s +notificationEventRemovedFromEventGroup = %s removed from Event Group %s (%s) by %s .\n\n%s +notificationEventGroupSummary = Here is a summary of the Events now contained in the Event Group:\n%s +notificationEventGroupSummaryEmpty = This event group is empty. +notificationExternalEmailSent = Email message sent. + #Labels -labelActualLongSeed=Actual Long seed -labelNumberOfUsers=No. of users -labelNumberOfContinents=No. of continents -labelNumberOfSubcontinents=No. of subcontinents -labelNumberOfCountries=No. of countries -labelNumberOfRegions=No. of regions -labelNumberOfDistricts=No. of districts -labelNumberOfCommunities=No. of communities -labelNumberOfPointofEntry=No. of points of entry -labelNumberOfFacilities=No. of facilities -labelNumberOfAreas=No. of areas -labelNumberOfTemplates=No. of Templates -labelNoVaccinationDate=No vaccination date -labelNoVaccineName=No vaccine name -labelNumberOfDiseaseConfigurations=No. of diseases +labelActualLongSeed = Actual Long seed +labelNumberOfUsers = No. of users +labelNumberOfContinents = No. of continents +labelNumberOfSubcontinents = No. of subcontinents +labelNumberOfCountries = No. of countries +labelNumberOfRegions = No. of regions +labelNumberOfDistricts = No. of districts +labelNumberOfCommunities = No. of communities +labelNumberOfPointofEntry = No. of points of entry +labelNumberOfFacilities = No. of facilities +labelNumberOfAreas = No. of areas +labelNumberOfTemplates = No. of Templates +labelNoVaccinationDate = No vaccination date +labelNoVaccineName = No vaccine name +labelNumberOfDiseaseConfigurations = No. of diseases + # Numbers -numberEight=eight -numberEleven=eleven -numberFive=five -numberFour=four -numberNine=nine -numberOne=one -numberSeven=seven -numberSix=six -numberTen=ten -numberThree=three -numberTwelve=twelve -numberTwo=two +numberEight = eight +numberEleven = eleven +numberFive = five +numberFour = four +numberNine = nine +numberOne = one +numberSeven = seven +numberSix = six +numberTen = ten +numberThree = three +numberTwelve = twelve +numberTwo = two + # Prompts -promptActionDateFrom=Date of action from... -promptActionDateTo=... to -promptActionEpiWeekFrom=Date of action from epi week... -promptActionEpiWeekTo=... to epi week -promptActionChangeDateFrom=Date of action change from... -promptActionChangeDateTo=... to -promptActionChangeEpiWeekFrom=Date of action change from epi week... -promptActionChangeEpiWeekTo=... to epi week -promptBirthdateFrom=Birthdate from -promptBirthdateTo=... to -promptCampaignSearch=ID, name -promptCasesDateFrom=New cases from... -promptCasesEpiWeekFrom=New cases from epi week... -promptCasesEpiWeekTo=... to epi week -promptCasesSearchField=ID, EPID number, external ID, facility -promptCaseOrContactEventSearchField=Event: ID, title, description -promptPersonsSearchField=ID, name, phone number, email, city, street, postal code -promptCreationDateFrom=Creation date from ... -promptDateTo=... to -promptNamePhoneEmail=Name, phone number and email address -promptContactDateType=Contact reference date -promptContactDateFrom=New contacts from... -promptContactDateTo=... to -promptContactEpiWeekFrom=New contacts from epi week... -promptContactEpiWeekTo=... to epi week -promptContactsSearchField=ID, case ID, case name, external ID -promptDisease=Disease -promptDistrict=District -promptEventDateType=Event reference date -promptEventDateFrom=Date of event from epi week -promptEventDateTo=... to -promptEventEpiWeekFrom=Date of event from epi week -promptEventEpiWeekTo=... to epi week -promptEventEvolutionDateFrom=Date of last evolution from... -promptEventEvolutionDateTo=... to -promptEventSignalEvolutionEpiWeekFrom=Date of last evolution from epi week... -promptEventSignalEvolutionEpiWeekTo=... to epi week -promptEventParticipantsSearchField=name, phone number -promptEventsSearchField=ID, title, description, source details -promptEnvironmentSearchField=Environment ID, name, media -promptEventsSearchFieldEventParticipants=ID or personal details of event participants -promptEventsSearchFieldEventGroups=ID or name of event group -promptEventGroupSearchField=ID, name -promptEventGroupSearchFieldEvent=Event ID, title, description, source details, location -promptImmunizationDateType=Immunization reference date -promptImmunizationValidFrom=New immunizations valid from... -promptImmunizationDateFrom=New immunizations from... -promptImmunizationDateTo=... to -promptImmunizationEpiWeekFrom=New immunizations from epi week... -promptImmunizationEpiWeekTo=... to epi week -promptEmail=Email: -promptExternalMessagesSearchField=UUID, name, postal code, reporter name, reporter postal code -promptExternalMessagesContentSearchField=External message content -promptExternalMessagesDateFrom=Message date from... -promptExternalMessagesDateTo=... to -promptExternalMessagesPersonBirthDateFrom=Birth date from... -promptExternalMessagesPersonBirthDateTo=... to -promptNewCaseDateType=Case reference date -promptPrescriptionTextFilter=Prescription details or prescribing clinician -promptRegion=Region -promptRelatedPersonLikeField=Person ID/name/contact information/location -promptSamplesSearchField=Sample ID/name, case name/epid number/ID, contact name/ID, event participant name/ID -promptSampleDateFrom=Sample date from ... -promptSampleDateTo=... to -promptSampleEpiWeekFrom=Sample date from epi week -promptSampleEpiWeekTo=... to epi week -promtSampleDataType=Sample reference date -promptSearch=Search... -promptTaskSearchField=Case or contact ID/name, Event ID/title -promptTelephoneNumber=Phone number: -promptTaskDateType=Task reference date -promptTaskDateFrom=Tasks from... -promptTaskDateTo=... to -promptTaskEpiWeekFrom=Tasks from epi week... -promptTaskEpiWeekTo=... to epi week -promptTravelEntrySearchField=Person first and last name, person UUID, person external ID, travel entry UUID, travel entry external ID -promptTreatmentTextFilter=Treatment details or executing staff member -promptTypeToAdd=Type here to add... -promptUserSearch=Search user -promptFilterByPeriod=Filter by period -promptSelectPeriod=Select period -promptSelfReportDateFrom=Report date from... -promptSelfReportDateTo=... to -promptSelfReportEpiWeekFrom=Report date from epi week... -promptSelfReportEpiWeekTo=Report date to epi week... -promptSelfReportFreeTextSearch=Case reference/ name/ contact information/ NationalHealthID -promptCampaign=Campaign -promptArea=Area +promptActionDateFrom = Date of action from... +promptActionDateTo = ... to +promptActionEpiWeekFrom = Date of action from epi week... +promptActionEpiWeekTo = ... to epi week +promptActionChangeDateFrom = Date of action change from... +promptActionChangeDateTo = ... to +promptActionChangeEpiWeekFrom = Date of action change from epi week... +promptActionChangeEpiWeekTo = ... to epi week +promptBirthdateFrom = Birthdate from +promptBirthdateTo = ... to +promptCampaignSearch = ID, name +promptCasesDateFrom = New cases from... +promptCasesEpiWeekFrom = New cases from epi week... +promptCasesEpiWeekTo = ... to epi week +promptCasesSearchField = ID, EPID number, external ID, facility +promptCaseOrContactEventSearchField = Event: ID, title, description +promptPersonsSearchField = ID, name, phone number, email, city, street, postal code +promptCreationDateFrom = Creation date from ... +promptDateTo = ... to +promptNamePhoneEmail = Name, phone number and email address +promptContactDateType = Contact reference date +promptContactDateFrom = New contacts from... +promptContactDateTo = ... to +promptContactEpiWeekFrom = New contacts from epi week... +promptContactEpiWeekTo = ... to epi week +promptContactsSearchField = ID, case ID, case name, external ID +promptDisease = Disease +promptDistrict = District +promptEventDateType = Event reference date +promptEventDateFrom =Date of event from epi week +promptEventDateTo = ... to +promptEventEpiWeekFrom = Date of event from epi week +promptEventEpiWeekTo = ... to epi week +promptEventEvolutionDateFrom = Date of last evolution from... +promptEventEvolutionDateTo = ... to +promptEventSignalEvolutionEpiWeekFrom = Date of last evolution from epi week... +promptEventSignalEvolutionEpiWeekTo = ... to epi week +promptEventParticipantsSearchField = name, phone number +promptEventsSearchField = ID, title, description, source details +promptEnvironmentSearchField = Environment ID, name, media +promptEventsSearchFieldEventParticipants = ID or personal details of event participants +promptEventsSearchFieldEventGroups = ID or name of event group +promptEventGroupSearchField = ID, name +promptEventGroupSearchFieldEvent = Event ID, title, description, source details, location +promptImmunizationDateType = Immunization reference date +promptImmunizationValidFrom = New immunizations valid from... +promptImmunizationDateFrom = New immunizations from... +promptImmunizationDateTo = ... to +promptImmunizationEpiWeekFrom = New immunizations from epi week... +promptImmunizationEpiWeekTo = ... to epi week +promptEmail = Email: +promptExternalMessagesSearchField = UUID, name, postal code, reporter name, reporter postal code +promptExternalMessagesContentSearchField = External message content +promptExternalMessagesDateFrom = Message date from... +promptExternalMessagesDateTo = ... to +promptExternalMessagesPersonBirthDateFrom = Birth date from... +promptExternalMessagesPersonBirthDateTo = ... to +promptNewCaseDateType = Case reference date +promptPrescriptionTextFilter = Prescription details or prescribing clinician +promptRegion = Region +promptRelatedPersonLikeField = Person ID/name/contact information/location +promptSamplesSearchField = Sample ID/name, case name/epid number/ID, contact name/ID, event participant name/ID +promptSampleDateFrom = Sample date from ... +promptSampleDateTo = ... to +promptSampleEpiWeekFrom = Sample date from epi week +promptSampleEpiWeekTo = ... to epi week +promtSampleDataType = Sample reference date +promptSearch = Search... +promptTaskSearchField = Case or contact ID/name, Event ID/title +promptTelephoneNumber = Phone number: +promptTaskDateType = Task reference date +promptTaskDateFrom = Tasks from... +promptTaskDateTo = ... to +promptTaskEpiWeekFrom = Tasks from epi week... +promptTaskEpiWeekTo = ... to epi week +promptTravelEntrySearchField = Person first and last name, person UUID, person external ID, travel entry UUID, travel entry external ID +promptTreatmentTextFilter = Treatment details or executing staff member +promptTypeToAdd = Type here to add... +promptUserSearch = Search user +promptFilterByPeriod = Filter by period +promptSelectPeriod = Select period +promptSelfReportDateFrom = Report date from... +promptSelfReportDateTo = ... to +promptSelfReportEpiWeekFrom = Report date from epi week... +promptSelfReportEpiWeekTo = Report date to epi week... +promptSelfReportFreeTextSearch = Case reference/ name/ contact information/ NationalHealthID + +promptCampaign = Campaign +promptArea = Area promptAllAreas=All areas promptAllRegions=All regions promptAllDistricts=All districts @@ -1806,94 +1816,107 @@ promptExternalIdExternalSurveillanceTool=Will adopt external reporting tool GUID promptExternalJournalForceDeletion=Do you want to force the cancellation in SORMAS? This would mark the person as deleted from the external journal in SORMAS, while there is a high probability of personal data still remaining in the external journal. promptPersonDuplicateSearchIdExternalId=First Name, Last Name, ID, External ID, External token promptAefiDashboardFilterDateType=AEFI reference date -promptAefiDateType=Aefi reference date -promptAefiValidFrom=New adverse events valid from... -promptAefiDateFrom=New adverse events from... -promptAefiDateTo=... to -promptAefiEpiWeekFrom=New adverse events from epi week... -promptAefiEpiWeekTo=... to epi week -promptAefiInvestigationDateType=Aefi investigation reference date -promptAefiInvestigationValidFrom=New Aefi investigations valid from... -promptAefiInvestigationDateFrom=New Aefi investigations from... -promptAefiInvestigationDateTo=... to -promptAefiInvestigationEpiWeekFrom=New Aefi investigations from epi week... -promptAefiInvestigationEpiWeekTo=... to epi week -promptRemarks=Remarks -promptDiseaseConfigurationAgeFrom=From age... -promptDiseaseConfigurationAgeTo=... to -promptDiseaseConfigurationStartAge=Start age -promptDiseaseConfigurationStartAgeType=Start age unit -promptDiseaseConfigurationEndAge=End age -promptDiseaseConfigurationEndAgeType=End age unit +promptAefiDateType = Aefi reference date +promptAefiValidFrom = New adverse events valid from... +promptAefiDateFrom = New adverse events from... +promptAefiDateTo = ... to +promptAefiEpiWeekFrom = New adverse events from epi week... +promptAefiEpiWeekTo = ... to epi week +promptAefiInvestigationDateType = Aefi investigation reference date +promptAefiInvestigationValidFrom = New Aefi investigations valid from... +promptAefiInvestigationDateFrom = New Aefi investigations from... +promptAefiInvestigationDateTo = ... to +promptAefiInvestigationEpiWeekFrom = New Aefi investigations from epi week... +promptAefiInvestigationEpiWeekTo = ... to epi week +promptRemarks = Remarks +promptDiseaseConfigurationAgeFrom = From age... +promptDiseaseConfigurationAgeTo = ... to +promptDiseaseConfigurationStartAge = Start age +promptDiseaseConfigurationStartAgeType = Start age unit +promptDiseaseConfigurationEndAge = End age +promptDiseaseConfigurationEndAgeType = End age unit promptCaseSex=Case sex + #DiseaseNetworkDiagram -DiseaseNetworkDiagram.Classification.HEALTHY=Healthy -DiseaseNetworkDiagram.heading=Disease network diagram -DiseaseNetworkDiagram.highRisk=High risk -DiseaseNetworkDiagram.legend=Legend -DiseaseNetworkDiagram.lowRisk=Low risk -DiseaseNetworkDiagram.selectByClassification=Select by Classification -DiseaseNetworkDiagram.subheading=The arrows indicate the direction of transmission -promptImmunizationDateFrom=Immunization report date from... -promptImmunizationStartDateFrom=Immunization start date from... -promptImmunizationPositiveTestResultDateFrom=Immunization positive test result date from... -promptImmunizationRecoveryDateFrom=Immunization recovery date from... -promptTravelEntryDateFrom=Travel entry report date from... -promptTravelEntryDateTo=... to -promptTravelEntryEpiWeekFrom=Travel entry from epi week... -promptTravelEntryEpiWeekTo=... to epi week -promptEnvironmentFreeTextSearch=UUID, External ID, Name, Description -promptEnvironmentDateFrom=Report date from... -promptEnvironmentDateTo=... to -promptEnvironmentEpiWeekFrom=Report date from epi week... -promptEnvironmentEpiWeekTo=... to epi week -promptEnvironmentLatFrom=Latitude from... -promptEnvironmentLatTo=... to -promptEnvironmentLonFrom=Longitude from... -promptEnvironmentLonTo=... to -promptEnvironmentSampleFreetext=Sample ID, Lab sample ID, Environment ID, Environment name -promptEnvironmentSampleRegion=Region of Environment -promptEnvironmentSampleDistrict=District of Environment -promptEnvironmentSampleLab=Laboratory -promptEnvironmentSampleTestedPathogen=Tested pathogen -promptEnvironmentSampleDateFrom=Report date from... -promptEnvironmentSampleDateTo=... to -promptEnvironmentSampleEpiWeekFrom=Report date from epi week... -promptEnvironmentSampleEpiWeekTo=... to epi week -promptEnvironmentSampleLatFrom=Environment latitude from... -promptEnvironmentSampleLatTo=... to -promptEnvironmentSampleLonFrom=Environment longitude from... -promptEnvironmentSampleLonTo=... to -promptCustomizableEnumTranslationLanguage=Language -promptCustomizableEnumTranslationCaption=Translated caption -promptCustomizableEnumSearchField=Search by value or caption... -promptSurveyFreeTextSearch=Name -promptSurveyTokenFreeTextSearch=Token +DiseaseNetworkDiagram.Classification.HEALTHY = Healthy +DiseaseNetworkDiagram.heading = Disease network diagram +DiseaseNetworkDiagram.highRisk = High risk +DiseaseNetworkDiagram.legend = Legend +DiseaseNetworkDiagram.lowRisk = Low risk +DiseaseNetworkDiagram.selectByClassification = Select by Classification +DiseaseNetworkDiagram.subheading = The arrows indicate the direction of transmission + +promptImmunizationDateFrom = Immunization report date from... +promptImmunizationStartDateFrom = Immunization start date from... +promptImmunizationPositiveTestResultDateFrom = Immunization positive test result date from... +promptImmunizationRecoveryDateFrom = Immunization recovery date from... + +promptTravelEntryDateFrom = Travel entry report date from... +promptTravelEntryDateTo = ... to +promptTravelEntryEpiWeekFrom = Travel entry from epi week... +promptTravelEntryEpiWeekTo = ... to epi week + +promptEnvironmentFreeTextSearch = UUID, External ID, Name, Description +promptEnvironmentDateFrom = Report date from... +promptEnvironmentDateTo = ... to +promptEnvironmentEpiWeekFrom = Report date from epi week... +promptEnvironmentEpiWeekTo = ... to epi week +promptEnvironmentLatFrom= Latitude from... +promptEnvironmentLatTo= ... to +promptEnvironmentLonFrom= Longitude from... +promptEnvironmentLonTo= ... to +promptEnvironmentSampleFreetext = Sample ID, Lab sample ID, Environment ID, Environment name +promptEnvironmentSampleRegion = Region of Environment +promptEnvironmentSampleDistrict = District of Environment +promptEnvironmentSampleLab = Laboratory +promptEnvironmentSampleTestedPathogen = Tested pathogen +promptEnvironmentSampleDateFrom = Report date from... +promptEnvironmentSampleDateTo = ... to +promptEnvironmentSampleEpiWeekFrom = Report date from epi week... +promptEnvironmentSampleEpiWeekTo = ... to epi week +promptEnvironmentSampleLatFrom= Environment latitude from... +promptEnvironmentSampleLatTo= ... to +promptEnvironmentSampleLonFrom= Environment longitude from... +promptEnvironmentSampleLonTo= ... to + +promptCustomizableEnumTranslationLanguage = Language +promptCustomizableEnumTranslationCaption = Translated caption +promptCustomizableEnumSearchField = Search by value or caption... + +promptSurveyFreeTextSearch = Name +promptSurveyTokenFreeTextSearch = Token + promptSurvey=Survey promptSurveyResponseStatus=Response status promptSurveyAssignedFrom=Assigned date from ... promptSurveyAssignedTo=... to -promptMicValue=MIC value -promptResistanceResult=Resistance result -promptSystemConfigurationSearchField=Search by key or value + +promptMicValue = MIC value +promptResistanceResult = Resistance result + +promptSystemConfigurationSearchField = Search by key or value # Unsaved changes -unsavedChanges.warningTitle=Unsaved changes -unsavedChanges.warningMessage=This form contains unsaved changes. Please decide whether you want to cancel the action you have just taken in order to review them, or save or discard the changes and continue. -unsavedChanges.discard=Discard changes -unsavedChanges.save=Save changes -unsavedChanges.cancel=Cancel action -headingNetworkDiagramTooManyContacts=Too many contacts -warningNetworkDiagramTooManyContacts=There are %d contacts and it is possible that your browser will freeze while displaying the diagram.
Please choose a smaller time window. -confirmNetworkDiagramTooManyContacts=Do you really want to update the diagram? -headingContactTracingFirstContact=First contact with Contact Tracing +unsavedChanges.warningTitle = Unsaved changes +unsavedChanges.warningMessage = This form contains unsaved changes. Please decide whether you want to cancel the action you have just taken in order to review them, or save or discard the changes and continue. +unsavedChanges.discard = Discard changes +unsavedChanges.save = Save changes +unsavedChanges.cancel = Cancel action + +headingNetworkDiagramTooManyContacts = Too many contacts +warningNetworkDiagramTooManyContacts = There are %d contacts and it is possible that your browser will freeze while displaying the diagram.
Please choose a smaller time window. +confirmNetworkDiagramTooManyContacts = Do you really want to update the diagram? + +headingContactTracingFirstContact = First contact with Contact Tracing + infoBAGExport=Full-Export to SEDEX + # Survnet Gateway -ExternalSurveillanceToolGateway.notificationEntrySent=Entry has been sent to the reporting tool -ExternalSurveillanceToolGateway.notificationEntriesSent=All selected entries have been sent to the reporting tool. -ExternalSurveillanceToolGateway.notificationEntriesDeleted=All selected entries have been successfully deleted in the reporting tool. -ExternalSurveillanceToolGateway.notificationEntryNotSent=Entry could not be sent -ExternalSurveillanceToolGateway.notificationErrorArchiving=The entity was not archived because the communication with the reporting tool failed -ExternalSurveillanceToolGateway.notificationErrorSending=Error when sending entry +ExternalSurveillanceToolGateway.notificationEntrySent = Entry has been sent to the reporting tool +ExternalSurveillanceToolGateway.notificationEntriesSent = All selected entries have been sent to the reporting tool. +ExternalSurveillanceToolGateway.notificationEntriesDeleted = All selected entries have been successfully deleted in the reporting tool. +ExternalSurveillanceToolGateway.notificationEntryNotSent = Entry could not be sent +ExternalSurveillanceToolGateway.notificationErrorArchiving = The entity was not archived because the communication with the reporting tool failed +ExternalSurveillanceToolGateway.notificationErrorSending = Error when sending entry ExternalSurveillanceToolGateway.unableToSend=Please save or discard any unsaved changes before sending the %s to the reporting tool. ExternalSurveillanceToolGateway.confirmSendCase=Are you sure you want to send the case to the reporting tool? ExternalSurveillanceToolGateway.confirmSendCases=Are you sure you want to send the cases to the reporting tool? @@ -1901,15 +1924,18 @@ ExternalSurveillanceToolGateway.confirmSendEvent=Are you sure you want to send t ExternalSurveillanceToolGateway.confirmSendEvents=Are you sure you want to send the events to the reporting tool? ExternalSurveillanceToolGateway.confirmDeleteCase=Are you sure you want to delete the case in the reporting tool? ExternalSurveillanceToolGateway.confirmDeleteEvent=Are you sure you want to delete the event in the reporting tool? -ExternalSurveillanceToolGateway.sharedAt=shared at -ExternalSurveillanceToolGateway.deletedAt=deleted at -ExternalSurveillanceToolGateway.notificationEntryNotDeleted=Entry could not be deleted in the reporting tool -warningDashboardMapTooManyMarkers=There are more than %d places to display and it is possible that your browser will freeze while displaying them. -ExternalSurveillanceToolGateway.notificationErrorDeleting=Error when deleting entry -ExternalSurveillanceToolGateway.versionRequestError=Error requesting version +ExternalSurveillanceToolGateway.sharedAt = shared at +ExternalSurveillanceToolGateway.deletedAt = deleted at +ExternalSurveillanceToolGateway.notificationEntryNotDeleted = Entry could not be deleted in the reporting tool +warningDashboardMapTooManyMarkers = There are more than %d places to display and it is possible that your browser will freeze while displaying them. +ExternalSurveillanceToolGateway.notificationErrorDeleting = Error when deleting entry +ExternalSurveillanceToolGateway.versionRequestError = Error requesting version + headingSurveillanceReports=Reports headingCreateSurveillanceReport=Create new report headingEditSurveillanceReport=Edit report + + # Default password DefaultPassword.ownUserIntroduction=You have just logged in using the default password for this user. This password is not secure, as it could be used by unauthorized third parties to gain access to your account. Please make sure to change your password as soon as possible. DefaultPassword.otherUsersIntroduction=Your installation of SORMAS has default logins enabled, which were automatically created during setup. These logins have insecure default passwords, which could be used by unauthorized third parties to gain access to these accounts. Please make sure to change the default passwords of all affected users as soon as possible, or to entirely remove the accounts, if they are no longer required. @@ -1920,33 +1946,39 @@ DefaultPassword.otherUsersNewPasswordSetHints=Your accounts have been successful DefaultPassword.newPassword=New Password DefaultPassword.newPasswordPlaceholder=New Password: %s DefaultPassword.unchanged=- unchanged - -sormasToSormasLoadingShares=Loading shares... -errorConstraintViolation=Invalid data -reloadPageToSeeChanges=Please reload the page to see the latest changes. -checkboxSetTickAnAnswerForAll=Please tick an answer for ALL + +sormasToSormasLoadingShares = Loading shares... + +errorConstraintViolation = Invalid data + +reloadPageToSeeChanges = Please reload the page to see the latest changes. + +checkboxSetTickAnAnswerForAll = Please tick an answer for ALL + promptSampleDashboardFilterDateType=Sample reference date headingSampleDashboardEpiCurve=Final Laboratory Results Chart headingSampleDashboardMap=Sample Status Map infoHeadingSampleDashboardMap=Samples are shown using the GPS coordinate of the person's home address. infoHeadingEnvironmentSampleDashboardMap=Environment samples are shown using the GPS coordinates of those samples or, if not available, their associated environment. -headingSpecailCaseAccess=Grant special access -headingCreateSpecailCaseAccess=Create new special access -headingEditSpecailCaseAccess=Edit special access -headingConfirmBulkGrantSpecialAccess=Confirm saving special access -confirmationBulkGrantSpecialAccess=The selected user already has special access to at least one of the selected cases. Saving will overwrite the existing special access. Do you want to continue? -headingBulkSpecialCaseAccessSomeNotProcessed=Granted special access to some of the selected cases -headingBulkSpecialCaseAccessNoneProcessed=Not granted special access to any of the selected cases -messageBulkSpecialCaseAccessAllProcessed=Granted special access to all selected cases + +headingSpecailCaseAccess = Grant special access +headingCreateSpecailCaseAccess = Create new special access +headingEditSpecailCaseAccess = Edit special access +headingConfirmBulkGrantSpecialAccess = Confirm saving special access +confirmationBulkGrantSpecialAccess = The selected user already has special access to at least one of the selected cases. Saving will overwrite the existing special access. Do you want to continue? +headingBulkSpecialCaseAccessSomeNotProcessed= Granted special access to some of the selected cases +headingBulkSpecialCaseAccessNoneProcessed = Not granted special access to any of the selected cases +messageBulkSpecialCaseAccessAllProcessed = Granted special access to all selected cases messageCountAccessesNotGrantedDueToError=%s cases have not been processed: %s messageSelfReportSaved=Self report saved -headingArchiveSelfReport=Archive self report -confirmationArchiveSelfReport=Are you sure you want to archive this self report? This will not remove it from the system or any statistics, but only hide it from the normal self report directory. -messageSelfReportArchived=Self report has been archived -headingDearchiveSelfReport=De-Archive self report -confirmationDearchiveSelfReport=Are you sure you want to de-archive this self report? This will make it appear in the normal self report directory again. -messageSelfReportDearchived=Self report has been de-archived -headingNoSelfReportsSelected=No self reports selected -messageNoSelfReportsSelected=You have not selected any self reports +headingArchiveSelfReport = Archive self report +confirmationArchiveSelfReport = Are you sure you want to archive this self report? This will not remove it from the system or any statistics, but only hide it from the normal self report directory. +messageSelfReportArchived = Self report has been archived +headingDearchiveSelfReport = De-Archive self report +confirmationDearchiveSelfReport = Are you sure you want to de-archive this self report? This will make it appear in the normal self report directory again. +messageSelfReportDearchived = Self report has been de-archived +headingNoSelfReportsSelected = No self reports selected +messageNoSelfReportsSelected = You have not selected any self reports messageSelfReportOutsideJurisdictionDeletionDenied=The self report outside user's jurisdiction cannot be deleted infoSelfReportSelectOrCreateEntry=The database already contains at least one entry that seems to be very similar to the details of the self report.

Please look through the list of entries. If you feel certain that one matches the self report, select it and click on the Confirm button. Otherwise, select the option to create a new entry for the person.

If you are unsure, you can discard this window and cancel the process. infoSelfReportCreateEntry=The database contains no entry that seems to be similar to the details of the self message.

Select the option to create one and click on the Confirm to continue the processing.

If you are unsure, you can discard this window and cancel the process. @@ -1956,18 +1988,21 @@ headingSelfReportCaseReportWithSameReferenceFound=Case self report with same cas confirmationSelfReportCaseReportWithSameReferenceFound=There is a case self report with the same case reference number as the processed self report.
It is recommended to process case reports first.

Do you want to continue processing this self report? headingSelfReportCaseWithSameReferenceNumberFound=Case with same reference number found confirmationSelfReportLinkContactToCaseWithSameReferenceNumber=There is a case with the same reference number as the contact found

Do you want to link this contact to that case? + infoSystemConfigurationValueDescriptionEmailSenderAddress=Email address that will be set as the sender of email notifications sent out by the system. infoSystemConfigurationValueDescriptionEmailSenderName=Name that will be set as the sender of email notifications sent out by the system. infoSystemConfigurationValueDescriptionSmsSenderName=Name that will be set as the sender of SMS notifications sent out by the system. infoSystemConfigurationValueDescriptionSmsAuthKey=SORMAS supports the delivery of SMS notifications via Vonage (https://www.vonage.com/communications-apis/). You need to specify a valid authentication key and secret in order to use this feature. SORMAS will not attempt to send out SMS if these properties are left empty. infoSystemConfigurationValueDescriptionSmsAuthSecret=Secret for SMS authentication. infoSystemConfigurationValueDescriptionUseDeterminedVaccinationStatus=Use automatic vaccination status. The status will be derived from vaccination data. + notificationCannotCreate=Cannot Create Or Edit Notification notificationCreationNotAllowedWithoutSurveillanceReport=Notifier creation or modification is not allowed when a surveillance report already exists for this case. -notificationNotificationDateInformation=This date is automatically set based on when the notifier is created or modified. -notificationDiagnosisDateInformation=Diagnostic date is only available when editing surveillance reports, not when editing notifiers. -promptEpipulseExportDateFrom=Date from... -promptEpipulseExportDateTo=Date to... +notificationNotificationDateInformation=This date is managed automatically based on the surveillance report date. +notificationDiagnosisDateInformation=Diagnostic date is only available when editing surveillance reports. + +promptEpipulseExportDateFrom = Date from... +promptEpipulseExportDateTo = Date to... epipulseDownloadLinkText=Download headingCreateNewEpipulseExport=Create new Epipulse export headingViewEpipulseExport=Epipulse export detail diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyTokenFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyTokenFacadeEjb.java index 381bf77b76c..98dc5ce75f3 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyTokenFacadeEjb.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyTokenFacadeEjb.java @@ -168,7 +168,8 @@ public List getIndexList(SurveyTokenCriteria criteria, Inte joins.getGeneratedDocument().get(Document.UUID), joins.getGeneratedDocument().get(Document.NAME), joins.getGeneratedDocument().get(Document.MIME_TYPE), - root.get(SurveyToken.RESPONSE_RECEIVED_DATE)), + root.get(SurveyToken.RESPONSE_RECEIVED_DATE), + root.get(SurveyToken.EXTERNAL_RESPONDENT_ID)), // add sort properties to select sortBy(sortProperties, root, cb, cq, joins).stream()) .collect(Collectors.toList())); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyTokenIndexDtoResultTransformer.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyTokenIndexDtoResultTransformer.java index e0a469a095e..55c564b81ef 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyTokenIndexDtoResultTransformer.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyTokenIndexDtoResultTransformer.java @@ -41,7 +41,8 @@ public Object transformTuple(Object[] tuple, String[] aliases) { (String) tuple[++index], (String) tuple[++index], (String) tuple[++index], - (Date) tuple[++index]); + (Date) tuple[++index], + (String) tuple[++index]); } @Override From 81a6f5108918c818f8deb1b7e4ac5aef18cfb228 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Wed, 18 Mar 2026 07:22:11 +0100 Subject: [PATCH 066/134] single caption change --- .../src/main/resources/captions.properties | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/sormas-api/src/main/resources/captions.properties b/sormas-api/src/main/resources/captions.properties index 18d37297bb4..c7602e92624 100644 --- a/sormas-api/src/main/resources/captions.properties +++ b/sormas-api/src/main/resources/captions.properties @@ -422,6 +422,7 @@ CaseData.caseIdentificationSource=Case identification source CaseData.screeningType=Screening CaseData.clinicalConfirmation=Clinical confirmation CaseData.community=Community +CaseData.disease=Disease CaseData.epidemiologicalConfirmation= An epidemiological link to a confirmed case CaseData.laboratoryDiagnosticConfirmation=Laboratory diagnostic confirmation CaseData.caseConfirmationBasis=Basis for confirmation @@ -3677,4 +3678,19 @@ epipulseDownloadColumnCaption=Download epipulseNewExport=New export epipulseActiveExports=Active Epipulse exports epipulseArchivedExports=Archived Epipulse exports -epipulseAllExports=All Epipulse exports \ No newline at end of file +epipulseAllExports=All Epipulse exports + +# Survey responses UI +surveyResponseField=Field +surveyResponseSubmittedValue=Submitted Value +surveyResponseCurrentCaseValue=Current Case Value +surveyResponseFailureCause=Failure Cause +surveyResponseDescription=Description +surveyResponseCaseLink=Case +surveyResponseApplied=Applied +surveyResponseMetadata=Metadata +surveyResponsePatchDictionary=Patch Dictionary +surveyResponseProcessingResult=Processing Result +surveyResponseValidFields=Valid Fields (already applied) +actionCorrectAndReprocess=Correct & Reprocess +actionSaveAndReprocess=Save & Reprocess \ No newline at end of file From 00a1947de853cf932b7a268205aa29949582cd0c Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Wed, 18 Mar 2026 11:03:16 +0100 Subject: [PATCH 067/134] =?UTF-8?q?=F0=9F=92=A1cleanup=20and=20minor=20enh?= =?UTF-8?q?ancements?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapping/impl/valuemapper/CustomizableEnumPatchMapper.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapper.java index fb2bbbe3408..4d4ee932a70 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapper.java @@ -23,6 +23,9 @@ import de.symeda.sormas.backend.customizableenum.CustomizableEnumFacadeEjb; import de.symeda.sormas.backend.util.StringNormalizer; +/** + * Allows to find the adequate value for customizable enum values. + */ @ApplicationScoped public class CustomizableEnumPatchMapper implements ValuePatchMapper { From 582b6657f636c924e0c74edd563ead5da4f31a6a Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Wed, 22 Apr 2026 08:38:38 +0200 Subject: [PATCH 068/134] Added missing external survey respondent ID into UI --- .../SurveyAsExternalMessageAdapterFacade.java | 15 +++++++++ .../ExternalSurveyProviderFacade.java | 3 ++ .../external/views/ExternalSurveyView.java | 5 ++- .../external/views/QuestionAnswersView.java | 5 ++- .../symeda/sormas/api/utils/JsonWrapper.java | 25 +++++++++++++++ .../ExternalMessageFacadeEjb.java | 18 ++++++++++- .../backend/importexport/ImportFacadeEjb.java | 24 +++++++------- .../backend/survey/SurveyFacadeEjb.java | 2 ++ .../backend/survey/SurveyTokenFacadeEjb.java | 3 +- sormas-base/setup/keycloak/keycloak-setup.sh | 32 +++++++++---------- .../ImportSurveyTokensLayout.java | 21 ++++++------ .../externalmessage/ExternalMessagesView.java | 20 ++++++++---- .../sormas/ui/survey/SurveyDataForm.java | 1 + .../sormas/ui/survey/SurveyTokenDataForm.java | 3 +- 14 files changed, 125 insertions(+), 52 deletions(-) create mode 100644 sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/SurveyAsExternalMessageAdapterFacade.java create mode 100644 sormas-api/src/main/java/de/symeda/sormas/api/utils/JsonWrapper.java diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/SurveyAsExternalMessageAdapterFacade.java b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/SurveyAsExternalMessageAdapterFacade.java new file mode 100644 index 00000000000..9b073334add --- /dev/null +++ b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/SurveyAsExternalMessageAdapterFacade.java @@ -0,0 +1,15 @@ +package de.symeda.sormas.api.externalmessage.survey; + +import javax.ejb.Remote; + +import de.symeda.sormas.api.externalmessage.ExternalMessageAdapterFacade; + +/** + * A remote interface can only be implemented once, otherwise the build breaks. + * This second interface keeps the same contract, but allows to create a separate entry points for external messages. + * It allows to keep them both independent: separate fetching frequency | robustness: one can fail but not the other. + */ +@Remote +public interface SurveyAsExternalMessageAdapterFacade extends ExternalMessageAdapterFacade { + +} diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/ExternalSurveyProviderFacade.java b/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/ExternalSurveyProviderFacade.java index 79858a71486..3425d2aad59 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/ExternalSurveyProviderFacade.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/ExternalSurveyProviderFacade.java @@ -1,10 +1,13 @@ package de.symeda.sormas.api.survey.external; +import javax.ejb.Remote; + import de.symeda.sormas.api.survey.external.views.ExternalSurveyView; /** * To avoid integrating a specific survey-tool integration within SORMAS, this contract was specified to stay tool-agnostic. */ +@Remote public interface ExternalSurveyProviderFacade { ExternalSurveyView getExternalSurveyView(String externalSurveyId, String externalRespondentId); diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/views/ExternalSurveyView.java b/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/views/ExternalSurveyView.java index f91981b086e..cb6a1f04a39 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/views/ExternalSurveyView.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/views/ExternalSurveyView.java @@ -1,5 +1,6 @@ package de.symeda.sormas.api.survey.external.views; +import java.io.Serializable; import java.util.List; import de.symeda.sormas.api.audit.AuditedClass; @@ -8,7 +9,9 @@ * View used to display an external Survey in an tool-agnostic manner. */ @AuditedClass -public class ExternalSurveyView { +public class ExternalSurveyView implements Serializable { + + private static final long serialVersionUID = 1448651469231018412L; private List questionAnswersViews; diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/views/QuestionAnswersView.java b/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/views/QuestionAnswersView.java index cff9292648e..aed3cd3e27b 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/views/QuestionAnswersView.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/views/QuestionAnswersView.java @@ -1,5 +1,6 @@ package de.symeda.sormas.api.survey.external.views; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -9,7 +10,9 @@ import com.fasterxml.jackson.annotation.JsonIgnore; -public class QuestionAnswersView { +public class QuestionAnswersView implements Serializable { + + private static final long serialVersionUID = -1635618566991671402L; @NotNull private String question; diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/utils/JsonWrapper.java b/sormas-api/src/main/java/de/symeda/sormas/api/utils/JsonWrapper.java new file mode 100644 index 00000000000..4e0242d5651 --- /dev/null +++ b/sormas-api/src/main/java/de/symeda/sormas/api/utils/JsonWrapper.java @@ -0,0 +1,25 @@ +package de.symeda.sormas.api.utils; + +import java.io.Serializable; + +/** + * Meant to wrap JSON serialized objects. + */ +public class JsonWrapper> implements Serializable { + + private final String json; + private final T classType; + + public JsonWrapper(String json, T classType) { + this.json = json; + this.classType = classType; + } + + public String getJson() { + return json; + } + + public T getClassType() { + return classType; + } +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java index 5593f7f4456..752eb8cc647 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java @@ -83,6 +83,7 @@ import de.symeda.sormas.api.externalmessage.labmessage.SampleReportDto; import de.symeda.sormas.api.externalmessage.processing.ExternalMessageProcessingResult; import de.symeda.sormas.api.externalmessage.survey.ExternalSurveyResponseData; +import de.symeda.sormas.api.externalmessage.survey.SurveyAsExternalMessageAdapterFacade; import de.symeda.sormas.api.feature.FeatureType; import de.symeda.sormas.api.feature.FeatureTypeProperty; import de.symeda.sormas.api.i18n.Captions; @@ -138,6 +139,7 @@ public class ExternalMessageFacadeEjb implements ExternalMessageFacade { public static final String SURVEY_PERIOD_INTERVAL_HOURS = "SURVEY_PERIOD_INTERVAL_HOURS"; + private static final String SURVEY_AS_EXTERNAL_MESSAGE_ADAPTER_JNDI_KEY = "SURVEY_AS_EXTERNAL_MESSAGE_ADAPTER_JNDI_KEY"; private final Logger logger = LoggerFactory.getLogger(getClass()); @@ -338,7 +340,9 @@ public List saveAndProcessSurveyResponses(Date since) { since = DateHelper.addSeconds(new Date(), -(hoursRange * 3600)); } - ExternalMessageAdapterFacade externalLabResultsFacade = getSurveyExternalMessageFacade(); + logger.error("Since date: [{}]", since); + + ExternalMessageAdapterFacade externalLabResultsFacade = getExternalSurveyProviderFacade(); ExternalMessageResult> externalMessagesResult = externalLabResultsFacade.getExternalMessages(since); List surveyResponses = externalMessagesResult.getValue(); List savedDtos; @@ -874,6 +878,18 @@ private ExternalMessageAdapterFacade getSurveyExternalMessageFacade() { } } + private SurveyAsExternalMessageAdapterFacade getExternalSurveyProviderFacade() { + String jndiName = Optional.ofNullable(systemConfigurationValueFacade.getValue(SURVEY_AS_EXTERNAL_MESSAGE_ADAPTER_JNDI_KEY)).orElseGet(() -> { + logger.info("External Survey Provider JNDI Key not found, using default"); + return "java:global/sormas-esante-adapter/NgSurveyProviderFacade"; + }); + try { + return (SurveyAsExternalMessageAdapterFacade) new InitialContext().lookup(jndiName); + } catch (NamingException e) { + throw new RuntimeException("Could not look up SurveyAsExternalMessageAdapterFacade via JNDI: " + jndiName, e); + } + } + @Override @PermitAll public String getExternalMessagesAdapterVersion() throws NamingException { diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/importexport/ImportFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/importexport/ImportFacadeEjb.java index 89d291686a0..ef83c0fe66a 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/importexport/ImportFacadeEjb.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/importexport/ImportFacadeEjb.java @@ -569,13 +569,15 @@ public void generateSurveyTokenImportTemplateFile(List SurveyTokenDto.GENERATED_DOCUMENT, SurveyTokenDto.RECIPIENT_EMAIL, SurveyTokenDto.RESPONSE_RECEIVED, + SurveyTokenDto.EXTERNAL_RESPONDENT_ID, SurveyTokenDto.RESPONSE_RECEIVED_DATE); writeTemplate(Paths.get(getSurveyTokenImportTemplateFilePath()), importColumns, false); } @Override - public void generateSurveyTokenResponsesImportTemplateFile(List featureConfigurations) throws IOException, NoSuchFieldException { + public void generateSurveyTokenResponsesImportTemplateFile(List featureConfigurations) + throws IOException, NoSuchFieldException { createExportDirectoryIfNecessary(); @@ -583,16 +585,16 @@ public void generateSurveyTokenResponsesImportTemplateFile(List importColumns = new ArrayList<>(); appendListOfFields( - importColumns, - SurveyTokenDto.class, - "", - separator, - featureConfigurations, - SurveyTokenDto.SURVEY, - SurveyTokenDto.ASSIGNMENT_DATE, - SurveyTokenDto.CASE_ASSIGNED_TO, - SurveyTokenDto.GENERATED_DOCUMENT, - SurveyTokenDto.RECIPIENT_EMAIL); + importColumns, + SurveyTokenDto.class, + "", + separator, + featureConfigurations, + SurveyTokenDto.SURVEY, + SurveyTokenDto.ASSIGNMENT_DATE, + SurveyTokenDto.CASE_ASSIGNED_TO, + SurveyTokenDto.GENERATED_DOCUMENT, + SurveyTokenDto.RECIPIENT_EMAIL); writeTemplate(Paths.get(getSurveyTokenResponsesImportTemplateFilePath()), importColumns, false); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyFacadeEjb.java index b23c7e1a24d..8a7ad1cb883 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyFacadeEjb.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyFacadeEjb.java @@ -441,6 +441,7 @@ private Survey fillOrBuildEntity(SurveyDto source, Survey target) { target.setName(source.getName()); target.setDisease(source.getDisease()); + target.setExternalId(source.getExternalId()); return target; } @@ -457,6 +458,7 @@ private SurveyDto toDto(Survey source) { target.setDisease(source.getDisease()); target.setDocumentTemplate(DocumentTemplateFacadeEjb.toReferenceDto(source.getDocumentTemplate())); target.setEmailTemplate(DocumentTemplateFacadeEjb.toReferenceDto(source.getEmailTemplate())); + target.setExternalId(source.getExternalId()); return target; } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyTokenFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyTokenFacadeEjb.java index 98dc5ce75f3..2e00d545d3e 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyTokenFacadeEjb.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyTokenFacadeEjb.java @@ -303,6 +303,7 @@ private SurveyToken fillOrBuildEntity(SurveyTokenDto source, SurveyToken target) target.setRecipientEmail(source.getRecipientEmail()); target.setResponseReceived(source.isResponseReceived()); target.setResponseReceivedDate(source.getResponseReceivedDate()); + target.setExternalRespondentId(source.getExternalRespondentId()); return target; } @@ -356,7 +357,7 @@ public ExternalSurveyView getExternalSurveyView(String surveyTokenUuid) { private ExternalSurveyProviderFacade getExternalSurveyProviderFacade() { String jndiName = Optional.ofNullable(systemConfigurationValueFacade.getValue(EXTERNAL_SURVEY_PROVIDER_JNDI_KEY)).orElseGet(() -> { logger.info("External Survey Provider JNDI Key not found, using default"); - return "interface.externalMessageAdapter.jndiName=java:global/sormas-esante-adapter/NgSurveyMessageFacade"; + return "java:global/sormas-esante-adapter/NgSurveyProviderFacade"; }); try { return (ExternalSurveyProviderFacade) new InitialContext().lookup(jndiName); diff --git a/sormas-base/setup/keycloak/keycloak-setup.sh b/sormas-base/setup/keycloak/keycloak-setup.sh index 4efde00e6f4..a611423a59e 100644 --- a/sormas-base/setup/keycloak/keycloak-setup.sh +++ b/sormas-base/setup/keycloak/keycloak-setup.sh @@ -1,4 +1,5 @@ #!/bin/bash +#!/bin/bash #******************************************************************************* # SORMAS® - Surveillance Outbreak Response Management & Analysis System # Copyright © 2016-2018 Helmholtz-Zentrum für Infektionsforschung GmbH (HZI) @@ -40,12 +41,7 @@ else fi -if [ -x "$(command -v docker)" ]; then - echo "Found docker" -else - echo "Docker not installed. Please install before setting up Keycloak" - exit 2 -fi + echo "# Checking if the Payara server is up and running" @@ -59,12 +55,14 @@ if [[ -z "$PORT_ADMIN" ]]; then PORT_ADMIN=6048 echo "Using default Payara PORT_ADMIN ${PORT_ADMIN}" fi + +PAYARA_HOME=/c/Users/VRJ736/opt/payara5 if [[ -z "$PAYARA_HOME" ]]; then - PAYARA_HOME=${ROOT_PREFIX}/opt/payara5 + PAYARA_HOME=/c/Users/VRJ736/opt/payara5 echo "Using default PAYARA_HOME ${PAYARA_HOME}" fi if [[ -z "$DOMAINS_HOME" ]]; then - DOMAINS_HOME=${ROOT_PREFIX}/opt/domains + DOMAINS_HOME=/c/Users/VRJ736/opt/domains echo "Using default DOMAINS_HOME ${DOMAINS_HOME}" fi if [[ -z "$DOMAIN_NAME" ]]; then @@ -82,15 +80,15 @@ if [[ ! -d ${PAYARA_HOME} ]];then echo "Payara not found ${PAYARA_HOME}" exit 2 fi - -${PAYARA_HOME}/bin/asadmin restart-domain --domaindir ${DOMAINS_HOME} ${DOMAIN_NAME} -PAYARA_STATUS=$? -if [[ 0 != $PAYARA_STATUS ]]; then - echo "ERROR: Cannot start payara. Status ${PAYARA_STATUS}" - exit 2 -fi - -ASADMIN="${PAYARA_HOME}/bin/asadmin --port ${PORT_ADMIN}" +# +#${PAYARA_HOME}/bin/asadmin restart-domain --domaindir ${DOMAINS_HOME} ${DOMAIN_NAME} +#PAYARA_STATUS=$? +#if [[ 0 != $PAYARA_STATUS ]]; then +# echo "ERROR: Cannot start payara. Status ${PAYARA_STATUS}" +# exit 2 +#fi + +ASADMIN="${PAYARA_HOME}/bin/asadmin.bat --port ${PORT_ADMIN}" # Keycloak settings if [[ -z "$KEYCLOAK_PORT" ]]; then diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/configuration/infrastructure/ImportSurveyTokensLayout.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/configuration/infrastructure/ImportSurveyTokensLayout.java index b471504a8bc..e1b4f02ef6b 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/configuration/infrastructure/ImportSurveyTokensLayout.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/configuration/infrastructure/ImportSurveyTokensLayout.java @@ -15,10 +15,13 @@ package de.symeda.sormas.ui.configuration.infrastructure; +import java.io.IOException; + import com.opencsv.exceptions.CsvValidationException; import com.vaadin.server.ClassResource; import com.vaadin.server.Page; import com.vaadin.ui.Notification; + import de.symeda.sormas.api.FacadeProvider; import de.symeda.sormas.api.i18n.I18nProperties; import de.symeda.sormas.api.i18n.Strings; @@ -30,11 +33,9 @@ import de.symeda.sormas.ui.importer.ImportReceiver; import de.symeda.sormas.ui.importer.SurveyTokenImporter; -import java.io.IOException; - +// TODO: this is entry point to understand public class ImportSurveyTokensLayout extends AbstractImportLayout { - public ImportSurveyTokensLayout(SurveyDto survey) { super(); SurveyTokenFacade surveyTokenFacade = FacadeProvider.getSurveyTokenFacade(); @@ -48,18 +49,14 @@ public ImportSurveyTokensLayout(SurveyDto survey) { addImportCsvComponent(3, new ImportReceiver(fileNameAddition, file -> { resetDownloadErrorReportButton(); try { - DataImporter importer = new SurveyTokenImporter( - file, - currentUser, - survey, - (ValueSeparator) separator.getValue()); + DataImporter importer = new SurveyTokenImporter(file, currentUser, survey, (ValueSeparator) separator.getValue()); importer.startImport(this::extendDownloadErrorReportButton, currentUI, false); } catch (IOException | CsvValidationException e) { new Notification( - I18nProperties.getString(Strings.headingImportFailed), - I18nProperties.getString(Strings.messageImportFailed), - Notification.Type.ERROR_MESSAGE, - false).show(Page.getCurrent()); + I18nProperties.getString(Strings.headingImportFailed), + I18nProperties.getString(Strings.messageImportFailed), + Notification.Type.ERROR_MESSAGE, + false).show(Page.getCurrent()); } })); addDownloadErrorReportComponent(4); diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/ExternalMessagesView.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/ExternalMessagesView.java index 02f196f0901..685b8748f27 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/ExternalMessagesView.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/ExternalMessagesView.java @@ -26,9 +26,8 @@ import de.symeda.sormas.api.CountryHelper; import de.symeda.sormas.api.FacadeProvider; import de.symeda.sormas.api.externalmessage.ExternalMessageCriteria; -import de.symeda.sormas.api.externalmessage.ExternalMessageFetchResult; +import de.symeda.sormas.api.externalmessage.ExternalMessageDto; import de.symeda.sormas.api.externalmessage.ExternalMessageStatus; -import de.symeda.sormas.api.externalmessage.NewMessagesState; import de.symeda.sormas.api.feature.FeatureType; import de.symeda.sormas.api.feature.FeatureTypeProperty; import de.symeda.sormas.api.i18n.Captions; @@ -295,11 +294,18 @@ private void askForSinceDateAndFetch() { } private void fetchExternalMessages(Date since) { - ExternalMessageFetchResult fetchResult = FacadeProvider.getExternalMessageFacade().fetchAndSaveExternalMessages(since); - if (!fetchResult.isSuccess()) { - VaadinUiUtil.showWarningPopup(fetchResult.getError()); - } else if (NewMessagesState.NO_NEW_MESSAGES.equals(fetchResult.getNewMessagesState())) { - VaadinUiUtil.showWarningPopup(I18nProperties.getCaption(Captions.externalMessageNoNewMessages)); +// ExternalMessageFetchResult fetchResult = FacadeProvider.getExternalMessageFacade().saveAndProcessSurveyResponses(); +// if (!fetchResult.isSuccess()) { +// VaadinUiUtil.showWarningPopup(fetchResult.getError()); +// } else if (NewMessagesState.NO_NEW_MESSAGES.equals(fetchResult.getNewMessagesState())) { +// VaadinUiUtil.showWarningPopup(I18nProperties.getCaption(Captions.externalMessageNoNewMessages)); +// } else { +// grid.reload(); +// } + + List fetchResult = FacadeProvider.getExternalMessageFacade().saveAndProcessSurveyResponses(); + if (!fetchResult.isEmpty()) { + VaadinUiUtil.showWarningPopup(String.format("No new messages: [%s]", fetchResult)); } else { grid.reload(); } diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/survey/SurveyDataForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/survey/SurveyDataForm.java index 69fc6aeee4c..0941333812f 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/survey/SurveyDataForm.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/survey/SurveyDataForm.java @@ -20,6 +20,7 @@ public class SurveyDataForm extends AbstractEditForm { //@formatter:off private static final String HTML_LAYOUT = fluidRowLocs(SurveyDto.SURVEY_NAME, "") + fluidRowLocs(SurveyDto.DISEASE, "") + + fluidRowLocs(SurveyDto.EXTERNAL_ID, "") + fluidRowLocs(SURVEY_DOCUMENT_SECTION, ""); //@formatter:on diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/survey/SurveyTokenDataForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/survey/SurveyTokenDataForm.java index 2309152a5a4..98c1397e849 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/survey/SurveyTokenDataForm.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/survey/SurveyTokenDataForm.java @@ -28,7 +28,8 @@ public class SurveyTokenDataForm extends AbstractEditForm { private static final String HTML_LAYOUT = fluidRowLocs(SurveyTokenDto.UUID, SurveyTokenDto.TOKEN) + fluidRowLocs(SurveyTokenDto.SURVEY, "") + fluidRowLocs(SurveyTokenDto.ASSIGNMENT_DATE, SurveyTokenDto.RECIPIENT_EMAIL) - + fluidRowLocs(SurveyTokenDto.RESPONSE_RECEIVED, SurveyTokenDto.RESPONSE_RECEIVED_DATE); + + fluidRowLocs(SurveyTokenDto.RESPONSE_RECEIVED, SurveyTokenDto.RESPONSE_RECEIVED_DATE) + + fluidRowLocs(SurveyTokenDto.EXTERNAL_RESPONDENT_ID); private SurveyTokenReferenceDto surveyTokenReference; From 3576647249c03efdbb52faab49c7f3dfddb6c879 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Thu, 23 Apr 2026 13:41:41 +0200 Subject: [PATCH 069/134] External Message row is produced, but: - not yet displayed - No "processing" option - Must be checked for prefix: safely ignore "non-mapped"-fields --- .../survey/ExternalMessageSurveyResponseRequest.java | 5 ++++- .../survey/ExternalMessageSurveyResponseResult.java | 5 ++++- .../survey/ExternalMessageSurveyResponseWrapper.java | 5 ++++- .../survey/ExternalSurveyResponseData.java | 5 ++++- .../externalmessage/ExternalMessageFacadeEjb.java | 9 +++++---- .../ui/externalmessage/ExternalMessagesView.java | 11 +++++------ 6 files changed, 26 insertions(+), 14 deletions(-) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseRequest.java b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseRequest.java index fb65b1996e5..e8160223dd5 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseRequest.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseRequest.java @@ -1,5 +1,6 @@ package de.symeda.sormas.api.externalmessage.survey; +import java.io.Serializable; import java.util.Date; import java.util.List; import java.util.Map; @@ -18,7 +19,9 @@ * Mandatory fields that require * Will be present for {@link ExternalMessageType#SURVEY_RESPONSE}. */ -public class ExternalMessageSurveyResponseRequest { +public class ExternalMessageSurveyResponseRequest implements Serializable { + + private static final long serialVersionUID = 1L; private String token; private String externalSurveyId; diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseResult.java b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseResult.java index 22c018c5b70..f72c4dcc26d 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseResult.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseResult.java @@ -1,10 +1,13 @@ package de.symeda.sormas.api.externalmessage.survey; +import java.io.Serializable; import java.util.Objects; import de.symeda.sormas.api.patch.DataPatchResponse; -public class ExternalMessageSurveyResponseResult { +public class ExternalMessageSurveyResponseResult implements Serializable { + + private static final long serialVersionUID = 1L; private String caseUuid; diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseWrapper.java b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseWrapper.java index 3746cc723be..65ab7696807 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseWrapper.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseWrapper.java @@ -1,8 +1,11 @@ package de.symeda.sormas.api.externalmessage.survey; +import java.io.Serializable; import java.util.Objects; -public class ExternalMessageSurveyResponseWrapper { +public class ExternalMessageSurveyResponseWrapper implements Serializable { + + private static final long serialVersionUID = 1L; private ExternalMessageSurveyResponseRequest request; private ExternalMessageSurveyResponseResult result; diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalSurveyResponseData.java b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalSurveyResponseData.java index 916bcfdf55c..92ed4cfe288 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalSurveyResponseData.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalSurveyResponseData.java @@ -1,5 +1,6 @@ package de.symeda.sormas.api.externalmessage.survey; +import java.io.Serializable; import java.util.Objects; import java.util.Optional; @@ -11,7 +12,9 @@ /** * Some survey mapping might be valid and processed on first try, but for others another attempt might be required. */ -public class ExternalSurveyResponseData { +public class ExternalSurveyResponseData implements Serializable { + + private static final long serialVersionUID = 1L; /** * Represents the original mapping contract (request) and response for the survey mapping. diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java index 752eb8cc647..bbe0389673d 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java @@ -333,9 +333,9 @@ public ExternalMessageDto saveAndProcessLabmessage(@Valid ExternalMessageDto lab @Override public List saveAndProcessSurveyResponses(Date since) { - if (since == null) { + if (since == null) { // TODO: use shorter default range int hoursRange = - Integer.parseInt(Optional.ofNullable(systemConfigurationValueFacade.getValue(SURVEY_PERIOD_INTERVAL_HOURS)).orElse("168")); + Integer.parseInt(Optional.ofNullable(systemConfigurationValueFacade.getValue(SURVEY_PERIOD_INTERVAL_HOURS)).orElse("1680")); since = DateHelper.addSeconds(new Date(), -(hoursRange * 3600)); } @@ -381,7 +381,8 @@ public ExternalMessageDto save(@Valid ExternalMessageDto dto, boolean checkChang validate(dto); - if (ExternalMessageType.SURVEY_RESPONSE.equals(externalMessage.getType())) { + // TODO: is null but should not + if (ExternalMessageType.SURVEY_RESPONSE.equals(dto.getType())) { // TODO: fill missing holes from person: fetch the entities: case -> person } @@ -881,7 +882,7 @@ private ExternalMessageAdapterFacade getSurveyExternalMessageFacade() { private SurveyAsExternalMessageAdapterFacade getExternalSurveyProviderFacade() { String jndiName = Optional.ofNullable(systemConfigurationValueFacade.getValue(SURVEY_AS_EXTERNAL_MESSAGE_ADAPTER_JNDI_KEY)).orElseGet(() -> { logger.info("External Survey Provider JNDI Key not found, using default"); - return "java:global/sormas-esante-adapter/NgSurveyProviderFacade"; + return "java:global/sormas-esante-adapter/SurveyExternalMessageAdapterFacadeEjb"; }); try { return (SurveyAsExternalMessageAdapterFacade) new InitialContext().lookup(jndiName); diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/ExternalMessagesView.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/ExternalMessagesView.java index 685b8748f27..969c93f0fd3 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/ExternalMessagesView.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/ExternalMessagesView.java @@ -29,7 +29,6 @@ import de.symeda.sormas.api.externalmessage.ExternalMessageDto; import de.symeda.sormas.api.externalmessage.ExternalMessageStatus; import de.symeda.sormas.api.feature.FeatureType; -import de.symeda.sormas.api.feature.FeatureTypeProperty; import de.symeda.sormas.api.i18n.Captions; import de.symeda.sormas.api.i18n.I18nProperties; import de.symeda.sormas.api.i18n.Strings; @@ -79,11 +78,11 @@ public ExternalMessagesView() { ViewModelProviders.of(ExternalMessagesView.class).get(ExternalMessageCriteria.class, criteria); } - if (FacadeProvider.getFeatureConfigurationFacade().isPropertyValueTrue(FeatureType.EXTERNAL_MESSAGES, FeatureTypeProperty.FETCH_MODE)) { - addHeaderComponent(ButtonHelper.createIconButton(Captions.externalMessageFetch, VaadinIcons.REFRESH, e -> { - checkForConcurrentEventsAndFetch(); - }, ValoTheme.BUTTON_PRIMARY)); - } + //if (FacadeProvider.getFeatureConfigurationFacade().isPropertyValueTrue(FeatureType.EXTERNAL_MESSAGES, FeatureTypeProperty.FETCH_MODE)) { + addHeaderComponent(ButtonHelper.createIconButton(Captions.externalMessageFetch, VaadinIcons.REFRESH, e -> { + checkForConcurrentEventsAndFetch(); + }, ValoTheme.BUTTON_PRIMARY)); + //} if (isBulkEditAllowed()) { btnEnterBulkEditMode = ButtonHelper.createIconButton(Captions.actionEnterBulkEditMode, VaadinIcons.CHECK_SQUARE_O, e -> { From e3e8ef727bc4a1319521a8d8975a25f62f843d4a Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Fri, 24 Apr 2026 15:05:29 +0200 Subject: [PATCH 070/134] FIX serializable issue --- .../de/symeda/sormas/api/patch/DataPatchFailure.java | 5 ++++- .../de/symeda/sormas/api/patch/DataPatchResponse.java | 5 ++++- .../ExternalMessageAdditionalDataType.java | 9 ++++++++- .../externalmessage/ExternalMessageFacadeEjb.java | 7 +++++++ .../survey/AutomaticSurveyResponseProcessor.java | 4 +++- 5 files changed, 26 insertions(+), 4 deletions(-) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailure.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailure.java index 82e94bdb070..d07c41dc133 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailure.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailure.java @@ -1,5 +1,6 @@ package de.symeda.sormas.api.patch; +import java.io.Serializable; import java.util.Objects; import javax.annotation.Nullable; @@ -8,7 +9,9 @@ /** * Resulting object that is built in case some field couldn't be mapped during data patching. */ -public class DataPatchFailure { +public class DataPatchFailure implements Serializable { + + private static final long serialVersionUID = 1L; @NotNull private DataPatchFailureCause dataPatchFailureCause; diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchResponse.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchResponse.java index f12040631b2..3c518ebf378 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchResponse.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchResponse.java @@ -1,5 +1,6 @@ package de.symeda.sormas.api.patch; +import java.io.Serializable; import java.util.HashMap; import java.util.Map; import java.util.Objects; @@ -9,7 +10,9 @@ /** * Response to a patch request. */ -public class DataPatchResponse { +public class DataPatchResponse implements Serializable { + + private static final long serialVersionUID = 1L; /** * True if the dictionary was applied to the specified fields. diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageAdditionalDataType.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageAdditionalDataType.java index 0d536c431bb..e89075412f3 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageAdditionalDataType.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageAdditionalDataType.java @@ -1,5 +1,8 @@ package de.symeda.sormas.backend.externalmessage; +import java.util.Arrays; +import java.util.Optional; + import de.symeda.sormas.api.externalmessage.survey.ExternalSurveyResponseData; /** @@ -10,7 +13,7 @@ */ public enum ExternalMessageAdditionalDataType { - SURVEY_RESPONSE_WRAPPER(ExternalSurveyResponseData.class); + SURVEY_RESPONSE_DATA(ExternalSurveyResponseData.class); private final Class dataClass; @@ -21,4 +24,8 @@ public enum ExternalMessageAdditionalDataType { public Class getDataClass() { return dataClass; } + + public static Optional from(Class dataClass) { + return Arrays.stream(values()).filter(type -> type.dataClass.equals(dataClass)).findFirst(); + } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java index bbe0389673d..7100639f125 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java @@ -278,6 +278,13 @@ ExternalMessage fillOrBuildEntity(@NotNull ExternalMessageDto source, ExternalMe target.setTuberculosisMdrXdrTuberculosis(source.getTuberculosisMdrXdrTuberculosis()); target.setTuberculosisBeijingLineage(source.getTuberculosisBeijingLineage()); + ExternalSurveyResponseData surveyResponseData = source.getSurveyResponseData(); + + if (surveyResponseData != null) { + target.setAdditionalDataType(ExternalMessageAdditionalDataType.SURVEY_RESPONSE_DATA); + target.setAdditionalDataJson(ObjectMapperProvider.writeValueAsStringFailSafe(surveyResponseData)); + } + return target; } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java index 1dc36f12a8e..8168c28a81f 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java @@ -75,6 +75,7 @@ public List processSurveyResponses(List processSurveyResponses(List Date: Fri, 24 Apr 2026 16:00:21 +0200 Subject: [PATCH 071/134] ExternalMessages are displayed **BUT** for every fetch a new message is created --- .../backend/externalmessage/ExternalMessageService.java | 4 ++++ .../sormas/ui/externalmessage/ExternalMessagesView.java | 1 + 2 files changed, 5 insertions(+) diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageService.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageService.java index 5e9dddf0776..72c9547fba9 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageService.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageService.java @@ -108,6 +108,10 @@ public Predicate createDefaultFilter(CriteriaBuilder cb, From fetchResult = FacadeProvider.getExternalMessageFacade().saveAndProcessSurveyResponses(); if (!fetchResult.isEmpty()) { VaadinUiUtil.showWarningPopup(String.format("No new messages: [%s]", fetchResult)); + grid.reload(); } else { grid.reload(); } From 4815c4c9ef0f1e8c52db8d85c5b19c94f4074efc Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Fri, 24 Apr 2026 17:12:38 +0200 Subject: [PATCH 072/134] ability to display Case info in external messages --- .../java/de/symeda/sormas/api/survey/SurveyFacade.java | 9 ++++++++- .../de/symeda/sormas/api/survey/SurveyTokenFacade.java | 2 ++ .../externalmessage/ExternalMessageFacadeEjb.java | 5 ----- .../de/symeda/sormas/backend/survey/SurveyFacadeEjb.java | 4 ++-- .../sormas/backend/survey/SurveyTokenFacadeEjb.java | 9 +++++++++ 5 files changed, 21 insertions(+), 8 deletions(-) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/survey/SurveyFacade.java b/sormas-api/src/main/java/de/symeda/sormas/api/survey/SurveyFacade.java index 56c9d109676..2ea14c3575c 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/survey/SurveyFacade.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/survey/SurveyFacade.java @@ -17,11 +17,14 @@ import java.io.IOException; import java.util.List; +import java.util.Optional; import javax.ejb.Remote; import javax.validation.Valid; import javax.validation.constraints.NotNull; +import org.apache.commons.collections4.CollectionUtils; + import de.symeda.sormas.api.Disease; import de.symeda.sormas.api.docgeneneration.DocumentTemplateDto; import de.symeda.sormas.api.docgeneneration.DocumentTemplateException; @@ -41,7 +44,11 @@ void uploadDocumentTemplate(@NotNull SurveyReferenceDto surveyRef, DocumentTempl SurveyDto getByUuid(String uuid); - List getByExternalIds(List externalId); + List getByExternalIds(List externalIds); + + default Optional getByExternalId(@NotNull String externalId) { + return Optional.ofNullable(getByExternalIds(List.of(externalId))).filter(CollectionUtils::isNotEmpty).map(surveys -> surveys.get(0)); + } long count(SurveyCriteria criteria); diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/survey/SurveyTokenFacade.java b/sormas-api/src/main/java/de/symeda/sormas/api/survey/SurveyTokenFacade.java index 322616bac51..32d57f94b6a 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/survey/SurveyTokenFacade.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/survey/SurveyTokenFacade.java @@ -47,6 +47,8 @@ public interface SurveyTokenFacade { SurveyTokenDto getBySurveyAndToken(SurveyReferenceDto survey, String token); + SurveyTokenDto getBySurveyExternalIdAndToken(String externalSurveyId, String token); + List getBySurveyReferenceTokenTuples(List> surveyReferenceTokenTuples); boolean exists(String uuid); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java index 7100639f125..138ce26c11d 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java @@ -388,11 +388,6 @@ public ExternalMessageDto save(@Valid ExternalMessageDto dto, boolean checkChang validate(dto); - // TODO: is null but should not - if (ExternalMessageType.SURVEY_RESPONSE.equals(dto.getType())) { - // TODO: fill missing holes from person: fetch the entities: case -> person - } - externalMessage = fillOrBuildEntity(dto, externalMessage, checkChangeDate); // If it is a LabMessage and it has not set a DiseaseVariant, an attempt is made to determine this from the attached TestReports. diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyFacadeEjb.java index 8a7ad1cb883..3bee0b16f79 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyFacadeEjb.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyFacadeEjb.java @@ -237,11 +237,11 @@ public SurveyDto getByUuid(String uuid) { } @Override - public List getByExternalIds(List externalId) { + public List getByExternalIds(List externalIds) { CriteriaBuilder cb = em.getCriteriaBuilder(); CriteriaQuery cq = cb.createQuery(Survey.class); Root from = cq.from(Survey.class); - cq.where(cb.equal(from.get(Survey.EXTERNAL_ID), externalId)); + cq.where(cb.equal(from.get(Survey.EXTERNAL_ID), externalIds)); cq.orderBy(cb.desc(from.get(Survey.NAME))); return getAsStream(cq).map(this::toDto).collect(Collectors.toList()); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyTokenFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyTokenFacadeEjb.java index 2e00d545d3e..cc655137111 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyTokenFacadeEjb.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyTokenFacadeEjb.java @@ -44,6 +44,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import de.symeda.sormas.api.survey.SurveyDto; import de.symeda.sormas.api.survey.SurveyReferenceDto; import de.symeda.sormas.api.survey.SurveyTokenCriteria; import de.symeda.sormas.api.survey.SurveyTokenDto; @@ -228,6 +229,14 @@ public SurveyTokenDto getBySurveyAndToken(SurveyReferenceDto survey, String toke return toDto(surveyTokenService.getBySurveyAndToken(survey, token)); } + @Override + public SurveyTokenDto getBySurveyExternalIdAndToken(String externalSurveyId, String token) { + SurveyDto surveyDto = surveyFacade.getByExternalId(externalSurveyId) + .orElseThrow(() -> new RuntimeException(String.format("Survey with external id: [%s] not found", externalSurveyId))); + + return toDto(surveyTokenService.getBySurveyAndToken(surveyDto.toReference(), token)); + } + @Override public List getBySurveyReferenceTokenTuples( List> surveyReferenceTokenTuples) { From ad614c3185a7d2f54a0c08c58b0c861b312df602 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Mon, 27 Apr 2026 14:53:06 +0200 Subject: [PATCH 073/134] Current values are now successfully displayed --- .../patch/partial_retrieval/DisplayableFieldInfo.java | 5 ++++- .../DisplayablePartialRetrievalResponse.java | 5 ++++- .../externalmessage/ExternalMessageFacadeEjb.java | 6 +++++- .../java/de/symeda/sormas/ui/SormasErrorHandler.java | 3 +++ .../surveyresponse/SurveyResponseDetailsWindow.java | 10 +++++----- 5 files changed, 21 insertions(+), 8 deletions(-) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/DisplayableFieldInfo.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/DisplayableFieldInfo.java index 2338ddafcb0..effc5427d43 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/DisplayableFieldInfo.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/DisplayableFieldInfo.java @@ -1,11 +1,14 @@ package de.symeda.sormas.api.patch.partial_retrieval; +import java.io.Serializable; import java.util.Objects; /** * Type to display a specific value to the user with its field name and its value. */ -public class DisplayableFieldInfo { +public class DisplayableFieldInfo implements Serializable { + + private static final long serialVersionUID = 1L; private String translatedFieldName; private String translatedFieldValue; diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/DisplayablePartialRetrievalResponse.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/DisplayablePartialRetrievalResponse.java index ed0415a0f07..fcab37dd9cd 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/DisplayablePartialRetrievalResponse.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/DisplayablePartialRetrievalResponse.java @@ -1,10 +1,13 @@ package de.symeda.sormas.api.patch.partial_retrieval; +import java.io.Serializable; import java.util.HashMap; import java.util.Map; import java.util.Objects; -public class DisplayablePartialRetrievalResponse { +public class DisplayablePartialRetrievalResponse implements Serializable { + + private static final long serialVersionUID = 1L; private Map fieldInfoDictionary = new HashMap<>(); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java index 138ce26c11d..bf0cb7118e9 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java @@ -90,6 +90,7 @@ import de.symeda.sormas.api.i18n.I18nProperties; import de.symeda.sormas.api.i18n.Strings; import de.symeda.sormas.api.i18n.Validations; +import de.symeda.sormas.api.patch.partial_retrieval.DisplayablePartialRetrievalResponse; import de.symeda.sormas.api.sample.PathogenTestResultType; import de.symeda.sormas.api.sample.SampleReferenceDto; import de.symeda.sormas.api.systemconfiguration.SystemConfigurationValueFacade; @@ -1030,7 +1031,10 @@ public de.symeda.sormas.api.patch.partial_retrieval.DisplayablePartialRetrievalR new de.symeda.sormas.api.patch.partial_retrieval.PartialRetrievalRequest().setCaseUuid(result.getCaseUuid()) .setFieldsToRetrieve(fieldPaths); - return partialRetriever.retrievePartialForDisplay(request); + DisplayablePartialRetrievalResponse response = partialRetriever.retrievePartialForDisplay(request); + logger.error("retrieveSurveyResponseFieldsForDisplay: [{}]", response); + + return response; } public static ExternalMessageReferenceDto toReferenceDto(ExternalMessage entity) { diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/SormasErrorHandler.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/SormasErrorHandler.java index eb900b30e2d..fe746ad00e1 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/SormasErrorHandler.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/SormasErrorHandler.java @@ -40,6 +40,7 @@ import com.vaadin.shared.ui.ErrorLevel; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.Notification; +import com.vaadin.ui.UI; import com.vaadin.v7.data.Buffered; import com.vaadin.v7.data.Validator; import com.vaadin.v7.ui.AbstractField; @@ -76,6 +77,8 @@ public static void handleError(ErrorEvent event) { return; } + UI.getCurrent().getPage().getJavaScript().execute("Java exception: " + ExceptionUtils.getRootCauseMessage(t)); + ErrorMessage errorMessage = getErrorMessageForException(t); if (t != null) { diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseDetailsWindow.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseDetailsWindow.java index 1ffc3c2a603..be81fb11755 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseDetailsWindow.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseDetailsWindow.java @@ -45,6 +45,7 @@ import de.symeda.sormas.ui.caze.CaseDataView; import de.symeda.sormas.ui.utils.ButtonHelper; import de.symeda.sormas.ui.utils.CssStyles; +import de.symeda.sormas.ui.utils.VaadinUiUtil; /** * Popup window displaying full details of a SURVEY_RESPONSE external message. @@ -55,11 +56,7 @@ public SurveyResponseDetailsWindow(ExternalMessageDto externalMessage, Runnable String uuid = externalMessage.getUuid(); DisplayablePartialRetrievalResponse displayData; - try { - displayData = FacadeProvider.getExternalMessageFacade().retrieveSurveyResponseFieldsForDisplay(uuid); - } catch (Exception e) { - displayData = new DisplayablePartialRetrievalResponse(); - } + displayData = FacadeProvider.getExternalMessageFacade().retrieveSurveyResponseFieldsForDisplay(uuid); VerticalLayout layout = new VerticalLayout(); layout.setMargin(true); @@ -104,6 +101,9 @@ public SurveyResponseDetailsWindow(ExternalMessageDto externalMessage, Runnable dictionaryGrid.setItems(entries); dictionaryGrid.setHeightByRows(Math.max(entries.size(), 1)); + VaadinUiUtil.showWarningPopup(String.format("Entries: [%s]", entries)); + VaadinUiUtil.showWarningPopup(String.format("finalDisplayData: [%s]", finalDisplayData)); + dictionaryGrid.addColumn(entry -> resolveFieldName(entry.getKey(), finalDisplayData)) .setCaption(I18nProperties.getCaption(Captions.surveyResponseField)) .setExpandRatio(2); From 6ebfab792085e9d7d2770aa2259124f83af7b8f3 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Mon, 27 Apr 2026 15:20:36 +0200 Subject: [PATCH 074/134] fixes: - invalid person contact fields set (should have been contactInformation - non-copied request fields on reprocessing --- .../ExternalMessageFacadeEjb.java | 37 +++++++++---------- .../PersonContactDetailsFieldMapper.java | 4 +- .../PersonContactDetailsFieldMapperTest.java | 6 +-- .../sormas/patch/DataPatcherImplTest.java | 6 +-- .../SurveyResponseDetailsWindow.java | 2 +- 5 files changed, 27 insertions(+), 28 deletions(-) diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java index bf0cb7118e9..b65f1288650 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java @@ -82,6 +82,8 @@ import de.symeda.sormas.api.externalmessage.NewMessagesState; import de.symeda.sormas.api.externalmessage.labmessage.SampleReportDto; import de.symeda.sormas.api.externalmessage.processing.ExternalMessageProcessingResult; +import de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseRequest; +import de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseWrapper; import de.symeda.sormas.api.externalmessage.survey.ExternalSurveyResponseData; import de.symeda.sormas.api.externalmessage.survey.SurveyAsExternalMessageAdapterFacade; import de.symeda.sormas.api.feature.FeatureType; @@ -974,25 +976,22 @@ public ExternalMessageDto getForSurveillanceReport(SurveillanceReportReferenceDt @RightsAllowed(UserRight._EXTERNAL_MESSAGE_SURVEY_RESPONSE_PROCESS) public ExternalMessageDto reprocessSurveyResponse(String uuid, java.util.Map correctedDictionary) { ExternalMessageDto externalMessage = getByUuid(uuid); - de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseRequest latestRequest = - externalMessage.getSurveyResponseData().getLatest().getRequest(); - - de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseRequest correctedRequest = - new de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseRequest().setToken(latestRequest.getToken()) - .setExternalSurveyId(latestRequest.getExternalSurveyId()) - .setExternalRespondentId(latestRequest.getExternalRespondentId()) - .setResponseReceivedDate(latestRequest.getResponseReceivedDate()) - .setReplacementStrategy(latestRequest.getReplacementStrategy()) - .setEmptyValueBehavior(latestRequest.getEmptyValueBehavior()) - .setOrigin(latestRequest.getOrigin()) - .setInputLanguages(latestRequest.getInputLanguages()) - .setAllowFallbackValues(latestRequest.isAllowFallbackValues()) - .setSkipIfAlreadyProcessed(false) - .setPatchedInCaseOfFailures(true) - .setPatchDictionary(correctedDictionary); - - de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseWrapper updatedWrapper = - new de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseWrapper().setRequest(correctedRequest); + ExternalMessageSurveyResponseRequest latestRequest = externalMessage.getSurveyResponseData().getLatest().getRequest(); + + ExternalMessageSurveyResponseRequest correctedRequest = new ExternalMessageSurveyResponseRequest().setToken(latestRequest.getToken()) + .setExternalSurveyId(latestRequest.getExternalSurveyId()) + .setExternalRespondentId(latestRequest.getExternalRespondentId()) + .setResponseReceivedDate(latestRequest.getResponseReceivedDate()) + .setReplacementStrategy(latestRequest.getReplacementStrategy()) + .setEmptyValueBehavior(latestRequest.getEmptyValueBehavior()) + .setOrigin(latestRequest.getOrigin()) + .setInputLanguages(latestRequest.getInputLanguages()) + .setAllowFallbackValues(latestRequest.isAllowFallbackValues()) + .setSkipIfAlreadyProcessed(latestRequest.isSkipIfAlreadyProcessed()) + .setPatchedInCaseOfFailures(latestRequest.isPatchedInCaseOfFailures()) + .setPatchDictionary(correctedDictionary); + + ExternalMessageSurveyResponseWrapper updatedWrapper = new ExternalMessageSurveyResponseWrapper().setRequest(correctedRequest); externalMessage.getSurveyResponseData().setUpdated(updatedWrapper); try { diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapper.java index 8c57d60cd65..16978b7185a 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapper.java @@ -78,7 +78,7 @@ private PersonContactDetailDto buildGenericContactDetail(FieldPatchRequest reque PersonContactDetailDto detail = new PersonContactDetailDto(); detail.setUuid(DataHelper.createUuid()); detail.setPerson(personDto.toReference()); - detail.setDetails((String) request.getValue()); + detail.setContactInformation((String) request.getValue()); detail.setAdditionalInformation(request.getOrigin()); return detail; @@ -101,7 +101,7 @@ private PersonContactDetailDto buildEmailContactDetail(FieldPatchRequest request @Override public Set supportedFields() { - return Stream.of(PersonContactDetailDto.PHONE_NUMBER_TYPE, PersonContactDetailDto.DETAILS) + return Stream.of(PersonContactDetailDto.PHONE_NUMBER_TYPE, PersonContactDetailDto.CONTACT_INFORMATION) .map(suffix -> PersonDto.I18N_PREFIX + PATH_SEPARATOR + PersonDto.PERSON_CONTACT_DETAILS + PATH_SEPARATOR + suffix) .collect(Collectors.toSet()); } diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapperTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapperTest.java index 85e575c8797..9db06d4214c 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapperTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapperTest.java @@ -30,7 +30,7 @@ class PersonContactDetailsFieldMapperTest extends AbstractUnitTest { @Test void supportedFields_containsPhoneNumberTypeAndDetails() { // PREPARE - Set expected = Set.of("Person.personContactDetails.details, Person.personContactDetails.phoneNumberType"); + Set expected = Set.of("Person.personContactDetails.contactInformation", "Person.personContactDetails.phoneNumberType"); // EXECUTE Set actual = victim.supportedFields(); @@ -75,7 +75,7 @@ void map_phoneField_contactDetailNotPresent_addsPhoneContactDetail() { assertEquals(1, personDto.getPersonContactDetails().size()); PersonContactDetailDto added = personDto.getPersonContactDetails().get(0); assertEquals(PersonContactDetailType.PHONE, added.getPersonContactDetailType()); - assertEquals("0123456789", added.getDetails()); + assertEquals("0123456789", added.getContactInformation()); assertEquals(PhoneNumberType.OTHER, added.getPhoneNumberType()); assertEquals("someOrigin", added.getAdditionalInformation()); } @@ -147,7 +147,7 @@ void map_emailField_contactDetailNotPresent_addsEmailContactDetail() { assertEquals(1, personDto.getPersonContactDetails().size()); PersonContactDetailDto added = personDto.getPersonContactDetails().get(0); assertEquals(PersonContactDetailType.EMAIL, added.getPersonContactDetailType()); - assertEquals("test@example.com", added.getDetails()); + assertEquals("test@example.com", added.getContactInformation()); assertEquals("someOrigin", added.getAdditionalInformation()); } diff --git a/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java index 35df65617fa..0b4fe9a9c12 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java @@ -131,7 +131,7 @@ void patch_noErrorsReplaceAlwaysPersonContactDetails() { .setReplacementStrategy(DataReplacementStrategy.ALWAYS) .setPatchDictionary( Map.of( - "Person.personContactDetails.details", + "Person.personContactDetails.contactInformation", newEmail, "Person.personContactDetails.phoneNumberType", @@ -157,14 +157,14 @@ void patch_noErrorsReplaceAlwaysPersonContactDetails() { contactDetailsStreamProvider.get() .anyMatch( contactDetail -> contactDetail.getPersonContactDetailType() == PersonContactDetailType.PHONE - && newPhoneNumber.equals(contactDetail.getDetails()) + && newPhoneNumber.equals(contactDetail.getContactInformation()) && contactDetail.getPhoneNumberType() == PhoneNumberType.OTHER)), () -> Assertions.assertTrue( contactDetailsStreamProvider.get() .anyMatch( contactDetail -> contactDetail.getPersonContactDetailType() == PersonContactDetailType.EMAIL - && newEmail.equals(contactDetail.getDetails())))); + && newEmail.equals(contactDetail.getContactInformation())))); } @ParameterizedTest diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseDetailsWindow.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseDetailsWindow.java index be81fb11755..c6fb851c2ec 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseDetailsWindow.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseDetailsWindow.java @@ -61,7 +61,7 @@ public SurveyResponseDetailsWindow(ExternalMessageDto externalMessage, Runnable VerticalLayout layout = new VerticalLayout(); layout.setMargin(true); layout.setSpacing(true); - layout.setWidth(800, Sizeable.Unit.PIXELS); + layout.setWidth(100, Sizeable.Unit.PERCENTAGE); Window window = new Window(I18nProperties.getString(Strings.headingSurveyResponseDetails)); window.setModal(true); From 5c716019824fe04b3e1fb656c6a821ecc10e3022 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Mon, 27 Apr 2026 16:58:44 +0200 Subject: [PATCH 075/134] Handled downloading of survey request / ignore option for some fields --- .../sormas/api/symptoms/SymptomsDto.java | 32 +++++------ .../externalmessage/ExternalMessageGrid.java | 22 ++++++-- .../SurveyResponseFailureEditor.java | 53 +++++++++++++++---- 3 files changed, 73 insertions(+), 34 deletions(-) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/symptoms/SymptomsDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/symptoms/SymptomsDto.java index 8c6674ff3d5..51cb6e7508e 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/symptoms/SymptomsDto.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/symptoms/SymptomsDto.java @@ -5207,57 +5207,51 @@ public void setOtherNeurolocalSymptomText(String otherNeurolocalSymptomText) { this.otherNeurolocalSymptomText = otherNeurolocalSymptomText; } + public SymptomState getCoughingAtNight() { + return coughingAtNight; + } + + public void setCoughingAtNight(SymptomState coughingAtNight) { + this.coughingAtNight = coughingAtNight; + } + public SymptomState getLossOfAppetite() { return lossOfAppetite; } - public SymptomsDto setLossOfAppetite(SymptomState lossOfAppetite) { + public void setLossOfAppetite(SymptomState lossOfAppetite) { this.lossOfAppetite = lossOfAppetite; - return this; } public SymptomState getFlatulence() { return flatulence; } - public SymptomsDto setFlatulence(SymptomState flatulence) { + public void setFlatulence(SymptomState flatulence) { this.flatulence = flatulence; - return this; } public SymptomState getSmellyBurps() { return smellyBurps; } - public SymptomsDto setSmellyBurps(SymptomState smellyBurps) { + public void setSmellyBurps(SymptomState smellyBurps) { this.smellyBurps = smellyBurps; - return this; } public SymptomState getCoughingAttacks() { return coughingAttacks; } - public SymptomsDto setCoughingAttacks(SymptomState coughingAttacks) { + public void setCoughingAttacks(SymptomState coughingAttacks) { this.coughingAttacks = coughingAttacks; - return this; - } - - public SymptomState getCoughingAtNight() { - return coughingAtNight; - } - - public SymptomsDto setCoughingAtNight(SymptomState coughingAtNight) { - this.coughingAtNight = coughingAtNight; - return this; } public SymptomState getAbdominalCramps() { return abdominalCramps; } - public SymptomsDto setAbdominalCramps(SymptomState abdominalCramps) { + public void setAbdominalCramps(SymptomState abdominalCramps) { this.abdominalCramps = abdominalCramps; - return this; } } diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/ExternalMessageGrid.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/ExternalMessageGrid.java index 8feb3221403..741049ecb6b 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/ExternalMessageGrid.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/ExternalMessageGrid.java @@ -71,6 +71,7 @@ public class ExternalMessageGrid extends FilteredGrid dataProviderListener; @@ -236,19 +237,30 @@ private Component buildProcessComponent(ExternalMessageIndexDto indexDto) { } } - private Button buildDownloadButton(ExternalMessageIndexDto labMessage) { + private Button buildDownloadButton(ExternalMessageIndexDto externalMessageIndex) { Button downloadButton = new Button(VaadinIcons.DOWNLOAD); downloadButton.setDescription(I18nProperties.getString(Strings.headingExternalMessageDownload)); - final String fileName = - String.format(XML_FILENAME_FORMAT, DataHelper.getShortUuid(labMessage.getUuid()), DateHelper.formatDateForExport(new Date())); + + String fileName; + String mimeType; + if (externalMessageIndex.getType() == ExternalMessageType.SURVEY_RESPONSE) { + fileName = String + .format(SURVEY_FILENAME_FORMAT, DataHelper.getShortUuid(externalMessageIndex.getUuid()), DateHelper.formatDateForExport(new Date())); + + mimeType = "application/json"; + } else { + fileName = String + .format(XML_FILENAME_FORMAT, DataHelper.getShortUuid(externalMessageIndex.getUuid()), DateHelper.formatDateForExport(new Date())); + mimeType = "application/xml"; + } StreamResource streamResource = new StreamResource( () -> ControllerProvider.getExternalMessageController() - .downloadExternalMessageAttachment(labMessage.getUuid()) + .downloadExternalMessageAttachment(externalMessageIndex.getUuid()) .map(ByteArrayInputStream::new) .orElse(null), fileName); - streamResource.setMIMEType("application/xml"); + streamResource.setMIMEType(mimeType); FileDownloader fileDownloader = new FileDownloader(streamResource); fileDownloader.extend(downloadButton); diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailureEditor.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailureEditor.java index 913af8ab84c..2f7e4ffbcab 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailureEditor.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailureEditor.java @@ -18,6 +18,7 @@ import java.util.Map; import com.vaadin.ui.Button; +import com.vaadin.ui.CheckBox; import com.vaadin.ui.FormLayout; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; @@ -40,9 +41,11 @@ import de.symeda.sormas.api.patch.partial_retrieval.DisplayablePartialRetrievalResponse; import de.symeda.sormas.ui.utils.ButtonHelper; import de.symeda.sormas.ui.utils.CssStyles; +import de.symeda.sormas.ui.utils.VaadinUiUtil; /** * Modal editor window allowing users to correct failed survey response fields and reprocess. + * Each failed field can be ignored (excluded from reprocessing) or have its key renamed. */ public class SurveyResponseFailureEditor extends Window { @@ -76,7 +79,9 @@ public SurveyResponseFailureEditor(ExternalMessageDto externalMessage, Displayab FormLayout failuresForm = new FormLayout(); failuresForm.setMargin(false); - Map fieldEditors = new HashMap<>(); + Map ignoreCheckboxes = new HashMap<>(); + Map keyEditors = new HashMap<>(); + Map valueEditors = new HashMap<>(); for (Map.Entry entry : failures.entrySet()) { String fieldPath = entry.getKey(); @@ -91,6 +96,11 @@ public SurveyResponseFailureEditor(ExternalMessageDto externalMessage, Displayab fieldContainer.setMargin(false); fieldContainer.setSpacing(false); + // Ignore checkbox + CheckBox ignoreCheckbox = new CheckBox(I18nProperties.getCaption(Captions.surveyResponseIgnoreField)); + ignoreCheckboxes.put(fieldPath, ignoreCheckbox); + fieldContainer.addComponent(ignoreCheckbox); + Label causeLabel = new Label(I18nProperties.getCaption(Captions.surveyResponseFailureCause) + ": " + causeName); CssStyles.style(causeLabel, CssStyles.LABEL_SMALL, CssStyles.LABEL_SECONDARY); fieldContainer.addComponent(causeLabel); @@ -100,14 +110,28 @@ public SurveyResponseFailureEditor(ExternalMessageDto externalMessage, Displayab CssStyles.style(currentValueLabel, CssStyles.LABEL_SMALL, CssStyles.LABEL_SECONDARY); fieldContainer.addComponent(currentValueLabel); - TextField valueField = new TextField(); - valueField.setCaption(fieldLabel); + // Key rename field + TextField keyField = new TextField(I18nProperties.getCaption(Captions.surveyResponseKeyName)); + keyField.setValue(fieldPath); + keyField.setWidth(100, Unit.PERCENTAGE); + keyEditors.put(fieldPath, keyField); + fieldContainer.addComponent(keyField); + + // Value field + TextField valueField = new TextField(fieldLabel); valueField.setWidth(100, Unit.PERCENTAGE); if (failure.getProvidedFieldValue() != null) { valueField.setValue(failure.getProvidedFieldValue().toString()); } + valueEditors.put(fieldPath, valueField); fieldContainer.addComponent(valueField); - fieldEditors.put(fieldPath, valueField); + + // Wire ignore checkbox to disable key/value fields + ignoreCheckbox.addValueChangeListener(event -> { + boolean ignored = Boolean.TRUE.equals(event.getValue()); + keyField.setEnabled(!ignored); + valueField.setEnabled(!ignored); + }); failuresForm.addComponent(fieldContainer); } @@ -124,10 +148,12 @@ public SurveyResponseFailureEditor(ExternalMessageDto externalMessage, Displayab FormLayout validForm = new FormLayout(); validForm.setMargin(true); - for (Map.Entry entry : validValues.entrySet()) { - String fieldPath = entry.getKey(); + VaadinUiUtil.showWarningPopup(String.format("validValues: [%s]", validValues)); + + for (Map.Entry validEntry : validValues.entrySet()) { + String fieldPath = validEntry.getKey(); String fieldLabel = resolveFieldName(fieldPath, displayData); - Label label = new Label(entry.getValue() != null ? entry.getValue().toString() : ""); + Label label = new Label(validEntry.getValue() != null ? validEntry.getValue().toString() : ""); label.setCaption(fieldLabel); validForm.addComponent(label); } @@ -144,9 +170,16 @@ public SurveyResponseFailureEditor(ExternalMessageDto externalMessage, Displayab Button saveAndReprocessButton = ButtonHelper.createButton(Captions.actionSaveAndReprocess, I18nProperties.getCaption(Captions.actionSaveAndReprocess), e -> { Map correctedDictionary = new HashMap<>(validValues); - for (Map.Entry editorEntry : fieldEditors.entrySet()) { - String value = editorEntry.getValue().getValue(); - correctedDictionary.put(editorEntry.getKey(), value); + for (String fieldPath : valueEditors.keySet()) { + CheckBox ignoreCheckbox = ignoreCheckboxes.get(fieldPath); + if (ignoreCheckbox != null && Boolean.TRUE.equals(ignoreCheckbox.getValue())) { + continue; + } + String key = keyEditors.get(fieldPath).getValue(); + if (key == null || key.trim().isEmpty()) { + key = fieldPath; + } + correctedDictionary.put(key, valueEditors.get(fieldPath).getValue()); } FacadeProvider.getExternalMessageFacade().reprocessSurveyResponse(externalMessage.getUuid(), correctedDictionary); From e82a0094681595d4e5771309cfc25b0d8ec80593 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Mon, 27 Apr 2026 17:00:17 +0200 Subject: [PATCH 076/134] missing captions --- .../de/symeda/sormas/api/i18n/Captions.java | 2 + .../src/main/resources/captions.properties | 564 +++++++++--------- 2 files changed, 268 insertions(+), 298 deletions(-) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java index 89d81f90063..116d1a7e59c 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java @@ -2040,6 +2040,8 @@ public interface Captions { String surveyResponsePatchDictionary = "surveyResponsePatchDictionary"; String surveyResponseProcessingResult = "surveyResponseProcessingResult"; String surveyResponseValidFields = "surveyResponseValidFields"; + String surveyResponseIgnoreField = "surveyResponseIgnoreField"; + String surveyResponseKeyName = "surveyResponseKeyName"; String actionCorrectAndReprocess = "actionCorrectAndReprocess"; String actionSaveAndReprocess = "actionSaveAndReprocess"; String externalMessageRelatedEntriesFound = "externalMessageRelatedEntriesFound"; diff --git a/sormas-api/src/main/resources/captions.properties b/sormas-api/src/main/resources/captions.properties index 19b5ef4b791..531d1a8b488 100644 --- a/sormas-api/src/main/resources/captions.properties +++ b/sormas-api/src/main/resources/captions.properties @@ -52,7 +52,7 @@ creationDate=Creation date changeDate=Date of last change notAvailableShort=NA inaccessibleValue=Confidential -includePartialBirthdates = Include partial birthdates +includePartialBirthdates=Include partial birthdates numberOfCharacters=Number of characters: %d / %d remove=Remove notTestedYet=Not tested yet @@ -190,17 +190,17 @@ actionDiscardAndContinue=Discard and continue actionNext=Next actionYesAll=Yes all actionNoAll=No all -actionOkAndGoToMerge = Okay, and continue to merge overview -actionOkAndGoToContactDirectory = Okay, and continue to contact directory -actionOkAndGoToContactDetails = Okay, and continue to contact -actionOkAndGoToPersonDirectory = Okay, and continue to person directory -actionExecuteAutomaticDeletion = Execute automatic deletion -actionDone = Done -actionConfirmAction = Confirm action -actionAefiSelectPrimarySuspectVaccination = Select Suspect Vaccination -actionAefiAssignNewReportingIdNumber = "Assign New AEFI ID" -actionImportSurveyTokens = Import survey tokens -actionImportSurveyTokenResponses = Import survey token responses +actionOkAndGoToMerge=Okay, and continue to merge overview +actionOkAndGoToContactDirectory=Okay, and continue to contact directory +actionOkAndGoToContactDetails=Okay, and continue to contact +actionOkAndGoToPersonDirectory=Okay, and continue to person directory +actionExecuteAutomaticDeletion=Execute automatic deletion +actionDone=Done +actionConfirmAction=Confirm action +actionAefiSelectPrimarySuspectVaccination=Select Suspect Vaccination +actionAefiAssignNewReportingIdNumber="Assign New AEFI ID" +actionImportSurveyTokens=Import survey tokens +actionImportSurveyTokenResponses=Import survey token responses activityAsCaseFlightNumber=Flight number ActivityAsCase=Activity as case ActivityAsCase.startDate=Start of activity @@ -254,10 +254,10 @@ aggregateReportDiscardSelection=Discard selection aggregateReportEditAggregateReport=Edit aggregate report aggregateReportEditReport=Edit report aggregateReportReportFound=Aggregate report found -aggregateReportShowZeroRows = Show 0-rows for disease(s) -aggregateReportExpiredAgeGroups = Expired -aggregateReportNoAgeGroup = No age group -aggregateReportShowOnlyDuplicateReports = Display only duplicate reports +aggregateReportShowZeroRows=Show 0-rows for disease(s) +aggregateReportExpiredAgeGroups=Expired +aggregateReportNoAgeGroup=No age group +aggregateReportShowOnlyDuplicateReports=Display only duplicate reports aggregateReportNewAggregateReport=New aggregate report aggregateReportNewCasesShort=C aggregateReportThisWeek=This Week @@ -281,7 +281,7 @@ days=days # Bulk actions bulkActions=Bulk Actions bulkEditAssignee=Edit assignee -bulkEmailSend = Send emails +bulkEmailSend=Send emails bulkCancelFollowUp=Cancel follow-up bulkCaseClassification=Change case classification bulkCaseOutcome=Change case outcome @@ -424,7 +424,7 @@ CaseData.screeningType=Screening CaseData.clinicalConfirmation=Clinical confirmation CaseData.community=Community CaseData.disease=Disease -CaseData.epidemiologicalConfirmation= An epidemiological link to a confirmed case +CaseData.epidemiologicalConfirmation=An epidemiological link to a confirmed case CaseData.laboratoryDiagnosticConfirmation=Laboratory diagnostic confirmation CaseData.caseConfirmationBasis=Basis for confirmation CaseData.caseOfficer=Case officer @@ -580,8 +580,7 @@ CaseData.changeDate=Date of last change CaseData.creationDate=Creation date CaseData.radiographyCompatibility=Radiography CaseData.otherDiagnosticCriteria=Other diagnostic details - -CaseData.clinicalConfirmation.PERTUSSIS= Any person diagnosed as pertussis by a physician +CaseData.clinicalConfirmation.PERTUSSIS=Any person diagnosed as pertussis by a physician # CaseExport CaseExport.address=Address CaseExport.addressRegion=Address Region @@ -866,9 +865,9 @@ Contact.expectedFollowUpUntil=Expected follow-up until Contact.vaccinationStatus=Vaccination status Contact.changeDate=Date of last change Contact.creationDate=Creation date -Contact.prophylaxisPrescribed = Prophylaxis Prescribed -Contact.prescribedDrug = Prescribed Drug -Contact.prescribedDrugText = Specify Prescribed Drug +Contact.prophylaxisPrescribed=Prophylaxis Prescribed +Contact.prescribedDrug=Prescribed Drug +Contact.prescribedDrugText=Specify Prescribed Drug # ContactExport ContactExport.address=Address ContactExport.addressDistrict=Address District @@ -1064,7 +1063,6 @@ aefiDashboardAefiInvestigationDiscarded=Investigation Discarded aefiDashboardAefiClassificationRelatedToVaccination=Related to vaccine or vaccination aefiDashboardAefiClassificationCoincidentalAdverseEvent=Coincidental adverse event aefiDashboardAefiClassificationUndetermined=Undetermined - captionDefault=Default defaultRegion=Default Region defaultDistrict=Default District @@ -1156,19 +1154,19 @@ EpiData.clusterRelated=Cluster Related EpiData.clusterType=Cluster type EpiData.clusterTypeText=Specify cluster type text EpiData.modeOfTransmission=Suspected main mode of transmission -EpiData.modeOfTransmissionType= Specify mode of transmission -EpiData.infectionSource= Suspected vehicle or source of infection -EpiData.infectionSourceText= Specify source of infection -EpiData.importedCase= Imported Case -EpiData.country= Country of contamination -EpiData.otherDetails= General comment +EpiData.modeOfTransmissionType=Specify mode of transmission +EpiData.infectionSource=Suspected vehicle or source of infection +EpiData.infectionSourceText=Specify source of infection +EpiData.importedCase=Imported Case +EpiData.country=Country of contamination +EpiData.otherDetails=General comment #Therapy -Therapy.directlyObservedTreatment = Directly observed treatment -Therapy.mdrXdrTuberculosis = MDR/XDR tuberculosis -Therapy.beijingLineage = Beijing lineage -Therapy.treatmentStarted = Treatment started -Therapy.treatmentNotApplicable = Treatment not applicable -Therapy.treatmentStartedDate = Treatment started date +Therapy.directlyObservedTreatment=Directly observed treatment +Therapy.mdrXdrTuberculosis=MDR/XDR tuberculosis +Therapy.beijingLineage=Beijing lineage +Therapy.treatmentStarted=Treatment started +Therapy.treatmentNotApplicable=Treatment not applicable +Therapy.treatmentStartedDate=Treatment started date # Documents documentUploadDocument=New document documentNoDocuments=There are no documents for this %s @@ -1203,22 +1201,20 @@ DocumentTemplate.uploadGeneratedDocumentsToEntities=Also upload the generated do DocumentTemplate.documentUploadWarning=Document upload warning DocumentTemplate.fileTooBig=The documents were successfully generated, but at least one document could not be uploaded to its entity because its file size exceeds the specified file size limit of %dMB DocumentTemplate.notUploaded=Documents could not be uploaded to the following entities: - # Entity columns -EntityColumn.ENTITY = Entity -EntityColumn.FIELD_ID = Field ID -EntityColumn.FIELD = Field -EntityColumn.TYPE = Type -EntityColumn.DATA_PROTECTION = Data protection -EntityColumn.CAPTION = Caption -EntityColumn.DESCRIPTION = Description -EntityColumn.REQUIRED = Required -EntityColumn.NEW_DISEASE = New disease -EntityColumn.DISEASES = Diseases -EntityColumn.OUTBREAKS = Outbreaks -EntityColumn.IGNORED_COUNTRIES = Ignored countries -EntityColumn.EXCLUSIVE_COUNTRIES = Exclusive countries - +EntityColumn.ENTITY=Entity +EntityColumn.FIELD_ID=Field ID +EntityColumn.FIELD=Field +EntityColumn.TYPE=Type +EntityColumn.DATA_PROTECTION=Data protection +EntityColumn.CAPTION=Caption +EntityColumn.DESCRIPTION=Description +EntityColumn.REQUIRED=Required +EntityColumn.NEW_DISEASE=New disease +EntityColumn.DISEASES=Diseases +EntityColumn.OUTBREAKS=Outbreaks +EntityColumn.IGNORED_COUNTRIES=Ignored countries +EntityColumn.EXCLUSIVE_COUNTRIES=Exclusive countries # Environment Environment=Environment Environment.uuid=Environment ID @@ -1238,55 +1234,52 @@ Environment.waterUse=Water use Environment.otherWaterUse=Other water use Environment.location=Location Environment.vectorType=Vector Type - environmentActiveEnvironments=Active environments -environmentArchivedEnvironments = Archived environments -environmentAllActiveAndArchivedEnvironments = All active and archived environments -environmentDeletedEnvironments = Deleted environments -environmentNewEnvironment= New environment +environmentArchivedEnvironments=Archived environments +environmentAllActiveAndArchivedEnvironments=All active and archived environments +environmentDeletedEnvironments=Deleted environments +environmentNewEnvironment=New environment environmentEnvironmentsList=Environments list - # EnvironmentSample -EnvironmentSample = Environment Sample -EnvironmentSample.uuid = Sample ID -EnvironmentSample.environment = Environment -EnvironmentSample.sampleDateTime = Date of sampling -EnvironmentSample.sampleMaterial = Sample material -EnvironmentSample.otherSampleMaterial = Specify sample material -EnvironmentSample.sampleVolume = Volume (in mL) -EnvironmentSample.fieldSampleId = Field sample ID -EnvironmentSample.turbidity = Turbidity (in NTU) -EnvironmentSample.phValue = pH of sample -EnvironmentSample.sampleTemperature = Temperature (in °C) -EnvironmentSample.chlorineResiduals = Total chlorine residuals (mg/L) -EnvironmentSample.laboratory = Laboratory -EnvironmentSample.laboratoryDetails = Laboratory details -EnvironmentSample.requestedPathogenTests = Requested pathogens to be tested -EnvironmentSample.reportingUser = Reporting user -EnvironmentSample.otherRequestedPathogenTests = Other requested pathogens to be tested -EnvironmentSample.weatherConditions = Weather conditions at time of sampling -EnvironmentSample.heavyRain = Heavy rain in the past 24 hours before sampling? -EnvironmentSample.dispatched = Sent/dispatched -EnvironmentSample.dispatchDate = Dispatchment date -EnvironmentSample.dispatchDetails = Dispatchment details -EnvironmentSample.received = Received -EnvironmentSample.receivalDate = Receival date -EnvironmentSample.labSampleId = Lab sample ID -EnvironmentSample.specimenCondition = Specimen condition -EnvironmentSample.location = Location of sampling site -EnvironmentSample.generalComment = General comment -EnvironmentSample.positivePathogenTests = Positive pathogen tests -EnvironmentSample.latestPathogenTest = Latest pathogen test -EnvironmentSample.numberOfTests = Number of tests +EnvironmentSample=Environment Sample +EnvironmentSample.uuid=Sample ID +EnvironmentSample.environment=Environment +EnvironmentSample.sampleDateTime=Date of sampling +EnvironmentSample.sampleMaterial=Sample material +EnvironmentSample.otherSampleMaterial=Specify sample material +EnvironmentSample.sampleVolume=Volume (in mL) +EnvironmentSample.fieldSampleId=Field sample ID +EnvironmentSample.turbidity=Turbidity (in NTU) +EnvironmentSample.phValue=pH of sample +EnvironmentSample.sampleTemperature=Temperature (in °C) +EnvironmentSample.chlorineResiduals=Total chlorine residuals (mg/L) +EnvironmentSample.laboratory=Laboratory +EnvironmentSample.laboratoryDetails=Laboratory details +EnvironmentSample.requestedPathogenTests=Requested pathogens to be tested +EnvironmentSample.reportingUser=Reporting user +EnvironmentSample.otherRequestedPathogenTests=Other requested pathogens to be tested +EnvironmentSample.weatherConditions=Weather conditions at time of sampling +EnvironmentSample.heavyRain=Heavy rain in the past 24 hours before sampling? +EnvironmentSample.dispatched=Sent/dispatched +EnvironmentSample.dispatchDate=Dispatchment date +EnvironmentSample.dispatchDetails=Dispatchment details +EnvironmentSample.received=Received +EnvironmentSample.receivalDate=Receival date +EnvironmentSample.labSampleId=Lab sample ID +EnvironmentSample.specimenCondition=Specimen condition +EnvironmentSample.location=Location of sampling site +EnvironmentSample.generalComment=General comment +EnvironmentSample.positivePathogenTests=Positive pathogen tests +EnvironmentSample.latestPathogenTest=Latest pathogen test +EnvironmentSample.numberOfTests=Number of tests EnvironmentSample.vectorType=Vector Type - # Event eventActiveEvents=Active events eventArchivedEvents=Archived events eventAllActiveAndArchivedEvents=All active and archived events eventActiveGroups=Active groups eventArchivedGroups=Archived groups -eventDeletedEvents = Deleted events +eventDeletedEvents=Deleted events eventAllGroups=All groups eventEventActions=Event actions eventEventParticipants=Event participants @@ -1407,9 +1400,8 @@ Event.district=District Event.community=Community Event.changeDate=Date of last change Event.creationDate=Creation date - -Event.environmentMedia = Media -Event.environment.investigationStatus = Status +Event.environmentMedia=Media +Event.environment.investigationStatus=Status Event.environmentReportDate=Report Date # Event action EventAction.eventUuid=Event id @@ -1440,7 +1432,7 @@ eventParticipantAddPerson=Add participant eventParticipantContactCountOnlyWithSourceCaseInEvent=Only counts contacts whose source case is related to this event eventParticipantSelect=Select event participant eventParticipantCreateNew=Create new event participant -eventParticipantDeletedEventParticipants = Deleted event participants +eventParticipantDeletedEventParticipants=Deleted event participants eventParticipantActiveEventParticipants=Active event participants eventParticipantActiveAndArchivedEventParticipants=Active and archived event participants eventParticipantArchivedEventParticipants=Archived event participants @@ -1453,7 +1445,7 @@ EventParticipant.caseUuid=Case ID EventParticipant.approximateAge=Age EventParticipant.name=Name EventParticipant.sex=Sex -EventParticipant.reportingUser = Reporting user +EventParticipant.reportingUser=Reporting user EventParticipant.responsibleRegion=Responsible Region EventParticipant.responsibleDistrict=Responsible District EventParticipant.personUuid=Person ID @@ -1490,9 +1482,9 @@ EventParticipantExport.personNationalHealthId=Person National Health Id EventParticipantExport.eventParticipantInvolvmentDescription=Involvment description EventParticipantExport.eventParticipantUuid=Event participant ID #Event Participant Selection -EventParticipantSelection.eventParticipantUuidLink = Event participant ID -EventParticipantSelection.eventUuidLink = Event ID -EventParticipantSelection.resultingCaseUuidLink = Resulting case ID +EventParticipantSelection.eventParticipantUuidLink=Event participant ID +EventParticipantSelection.eventUuidLink=Event ID +EventParticipantSelection.resultingCaseUuidLink=Resulting case ID # Event Group EventGroup=Event group EventGroup.uuid=Group id @@ -1584,14 +1576,12 @@ Exposure.domesticSwimming=Swimming in Luxembourg Exposure.internationalSwimming=Swimming abroad Exposure.swimmingLocation=Swimming Location Exposure.swimmingLocationType=Specify swimming location -Exposure.animalLocation= Animal location -Exposure.animalLocationText= Specify animal location -Exposure.sexualExposureText= Specify sexual exposure - -Exposure.rawFoodContact= Contact with raw pet food -Exposure.rawFoodContactText= Specify contact with raw pet food -Exposure.symptomaticIndividualText= Specify contact with symptomatic individual - +Exposure.animalLocation=Animal location +Exposure.animalLocationText=Specify animal location +Exposure.sexualExposureText=Specify sexual exposure +Exposure.rawFoodContact=Contact with raw pet food +Exposure.rawFoodContactText=Specify contact with raw pet food +Exposure.symptomaticIndividualText=Specify contact with symptomatic individual Exposure.exposureCategory=Exposure category Exposure.exposureSetting=Exposure setting Exposure.exposureSettingDetails=Other setting details @@ -1609,7 +1599,6 @@ Exposure.exposureComment=Comment titleExposuresSection=Exposure details titleExposureActivitySection=Activity details titleExposureLocationSection=Location of exposure - # Facility facilityActiveFacilities=Active facilities facilityArchivedFacilities=Archived facilities @@ -1759,7 +1748,6 @@ ExternalMessageCriteria.messageDateTo=... to ExternalMessageCriteria.birthDateFrom=Birth date from... ExternalMessageCriteria.birthDateTo=... to externalMessageValueNotSpecified=Value not specified in external message - #Physician report physiciansReportCaseImmunizations=Immunizations physiciansReportCaseAddVaccination=Add vaccination @@ -1770,7 +1758,7 @@ lineListingDiseaseOfSourceCase=Disease of source case lineListingInfrastructureData=Take over infrastructure data from last line lineListingNewCasesList=List of new cases lineListingNewContactsList=List of new contacts -lineListingNewEventParticipantsList = List of new event participants +lineListingNewEventParticipantsList=List of new event participants lineListingSharedInformation=Shared information lineListingEdit=Edit line listing lineListingDisableAll=Disable all line listing @@ -1851,7 +1839,7 @@ mainMenuUsers=Users mainMenuAggregateReports=Aggregate mainMenuShareRequests=Shares mainMenuSelfReports=Self Reports -mainMenuSurveys = Surveys +mainMenuSurveys=Surveys MaternalHistory.childrenNumber=Total number of children MaternalHistory.ageAtBirth=Mother's age at birth of infant patient MaternalHistory.conjunctivitis=Conjunctivitis @@ -1977,10 +1965,10 @@ personNoContactLinkedToPerson=No contact linked to person personLinkToEvents=See events for this person personLinkToCases=See cases for this person personLinkToContacts=See contacts for this person -personLinkToSamples = See samples for this person -caseLinkToSamples = See samples for this case -contactLinkToSamples = See samples for this contact -eventParticipantLinkToSamples = See samples for this event participant +personLinkToSamples=See samples for this person +caseLinkToSamples=See samples for this case +contactLinkToSamples=See samples for this contact +eventParticipantLinkToSamples=See samples for this event participant personsReplaceGeoCoordinates=Also replace existing coordinates. Warning: This might replace coordinates which were intentionally set differently! personsSetMissingGeoCoordinates=Set Missing Geo Coordinates personsUpdated=Persons Updated @@ -2301,9 +2289,9 @@ SampleExport.caseReportDate=Case report date SampleExport.caseResponsibleCommunity=Case responsible community SampleExport.caseResponsibleDistrict=Case responsible district SampleExport.caseResponsibleRegion=Case responsible region -SampleExport.eventParticipantCommunity = Community of event participant -SampleExport.eventParticipantDistrict = District of event participant -SampleExport.eventParticipantRegion = Region of event participant +SampleExport.eventParticipantCommunity=Community of event participant +SampleExport.eventParticipantDistrict=District of event participant +SampleExport.eventParticipantRegion=Region of event participant SampleExport.personSex=Sex of case/contact/event participant person SampleExport.caseUuid=Case UUID SampleExport.contactUuid=Contact UUID @@ -2362,7 +2350,7 @@ SampleExport.wbcCount=WBC count of latest additional test # Immunization Immunization=Immunization Immunization.reportDate=Date of report -Immunization.reportingUser = Reporting user +Immunization.reportingUser=Reporting user Immunization.externalId=External ID Immunization.country=Immunization country Immunization.deletionReason=Reason for deletion @@ -2407,10 +2395,10 @@ Immunization.district=District Immunization.community=Community Immunization.changeDate=Date of last change Immunization.creationDate=Creation date -immunizationActiveImmunizations = Active immunizations -immunizationArchivedImmunizations = Archived immunizations -immunizationAllActiveAndArchivedImmunizations = All active and archived immunizations -immunizationDeletedImmunizations = Deleted immunizations +immunizationActiveImmunizations=Active immunizations +immunizationArchivedImmunizations=Archived immunizations +immunizationAllActiveAndArchivedImmunizations=All active and archived immunizations +immunizationDeletedImmunizations=Deleted immunizations immunizationImmunizationsList=Immunizations list linkImmunizationToCaseButton=Link case openLinkedCaseToImmunizationButton=Open case @@ -2476,10 +2464,10 @@ aefiVaccinationsDiluentInformation=Diluent Information aefiVaccinationsDiluentBatchLotNumber=Batch/Lot number aefiVaccinationsDiluentExpiryDate=Expiry date aefiVaccinationsDiluentTimeOfReconstitution=Reconstitution time -aefiActiveAdverseEvents = Active adverse events -aefiArchivedAdverseEvents = Archived adverse events -aefiAllActiveAndArchivedAdverseEvents = All active and archived adverse events -aefiDeletedAdverseEvents = Deleted adverse events +aefiActiveAdverseEvents=Active adverse events +aefiArchivedAdverseEvents=Archived adverse events +aefiAllActiveAndArchivedAdverseEvents=All active and archived adverse events +aefiDeletedAdverseEvents=Deleted adverse events # Adverse Events AdverseEvents.severeLocalReaction=Severe local reaction AdverseEvents.severeLocalReactionMoreThanThreeDays=>3 days @@ -2730,13 +2718,13 @@ aefiInvestigationMedicalCareDetailsInstruction=**Instructions ? Attach copies of aefiInvestigationReconstitutionProcedure=Reconstitution procedure aefiInvestigationOfThoseAffected=Of those effected, how many are aefiAefiInvestigationList=Adverse Event Investigations -aefiNewAefiInvestigation = New Investigation +aefiNewAefiInvestigation=New Investigation aefiAefiInvestigationDataView=Adverse Event Investigation aefiNewAefiInvestigationStageTitle=Investigation -aefiActiveInvestigations = Active AEFI investigations -aefiArchivedInvestigations = Archived AEFI investigations -aefiAllActiveAndArchivedInvestigations = All active and archived AEFI investigations -aefiDeletedInvestigations = Deleted AEFI investigations +aefiActiveInvestigations=Active AEFI investigations +aefiArchivedInvestigations=Archived AEFI investigations +aefiAllActiveAndArchivedInvestigations=All active and archived AEFI investigations +aefiDeletedInvestigations=Deleted AEFI investigations titleAefiInvestigationBasicDetails=Section A: Basic details titleAefiInvestigationRelevantPatientInformation=Section B: Relevant patient information prior to immunization titleAefiInvestigationFirstExaminationDetails=Section C: Details of first examination** of serious AEFI case @@ -3005,7 +2993,7 @@ Symptoms.hemorrhagicRash=Hemorrhagic rash Symptoms.arthritis=Septic Arthritis Symptoms.meningitis=Meningitis Symptoms.septicaemia=Septicaemia -Symptoms.nocturnalCough= Nocturnal cough +Symptoms.nocturnalCough=Nocturnal cough Symptoms.otherClinicalPresentation=Other Symptoms Symptoms.otherClinicalPresentationText=Specify Other Symptoms Symptoms.imi.shock=Septic Shock @@ -3031,12 +3019,12 @@ Symptoms.skinRash.lu-MEASLES=Any person not recently vaccinated Symptoms.eggyBurps=Eggy Burps Symptoms.weightLoss=Weight Loss Symptoms.weightLossAmount=Weight Loss Amount (kg) -Symptoms.symptomStatus= Symptom Status -Symptoms.reoccurrence= Reoccurrence -Symptoms.overnightStayRequired= Overnight hospitalization required -Symptoms.bloating= Bloating -Symptoms.symptomCurrentStatus= Symptom persistence -Symptoms.durationOfSymptoms= Duration of symptoms (days) +Symptoms.symptomStatus=Symptom Status +Symptoms.reoccurrence=Reoccurrence +Symptoms.overnightStayRequired=Overnight hospitalization required +Symptoms.bloating=Bloating +Symptoms.symptomCurrentStatus=Symptom persistence +Symptoms.durationOfSymptoms=Duration of symptoms (days) Symptoms.timeOffWorkDays.giardiasis=Duration of absence from work (days) Symptoms.clammySkin=Clammy skin Symptoms.coldSkin=Cold skin @@ -3058,16 +3046,15 @@ Symptoms.metabolicAcidosis=Metabolic acidosis Symptoms.acuteKidneyFailure=Acute kidney failure Symptoms.cerebralMalaria=Cerebral malaria Symptoms.offsetDate=End of symptoms date -Symptoms.clinicallyEvident= The criteria for a clinical picture of the disease are met -Symptoms.clinicalManifestation= Clinical manifestation of the disease according to EU case definition +Symptoms.clinicallyEvident=The criteria for a clinical picture of the disease are met +Symptoms.clinicalManifestation=Clinical manifestation of the disease according to EU case definition Symptoms.clinicalManifestationText=Specify clinical manifestation Symptoms.disseminatedIntraVascularCoagulation=Disseminated intra-vascular coagulation Symptoms.scantHemorrhage=Other minor bleeding Symptoms.otherNeurolocalSymptom=Neurological symptom -Symptoms.otherNeurolocalSymptomText= Specify neurological symptom +Symptoms.otherNeurolocalSymptomText=Specify neurological symptom titleComplications=Complications titleNoComplications=No complications - # Task taskMyTasks=My tasks taskNewTask=New task @@ -3086,7 +3073,7 @@ Task.contextReference=Associated link Task.creatorComment=Comments on task Task.creatorUser=Created by Task.dueDate=Due date -Task.environment = Associated environment +Task.environment=Associated environment Task.event=Associated event Task.observerUsers=Observed by Task.perceivedStart=Perceived start @@ -3148,7 +3135,7 @@ travelEntriesNoTravelEntriesForPerson=There are no travel entries for this perso TravelEntry=Travel entry TravelEntry.person=Travel entry person TravelEntry.reportDate=Date of report -TravelEntry.reportingUser = Reporting user +TravelEntry.reportingUser=Reporting user TravelEntry.uuid=Travel Entry ID TravelEntry.externalId=External ID TravelEntry.personFirstName=Person First Name @@ -3497,9 +3484,9 @@ cancelExternalFollowUpButton=Cancel external follow-up createSymptomJournalAccountButton=Create PIA Account registerInPatientDiaryButton=Register in CLIMEDO eDiary symptomJournalOptionsButton=PIA eDiary -surveyNewSurvey = New survey -surveySurveyList = Survey list -surveySurveyTokenList = Survey token list +surveyNewSurvey=New survey +surveySurveyList=Survey list +surveySurveyTokenList=Survey token list patientDiaryOptionsButton=CLIMEDO eDiary openInSymptomJournalButton=Open in PIA openInPatientDiaryButton=Open in CLIMEDO @@ -3532,22 +3519,19 @@ UserRole.restrictAccessToAssignedEntities=Restrict access to assigned entities userRoleShowOnlyRestrictedAccessToAssignCases=Only show user roles with access restricted to assigned entities userRoleUserrolesView=User role list userRoleNotifications=Notifications -userRoleNotificationTypeSms = SMS -userRoleNotificationTypeEmail = EMAIL +userRoleNotificationTypeSms=SMS +userRoleNotificationTypeEmail=EMAIL userrole.main=User role userrole.notifications=Notifications userrole.applyUserRoleTemplate=Apply user role template - -Contact.vaccinationProposed = Vaccination proposed -Contact.immuneGlobulinProposed = Immune globulin proposed -Contact.vaccinationDoseOneDate = Vaccination dose one date -Contact.vaccinationDoseTwoDate = Vaccination dose two date - +Contact.vaccinationProposed=Vaccination proposed +Contact.immuneGlobulinProposed=Immune globulin proposed +Contact.vaccinationDoseOneDate=Vaccination dose one date +Contact.vaccinationDoseTwoDate=Vaccination dose two date notificationType=Notification type -notificationType.group = Group -notificationType.caption = Caption -notificationType.description = Description - +notificationType.group=Group +notificationType.caption=Caption +notificationType.description=Description SormasToSormasShareRequest.uuid=Request ID SormasToSormasShareRequest.creationDate=Share date SormasToSormasShareRequest.dataType=Type @@ -3582,10 +3566,10 @@ TaskExport.personAddressPostalCode=Person address postal code TaskExport.personPhone=Person phone TaskExport.personPhoneOwner=Person phone owner TaskExport.personEmailAddress=Person email address -TaskExport.personOtherContactDetails = Person contact details -environmentSampleNotShipped = Not shipped -environmentSampleShipped = Shipped -environmentSampleReceived = Received +TaskExport.personOtherContactDetails=Person contact details +environmentSampleNotShipped=Not shipped +environmentSampleShipped=Shipped +environmentSampleReceived=Received environmentSampleActiveSamples=Active environment samples environmentSampleArchivedSamples=Archived environment samples environmentSampleAllActiveAndArchivedSamples=All active and archived environment samples @@ -3602,85 +3586,75 @@ externalEmailUsedTemplate=Template externalEmailSentBy=Sent by externalEmailSentTo=Sent to externalEmailAttachedDocuments=Attached documents -environmentNoEnvs = There are no environments for this event %s - +environmentNoEnvs=There are no environments for this event %s # SpecialCaseAccess SpecialCaseAccess=Special case access -caze = Case -assignedTo = Assigned to -assignedBy = Assigned by -endDateTime = Access until -assignmentDate = Date assigned - +caze=Case +assignedTo=Assigned to +assignedBy=Assigned by +endDateTime=Access until +assignmentDate=Date assigned specialCaseAccessNew=New specailCaseAccessNoAccessGranted=No special access granted for this case - # SelfReport -SelfReport = Self report -SelfReport.type = Type -SelfReport.reportDate = Report date -SelfReport.caseReference = Case reference number -SelfReport.disease = Disease -SelfReport.diseaseDetails = Disease details -SelfReport.diseaseVariant = Disease variant -SelfReport.diseaseVariantDetails = Disease variant details -SelfReport.firstName = First name -SelfReport.lastName = Last name -SelfReport.sex = Sex -SelfReport.birthDate = Birth date -SelfReport.birthdateDD = Day of birth -SelfReport.birthdateMM = Month of birth -SelfReport.birthdateYYYY = Year of birth -SelfReport.nationalHealthId = National health ID -SelfReport.email = Email -SelfReport.phoneNumber = Phone number -SelfReport.address = Address -SelfReport.dateOfTest = Date of test -SelfReport.dateOfSymptoms = Date of symptoms -SelfReport.workplace = Workplace -SelfReport.dateWorkplace = Date workplace -SelfReport.isolationDate = Date of isolation -SelfReport.contactDate = Date of contact -SelfReport.comment = Comment -SelfReport.responsibleUser = Responsible user -SelfReport.investigationStatus = Investigation status -SelfReport.processingStatus = Processing status +SelfReport=Self report +SelfReport.type=Type +SelfReport.reportDate=Report date +SelfReport.caseReference=Case reference number +SelfReport.disease=Disease +SelfReport.diseaseDetails=Disease details +SelfReport.diseaseVariant=Disease variant +SelfReport.diseaseVariantDetails=Disease variant details +SelfReport.firstName=First name +SelfReport.lastName=Last name +SelfReport.sex=Sex +SelfReport.birthDate=Birth date +SelfReport.birthdateDD=Day of birth +SelfReport.birthdateMM=Month of birth +SelfReport.birthdateYYYY=Year of birth +SelfReport.nationalHealthId=National health ID +SelfReport.email=Email +SelfReport.phoneNumber=Phone number +SelfReport.address=Address +SelfReport.dateOfTest=Date of test +SelfReport.dateOfSymptoms=Date of symptoms +SelfReport.workplace=Workplace +SelfReport.dateWorkplace=Date workplace +SelfReport.isolationDate=Date of isolation +SelfReport.contactDate=Date of contact +SelfReport.comment=Comment +SelfReport.responsibleUser=Responsible user +SelfReport.investigationStatus=Investigation status +SelfReport.processingStatus=Processing status selfReportActiveEnvironments=Active self reports selfReportArchivedEnvironments=Archived self reports selfReportAllActiveAndArchivedEnvironments=All active and archived self reports selfReportDeletedEnvironments=Deleted self reports selfReportSelfReportsList=Self reports list selfReportProcess=Process - confirmChangesField=Field: confirmChangesValue=Will be changed to: - # Survey surveyNew=New Survey surveyGenerate=Generate Document surveySend=Send Document - -SurveyToken = Survey token -SurveyToken.uuid = Token ID -SurveyToken.survey = Survey -SurveyToken.token = Token -SurveyToken.assignedCaseUuid = Case assigned to -SurveyToken.assignmentDate = Assignment date -SurveyToken.recipientEmail = Recipient email -SurveyToken.generatedDocument = Generated document -SurveyToken.responseReceived = Response received -SurveyToken.responseReceivedDate = Response received date -surveyTokenDeleteSurveyToken = Delete survey token -surveyTokenFilterResponseReceived = Response received -surveyTokenFilterTokenNotAssigned = Token not assigned yet - - -SurveyDocumentOptions.survey = Survey -SurveyDocumentOptions.recipientEmail = Recipient email - +SurveyToken=Survey token +SurveyToken.uuid=Token ID +SurveyToken.survey=Survey +SurveyToken.token=Token +SurveyToken.assignedCaseUuid=Case assigned to +SurveyToken.assignmentDate=Assignment date +SurveyToken.recipientEmail=Recipient email +SurveyToken.generatedDocument=Generated document +SurveyToken.responseReceived=Response received +SurveyToken.responseReceivedDate=Response received date +surveyTokenDeleteSurveyToken=Delete survey token +surveyTokenFilterResponseReceived=Response received +surveyTokenFilterTokenNotAssigned=Token not assigned yet +SurveyDocumentOptions.survey=Survey +SurveyDocumentOptions.recipientEmail=Recipient email # Disease configuration diseaseConfigurationReportingTypeFilter=Reporting Type - # DiseaseConfiguration DiseaseConfiguration.disease=Disease DiseaseConfiguration.active=Active @@ -3703,85 +3677,78 @@ DiseaseConfiguration.exposureCategoryNames=Exposure categories titleDiseaseConfigurationGeneral=General titleDiseaseConfigurationCaseDefinition=Case definition titleDiseaseConfigurationAgeGroup=Age groups - # System Configuration -SystemConfigurationValue.category = Category -SystemConfigurationValue.categoryName = Category -SystemConfigurationValue.encrytp = Encrypt -SystemConfigurationValue.key = Key -SystemConfigurationValue.pattern = Pattern -SystemConfigurationValue.value = Value -SystemConfigurationValue.General = General - +SystemConfigurationValue.category=Category +SystemConfigurationValue.categoryName=Category +SystemConfigurationValue.encrytp=Encrypt +SystemConfigurationValue.key=Key +SystemConfigurationValue.pattern=Pattern +SystemConfigurationValue.value=Value +SystemConfigurationValue.General=General # CustomizableFieldMetadata -CustomizableFieldMetadata.name = Internal Name -CustomizableFieldMetadata.description = Description -CustomizableFieldMetadata.fieldType = Field Type -CustomizableFieldMetadata.contextClass = Context / Entity -CustomizableFieldMetadata.uiGroup = UI Group -CustomizableFieldMetadata.uiLinePosition = Line Position -CustomizableFieldMetadata.uiLineWeight = Line Weight -CustomizableFieldMetadata.active = Active -CustomizableFieldMetadata.mandatory = Mandatory -CustomizableFieldMetadata.readOnly = Read Only -CustomizableFieldMetadata.defaultValue = Default Value -CustomizableFieldMetadata.visibilityRestrictions = Visibility Restrictions -CustomizableFieldMetadata.visibilityRestrictionsDiseases = Visible for Diseases -customizableFieldsAllActive = All -customizableFieldsActiveOnly = Active only -customizableFieldsInactiveOnly = Inactive only -customizableFieldsNewLabel = New name for clone - +CustomizableFieldMetadata.name=Internal Name +CustomizableFieldMetadata.description=Description +CustomizableFieldMetadata.fieldType=Field Type +CustomizableFieldMetadata.contextClass=Context / Entity +CustomizableFieldMetadata.uiGroup=UI Group +CustomizableFieldMetadata.uiLinePosition=Line Position +CustomizableFieldMetadata.uiLineWeight=Line Weight +CustomizableFieldMetadata.active=Active +CustomizableFieldMetadata.mandatory=Mandatory +CustomizableFieldMetadata.readOnly=Read Only +CustomizableFieldMetadata.defaultValue=Default Value +CustomizableFieldMetadata.visibilityRestrictions=Visibility Restrictions +CustomizableFieldMetadata.visibilityRestrictionsDiseases=Visible for Diseases +customizableFieldsAllActive=All +customizableFieldsActiveOnly=Active only +customizableFieldsInactiveOnly=Inactive only +customizableFieldsNewLabel=New name for clone # CustomizableFieldGroup -CustomizableFieldGroup.CASE_DATA_GENERAL = Case Data General -CustomizableFieldGroup.CASE_DATA_CLASSIFICATION = Case Data Classification -CustomizableFieldGroup.CASE_DATA_INVESTIGATION = Case Data Investigation -CustomizableFieldGroup.CASE_DATA_IDENTIFIERS = Case Data Identifiers -CustomizableFieldGroup.CASE_DATA_DISEASE = Case Data Disease -CustomizableFieldGroup.CASE_DATA_REINFECTION = Case Data Reinfection -CustomizableFieldGroup.CASE_DATA_OUTCOME = Case Data Outcome -CustomizableFieldGroup.CASE_DATA_SEQUELAE = Case Data Sequelae -CustomizableFieldGroup.CASE_DATA_JURISDICTION = Case Data Jurisdiction -CustomizableFieldGroup.CASE_DATA_PLACE_OF_STAY = Case Data Place Of Stay -CustomizableFieldGroup.CASE_DATA_QUARANTINE = Case Data Quarantine -CustomizableFieldGroup.CASE_DATA_REPORT_GEO = Case Data Report Geo -CustomizableFieldGroup.CASE_DATA_HEALTH_CONDITIONS = Case Data Health Conditions -CustomizableFieldGroup.CASE_DATA_DIAGNOSTIC = Case Data Diagnostic -CustomizableFieldGroup.CASE_DATA_MEDICAL_INFORMATION = Case Data Medical Information -CustomizableFieldGroup.CASE_DATA_VACCINATION = Case Data Vaccination -CustomizableFieldGroup.CASE_DATA_CLINICIAN_NOTIFICATION = Case Data Clinician Notification -CustomizableFieldGroup.CASE_DATA_CONTACT_TRACING = Case Data Contact Tracing -CustomizableFieldGroup.EPIDATA_EXPOSURE_INVESTIGATION = Exposure Investigation -CustomizableFieldGroup.EPIDATA_ACTIVITY_AS_CASE = Activity as Case -CustomizableFieldGroup.EPIDATA_CONTACT_WITH_SOURCE_CASE = Contact with Source Case - +CustomizableFieldGroup.CASE_DATA_GENERAL=Case Data General +CustomizableFieldGroup.CASE_DATA_CLASSIFICATION=Case Data Classification +CustomizableFieldGroup.CASE_DATA_INVESTIGATION=Case Data Investigation +CustomizableFieldGroup.CASE_DATA_IDENTIFIERS=Case Data Identifiers +CustomizableFieldGroup.CASE_DATA_DISEASE=Case Data Disease +CustomizableFieldGroup.CASE_DATA_REINFECTION=Case Data Reinfection +CustomizableFieldGroup.CASE_DATA_OUTCOME=Case Data Outcome +CustomizableFieldGroup.CASE_DATA_SEQUELAE=Case Data Sequelae +CustomizableFieldGroup.CASE_DATA_JURISDICTION=Case Data Jurisdiction +CustomizableFieldGroup.CASE_DATA_PLACE_OF_STAY=Case Data Place Of Stay +CustomizableFieldGroup.CASE_DATA_QUARANTINE=Case Data Quarantine +CustomizableFieldGroup.CASE_DATA_REPORT_GEO=Case Data Report Geo +CustomizableFieldGroup.CASE_DATA_HEALTH_CONDITIONS=Case Data Health Conditions +CustomizableFieldGroup.CASE_DATA_DIAGNOSTIC=Case Data Diagnostic +CustomizableFieldGroup.CASE_DATA_MEDICAL_INFORMATION=Case Data Medical Information +CustomizableFieldGroup.CASE_DATA_VACCINATION=Case Data Vaccination +CustomizableFieldGroup.CASE_DATA_CLINICIAN_NOTIFICATION=Case Data Clinician Notification +CustomizableFieldGroup.CASE_DATA_CONTACT_TRACING=Case Data Contact Tracing +CustomizableFieldGroup.EPIDATA_EXPOSURE_INVESTIGATION=Exposure Investigation +CustomizableFieldGroup.EPIDATA_ACTIVITY_AS_CASE=Activity as Case +CustomizableFieldGroup.EPIDATA_CONTACT_WITH_SOURCE_CASE=Contact with Source Case # CustomizableFieldContext -CustomizableFieldContext.CASE = Case -CustomizableFieldContext.EPIDATA = Epidemiological Data - +CustomizableFieldContext.CASE=Case +CustomizableFieldContext.EPIDATA=Epidemiological Data # Notifier -Notifier.notification = Notification -Notification.dateOfNotification = Date of notification -Notification.noNotification = There are no notifications -Notification.reportingAgent = Reporting Health Agent: -Notification.registrationNumber = Registration Number -Notification.createNotification = Create Notification -Notification.editNotification = Edit Notification -Notification.viewNotification = View Notification -Notification.notificationTypeExternal = External notification -Notification.notificationTypePhone = Phone notification -Notification.notifierInformation = Notifier information - +Notifier.notification=Notification +Notification.dateOfNotification=Date of notification +Notification.noNotification=There are no notifications +Notification.reportingAgent=Reporting Health Agent: +Notification.registrationNumber=Registration Number +Notification.createNotification=Create Notification +Notification.editNotification=Edit Notification +Notification.viewNotification=View Notification +Notification.notificationTypeExternal=External notification +Notification.notificationTypePhone=Phone notification +Notification.notifierInformation=Notifier information # Diagnosis Criteria Lab Test Details -diagnosisCriteriaDetailTestResult = Result -diagnosisCriteriaDetailTestResultDate = Date -diagnosisCriteriaDetailTestTypeYes = Yes -diagnosisCriteriaDetailTestTypeNo = No -diagnosisCriteriaDetailTestTypeNotApplicable = N/A -diagnosisCriteriaDetailTestResultPos = Pos -diagnosisCriteriaDetailTestResultNeg = Neg -diagnosisCriteriaDetailTestResultOngoing = Ongoing - +diagnosisCriteriaDetailTestResult=Result +diagnosisCriteriaDetailTestResultDate=Date +diagnosisCriteriaDetailTestTypeYes=Yes +diagnosisCriteriaDetailTestTypeNo=No +diagnosisCriteriaDetailTestTypeNotApplicable=N/A +diagnosisCriteriaDetailTestResultPos=Pos +diagnosisCriteriaDetailTestResultNeg=Neg +diagnosisCriteriaDetailTestResultOngoing=Ongoing # Epipulse Export EpipulseExport.uuid=Export ID EpipulseExport.subjectCode=Disease @@ -3799,7 +3766,6 @@ epipulseNewExport=New export epipulseActiveExports=Active Epipulse exports epipulseArchivedExports=Archived Epipulse exports epipulseAllExports=All Epipulse exports - # Survey responses UI surveyResponseField=Field surveyResponseSubmittedValue=Submitted Value @@ -3811,6 +3777,8 @@ surveyResponseApplied=Applied surveyResponseMetadata=Metadata surveyResponsePatchDictionary=Patch Dictionary surveyResponseProcessingResult=Processing Result -surveyResponseValidFields=Valid Fields (already applied) +surveyResponseValidFields=Valid Fields +surveyResponseIgnoreField=Ignore +surveyResponseKeyName=Field Key actionCorrectAndReprocess=Correct & Reprocess actionSaveAndReprocess=Save & Reprocess \ No newline at end of file From 55068f9dcc9eecb4b336f726507de78b77c3c936 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Mon, 27 Apr 2026 20:50:38 +0200 Subject: [PATCH 077/134] Handled downloading of survey request / ignore option for some fields --- .../api/externalmessage/ExternalMessageDto.java | 2 ++ .../api/hospitalization/HospitalizationDto.java | 10 ++++++++++ .../java/de/symeda/sormas/api/utils/YesNoUnknown.java | 2 +- .../survey/AutomaticSurveyResponseProcessor.java | 9 +++++++++ .../backend/hospitalization/Hospitalization.java | 11 +++++++++++ 5 files changed, 33 insertions(+), 1 deletion(-) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageDto.java index b103baeac91..24e48ed49ad 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageDto.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageDto.java @@ -204,6 +204,8 @@ public class ExternalMessageDto extends SormasToSormasShareableDto { private String externalMessageDetails; @Size(max = FieldConstraints.CHARACTER_LIMIT_TEXT, message = Validations.textTooLong) private String caseComments; + + // TODO: reportId can be used as dedup - idempotency key @Size(max = FieldConstraints.CHARACTER_LIMIT_DEFAULT, message = Validations.textTooLong) private String reportId; diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/hospitalization/HospitalizationDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/hospitalization/HospitalizationDto.java index f1d7d1aff13..343f9eb9497 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/hospitalization/HospitalizationDto.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/hospitalization/HospitalizationDto.java @@ -119,6 +119,8 @@ public class HospitalizationDto extends EntityDto { Disease.CRYPTOSPORIDIOSIS }) private Integer durationOfHospitalization; + private YesNoUnknown oxygenTherapy; + public static HospitalizationDto build() { HospitalizationDto hospitalization = new HospitalizationDto(); hospitalization.setUuid(DataHelper.createUuid()); @@ -278,4 +280,12 @@ public Integer getDurationOfHospitalization() { public void setDurationOfHospitalization(Integer durationOfHospitalization) { this.durationOfHospitalization = durationOfHospitalization; } + + public YesNoUnknown getOxygenTherapy() { + return oxygenTherapy; + } + + public void setOxygenTherapy(YesNoUnknown oxygenTherapy) { + this.oxygenTherapy = oxygenTherapy; + } } diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/utils/YesNoUnknown.java b/sormas-api/src/main/java/de/symeda/sormas/api/utils/YesNoUnknown.java index 09f9072ff4e..0f9e66a4110 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/utils/YesNoUnknown.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/utils/YesNoUnknown.java @@ -22,9 +22,9 @@ public enum YesNoUnknown { + @ValueMapperDefault YES, NO, - @ValueMapperDefault UNKNOWN; @Override diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java index 8168c28a81f..fe984a7ff8b 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java @@ -17,6 +17,7 @@ import org.slf4j.LoggerFactory; import de.symeda.sormas.api.externalmessage.ExternalMessageDto; +import de.symeda.sormas.api.externalmessage.ExternalMessageStatus; import de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseRequest; import de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseResult; import de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseWrapper; @@ -27,6 +28,7 @@ import de.symeda.sormas.api.survey.SurveyTokenDto; import de.symeda.sormas.api.utils.Tuple; import de.symeda.sormas.api.utils.dataprocessing.ProcessingResultStatus; +import de.symeda.sormas.backend.externalmessage.labmessage.ExternalMessageProcessingFacadeEjbLocal; import de.symeda.sormas.backend.survey.SurveyFacadeEjb; import de.symeda.sormas.backend.survey.SurveyTokenFacadeEjb; import de.symeda.sormas.backend.util.CollectorUtils; @@ -45,6 +47,9 @@ public class AutomaticSurveyResponseProcessor { @EJB private SurveyTokenFacadeEjb.SurveyTokenFacadeEjbLocal surveyTokenFacade; + @EJB + private ExternalMessageProcessingFacadeEjbLocal processingFacade; + @Transactional(Transactional.TxType.REQUIRES_NEW) public List processSurveyResponses(List externalMessages) throws InterruptedException, ExecutionException { @@ -111,6 +116,10 @@ public List processSurveyResponses(List Date: Mon, 27 Apr 2026 20:51:50 +0200 Subject: [PATCH 078/134] removed / enhanced warning popups --- .../sormas/ui/externalmessage/ExternalMessagesView.java | 2 +- .../surveyresponse/SurveyResponseDetailsWindow.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/ExternalMessagesView.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/ExternalMessagesView.java index 9c66a6b8b52..1594556b966 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/ExternalMessagesView.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/ExternalMessagesView.java @@ -304,7 +304,7 @@ private void fetchExternalMessages(Date since) { List fetchResult = FacadeProvider.getExternalMessageFacade().saveAndProcessSurveyResponses(); if (!fetchResult.isEmpty()) { - VaadinUiUtil.showWarningPopup(String.format("No new messages: [%s]", fetchResult)); + VaadinUiUtil.showWarningPopup(String.format("New messages: [%s]", fetchResult)); grid.reload(); } else { grid.reload(); diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseDetailsWindow.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseDetailsWindow.java index c6fb851c2ec..cac6b347759 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseDetailsWindow.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseDetailsWindow.java @@ -45,7 +45,6 @@ import de.symeda.sormas.ui.caze.CaseDataView; import de.symeda.sormas.ui.utils.ButtonHelper; import de.symeda.sormas.ui.utils.CssStyles; -import de.symeda.sormas.ui.utils.VaadinUiUtil; /** * Popup window displaying full details of a SURVEY_RESPONSE external message. @@ -101,8 +100,8 @@ public SurveyResponseDetailsWindow(ExternalMessageDto externalMessage, Runnable dictionaryGrid.setItems(entries); dictionaryGrid.setHeightByRows(Math.max(entries.size(), 1)); - VaadinUiUtil.showWarningPopup(String.format("Entries: [%s]", entries)); - VaadinUiUtil.showWarningPopup(String.format("finalDisplayData: [%s]", finalDisplayData)); + // VaadinUiUtil.showWarningPopup(String.format("Entries: [%s]", entries)); + // VaadinUiUtil.showWarningPopup(String.format("finalDisplayData: [%s]", finalDisplayData)); dictionaryGrid.addColumn(entry -> resolveFieldName(entry.getKey(), finalDisplayData)) .setCaption(I18nProperties.getCaption(Captions.surveyResponseField)) From a87522b8cdd8c934ed40f0a3bfe4500514935dc6 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Mon, 27 Apr 2026 21:13:10 +0200 Subject: [PATCH 079/134] enhanced processing display --- .../SurveyResponseFailureEditor.java | 39 ++++++++++--------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailureEditor.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailureEditor.java index 2f7e4ffbcab..fc1df9e1e54 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailureEditor.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailureEditor.java @@ -15,15 +15,17 @@ package de.symeda.sormas.ui.externalmessage.surveyresponse; import java.util.HashMap; +import java.util.List; import java.util.Map; +import java.util.stream.Collectors; import com.vaadin.ui.Button; import com.vaadin.ui.CheckBox; import com.vaadin.ui.FormLayout; +import com.vaadin.ui.Grid; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Notification; -import com.vaadin.ui.Panel; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; @@ -41,7 +43,6 @@ import de.symeda.sormas.api.patch.partial_retrieval.DisplayablePartialRetrievalResponse; import de.symeda.sormas.ui.utils.ButtonHelper; import de.symeda.sormas.ui.utils.CssStyles; -import de.symeda.sormas.ui.utils.VaadinUiUtil; /** * Modal editor window allowing users to correct failed survey response fields and reprocess. @@ -58,7 +59,6 @@ public SurveyResponseFailureEditor(ExternalMessageDto externalMessage, Displayab setWidth(700, Unit.PIXELS); ExternalMessageSurveyResponseWrapper latest = externalMessage.getSurveyResponseData().getLatest(); - Map patchDictionary = latest.getRequest().getPatchDictionary(); ExternalMessageSurveyResponseResult result = latest.getResult(); Map failures = @@ -138,29 +138,32 @@ public SurveyResponseFailureEditor(ExternalMessageDto externalMessage, Displayab mainLayout.addComponent(failuresForm); - // --- Valid fields (read-only context) --- + // --- Valid fields (read-only context) ---§ if (!validValues.isEmpty()) { Label validHeading = new Label(I18nProperties.getCaption(Captions.surveyResponseValidFields)); CssStyles.style(validHeading, CssStyles.H4); mainLayout.addComponent(validHeading); - Panel validPanel = new Panel(); - FormLayout validForm = new FormLayout(); - validForm.setMargin(true); + List> validEntries = validValues.entrySet().stream().collect(Collectors.toList()); - VaadinUiUtil.showWarningPopup(String.format("validValues: [%s]", validValues)); + Grid> validGrid = new Grid<>(); + validGrid.setSizeFull(); + validGrid.setItems(validEntries); + validGrid.setHeightByRows(Math.max(validEntries.size(), 1)); - for (Map.Entry validEntry : validValues.entrySet()) { - String fieldPath = validEntry.getKey(); - String fieldLabel = resolveFieldName(fieldPath, displayData); - Label label = new Label(validEntry.getValue() != null ? validEntry.getValue().toString() : ""); - label.setCaption(fieldLabel); - validForm.addComponent(label); - } + validGrid.addColumn(entry -> resolveFieldName(entry.getKey(), displayData)) + .setCaption(I18nProperties.getCaption(Captions.surveyResponseField)) + .setExpandRatio(2); + + validGrid.addColumn(entry -> entry.getValue() != null ? entry.getValue().toString() : "") + .setCaption(I18nProperties.getCaption(Captions.surveyResponseSubmittedValue)) + .setExpandRatio(2); + + validGrid.addColumn(entry -> resolveCurrentValue(entry.getKey(), displayData)) + .setCaption(I18nProperties.getCaption(Captions.surveyResponseCurrentCaseValue)) + .setExpandRatio(2); - validPanel.setContent(validForm); - validPanel.setHeight(120, Unit.PIXELS); - mainLayout.addComponent(validPanel); + mainLayout.addComponent(validGrid); } // --- Buttons --- From 50c918d01b79d9c1d72bc03b47d3d8fbb07efaa2 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Wed, 29 Apr 2026 06:59:30 +0200 Subject: [PATCH 080/134] Fixing DEMO-comments --- .../hospitalization/HospitalizationDto.java | 17 +------- .../api/person/BirthWeightCategory.java | 24 +++++------ .../ExternalMessageFacadeEjb.java | 40 ++++--------------- .../hospitalization/Hospitalization.java | 20 +--------- 4 files changed, 21 insertions(+), 80 deletions(-) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/hospitalization/HospitalizationDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/hospitalization/HospitalizationDto.java index 343f9eb9497..d6d9db01091 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/hospitalization/HospitalizationDto.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/hospitalization/HospitalizationDto.java @@ -29,12 +29,7 @@ import de.symeda.sormas.api.ImportIgnore; import de.symeda.sormas.api.feature.FeatureType; import de.symeda.sormas.api.i18n.Validations; -import de.symeda.sormas.api.utils.DataHelper; -import de.symeda.sormas.api.utils.DependingOnFeatureType; -import de.symeda.sormas.api.utils.Diseases; -import de.symeda.sormas.api.utils.FieldConstraints; -import de.symeda.sormas.api.utils.Outbreaks; -import de.symeda.sormas.api.utils.YesNoUnknown; +import de.symeda.sormas.api.utils.*; @DependingOnFeatureType(featureType = FeatureType.CASE_SURVEILANCE) public class HospitalizationDto extends EntityDto { @@ -119,8 +114,6 @@ public class HospitalizationDto extends EntityDto { Disease.CRYPTOSPORIDIOSIS }) private Integer durationOfHospitalization; - private YesNoUnknown oxygenTherapy; - public static HospitalizationDto build() { HospitalizationDto hospitalization = new HospitalizationDto(); hospitalization.setUuid(DataHelper.createUuid()); @@ -280,12 +273,4 @@ public Integer getDurationOfHospitalization() { public void setDurationOfHospitalization(Integer durationOfHospitalization) { this.durationOfHospitalization = durationOfHospitalization; } - - public YesNoUnknown getOxygenTherapy() { - return oxygenTherapy; - } - - public void setOxygenTherapy(YesNoUnknown oxygenTherapy) { - this.oxygenTherapy = oxygenTherapy; - } } diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/person/BirthWeightCategory.java b/sormas-api/src/main/java/de/symeda/sormas/api/person/BirthWeightCategory.java index 76754ae6625..09b779ca7e8 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/person/BirthWeightCategory.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/person/BirthWeightCategory.java @@ -23,18 +23,18 @@ */ public enum BirthWeightCategory { - /** - * Normal birth weight - */ - NORMAL, + /** + * Normal birth weight + */ + NORMAL, - /** - * Low birth weight (stunted growth) - */ - LOW_BIRTH_WEIGHT; + /** + * Low birth weight (stunted growth) + */ + LOW_BIRTH_WEIGHT; - @Override - public String toString() { - return I18nProperties.getEnumCaption(this); - } + @Override + public String toString() { + return I18nProperties.getEnumCaption(this); + } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java index b65f1288650..13be6b23b97 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java @@ -17,13 +17,7 @@ import static java.util.stream.Collectors.toList; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; -import java.util.List; -import java.util.Objects; -import java.util.Optional; -import java.util.Set; +import java.util.*; import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -39,15 +33,7 @@ import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; import javax.persistence.Tuple; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Order; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Selection; +import javax.persistence.criteria.*; import javax.validation.Valid; import javax.validation.constraints.NotNull; @@ -69,17 +55,7 @@ import de.symeda.sormas.api.customizableenum.CustomEnumNotFoundException; import de.symeda.sormas.api.customizableenum.CustomizableEnumType; import de.symeda.sormas.api.event.EventParticipantReferenceDto; -import de.symeda.sormas.api.externalmessage.ExternalMessageAdapterFacade; -import de.symeda.sormas.api.externalmessage.ExternalMessageCriteria; -import de.symeda.sormas.api.externalmessage.ExternalMessageDto; -import de.symeda.sormas.api.externalmessage.ExternalMessageFacade; -import de.symeda.sormas.api.externalmessage.ExternalMessageFetchResult; -import de.symeda.sormas.api.externalmessage.ExternalMessageIndexDto; -import de.symeda.sormas.api.externalmessage.ExternalMessageReferenceDto; -import de.symeda.sormas.api.externalmessage.ExternalMessageResult; -import de.symeda.sormas.api.externalmessage.ExternalMessageStatus; -import de.symeda.sormas.api.externalmessage.ExternalMessageType; -import de.symeda.sormas.api.externalmessage.NewMessagesState; +import de.symeda.sormas.api.externalmessage.*; import de.symeda.sormas.api.externalmessage.labmessage.SampleReportDto; import de.symeda.sormas.api.externalmessage.processing.ExternalMessageProcessingResult; import de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseRequest; @@ -92,6 +68,7 @@ import de.symeda.sormas.api.i18n.I18nProperties; import de.symeda.sormas.api.i18n.Strings; import de.symeda.sormas.api.i18n.Validations; +import de.symeda.sormas.api.patch.DataReplacementStrategy; import de.symeda.sormas.api.patch.partial_retrieval.DisplayablePartialRetrievalResponse; import de.symeda.sormas.api.sample.PathogenTestResultType; import de.symeda.sormas.api.sample.SampleReferenceDto; @@ -128,11 +105,7 @@ import de.symeda.sormas.backend.systemevent.sync.SyncFacadeEjb; import de.symeda.sormas.backend.user.User; import de.symeda.sormas.backend.user.UserService; -import de.symeda.sormas.backend.util.DtoHelper; -import de.symeda.sormas.backend.util.IterableHelper; -import de.symeda.sormas.backend.util.ModelConstants; -import de.symeda.sormas.backend.util.QueryHelper; -import de.symeda.sormas.backend.util.RightsAllowed; +import de.symeda.sormas.backend.util.*; @Stateless(name = "ExternalMessageFacade") @RightsAllowed({ @@ -978,11 +951,12 @@ public ExternalMessageDto reprocessSurveyResponse(String uuid, java.util.Map Date: Wed, 29 Apr 2026 14:53:43 +0200 Subject: [PATCH 081/134] Showing excluded fields within modal and within download --- .../ExternalMessageSurveyResponseRequest.java | 23 ++++++++++- .../de/symeda/sormas/api/i18n/Captions.java | 1 + .../src/main/resources/captions.properties | 1 + .../ExternalMessageFacadeEjb.java | 2 +- .../sormas/backend/patch/DataPatcherImpl.java | 28 +++----------- .../backend/patch/alias/PathAliasHelper.java | 6 ++- .../SurveyResponseDetailsWindow.java | 38 ++++++++++++++----- .../SurveyResponseFailurePanel.java | 10 ++--- 8 files changed, 68 insertions(+), 41 deletions(-) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseRequest.java b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseRequest.java index e8160223dd5..007de8c07f9 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseRequest.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseRequest.java @@ -45,6 +45,13 @@ public class ExternalMessageSurveyResponseRequest implements Serializable { @NotNull private Map patchDictionary; + /** + * Contains fields that were excluded from the patch dictionary, meant for fields that may not start with the prefix. + * The prefix allows to safely exclude fields that are not meant to be mapped into SORMAS. + */ + @NotNull + private Map excludedPatchDictionary; + /** * Origin that wants the patch operation. * Can be used within {@link de.symeda.sormas.api.patch.mapping.FieldCustomMapper}. @@ -180,6 +187,15 @@ public ExternalMessageSurveyResponseRequest setSkipIfAlreadyProcessed(boolean sk return this; } + public Map getExcludedPatchDictionary() { + return excludedPatchDictionary; + } + + public ExternalMessageSurveyResponseRequest setExcludedPatchDictionary(Map excludedPatchDictionary) { + this.excludedPatchDictionary = excludedPatchDictionary; + return this; + } + @Override public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) @@ -195,6 +211,7 @@ public boolean equals(Object o) { && replacementStrategy == that.replacementStrategy && emptyValueBehavior == that.emptyValueBehavior && Objects.equals(patchDictionary, that.patchDictionary) + && Objects.equals(excludedPatchDictionary, that.excludedPatchDictionary) && Objects.equals(origin, that.origin) && Objects.equals(inputLanguages, that.inputLanguages); } @@ -210,6 +227,7 @@ public int hashCode() { replacementStrategy, emptyValueBehavior, patchDictionary, + excludedPatchDictionary, origin, inputLanguages, allowFallbackValues, @@ -221,7 +239,8 @@ public String toString() { return "ExternalMessageSurveyResponseRequest{" + "token='" + token + '\'' + ", externalSurveyId='" + externalSurveyId + '\'' + ", externalRespondentId='" + externalRespondentId + '\'' + ", responseReceivedDate=" + responseReceivedDate + ", patchedInCaseOfFailures=" + patchedInCaseOfFailures + ", replacementStrategy=" + replacementStrategy + ", emptyValueBehavior=" - + emptyValueBehavior + ", patchDictionary=" + patchDictionary + ", origin='" + origin + '\'' + ", inputLanguages=" + inputLanguages - + ", allowFallbackValues=" + allowFallbackValues + ", skipIfAlreadyProcessed=" + skipIfAlreadyProcessed + '}'; + + emptyValueBehavior + ", patchDictionary=" + patchDictionary + ", excludedPatchDictionary=" + excludedPatchDictionary + ", origin='" + + origin + '\'' + ", inputLanguages=" + inputLanguages + ", allowFallbackValues=" + allowFallbackValues + ", skipIfAlreadyProcessed=" + + skipIfAlreadyProcessed + '}'; } } diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java index 116d1a7e59c..02bf0a6d08e 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java @@ -2038,6 +2038,7 @@ public interface Captions { String surveyResponseApplied = "surveyResponseApplied"; String surveyResponseMetadata = "surveyResponseMetadata"; String surveyResponsePatchDictionary = "surveyResponsePatchDictionary"; + String surveyResponseExcludedFieldsDictionary = "surveyResponseExcludedFieldsDictionary"; String surveyResponseProcessingResult = "surveyResponseProcessingResult"; String surveyResponseValidFields = "surveyResponseValidFields"; String surveyResponseIgnoreField = "surveyResponseIgnoreField"; diff --git a/sormas-api/src/main/resources/captions.properties b/sormas-api/src/main/resources/captions.properties index 531d1a8b488..a53a6f63936 100644 --- a/sormas-api/src/main/resources/captions.properties +++ b/sormas-api/src/main/resources/captions.properties @@ -3776,6 +3776,7 @@ surveyResponseCaseLink=Case surveyResponseApplied=Applied surveyResponseMetadata=Metadata surveyResponsePatchDictionary=Patch Dictionary +surveyResponseExcludedFieldsDictionary=Ignored fields Dictionary surveyResponseProcessingResult=Processing Result surveyResponseValidFields=Valid Fields surveyResponseIgnoreField=Ignore diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java index 13be6b23b97..57a728fc206 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java @@ -318,7 +318,7 @@ public List saveAndProcessSurveyResponses(Date since) { if (since == null) { // TODO: use shorter default range int hoursRange = - Integer.parseInt(Optional.ofNullable(systemConfigurationValueFacade.getValue(SURVEY_PERIOD_INTERVAL_HOURS)).orElse("1680")); + Integer.parseInt(Optional.ofNullable(systemConfigurationValueFacade.getValue(SURVEY_PERIOD_INTERVAL_HOURS)).orElse("50000")); since = DateHelper.addSeconds(new Date(), -(hoursRange * 3600)); } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java index d99ca1451cc..34b8ce395ae 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java @@ -1,12 +1,6 @@ package de.symeda.sormas.backend.patch; -import java.util.AbstractMap; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; +import java.util.*; import java.util.function.Function; import java.util.function.Predicate; import java.util.function.Supplier; @@ -28,20 +22,8 @@ import de.symeda.sormas.api.Disease; import de.symeda.sormas.api.EntityDto; import de.symeda.sormas.api.caze.CaseDataDto; -import de.symeda.sormas.api.patch.CaseDataPatchRequest; -import de.symeda.sormas.api.patch.DataPatchFailure; -import de.symeda.sormas.api.patch.DataPatchFailureCause; -import de.symeda.sormas.api.patch.DataPatchResponse; -import de.symeda.sormas.api.patch.DataPatcher; -import de.symeda.sormas.api.patch.DataReplacementStrategy; -import de.symeda.sormas.api.patch.EmptyValueBehavior; -import de.symeda.sormas.api.patch.SinglePatchResult; -import de.symeda.sormas.api.patch.mapping.FieldCustomMapper; -import de.symeda.sormas.api.patch.mapping.FieldPatchRequest; -import de.symeda.sormas.api.patch.mapping.GroupedFieldsRequest; -import de.symeda.sormas.api.patch.mapping.GroupedFieldsResponse; -import de.symeda.sormas.api.patch.mapping.ValueMappingResult; -import de.symeda.sormas.api.patch.mapping.ValuePatchRequest; +import de.symeda.sormas.api.patch.*; +import de.symeda.sormas.api.patch.mapping.*; import de.symeda.sormas.api.person.PersonDto; import de.symeda.sormas.api.utils.Tuple; import de.symeda.sormas.api.utils.fieldvisibility.FieldVisibilityCheckers; @@ -291,9 +273,11 @@ private boolean anyFieldPatchedWithPrefix(Map validPatchDictiona Optional exception = PropertyAccessor.setNestedProperty(target, relativeFieldName, typedValue); if (exception.isPresent()) { + Exception e = exception.orElseThrow(); + logger.error("Setting nested property failed", e); return singlePatchResult.setFailure( new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.TECHNICAL) - .setDescription(exception.orElseThrow().getMessage()) + .setDescription(e.getMessage()) .setProvidedFieldValue(untypedTargetValue)); } else { return singlePatchResult.setValue(untypedTargetValue); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java index cda05973c1a..805ced8ef62 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java @@ -34,6 +34,9 @@ public class PathAliasHelper { public static final Map DEFAULT_ALIAS_DICTIONARY = buildDefaultAliasDictionary(); + /** + * Can be used as OUT: for displaying purposes but not for in. + */ public static final Map> DEFAULT_FORBIDDEN_ALIASES_DICTIONARY = Map.of("Location", Set.of("Person.address", "Exposure.location")); @@ -96,7 +99,8 @@ public Tuple resolveAlias(String pathWithPotentialAlia * Objective is to retrieve a path WITH an alias to get the Field ID as in the data dictionary. * * @param pathWithoutAlias - * @return + * field that may or may not contain a "physical-path" that must be "shortened" to the Field ID. + * @return path that is "shortened" to a path using the Field ID (alias). */ public String toAliasPath(String pathWithoutAlias) { Set> reduce = Stream.concat( diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseDetailsWindow.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseDetailsWindow.java index cac6b347759..f1ddd432795 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseDetailsWindow.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseDetailsWindow.java @@ -20,13 +20,7 @@ import com.vaadin.server.ExternalResource; import com.vaadin.server.Sizeable; -import com.vaadin.ui.Button; -import com.vaadin.ui.Grid; -import com.vaadin.ui.Label; -import com.vaadin.ui.Link; -import com.vaadin.ui.UI; -import com.vaadin.ui.VerticalLayout; -import com.vaadin.ui.Window; +import com.vaadin.ui.*; import com.vaadin.ui.themes.ValoTheme; import de.symeda.sormas.api.FacadeProvider; @@ -100,9 +94,6 @@ public SurveyResponseDetailsWindow(ExternalMessageDto externalMessage, Runnable dictionaryGrid.setItems(entries); dictionaryGrid.setHeightByRows(Math.max(entries.size(), 1)); - // VaadinUiUtil.showWarningPopup(String.format("Entries: [%s]", entries)); - // VaadinUiUtil.showWarningPopup(String.format("finalDisplayData: [%s]", finalDisplayData)); - dictionaryGrid.addColumn(entry -> resolveFieldName(entry.getKey(), finalDisplayData)) .setCaption(I18nProperties.getCaption(Captions.surveyResponseField)) .setExpandRatio(2); @@ -118,6 +109,33 @@ public SurveyResponseDetailsWindow(ExternalMessageDto externalMessage, Runnable layout.addComponent(dictionaryGrid); } + // --- Ignored patch dictionary Patch Dictionary section --- + Label excludedFieldsDictionaryLabel = new Label(I18nProperties.getCaption(Captions.surveyResponseExcludedFieldsDictionary)); + CssStyles.style(excludedFieldsDictionaryLabel, CssStyles.H3); + layout.addComponent(excludedFieldsDictionaryLabel); + + Map excludedFieldsDictionary = request.getExcludedPatchDictionary(); + if (excludedFieldsDictionary != null && !excludedFieldsDictionary.isEmpty()) { + List> entries = excludedFieldsDictionary.entrySet().stream().collect(Collectors.toList()); + + final DisplayablePartialRetrievalResponse finalDisplayData = displayData; + + Grid> dictionaryGrid = new Grid<>(); + dictionaryGrid.setSizeFull(); + dictionaryGrid.setItems(entries); + dictionaryGrid.setHeightByRows(Math.max(entries.size(), 1)); + + dictionaryGrid.addColumn(entry -> resolveFieldName(entry.getKey(), finalDisplayData)) + .setCaption(I18nProperties.getCaption(Captions.surveyResponseField)) + .setExpandRatio(2); + + dictionaryGrid.addColumn(entry -> entry.getValue() != null ? entry.getValue().toString() : "") + .setCaption(I18nProperties.getCaption(Captions.surveyResponseSubmittedValue)) + .setExpandRatio(2); + + layout.addComponent(dictionaryGrid); + } + // --- Processing Result section --- if (result != null) { Label resultHeading = new Label(I18nProperties.getCaption(Captions.surveyResponseProcessingResult)); diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailurePanel.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailurePanel.java index f59b57de661..c63ad10936b 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailurePanel.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailurePanel.java @@ -59,16 +59,16 @@ public SurveyResponseFailurePanel(Map failures, Displa .setId("cause") .setExpandRatio(2); - grid.addColumn(entry -> resolveCurrentValue(entry.getKey(), displayData)) - .setCaption(I18nProperties.getCaption(Captions.surveyResponseCurrentCaseValue)) - .setId("currentValue") - .setExpandRatio(2); - grid.addColumn(entry -> entry.getValue().getProvidedFieldValue() != null ? entry.getValue().getProvidedFieldValue().toString() : "") .setCaption(I18nProperties.getCaption(Captions.surveyResponseSubmittedValue)) .setId("submittedValue") .setExpandRatio(2); + grid.addColumn(entry -> resolveCurrentValue(entry.getKey(), displayData)) + .setCaption(I18nProperties.getCaption(Captions.surveyResponseCurrentCaseValue)) + .setId("currentValue") + .setExpandRatio(2); + grid.addColumn(entry -> entry.getValue().getDescription() != null ? entry.getValue().getDescription() : "") .setCaption(I18nProperties.getCaption(Captions.surveyResponseDescription)) .setId("description") From 3ae1690568ce2e9ec90a1a99aff396954707d551 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Wed, 29 Apr 2026 17:40:16 +0200 Subject: [PATCH 082/134] Fixed optimistic locking exception --- .../externalmessage/survey/AutomaticSurveyResponseProcessor.java | 1 - 1 file changed, 1 deletion(-) diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java index fe984a7ff8b..b84d367e67d 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java @@ -118,7 +118,6 @@ public List processSurveyResponses(List Date: Wed, 29 Apr 2026 18:43:39 +0200 Subject: [PATCH 083/134] enhanced display name of fields to use the alias --- .../de/symeda/sormas/api/FacadeProvider.java | 5 +++ .../api/survey/alias/PathAliasFacade.java | 16 +++++++++ .../patch/alias/PathAliasFacadeEjb.java | 25 ++++++++++++++ .../backend/patch/alias/PathAliasHelper.java | 10 +++--- .../SurveyResponseDetailsWindow.java | 23 +++++++------ .../SurveyResponseFailureEditor.java | 33 +++++++------------ .../SurveyResponseFailurePanel.java | 23 ++++++------- 7 files changed, 88 insertions(+), 47 deletions(-) create mode 100644 sormas-api/src/main/java/de/symeda/sormas/api/survey/alias/PathAliasFacade.java create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasFacadeEjb.java diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/FacadeProvider.java b/sormas-api/src/main/java/de/symeda/sormas/api/FacadeProvider.java index 6dc5c60b1e5..dd1cd0bb5ee 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/FacadeProvider.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/FacadeProvider.java @@ -109,6 +109,7 @@ import de.symeda.sormas.api.specialcaseaccess.SpecialCaseAccessFacade; import de.symeda.sormas.api.survey.SurveyFacade; import de.symeda.sormas.api.survey.SurveyTokenFacade; +import de.symeda.sormas.api.survey.alias.PathAliasFacade; import de.symeda.sormas.api.symptoms.SymptomsFacade; import de.symeda.sormas.api.systemconfiguration.SystemConfigurationCategoryFacade; import de.symeda.sormas.api.systemconfiguration.SystemConfigurationValueFacade; @@ -319,6 +320,10 @@ public static PrescriptionFacade getPrescriptionFacade() { return get().lookupEjbRemote(PrescriptionFacade.class); } + public static PathAliasFacade getPathAliasFacade() { + return get().lookupEjbRemote(PathAliasFacade.class); + } + public static TreatmentFacade getTreatmentFacade() { return get().lookupEjbRemote(TreatmentFacade.class); } diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/survey/alias/PathAliasFacade.java b/sormas-api/src/main/java/de/symeda/sormas/api/survey/alias/PathAliasFacade.java new file mode 100644 index 00000000000..3b360e885c3 --- /dev/null +++ b/sormas-api/src/main/java/de/symeda/sormas/api/survey/alias/PathAliasFacade.java @@ -0,0 +1,16 @@ +package de.symeda.sormas.api.survey.alias; + +import javax.ejb.Remote; + +@Remote +public interface PathAliasFacade { + + /** + * Makes it more "readable" by shortening physical paths into aliases per example FieldIds. + * + * @param path + * that may (or may not) contain physical paths. + * @return shortened path. + */ + String toAliasPath(String path); +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasFacadeEjb.java new file mode 100644 index 00000000000..ab3a584887f --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasFacadeEjb.java @@ -0,0 +1,25 @@ +package de.symeda.sormas.backend.patch.alias; + +import javax.ejb.LocalBean; +import javax.ejb.Stateless; +import javax.inject.Inject; + +import de.symeda.sormas.api.survey.alias.PathAliasFacade; + +@Stateless(name = "PathAliasFacade") +public class PathAliasFacadeEjb implements PathAliasFacade { + + @Inject + private PathAliasHelper pathAliasHelper; + + @Override + public String toAliasPath(String path) { + return pathAliasHelper.toAliasPath(path); + } + + @LocalBean + @Stateless + public static class PathAliasFacadeEjbLocal extends PathAliasFacadeEjb { + + } +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java index 805ced8ef62..e16d0c8832a 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java @@ -98,11 +98,11 @@ public Tuple resolveAlias(String pathWithPotentialAlia /** * Objective is to retrieve a path WITH an alias to get the Field ID as in the data dictionary. * - * @param pathWithoutAlias + * @param path * field that may or may not contain a "physical-path" that must be "shortened" to the Field ID. * @return path that is "shortened" to a path using the Field ID (alias). */ - public String toAliasPath(String pathWithoutAlias) { + public String toAliasPath(String path) { Set> reduce = Stream.concat( DEFAULT_ALIAS_DICTIONARY.entrySet().stream(), DEFAULT_FORBIDDEN_ALIASES_DICTIONARY.entrySet() @@ -111,14 +111,14 @@ public String toAliasPath(String pathWithoutAlias) { .collect(Collectors.toSet()); for (Map.Entry entry : reduce) { - pathWithoutAlias = pathWithoutAlias.replace(entry.getValue(), entry.getKey()); + path = path.replace(entry.getValue(), entry.getKey()); } for (Map.Entry entry : REFERENCE_TO_ROOT_DICTIONARY.entrySet()) { - pathWithoutAlias = pathWithoutAlias.replace(entry.getKey(), entry.getValue()); + path = path.replace(entry.getKey(), entry.getValue()); } - return pathWithoutAlias; + return path; } private static @NotNull Tuple tupleWithFailure(PathFailureCause forbiddenNonUniqueAlias) { diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseDetailsWindow.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseDetailsWindow.java index f1ddd432795..6b3fa433dc3 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseDetailsWindow.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseDetailsWindow.java @@ -202,21 +202,24 @@ private void addReadOnlyField(VerticalLayout layout, String caption, String valu layout.addComponent(label); } - private String resolveFieldName(String fieldPath, DisplayablePartialRetrievalResponse displayData) { - if (displayData != null) { - DisplayableFieldInfo info = displayData.getFieldInfoDictionary().get(fieldPath); - if (info != null && info.getTranslatedFieldName() != null) { - return info.getTranslatedFieldName(); + public String resolveFieldName(String fieldPath, DisplayablePartialRetrievalResponse displayData) { + DisplayableFieldInfo info = displayData.getFieldInfoDictionary().get(fieldPath); + String aliasPath = FacadeProvider.getPathAliasFacade().toAliasPath(fieldPath); + if (info != null) { + String translatedFieldName = info.getTranslatedFieldName(); + if (translatedFieldName != null) { + return String.format("%s (%s)", translatedFieldName, aliasPath); } } - return fieldPath; + return aliasPath; } private String resolveCurrentValue(String fieldPath, DisplayablePartialRetrievalResponse displayData) { - if (displayData != null) { - DisplayableFieldInfo info = displayData.getFieldInfoDictionary().get(fieldPath); - if (info != null && info.getTranslatedFieldValue() != null) { - return info.getTranslatedFieldValue(); + DisplayableFieldInfo info = displayData.getFieldInfoDictionary().get(fieldPath); + if (info != null) { + String translatedFieldValue = info.getTranslatedFieldValue(); + if (translatedFieldValue != null) { + return translatedFieldValue; } } return ""; diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailureEditor.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailureEditor.java index fc1df9e1e54..0e7f0a35280 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailureEditor.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailureEditor.java @@ -19,16 +19,7 @@ import java.util.Map; import java.util.stream.Collectors; -import com.vaadin.ui.Button; -import com.vaadin.ui.CheckBox; -import com.vaadin.ui.FormLayout; -import com.vaadin.ui.Grid; -import com.vaadin.ui.HorizontalLayout; -import com.vaadin.ui.Label; -import com.vaadin.ui.Notification; -import com.vaadin.ui.TextField; -import com.vaadin.ui.VerticalLayout; -import com.vaadin.ui.Window; +import com.vaadin.ui.*; import com.vaadin.ui.themes.ValoTheme; import de.symeda.sormas.api.FacadeProvider; @@ -202,22 +193,22 @@ public SurveyResponseFailureEditor(ExternalMessageDto externalMessage, Displayab setContent(mainLayout); } - private String resolveFieldName(String fieldPath, DisplayablePartialRetrievalResponse displayData) { - if (displayData != null) { - DisplayableFieldInfo info = displayData.getFieldInfoDictionary().get(fieldPath); - if (info != null && info.getTranslatedFieldName() != null) { - return info.getTranslatedFieldName(); + public String resolveFieldName(String fieldPath, DisplayablePartialRetrievalResponse displayData) { + DisplayableFieldInfo info = displayData.getFieldInfoDictionary().get(fieldPath); + String aliasPath = FacadeProvider.getPathAliasFacade().toAliasPath(fieldPath); + if (info != null) { + String translatedFieldName = info.getTranslatedFieldName(); + if (translatedFieldName != null) { + return String.format("%s (%s)", translatedFieldName, aliasPath); } } - return fieldPath; + return aliasPath; } private String resolveCurrentValue(String fieldPath, DisplayablePartialRetrievalResponse displayData) { - if (displayData != null) { - DisplayableFieldInfo info = displayData.getFieldInfoDictionary().get(fieldPath); - if (info != null) { - return info.getTranslatedFieldValue(); - } + DisplayableFieldInfo info = displayData.getFieldInfoDictionary().get(fieldPath); + if (info != null) { + return info.getTranslatedFieldValue(); } return null; } diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailurePanel.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailurePanel.java index c63ad10936b..e80e5c4df8d 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailurePanel.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailurePanel.java @@ -21,6 +21,7 @@ import com.vaadin.ui.Grid; import com.vaadin.ui.VerticalLayout; +import de.symeda.sormas.api.FacadeProvider; import de.symeda.sormas.api.i18n.Captions; import de.symeda.sormas.api.i18n.I18nProperties; import de.symeda.sormas.api.patch.DataPatchFailure; @@ -79,22 +80,22 @@ public SurveyResponseFailurePanel(Map failures, Displa addComponent(grid); } - private String resolveFieldName(String fieldPath, DisplayablePartialRetrievalResponse displayData) { - if (displayData != null) { - DisplayableFieldInfo info = displayData.getFieldInfoDictionary().get(fieldPath); - if (info != null && info.getTranslatedFieldName() != null) { - return info.getTranslatedFieldName(); + public String resolveFieldName(String fieldPath, DisplayablePartialRetrievalResponse displayData) { + DisplayableFieldInfo info = displayData.getFieldInfoDictionary().get(fieldPath); + String aliasPath = FacadeProvider.getPathAliasFacade().toAliasPath(fieldPath); + if (info != null) { + String translatedFieldName = info.getTranslatedFieldName(); + if (translatedFieldName != null) { + return String.format("%s (%s)", translatedFieldName, aliasPath); } } - return fieldPath; + return aliasPath; } private String resolveCurrentValue(String fieldPath, DisplayablePartialRetrievalResponse displayData) { - if (displayData != null) { - DisplayableFieldInfo info = displayData.getFieldInfoDictionary().get(fieldPath); - if (info != null && info.getTranslatedFieldValue() != null) { - return info.getTranslatedFieldValue(); - } + DisplayableFieldInfo info = displayData.getFieldInfoDictionary().get(fieldPath); + if (info != null && info.getTranslatedFieldValue() != null) { + return info.getTranslatedFieldValue(); } return ""; } From 5520493d8106b86073184ba83fc122a5edd97fe2 Mon Sep 17 00:00:00 2001 From: = <=> Date: Thu, 30 Apr 2026 14:48:00 +0200 Subject: [PATCH 084/134] fixed test --- .../PartialRetrieverImplTest.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImplTest.java index 8444ae46291..f02de68b56c 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImplTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImplTest.java @@ -66,7 +66,7 @@ void retrievePartialForDisplay_immunization_and_vaccine() { () -> Assertions.assertEquals("Immunization status", immunizationStatusFieldInfo.getTranslatedFieldName()), () -> Assertions.assertEquals("Acquired", immunizationStatusFieldInfo.getTranslatedFieldValue()), - () -> Assertions.assertEquals("Pfizer-BioNTech COVID-19 vaccine", vaccineNameFieldInfo.getTranslatedFieldValue()), + () -> Assertions.assertEquals("COMIRNATY", vaccineNameFieldInfo.getTranslatedFieldValue()), () -> Assertions.assertEquals("actual vaccine name", otherVaccineNameFieldInfo.getTranslatedFieldValue()), () -> Assertions.assertEquals(3, actual.getFieldInfoDictionary().size())); @@ -75,8 +75,8 @@ void retrievePartialForDisplay_immunization_and_vaccine() { @Test void retrievePartialForDisplay() { // PREPARE - I18nProperties.setUserLanguage(Language.DE); - Disease disease = Disease.ANTHRAX; + I18nProperties.setUserLanguage(Language.FR); + Disease disease = Disease.AFP; CaseDataDto originalCase = creator.createUnclassifiedCase(disease); String caseDiseaseFieldName = toFieldName(CaseDataDto.I18N_PREFIX, CaseDataDto.DISEASE); @@ -92,8 +92,8 @@ void retrievePartialForDisplay() { () -> Assertions.assertNotNull(caseDiseaseFieldInfo), - () -> Assertions.assertEquals("Krankheit", caseDiseaseFieldInfo.getTranslatedFieldName()), - () -> Assertions.assertEquals("Milzbrand", caseDiseaseFieldInfo.getTranslatedFieldValue())); + () -> Assertions.assertEquals("Disease", caseDiseaseFieldInfo.getTranslatedFieldName()), + () -> Assertions.assertEquals("Paralysie Flasque Aiguë", caseDiseaseFieldInfo.getTranslatedFieldValue())); } @Test @@ -105,23 +105,23 @@ void retrievePartial_german() { CaseDataDto originalCase = creator.createUnclassifiedCase(disease); // EXECUTE - String caseDiseaseFieldName = toFieldName(CaseDataDto.I18N_PREFIX, CaseDataDto.DISEASE); + String clinicalConfirmation = toFieldName(CaseDataDto.I18N_PREFIX, CaseDataDto.CLINICAL_CONFIRMATION); String symptomsAbdominalPain = toFieldName(SymptomsDto.I18N_PREFIX, SymptomsDto.ABDOMINAL_PAIN); PartialRetrievalResponse actual = victim().retrievePartial( new PartialRetrievalRequest().setCaseUuid(originalCase.getUuid()) - .setFieldsToRetrieve(Set.of(caseDiseaseFieldName, symptomsAbdominalPain))); + .setFieldsToRetrieve(Set.of(clinicalConfirmation, symptomsAbdominalPain))); // CHECK System.out.println("actual = " + actual); - FieldInfo caseDiseaseFieldInfo = actual.getFieldInfoDictionary().get(caseDiseaseFieldName); + FieldInfo caseDiseaseFieldInfo = actual.getFieldInfoDictionary().get(clinicalConfirmation); FieldInfo symptomsAbdominalPainFieldInfo = actual.getFieldInfoDictionary().get(symptomsAbdominalPain); Assertions.assertAll( () -> Assertions.assertTrue(actual.getFailuresDictionary().isEmpty()), - () -> Assertions.assertTrue(actual.getFieldInfoDictionary().containsKey(caseDiseaseFieldName)), - () -> Assertions.assertEquals("Krankheit", caseDiseaseFieldInfo.getTranslatedFieldName()), - () -> Assertions.assertEquals(disease, caseDiseaseFieldInfo.getFieldValue()), + () -> Assertions.assertTrue(actual.getFieldInfoDictionary().containsKey(clinicalConfirmation)), + () -> Assertions.assertEquals("Klinische Bestätigung", caseDiseaseFieldInfo.getTranslatedFieldName()), + () -> Assertions.assertEquals(originalCase.getClinicalConfirmation(), caseDiseaseFieldInfo.getFieldValue()), () -> Assertions.assertTrue(actual.getFieldInfoDictionary().containsKey(symptomsAbdominalPain)), () -> Assertions.assertEquals("Abdominalschmerzen", symptomsAbdominalPainFieldInfo.getTranslatedFieldName()), From 0ddee0e640f77f7dae4ec02784005bef55574421 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Thu, 30 Apr 2026 14:56:00 +0200 Subject: [PATCH 085/134] preparing systemconfig usage --- .../sormas/api/feature/FeatureType.java | 21 ++-- .../api/feature/FeatureTypeProperty.java | 1 + .../src/main/resources/captions.properties | 1 + sormas-api/src/main/resources/enum.properties | 17 +++- .../src/main/resources/strings.properties | 9 +- .../sormas/backend/common/CronService.java | 15 +-- .../ExternalMessageFacadeEjb.java | 36 ++++++- .../ExternalMessageService.java | 52 ++++++---- .../AutomaticSurveyResponseProcessor.java | 4 - .../main/resources/sql/sormas_schema_next.sql | 62 ++++++++++++ .../externalmessage/ExternalMessagesView.java | 95 ++++++++++--------- .../SurveyResponseDetailsWindow.java | 1 + 12 files changed, 221 insertions(+), 93 deletions(-) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/feature/FeatureType.java b/sormas-api/src/main/java/de/symeda/sormas/api/feature/FeatureType.java index fd62ec0ba96..e031f435647 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/feature/FeatureType.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/feature/FeatureType.java @@ -14,18 +14,9 @@ */ package de.symeda.sormas.api.feature; -import static de.symeda.sormas.api.common.DeletableEntityType.CASE; -import static de.symeda.sormas.api.common.DeletableEntityType.CONTACT; -import static de.symeda.sormas.api.common.DeletableEntityType.EVENT; -import static de.symeda.sormas.api.common.DeletableEntityType.EVENT_PARTICIPANT; -import static de.symeda.sormas.api.common.DeletableEntityType.IMMUNIZATION; -import static de.symeda.sormas.api.common.DeletableEntityType.TRAVEL_ENTRY; +import static de.symeda.sormas.api.common.DeletableEntityType.*; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import com.google.common.collect.ImmutableMap; @@ -128,7 +119,13 @@ public enum FeatureType { new FeatureType[] { SAMPLES_LAB }, null, - ImmutableMap.of(FeatureTypeProperty.FETCH_MODE, Boolean.FALSE, FeatureTypeProperty.FORCE_AUTOMATIC_PROCESSING, false)), + ImmutableMap.of( + FeatureTypeProperty.FETCH_MODE, + Boolean.FALSE, + FeatureTypeProperty.FORCE_AUTOMATIC_PROCESSING, + false, + FeatureTypeProperty.SURVEY_FETCH_ENABLED, + false)), MANUAL_EXTERNAL_MESSAGES(true, true, new FeatureType[] { diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/feature/FeatureTypeProperty.java b/sormas-api/src/main/java/de/symeda/sormas/api/feature/FeatureTypeProperty.java index f4c0878e202..8266494dd4d 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/feature/FeatureTypeProperty.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/feature/FeatureTypeProperty.java @@ -30,6 +30,7 @@ public enum FeatureTypeProperty { SHARE_IMMUNIZATIONS(Boolean.class), SHARE_REPORTS(Boolean.class), FETCH_MODE(Boolean.class), + SURVEY_FETCH_ENABLED(Boolean.class), FORCE_AUTOMATIC_PROCESSING(Boolean.class); private final Class returnType; diff --git a/sormas-api/src/main/resources/captions.properties b/sormas-api/src/main/resources/captions.properties index a53a6f63936..ad5e337ae22 100644 --- a/sormas-api/src/main/resources/captions.properties +++ b/sormas-api/src/main/resources/captions.properties @@ -1737,6 +1737,7 @@ ExternalMessage.personNationalHealthId=National health ID ExternalMessage.personPhoneNumberType=Phone number type ExternalMessage.personCountry=Country externalMessageFetch=Fetch messages +surveyFetch=Fetch Surveys externalMessageProcess=Process externalMessageNoDisease=No disease found externalMessageNoNewMessages=No new messages available diff --git a/sormas-api/src/main/resources/enum.properties b/sormas-api/src/main/resources/enum.properties index c52494fdb13..dc505857fb4 100644 --- a/sormas-api/src/main/resources/enum.properties +++ b/sormas-api/src/main/resources/enum.properties @@ -3062,4 +3062,19 @@ AnimalCategory.WILD=Wild # FomiteTransmissionLocation FomiteTransmissionLocation.INSIDE_HOME=Inside home -FomiteTransmissionLocation.OUTSIDE=Outside \ No newline at end of file +FomiteTransmissionLocation.OUTSIDE=Outside + +# DataPatchFailureCause +DataPatchFailureCause.INVALID_MULTIPLE_FIELDS_FORMAT=Invalid multiple fields format +DataPatchFailureCause.MISSING_MANDATORY_FIELD_FOR_GROUP=Missing required field for group +DataPatchFailureCause.FORBIDDEN_NON_UNIQUE_ALIAS=Alias must map to a single unique field +DataPatchFailureCause.NOT_PRESENT_IN_REFERENCE_DATA_LIST=Value not in allowed reference list +DataPatchFailureCause.UNSUPPORTED_FIELD_FOR_DISEASE_OR_COUNTRY_OR_FEATURE=Field not supported for this disease, country, or feature +DataPatchFailureCause.UNSUPPORTED_PREFIX=Unsupported path prefix +DataPatchFailureCause.FIELD_DOES_NOT_EXIST=Field does not exist +DataPatchFailureCause.FORBIDDEN_FIELD=Field cannot be modified +DataPatchFailureCause.FORBIDDEN_VALUE_OVERRIDE=Overriding existing value is not allowed +DataPatchFailureCause.INVALID_VALUE_TYPE=Invalid value type +DataPatchFailureCause.UNSUPPORTED_TARGET_TYPE=Unsupported target type +DataPatchFailureCause.INVALID_PATH_FORMAT=Invalid path format +DataPatchFailureCause.TECHNICAL=Technical error \ No newline at end of file diff --git a/sormas-api/src/main/resources/strings.properties b/sormas-api/src/main/resources/strings.properties index d490292afa0..eb93af743a0 100644 --- a/sormas-api/src/main/resources/strings.properties +++ b/sormas-api/src/main/resources/strings.properties @@ -2069,4 +2069,11 @@ Vaccine.vaccinationType.PCV15=PCV15 Vaccine.vaccinationType.PCV13=PCV13 Vaccine.vaccinationType.PCV20=PCV20 exposureStartDate = Exposure start date -exposureEndDate = Exposure end date \ No newline at end of file +exposureEndDate = Exposure end date + +headingSurveyResponseDetails=Response Details +headingSurveyResponseFailures=Validation Issues +headingSurveyResponseCorrectAndReprocess=Correct & Reprocess +messageSurveyResponseAllFieldsApplied=All fields were successfully applied +messageSurveyResponseNotYetProcessed=This response has not been processed yet +messageSurveyResponseReprocessed=The response has been successfully reprocessed diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/common/CronService.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/common/CronService.java index 412f93b3e26..717b00e239c 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/common/CronService.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/common/CronService.java @@ -225,7 +225,7 @@ public void deleteSystemEvents() { } } - @Schedule(hour = "*", minute = "*/30", persistent = false) + @Schedule(hour = "*", minute = "0", second = "0", persistent = false) public void fetchExternalMessages() { if (featureConfigurationFacade.isFeatureEnabled(FeatureType.EXTERNAL_MESSAGES)) { externalMessageFacade.fetchAndSaveExternalMessages(null); @@ -234,18 +234,19 @@ public void fetchExternalMessages() { @Schedule(hour = "*", minute = "*/5", persistent = false) public void fetchSurveyResponses() { - if (!featureConfigurationFacade.isFeatureEnabled(FeatureType.EXTERNAL_MESSAGES)) { + if (!featureConfigurationFacade.isFeatureEnabled(FeatureType.EXTERNAL_MESSAGES) + || featureConfigurationFacade.isPropertyValueTrue(FeatureType.EXTERNAL_MESSAGES, FeatureTypeProperty.SURVEY_FETCH_ENABLED)) { logger.info("External messages are disabled, survey responses will not be fetched"); return; } - logger.error("fetchSurveyResponses is triggered"); - - List externalMessageDtos = externalMessageFacade.saveAndProcessSurveyResponses(); + List surveyExternalMessages = externalMessageFacade.saveAndProcessSurveyResponses(); if (logger.isInfoEnabled()) { - List reportIds = externalMessageDtos.stream().map(ExternalMessageDto::getReportId).collect(Collectors.toList()); - logger.info("Following response ids were saved: [{}]", reportIds); + List reportIds = surveyExternalMessages.stream().map(ExternalMessageDto::getReportId).collect(Collectors.toList()); + if (!reportIds.isEmpty()) { + logger.info("Survey responses with following reportIds were saved: [{}]", reportIds); + } } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java index 57a728fc206..684d8fb05df 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java @@ -114,7 +114,7 @@ UserRight._EXTERNAL_MESSAGE_DOCTOR_DECLARATION_VIEW }) public class ExternalMessageFacadeEjb implements ExternalMessageFacade { - public static final String SURVEY_PERIOD_INTERVAL_HOURS = "SURVEY_PERIOD_INTERVAL_HOURS"; + public static final String SURVEY_PERIOD_INTERVAL_DAYS = "SURVEY_PERIOD_INTERVAL_DAYS"; private static final String SURVEY_AS_EXTERNAL_MESSAGE_ADAPTER_JNDI_KEY = "SURVEY_AS_EXTERNAL_MESSAGE_ADAPTER_JNDI_KEY"; private final Logger logger = LoggerFactory.getLogger(getClass()); @@ -317,10 +317,9 @@ public ExternalMessageDto saveAndProcessLabmessage(@Valid ExternalMessageDto lab public List saveAndProcessSurveyResponses(Date since) { if (since == null) { // TODO: use shorter default range - int hoursRange = - Integer.parseInt(Optional.ofNullable(systemConfigurationValueFacade.getValue(SURVEY_PERIOD_INTERVAL_HOURS)).orElse("50000")); + int dateRange = Integer.parseInt(Optional.ofNullable(systemConfigurationValueFacade.getValue(SURVEY_PERIOD_INTERVAL_DAYS)).orElse("350")); - since = DateHelper.addSeconds(new Date(), -(hoursRange * 3600)); + since = DateHelper.addDays(new Date(), -dateRange); } logger.error("Since date: [{}]", since); @@ -328,6 +327,35 @@ public List saveAndProcessSurveyResponses(Date since) { ExternalMessageAdapterFacade externalLabResultsFacade = getExternalSurveyProviderFacade(); ExternalMessageResult> externalMessagesResult = externalLabResultsFacade.getExternalMessages(since); List surveyResponses = externalMessagesResult.getValue(); + + List reportIds = surveyResponses.stream().map(ExternalMessageDto::getReportId).filter(Objects::nonNull).collect(toList()); + + if (!reportIds.isEmpty()) { + Map> statusUuidTuplesByReportId = + externalMessageService.getUuidsByReportIds(reportIds); + + Set unProcessedMessagesReportIds = statusUuidTuplesByReportId.entrySet() + .stream() + .filter(tuple -> tuple.getValue().getFirst() == ExternalMessageStatus.UNPROCESSED) + .map(Map.Entry::getKey) + .collect(Collectors.toSet()); + + Set alreadyPresentReportIds = statusUuidTuplesByReportId.keySet(); + + surveyResponses.forEach(dto -> { + de.symeda.sormas.api.utils.Tuple tuple = statusUuidTuplesByReportId.get(dto.getReportId()); + if (tuple != null && tuple.getFirst() == ExternalMessageStatus.UNPROCESSED) { + dto.setUuid(tuple.getSecond()); + } + }); + + surveyResponses = surveyResponses.stream() + .filter( + externalMessage -> !alreadyPresentReportIds.contains(externalMessage.getReportId()) + || unProcessedMessagesReportIds.contains(externalMessage.getReportId())) + .collect(toList()); + } + List savedDtos; try { List processingResults = automaticSurveyResponseProcessor.processSurveyResponses(surveyResponses); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageService.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageService.java index 72c9547fba9..767df2baf41 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageService.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageService.java @@ -1,29 +1,18 @@ package de.symeda.sormas.backend.externalmessage; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Collections; -import java.util.List; - -import javax.ejb.EJB; -import javax.ejb.LocalBean; -import javax.ejb.Stateless; -import javax.ejb.TransactionAttribute; -import javax.ejb.TransactionAttributeType; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.From; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Path; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; +import java.util.*; +import java.util.stream.Collectors; + +import javax.ejb.*; +import javax.persistence.Tuple; +import javax.persistence.criteria.*; import org.apache.commons.lang3.StringUtils; import de.symeda.sormas.api.ReferenceDto; import de.symeda.sormas.api.caze.surveillancereport.SurveillanceReportReferenceDto; import de.symeda.sormas.api.externalmessage.ExternalMessageCriteria; +import de.symeda.sormas.api.externalmessage.ExternalMessageStatus; import de.symeda.sormas.api.externalmessage.ExternalMessageType; import de.symeda.sormas.api.sample.SampleReferenceDto; import de.symeda.sormas.api.user.UserRight; @@ -323,4 +312,31 @@ public ExternalMessage getForSurveillanceReport(SurveillanceReportReferenceDto s return em.createQuery(cq).getResultStream().findFirst().orElse(null); } + + /** + * Allows to only update (refresh with latest survey data) for messages that are not yet processed: + * {@link ExternalMessageStatus#UNPROCESSED}. + * + * @param reportIds + * dedup / idempotency key composed of the survey id and response id. + * @return UUIds that must be updated / refreshed. + */ + public Map> getUuidsByReportIds(Collection reportIds) { + if (reportIds == null || reportIds.isEmpty()) { + return Collections.emptyMap(); + } + CriteriaBuilder cb = em.getCriteriaBuilder(); + CriteriaQuery cq = cb.createTupleQuery(); + Root root = cq.from(ExternalMessage.class); + cq.multiselect(root.get(AbstractDomainObject.UUID), root.get(ExternalMessage.REPORT_ID), root.get(ExternalMessage.STATUS)); + cq.where(root.get(ExternalMessage.REPORT_ID).in(reportIds)); + return em.createQuery(cq) + .getResultList() + .stream() + .collect( + Collectors.toMap( + t -> t.get(1, String.class), + t -> new de.symeda.sormas.api.utils.Tuple<>(t.get(2, ExternalMessageStatus.class), t.get(0, String.class)), + (a, b) -> a)); + } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java index b84d367e67d..71674c2b31f 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java @@ -28,7 +28,6 @@ import de.symeda.sormas.api.survey.SurveyTokenDto; import de.symeda.sormas.api.utils.Tuple; import de.symeda.sormas.api.utils.dataprocessing.ProcessingResultStatus; -import de.symeda.sormas.backend.externalmessage.labmessage.ExternalMessageProcessingFacadeEjbLocal; import de.symeda.sormas.backend.survey.SurveyFacadeEjb; import de.symeda.sormas.backend.survey.SurveyTokenFacadeEjb; import de.symeda.sormas.backend.util.CollectorUtils; @@ -47,9 +46,6 @@ public class AutomaticSurveyResponseProcessor { @EJB private SurveyTokenFacadeEjb.SurveyTokenFacadeEjbLocal surveyTokenFacade; - @EJB - private ExternalMessageProcessingFacadeEjbLocal processingFacade; - @Transactional(Transactional.TxType.REQUIRES_NEW) public List processSurveyResponses(List externalMessages) throws InterruptedException, ExecutionException { diff --git a/sormas-backend/src/main/resources/sql/sormas_schema_next.sql b/sormas-backend/src/main/resources/sql/sormas_schema_next.sql index 0af811844bf..04e7f4a00e2 100644 --- a/sormas-backend/src/main/resources/sql/sormas_schema_next.sql +++ b/sormas-backend/src/main/resources/sql/sormas_schema_next.sql @@ -28,5 +28,67 @@ ALTER TABLE externalmessage ALTER TABLE externalmessage ADD COLUMN IF NOT EXISTS additionalDataJson JSONB; + +-- system configuration for surveys + +DO +$$ DECLARE +general_category_id bigint; + +BEGIN +-- Get GENERAL category id +-- General category should always exist +SELECT id +INTO general_category_id +FROM systemconfigurationcategory +WHERE name = 'GENERAL_CATEGORY'; + +INSERT INTO systemconfigurationvalue(config_key, config_value, value_description, category_id, value_optional, value_pattern, + value_encrypt, data_provider, validation_message, changedate, creationdate, id, + uuid) +VALUES ('NG_SUVEY_BASE_URI', null, 'i18n/infoSystemConfigurationValueDescriptionNgSurveyBaseURI', general_category_id, true, + '', false, null, + 'i18n/systemConfigurationValueInvalidValue', now(), now(), nextval('entity_seq'), generate_base32_uuid()); + + +INSERT INTO systemconfigurationvalue(config_key, config_value, value_description, category_id, value_optional, value_pattern, + value_encrypt, data_provider, validation_message, changedate, creationdate, id, + uuid) +VALUES ('NG_SUVEY_CRYPTED_TOKEN', null, 'i18n/infoSystemConfigurationValueDescriptionNgSurveyCryptedToken', general_category_id, true, + '', true, null, + 'i18n/systemConfigurationValueInvalidValue', now(), now(), nextval('entity_seq'), generate_base32_uuid()); + +INSERT INTO systemconfigurationvalue(config_key, config_value, value_description, category_id, value_optional, value_pattern, + value_encrypt, data_provider, validation_message, changedate, creationdate, id, + uuid) +VALUES ('NG_SUVEY_FIELD_PREFIX', '_so', 'i18n/infoSystemConfigurationValueDescriptionNgSurveyFieldPrefix', general_category_id, true, + '', true, null, + 'i18n/systemConfigurationValueInvalidValue', now(), now(), nextval('entity_seq'), generate_base32_uuid()); + +INSERT INTO systemconfigurationvalue(config_key, config_value, value_description, category_id, value_optional, value_pattern, + value_encrypt, data_provider, validation_message, changedate, creationdate, id, + uuid) +VALUES ('SURVEY_AS_EXTERNAL_MESSAGE_ADAPTER_JNDI_KEY', 'java:global/sormas-esante-adapter/SurveyExternalMessageAdapterFacadeEjb', 'i18n/infoSystemConfigurationValueDescriptionSurveyJDNI', general_category_id, true, + '', true, null, + 'i18n/systemConfigurationValueInvalidValue', now(), now(), nextval('entity_seq'), generate_base32_uuid()); + + + +INSERT INTO systemconfigurationvalue(config_key, config_value, value_description, category_id, value_optional, value_pattern, + value_encrypt, data_provider, validation_message, changedate, creationdate, id, + uuid) +VALUES ('SURVEY_PERIOD_INTERVAL_DAYS', '4', 'i18n/infoSystemConfigurationValueDescriptionSurveyPeriodIntervalDays', general_category_id, true, + '', true, null, + 'i18n/systemConfigurationValueInvalidValue', now(), now(), nextval('entity_seq'), generate_base32_uuid()); + + + +END $$ +LANGUAGE plpgsql; + +-- index to avoid full table scan when checking for survey duplicates +CREATE INDEX idx_externalmessage_report_id + ON externalmessage (reportid); + INSERT INTO schema_version (version_number, comment) VALUES (609, '#13832 - External Survey facade'); \ No newline at end of file diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/ExternalMessagesView.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/ExternalMessagesView.java index 1594556b966..7bd81346df9 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/ExternalMessagesView.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/ExternalMessagesView.java @@ -1,10 +1,6 @@ package de.symeda.sormas.ui.externalmessage; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.function.Consumer; import javax.annotation.Nullable; @@ -12,23 +8,18 @@ import com.vaadin.icons.VaadinIcons; import com.vaadin.navigator.ViewChangeListener; import com.vaadin.server.Page; -import com.vaadin.ui.Alignment; -import com.vaadin.ui.Button; -import com.vaadin.ui.HorizontalLayout; -import com.vaadin.ui.Label; -import com.vaadin.ui.MenuBar; -import com.vaadin.ui.Notification; -import com.vaadin.ui.VerticalLayout; -import com.vaadin.ui.Window; +import com.vaadin.ui.*; import com.vaadin.ui.themes.ValoTheme; import com.vaadin.v7.data.Validator; import de.symeda.sormas.api.CountryHelper; import de.symeda.sormas.api.FacadeProvider; import de.symeda.sormas.api.externalmessage.ExternalMessageCriteria; -import de.symeda.sormas.api.externalmessage.ExternalMessageDto; +import de.symeda.sormas.api.externalmessage.ExternalMessageFetchResult; import de.symeda.sormas.api.externalmessage.ExternalMessageStatus; +import de.symeda.sormas.api.externalmessage.NewMessagesState; import de.symeda.sormas.api.feature.FeatureType; +import de.symeda.sormas.api.feature.FeatureTypeProperty; import de.symeda.sormas.api.i18n.Captions; import de.symeda.sormas.api.i18n.I18nProperties; import de.symeda.sormas.api.i18n.Strings; @@ -38,18 +29,13 @@ import de.symeda.sormas.ui.SormasUI; import de.symeda.sormas.ui.UiUtil; import de.symeda.sormas.ui.ViewModelProviders; -import de.symeda.sormas.ui.utils.AbstractView; -import de.symeda.sormas.ui.utils.ButtonHelper; -import de.symeda.sormas.ui.utils.CssStyles; +import de.symeda.sormas.ui.utils.*; import de.symeda.sormas.ui.utils.DateTimeField; -import de.symeda.sormas.ui.utils.FutureDateValidator; -import de.symeda.sormas.ui.utils.LayoutUtil; -import de.symeda.sormas.ui.utils.MenuBarHelper; -import de.symeda.sormas.ui.utils.VaadinUiUtil; -import de.symeda.sormas.ui.utils.ViewConfiguration; public class ExternalMessagesView extends AbstractView { + private static final String SURVEY_FETCH_BUTTON_ENABLED = "SURVEY_FETCH_BUTTON_ENABLED"; + public static final String VIEW_NAME = "messages"; private final ViewConfiguration viewConfiguration; @@ -78,11 +64,21 @@ public ExternalMessagesView() { ViewModelProviders.of(ExternalMessagesView.class).get(ExternalMessageCriteria.class, criteria); } - //if (FacadeProvider.getFeatureConfigurationFacade().isPropertyValueTrue(FeatureType.EXTERNAL_MESSAGES, FeatureTypeProperty.FETCH_MODE)) { - addHeaderComponent(ButtonHelper.createIconButton(Captions.externalMessageFetch, VaadinIcons.REFRESH, e -> { - checkForConcurrentEventsAndFetch(); - }, ValoTheme.BUTTON_PRIMARY)); - //} + if (FacadeProvider.getFeatureConfigurationFacade().isPropertyValueTrue(FeatureType.EXTERNAL_MESSAGES, FeatureTypeProperty.FETCH_MODE)) { + addHeaderComponent(ButtonHelper.createIconButton(Captions.externalMessageFetch, VaadinIcons.REFRESH, e -> { + checkForConcurrentEventsAndFetch(false); + }, ValoTheme.BUTTON_PRIMARY)); + } + + if (FacadeProvider.getFeatureConfigurationFacade() + .isPropertyValueTrue(FeatureType.EXTERNAL_MESSAGES, FeatureTypeProperty.SURVEY_FETCH_ENABLED)) { + addHeaderComponent( + ButtonHelper.createIconButton( + Captions.surveyFetch, + VaadinIcons.REFRESH, + e -> checkForConcurrentEventsAndFetch(true), + ValoTheme.BUTTON_PRIMARY)); + } if (isBulkEditAllowed()) { btnEnterBulkEditMode = ButtonHelper.createIconButton(Captions.actionEnterBulkEditMode, VaadinIcons.CHECK_SQUARE_O, e -> { @@ -264,7 +260,7 @@ private Button createAndAddStatusButton(@Nullable ExternalMessageStatus status, return button; } - private void checkForConcurrentEventsAndFetch() { + private void checkForConcurrentEventsAndFetch(boolean surveyMode) { boolean fetchAlreadyStarted = FacadeProvider.getSystemEventFacade().existsStartedEvent(SystemEventType.FETCH_EXTERNAL_MESSAGES); if (fetchAlreadyStarted) { VaadinUiUtil.showConfirmationPopup( @@ -275,42 +271,49 @@ private void checkForConcurrentEventsAndFetch() { 480, confirmed -> { if (confirmed) { - askForSinceDateAndFetch(); + askForSinceDateAndFetch(surveyMode); } }); } else { - askForSinceDateAndFetch(); + askForSinceDateAndFetch(surveyMode); } } - private void askForSinceDateAndFetch() { + private void askForSinceDateAndFetch(boolean surveyMode) { boolean atLeastOneFetchExecuted = FacadeProvider.getSyncFacade().hasAtLeastOneSuccessfullSyncOf(SystemEventType.FETCH_EXTERNAL_MESSAGES); if (atLeastOneFetchExecuted) { - fetchExternalMessages(null); + if (surveyMode) { + fetchSurveyMessages(null); + } else { + fetchExternalMessages(null); + } } else { - showSinceDateSelectionWindow(this::fetchExternalMessages); + showSinceDateSelectionWindow(since -> { + if (surveyMode) { + fetchSurveyMessages(since); + } else { + fetchExternalMessages(since); + } + }); } } private void fetchExternalMessages(Date since) { -// ExternalMessageFetchResult fetchResult = FacadeProvider.getExternalMessageFacade().saveAndProcessSurveyResponses(); -// if (!fetchResult.isSuccess()) { -// VaadinUiUtil.showWarningPopup(fetchResult.getError()); -// } else if (NewMessagesState.NO_NEW_MESSAGES.equals(fetchResult.getNewMessagesState())) { -// VaadinUiUtil.showWarningPopup(I18nProperties.getCaption(Captions.externalMessageNoNewMessages)); -// } else { -// grid.reload(); -// } - - List fetchResult = FacadeProvider.getExternalMessageFacade().saveAndProcessSurveyResponses(); - if (!fetchResult.isEmpty()) { - VaadinUiUtil.showWarningPopup(String.format("New messages: [%s]", fetchResult)); - grid.reload(); + ExternalMessageFetchResult fetchResult = FacadeProvider.getExternalMessageFacade().fetchAndSaveExternalMessages(since); + if (!fetchResult.isSuccess()) { + VaadinUiUtil.showWarningPopup(fetchResult.getError()); + } else if (NewMessagesState.NO_NEW_MESSAGES.equals(fetchResult.getNewMessagesState())) { + VaadinUiUtil.showWarningPopup(I18nProperties.getCaption(Captions.externalMessageNoNewMessages)); } else { grid.reload(); } } + private void fetchSurveyMessages(Date since) { + FacadeProvider.getExternalMessageFacade().saveAndProcessSurveyResponses(since); + grid.reload(); + } + private void showSinceDateSelectionWindow(Consumer dateConsumer) { VerticalLayout verticalLayout = new VerticalLayout(); Label label = new Label(I18nProperties.getString(Strings.confirmationSinceExternalMessages)); diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseDetailsWindow.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseDetailsWindow.java index 6b3fa433dc3..b8a10f1d37c 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseDetailsWindow.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseDetailsWindow.java @@ -146,6 +146,7 @@ public SurveyResponseDetailsWindow(ExternalMessageDto externalMessage, Runnable Link caseLink = new Link( I18nProperties.getCaption(Captions.surveyResponseCaseLink) + ": " + result.getCaseUuid(), new ExternalResource("#!" + CaseDataView.VIEW_NAME + "/" + result.getCaseUuid())); + caseLink.setTargetName("_blank"); layout.addComponent(caseLink); } From 1b86a1c020295362c0111229e0bff0a52384196b Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Thu, 30 Apr 2026 15:07:30 +0200 Subject: [PATCH 086/134] translation files --- .../de/symeda/sormas/api/i18n/Captions.java | 76 ++++++++----------- .../de/symeda/sormas/api/i18n/Strings.java | 18 ++--- 2 files changed, 40 insertions(+), 54 deletions(-) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java index 02bf0a6d08e..17b610f6929 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java @@ -60,6 +60,7 @@ public interface Captions { String actionConfirmAction = "actionConfirmAction"; String actionConfirmFilters = "actionConfirmFilters"; String actionContinue = "actionContinue"; + String actionCorrectAndReprocess = "actionCorrectAndReprocess"; String actionCreate = "actionCreate"; String actionCreatingLabel = "actionCreatingLabel"; String actionDearchiveCoreEntity = "actionDearchiveCoreEntity"; @@ -120,6 +121,7 @@ public interface Captions { String actionSaveAndOpenContact = "actionSaveAndOpenContact"; String actionSaveAndOpenEventParticipant = "actionSaveAndOpenEventParticipant"; String actionSaveAndOpenHospitalization = "actionSaveAndOpenHospitalization"; + String actionSaveAndReprocess = "actionSaveAndReprocess"; String actionSaveChanges = "actionSaveChanges"; String actionSearch = "actionSearch"; String actionSelectAll = "actionSelectAll"; @@ -336,11 +338,9 @@ public interface Captions { String AefiInvestigation_aefiClassificationDetails = "AefiInvestigation.aefiClassificationDetails"; String AefiInvestigation_aefiClassificationSubType = "AefiInvestigation.aefiClassificationSubType"; String AefiInvestigation_allCasesInClusterReceivedVaccineFromSameVial = "AefiInvestigation.allCasesInClusterReceivedVaccineFromSameVial"; - String AefiInvestigation_allCasesInClusterReceivedVaccineFromSameVialDetails = - "AefiInvestigation.allCasesInClusterReceivedVaccineFromSameVialDetails"; + String AefiInvestigation_allCasesInClusterReceivedVaccineFromSameVialDetails = "AefiInvestigation.allCasesInClusterReceivedVaccineFromSameVialDetails"; String AefiInvestigation_anyOtherItemInRefrigerator = "AefiInvestigation.anyOtherItemInRefrigerator"; - String AefiInvestigation_anyStorageTemperatureDeviationOutsideTwoToEightDegrees = - "AefiInvestigation.anyStorageTemperatureDeviationOutsideTwoToEightDegrees"; + String AefiInvestigation_anyStorageTemperatureDeviationOutsideTwoToEightDegrees = "AefiInvestigation.anyStorageTemperatureDeviationOutsideTwoToEightDegrees"; String AefiInvestigation_autopsyDate = "AefiInvestigation.autopsyDate"; String AefiInvestigation_autopsyDone = "AefiInvestigation.autopsyDone"; String AefiInvestigation_autopsyPlannedDateTime = "AefiInvestigation.autopsyPlannedDateTime"; @@ -376,8 +376,7 @@ public interface Captions { String AefiInvestigation_errorPrescribingVaccine = "AefiInvestigation.errorPrescribingVaccine"; String AefiInvestigation_errorPrescribingVaccineDetails = "AefiInvestigation.errorPrescribingVaccineDetails"; String AefiInvestigation_eventIsAStressResponseRelatedToImmunization = "AefiInvestigation.eventIsAStressResponseRelatedToImmunization"; - String AefiInvestigation_eventIsAStressResponseRelatedToImmunizationDetails = - "AefiInvestigation.eventIsAStressResponseRelatedToImmunizationDetails"; + String AefiInvestigation_eventIsAStressResponseRelatedToImmunizationDetails = "AefiInvestigation.eventIsAStressResponseRelatedToImmunizationDetails"; String AefiInvestigation_externalId = "AefiInvestigation.externalId"; String AefiInvestigation_familyHistoryOfDiseaseOrAllergy = "AefiInvestigation.familyHistoryOfDiseaseOrAllergy"; String AefiInvestigation_familyHistoryOfDiseaseOrAllergyDetails = "AefiInvestigation.familyHistoryOfDiseaseOrAllergyDetails"; @@ -385,10 +384,8 @@ public interface Captions { String AefiInvestigation_formCompletionDate = "AefiInvestigation.formCompletionDate"; String AefiInvestigation_historyOfAllergyToVaccineDrugOrFood = "AefiInvestigation.historyOfAllergyToVaccineDrugOrFood"; String AefiInvestigation_historyOfAllergyToVaccineDrugOrFoodDetails = "AefiInvestigation.historyOfAllergyToVaccineDrugOrFoodDetails"; - String AefiInvestigation_historyOfHospitalizationInLastThirtyDaysWithCause = - "AefiInvestigation.historyOfHospitalizationInLastThirtyDaysWithCause"; - String AefiInvestigation_historyOfHospitalizationInLastThirtyDaysWithCauseDetails = - "AefiInvestigation.historyOfHospitalizationInLastThirtyDaysWithCauseDetails"; + String AefiInvestigation_historyOfHospitalizationInLastThirtyDaysWithCause = "AefiInvestigation.historyOfHospitalizationInLastThirtyDaysWithCause"; + String AefiInvestigation_historyOfHospitalizationInLastThirtyDaysWithCauseDetails = "AefiInvestigation.historyOfHospitalizationInLastThirtyDaysWithCauseDetails"; String AefiInvestigation_hospitalizationDate = "AefiInvestigation.hospitalizationDate"; String AefiInvestigation_injectionTechniqueAdditionalDetails = "AefiInvestigation.injectionTechniqueAdditionalDetails"; String AefiInvestigation_investigationCaseId = "AefiInvestigation.investigationCaseId"; @@ -400,17 +397,13 @@ public interface Captions { String AefiInvestigation_keySymptomDateTime = "AefiInvestigation.keySymptomDateTime"; String AefiInvestigation_lastTrainingReceivedByVaccinatorDate = "AefiInvestigation.lastTrainingReceivedByVaccinatorDate"; String AefiInvestigation_nonTouchTechniqueFollowed = "AefiInvestigation.nonTouchTechniqueFollowed"; - String AefiInvestigation_numberImmunizedConcernedVaccineSameBatchNumberLocationDetails = - "AefiInvestigation.numberImmunizedConcernedVaccineSameBatchNumberLocationDetails"; - String AefiInvestigation_numberImmunizedConcernedVaccineSameBatchNumberOtherLocations = - "AefiInvestigation.numberImmunizedConcernedVaccineSameBatchNumberOtherLocations"; + String AefiInvestigation_numberImmunizedConcernedVaccineSameBatchNumberLocationDetails = "AefiInvestigation.numberImmunizedConcernedVaccineSameBatchNumberLocationDetails"; + String AefiInvestigation_numberImmunizedConcernedVaccineSameBatchNumberOtherLocations = "AefiInvestigation.numberImmunizedConcernedVaccineSameBatchNumberOtherLocations"; String AefiInvestigation_numberImmunizedFromConcernedVaccineVial = "AefiInvestigation.numberImmunizedFromConcernedVaccineVial"; String AefiInvestigation_numberImmunizedWithConcernedVaccineInSameSession = "AefiInvestigation.numberImmunizedWithConcernedVaccineInSameSession"; - String AefiInvestigation_numberOfAefiReportedFromVaccineDistributionCenterLastThirtyDays = - "AefiInvestigation.numberOfAefiReportedFromVaccineDistributionCenterLastThirtyDays"; + String AefiInvestigation_numberOfAefiReportedFromVaccineDistributionCenterLastThirtyDays = "AefiInvestigation.numberOfAefiReportedFromVaccineDistributionCenterLastThirtyDays"; String AefiInvestigation_numberOfCasesDetectedInCluster = "AefiInvestigation.numberOfCasesDetectedInCluster"; - String AefiInvestigation_numberOfSimilarEventsReportedSamePeriodAndLocality = - "AefiInvestigation.numberOfSimilarEventsReportedSamePeriodAndLocality"; + String AefiInvestigation_numberOfSimilarEventsReportedSamePeriodAndLocality = "AefiInvestigation.numberOfSimilarEventsReportedSamePeriodAndLocality"; String AefiInvestigation_numberOfThoseAffectedNotVaccinated = "AefiInvestigation.numberOfThoseAffectedNotVaccinated"; String AefiInvestigation_numberOfThoseAffectedVaccinated = "AefiInvestigation.numberOfThoseAffectedVaccinated"; String AefiInvestigation_numberOfThoseAffectedVaccinatedUnknown = "AefiInvestigation.numberOfThoseAffectedVaccinatedUnknown"; @@ -431,8 +424,7 @@ public interface Captions { String AefiInvestigation_placeOfVaccination = "AefiInvestigation.placeOfVaccination"; String AefiInvestigation_placeOfVaccinationDetails = "AefiInvestigation.placeOfVaccinationDetails"; String AefiInvestigation_preExistingIllnessThirtyDaysOrCongenitalDisorder = "AefiInvestigation.preExistingIllnessThirtyDaysOrCongenitalDisorder"; - String AefiInvestigation_preExistingIllnessThirtyDaysOrCongenitalDisorderDetails = - "AefiInvestigation.preExistingIllnessThirtyDaysOrCongenitalDisorderDetails"; + String AefiInvestigation_preExistingIllnessThirtyDaysOrCongenitalDisorderDetails = "AefiInvestigation.preExistingIllnessThirtyDaysOrCongenitalDisorderDetails"; String AefiInvestigation_provisionalOrFinalDiagnosis = "AefiInvestigation.provisionalOrFinalDiagnosis"; String AefiInvestigation_reconstitutionAdditionalDetails = "AefiInvestigation.reconstitutionAdditionalDetails"; String AefiInvestigation_reportDate = "AefiInvestigation.reportDate"; @@ -452,17 +444,14 @@ public interface Captions { String AefiInvestigation_responsibleRegion = "AefiInvestigation.responsibleRegion"; String AefiInvestigation_sameReconstitutionSyringeForEachVaccination = "AefiInvestigation.sameReconstitutionSyringeForEachVaccination"; String AefiInvestigation_sameReconstitutionSyringeForEachVaccineVial = "AefiInvestigation.sameReconstitutionSyringeForEachVaccineVial"; - String AefiInvestigation_sameReconstitutionSyringeUsedForMultipleVialsOfSameVaccine = - "AefiInvestigation.sameReconstitutionSyringeUsedForMultipleVialsOfSameVaccine"; - String AefiInvestigation_sameReconstitutionSyringeUsedForReconstitutingDifferentVaccines = - "AefiInvestigation.sameReconstitutionSyringeUsedForReconstitutingDifferentVaccines"; + String AefiInvestigation_sameReconstitutionSyringeUsedForMultipleVialsOfSameVaccine = "AefiInvestigation.sameReconstitutionSyringeUsedForMultipleVialsOfSameVaccine"; + String AefiInvestigation_sameReconstitutionSyringeUsedForReconstitutingDifferentVaccines = "AefiInvestigation.sameReconstitutionSyringeUsedForReconstitutingDifferentVaccines"; String AefiInvestigation_seriousAefiInfoSource = "AefiInvestigation.seriousAefiInfoSource"; String AefiInvestigation_seriousAefiInfoSourceDetails = "AefiInvestigation.seriousAefiInfoSourceDetails"; String AefiInvestigation_seriousAefiVerbalAutopsyInfoSourceDetails = "AefiInvestigation.seriousAefiVerbalAutopsyInfoSourceDetails"; String AefiInvestigation_signsAndSymptomsFromTimeOfVaccination = "AefiInvestigation.signsAndSymptomsFromTimeOfVaccination"; String AefiInvestigation_similarEventsReportedSamePeriodAndLocality = "AefiInvestigation.similarEventsReportedSamePeriodAndLocality"; - String AefiInvestigation_similarEventsReportedSamePeriodAndLocalityDetails = - "AefiInvestigation.similarEventsReportedSamePeriodAndLocalityDetails"; + String AefiInvestigation_similarEventsReportedSamePeriodAndLocalityDetails = "AefiInvestigation.similarEventsReportedSamePeriodAndLocalityDetails"; String AefiInvestigation_statusOnDateOfInvestigation = "AefiInvestigation.statusOnDateOfInvestigation"; String AefiInvestigation_storageTemperatureMonitoringAdditionalDetails = "AefiInvestigation.storageTemperatureMonitoringAdditionalDetails"; String AefiInvestigation_syringesUsedAdditionalDetails = "AefiInvestigation.syringesUsedAdditionalDetails"; @@ -481,8 +470,7 @@ public interface Captions { String AefiInvestigation_vaccinationFacilityDetails = "AefiInvestigation.vaccinationFacilityDetails"; String AefiInvestigation_vaccineAdministeredIncorrectly = "AefiInvestigation.vaccineAdministeredIncorrectly"; String AefiInvestigation_vaccineAdministeredIncorrectlyDetails = "AefiInvestigation.vaccineAdministeredIncorrectlyDetails"; - String AefiInvestigation_vaccineCarrierReturnedFromSiteOnSameDateAsVaccination = - "AefiInvestigation.vaccineCarrierReturnedFromSiteOnSameDateAsVaccination"; + String AefiInvestigation_vaccineCarrierReturnedFromSiteOnSameDateAsVaccination = "AefiInvestigation.vaccineCarrierReturnedFromSiteOnSameDateAsVaccination"; String AefiInvestigation_vaccineCarrierSentToSiteOnSameDateAsVaccination = "AefiInvestigation.vaccineCarrierSentToSiteOnSameDateAsVaccination"; String AefiInvestigation_vaccineCarrierType = "AefiInvestigation.vaccineCarrierType"; String AefiInvestigation_vaccineCarrierTypeDetails = "AefiInvestigation.vaccineCarrierTypeDetails"; @@ -698,6 +686,7 @@ public interface Captions { String CaseData_department = "CaseData.department"; String CaseData_differentPlaceOfStayJurisdiction = "CaseData.differentPlaceOfStayJurisdiction"; String CaseData_differentPointOfEntryJurisdiction = "CaseData.differentPointOfEntryJurisdiction"; + String CaseData_disease = "CaseData.disease"; String CaseData_diseaseDetails = "CaseData.diseaseDetails"; String CaseData_diseaseVariant = "CaseData.diseaseVariant"; String CaseData_district = "CaseData.district"; @@ -2029,22 +2018,6 @@ public interface Captions { String externalMessageNoDisease = "externalMessageNoDisease"; String externalMessageNoNewMessages = "externalMessageNoNewMessages"; String externalMessageProcess = "externalMessageProcess"; - String surveyResponseField = "surveyResponseField"; - String surveyResponseSubmittedValue = "surveyResponseSubmittedValue"; - String surveyResponseCurrentCaseValue = "surveyResponseCurrentCaseValue"; - String surveyResponseFailureCause = "surveyResponseFailureCause"; - String surveyResponseDescription = "surveyResponseDescription"; - String surveyResponseCaseLink = "surveyResponseCaseLink"; - String surveyResponseApplied = "surveyResponseApplied"; - String surveyResponseMetadata = "surveyResponseMetadata"; - String surveyResponsePatchDictionary = "surveyResponsePatchDictionary"; - String surveyResponseExcludedFieldsDictionary = "surveyResponseExcludedFieldsDictionary"; - String surveyResponseProcessingResult = "surveyResponseProcessingResult"; - String surveyResponseValidFields = "surveyResponseValidFields"; - String surveyResponseIgnoreField = "surveyResponseIgnoreField"; - String surveyResponseKeyName = "surveyResponseKeyName"; - String actionCorrectAndReprocess = "actionCorrectAndReprocess"; - String actionSaveAndReprocess = "actionSaveAndReprocess"; String externalMessageRelatedEntriesFound = "externalMessageRelatedEntriesFound"; String externalMessagesList = "externalMessagesList"; String externalMessageValueNotSpecified = "externalMessageValueNotSpecified"; @@ -2956,9 +2929,24 @@ public interface Captions { String surveillanceReportNoReportsForCase = "surveillanceReportNoReportsForCase"; String SurveyDocumentOptions_recipientEmail = "SurveyDocumentOptions.recipientEmail"; String SurveyDocumentOptions_survey = "SurveyDocumentOptions.survey"; + String surveyFetch = "surveyFetch"; String surveyGenerate = "surveyGenerate"; String surveyNew = "surveyNew"; String surveyNewSurvey = "surveyNewSurvey"; + String surveyResponseApplied = "surveyResponseApplied"; + String surveyResponseCaseLink = "surveyResponseCaseLink"; + String surveyResponseCurrentCaseValue = "surveyResponseCurrentCaseValue"; + String surveyResponseDescription = "surveyResponseDescription"; + String surveyResponseExcludedFieldsDictionary = "surveyResponseExcludedFieldsDictionary"; + String surveyResponseFailureCause = "surveyResponseFailureCause"; + String surveyResponseField = "surveyResponseField"; + String surveyResponseIgnoreField = "surveyResponseIgnoreField"; + String surveyResponseKeyName = "surveyResponseKeyName"; + String surveyResponseMetadata = "surveyResponseMetadata"; + String surveyResponsePatchDictionary = "surveyResponsePatchDictionary"; + String surveyResponseProcessingResult = "surveyResponseProcessingResult"; + String surveyResponseSubmittedValue = "surveyResponseSubmittedValue"; + String surveyResponseValidFields = "surveyResponseValidFields"; String surveySend = "surveySend"; String surveySurveyList = "surveySurveyList"; String surveySurveyTokenList = "surveySurveyTokenList"; diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java index 15e4ce7d871..e86736f019f 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java @@ -869,12 +869,6 @@ public interface Strings { String headingShareRequestEventParticipants = "headingShareRequestEventParticipants"; String headingShareRequestEvents = "headingShareRequestEvents"; String headingShowExternalMessage = "headingShowExternalMessage"; - String headingSurveyResponseDetails = "headingSurveyResponseDetails"; - String headingSurveyResponseFailures = "headingSurveyResponseFailures"; - String headingSurveyResponseCorrectAndReprocess = "headingSurveyResponseCorrectAndReprocess"; - String messageSurveyResponseAllFieldsApplied = "messageSurveyResponseAllFieldsApplied"; - String messageSurveyResponseNotYetProcessed = "messageSurveyResponseNotYetProcessed"; - String messageSurveyResponseReprocessed = "messageSurveyResponseReprocessed"; String headingSignsAndSymptoms = "headingSignsAndSymptoms"; String headingSimilarImmunization = "headingSimilarImmunization"; String headingSimilarPerson = "headingSimilarPerson"; @@ -906,6 +900,9 @@ public interface Strings { String headingStoppedFollowUp = "headingStoppedFollowUp"; String headingSurveillanceReports = "headingSurveillanceReports"; String headingSurveyGenerateDocument = "headingSurveyGenerateDocument"; + String headingSurveyResponseCorrectAndReprocess = "headingSurveyResponseCorrectAndReprocess"; + String headingSurveyResponseDetails = "headingSurveyResponseDetails"; + String headingSurveyResponseFailures = "headingSurveyResponseFailures"; String headingSurveySendDocument = "headingSurveySendDocument"; String headingSurveySideComponent = "headingSurveySideComponent"; String headingSymptomJournalAccountCreation = "headingSymptomJournalAccountCreation"; @@ -1140,8 +1137,7 @@ public interface Strings { String infoPickOrCreatePathogenTest = "infoPickOrCreatePathogenTest"; String infoPickOrCreateSample = "infoPickOrCreateSample"; String infoPickOrCreateSuperordinateEventForEvent = "infoPickOrCreateSuperordinateEventForEvent"; - String infoPickorMergeEventParticipantDuplicateEventParticipantByPersonByEvent = - "infoPickorMergeEventParticipantDuplicateEventParticipantByPersonByEvent"; + String infoPickorMergeEventParticipantDuplicateEventParticipantByPersonByEvent = "infoPickorMergeEventParticipantDuplicateEventParticipantByPersonByEvent"; String infoPlaceOfStayInHospital = "infoPlaceOfStayInHospital"; String infoPopulationCollectionDate = "infoPopulationCollectionDate"; String infoPopulationDataView = "infoPopulationDataView"; @@ -1184,8 +1180,7 @@ public interface Strings { String infoSystemConfigurationValueDescriptionSmsAuthKey = "infoSystemConfigurationValueDescriptionSmsAuthKey"; String infoSystemConfigurationValueDescriptionSmsAuthSecret = "infoSystemConfigurationValueDescriptionSmsAuthSecret"; String infoSystemConfigurationValueDescriptionSmsSenderName = "infoSystemConfigurationValueDescriptionSmsSenderName"; - String infoSystemConfigurationValueDescriptionUseDeterminedVaccinationStatus = - "infoSystemConfigurationValueDescriptionUseDeterminedVaccinationStatus"; + String infoSystemConfigurationValueDescriptionUseDeterminedVaccinationStatus = "infoSystemConfigurationValueDescriptionUseDeterminedVaccinationStatus"; String infoTasksWithMultipleJurisdictionsSelected = "infoTasksWithMultipleJurisdictionsSelected"; String infoUploadDocumentTemplate = "infoUploadDocumentTemplate"; String infoUsageOfEditableCampaignGrids = "infoUsageOfEditableCampaignGrids"; @@ -1656,6 +1651,9 @@ public interface Strings { String messageSurveyNoDocumentTemplate = "messageSurveyNoDocumentTemplate"; String messageSurveyNoEmailTemplate = "messageSurveyNoEmailTemplate"; String messageSurveyNoTokens = "messageSurveyNoTokens"; + String messageSurveyResponseAllFieldsApplied = "messageSurveyResponseAllFieldsApplied"; + String messageSurveyResponseNotYetProcessed = "messageSurveyResponseNotYetProcessed"; + String messageSurveyResponseReprocessed = "messageSurveyResponseReprocessed"; String messageSurveySaved = "messageSurveySaved"; String messageSurveyTokenDelete = "messageSurveyTokenDelete"; String messageSurveyTokenSaved = "messageSurveyTokenSaved"; From ca8842a971c449ff4aa8b80d7447b3c90fda6c21 Mon Sep 17 00:00:00 2001 From: = <=> Date: Thu, 30 Apr 2026 18:07:29 +0200 Subject: [PATCH 087/134] fixing unit tests --- .../externalmessage/ExternalMessageDto.java | 173 ------------------ .../ExternalMessageFacade.java | 4 +- .../DisplayablePartialRetrievalResponse.java | 3 + .../api/survey/alias/PathAliasFacade.java | 2 +- .../ExternalMessageFacadeEjb.java | 10 +- .../patch/alias/PathAliasFacadeEjb.java | 2 +- .../SpecificFieldValueRetriever.java | 36 ++++ ...mpl.java => EnumToDisplayValueMapper.java} | 2 +- .../symeda/sormas/backend/survey/Survey.java | 2 +- .../SystemConfigurationValueEjb.java | 4 +- .../resources/META-INF/glassfish-ejb-jar.xml | 16 ++ .../main/resources/sql/sormas_schema_next.sql | 2 +- .../mapping/ValueMapperRegistryTest.java | 5 +- .../PartialRetrieverImplTest.java | 27 +++ .../backend/util/CollectorUtilsTest.java | 23 ++- .../sormas/patch/DataPatcherImplTest.java | 5 + .../src/main/webapp/WEB-INF/glassfish-web.xml | 16 ++ sormas-rest/src/main/webapp/WEB-INF/web.xml | 12 ++ .../ExternalMessageController.java | 2 +- .../SurveyResponseDetailsWindow.java | 4 +- .../SurveyResponseFailureEditor.java | 4 +- .../SurveyResponseFailurePanel.java | 2 +- .../src/main/webapp/WEB-INF/glassfish-web.xml | 19 +- sormas-ui/src/main/webapp/WEB-INF/web.xml | 16 ++ 24 files changed, 181 insertions(+), 210 deletions(-) create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/SpecificFieldValueRetriever.java rename sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/{EnumToDisplayValueMapperImpl.java => EnumToDisplayValueMapper.java} (88%) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageDto.java index 24e48ed49ad..3e7fe6bdb06 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageDto.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageDto.java @@ -976,177 +976,4 @@ public ExternalMessageDto setSurveyResponseData(ExternalSurveyResponseData surve this.surveyResponseData = surveyResponseData; return this; } - - @Override - public boolean equals(Object o) { - if (o == null || getClass() != o.getClass()) - return false; - if (!super.equals(o)) - return false; - ExternalMessageDto that = (ExternalMessageDto) o; - return automaticProcessingPossible == that.automaticProcessingPossible - && type == that.type - && disease == that.disease - && Objects.equals(diseaseVariant, that.diseaseVariant) - && Objects.equals(diseaseVariantDetails, that.diseaseVariantDetails) - && Objects.equals(messageDateTime, that.messageDateTime) - && caseClassification == that.caseClassification - && Objects.equals(caseReportDate, that.caseReportDate) - && Objects.equals(caseSymptoms, that.caseSymptoms) - && Objects.equals(reporterName, that.reporterName) - && Objects.equals(reporterExternalIds, that.reporterExternalIds) - && Objects.equals(reporterPostalCode, that.reporterPostalCode) - && Objects.equals(reporterCity, that.reporterCity) - && Objects.equals(personFirstName, that.personFirstName) - && Objects.equals(personLastName, that.personLastName) - && Objects.equals(personExternalId, that.personExternalId) - && Objects.equals(personNationalHealthId, that.personNationalHealthId) - && personSex == that.personSex - && personPresentCondition == that.personPresentCondition - && Objects.equals(personBirthDateDD, that.personBirthDateDD) - && Objects.equals(personBirthDateMM, that.personBirthDateMM) - && Objects.equals(personBirthDateYYYY, that.personBirthDateYYYY) - && Objects.equals(personPostalCode, that.personPostalCode) - && Objects.equals(personCity, that.personCity) - && Objects.equals(personStreet, that.personStreet) - && Objects.equals(personHouseNumber, that.personHouseNumber) - && Objects.equals(personCountry, that.personCountry) - && Objects.equals(personFacility, that.personFacility) - && Objects.equals(personPhone, that.personPhone) - && personPhoneNumberType == that.personPhoneNumberType - && Objects.equals(personEmail, that.personEmail) - && Objects.equals(personGuardianFirstName, that.personGuardianFirstName) - && Objects.equals(personGuardianLastName, that.personGuardianLastName) - && Objects.equals(personGuardianRelationship, that.personGuardianRelationship) - && Objects.equals(personGuardianPhone, that.personGuardianPhone) - && Objects.equals(personGuardianEmail, that.personGuardianEmail) - && Objects.equals(personOccupation, that.personOccupation) - && treatmentStarted == that.treatmentStarted - && Objects.equals(treatmentNotApplicable, that.treatmentNotApplicable) - && Objects.equals(treatmentStartedDate, that.treatmentStartedDate) - && Objects.equals(diagnosticDate, that.diagnosticDate) - && Objects.equals(deceasedDate, that.deceasedDate) - && Objects.equals(sampleReports, that.sampleReports) - && Objects.equals(surveillanceReport, that.surveillanceReport) - && Objects.equals(externalMessageDetails, that.externalMessageDetails) - && Objects.equals(caseComments, that.caseComments) - && Objects.equals(reportId, that.reportId) - && Objects.equals(reportMessageId, that.reportMessageId) - && status == that.status - && Objects.equals(assignee, that.assignee) - && Objects.equals(reportingUser, that.reportingUser) - && Objects.equals(personAdditionalDetails, that.personAdditionalDetails) - && vaccinationStatus == that.vaccinationStatus - && admittedToHealthFacility == that.admittedToHealthFacility - && Objects.equals(hospitalizationFacilityName, that.hospitalizationFacilityName) - && Objects.equals(hospitalizationFacilityExternalId, that.hospitalizationFacilityExternalId) - && Objects.equals(hospitalizationFacilityDepartment, that.hospitalizationFacilityDepartment) - && Objects.equals(hospitalizationAdmissionDate, that.hospitalizationAdmissionDate) - && Objects.equals(hospitalizationDischargeDate, that.hospitalizationDischargeDate) - && Objects.equals(notifierFirstName, that.notifierFirstName) - && Objects.equals(notifierLastName, that.notifierLastName) - && Objects.equals(notifierRegistrationNumber, that.notifierRegistrationNumber) - && Objects.equals(notifierAddress, that.notifierAddress) - && Objects.equals(notifierEmail, that.notifierEmail) - && Objects.equals(notifierPhone, that.notifierPhone) - && Objects.equals(activitiesAsCase, that.activitiesAsCase) - && Objects.equals(exposures, that.exposures) - && radiographyCompatibility == that.radiographyCompatibility - && Objects.equals(otherDiagnosticCriteria, that.otherDiagnosticCriteria) - && tuberculosis == that.tuberculosis - && hiv == that.hiv - && hivArt == that.hivArt - && Objects.equals(tuberculosisInfectionYear, that.tuberculosisInfectionYear) - && previousTuberculosisTreatment == that.previousTuberculosisTreatment - && complianceWithTreatment == that.complianceWithTreatment - && Objects.equals(tuberculosisDirectlyObservedTreatment, that.tuberculosisDirectlyObservedTreatment) - && Objects.equals(tuberculosisMdrXdrTuberculosis, that.tuberculosisMdrXdrTuberculosis) - && Objects.equals(tuberculosisBeijingLineage, that.tuberculosisBeijingLineage) - && Objects.equals(surveyResponseData, that.surveyResponseData); - } - - @Override - public int hashCode() { - return Objects.hash( - super.hashCode(), - type, - disease, - diseaseVariant, - diseaseVariantDetails, - messageDateTime, - caseClassification, - caseReportDate, - caseSymptoms, - reporterName, - reporterExternalIds, - reporterPostalCode, - reporterCity, - personFirstName, - personLastName, - personExternalId, - personNationalHealthId, - personSex, - personPresentCondition, - personBirthDateDD, - personBirthDateMM, - personBirthDateYYYY, - personPostalCode, - personCity, - personStreet, - personHouseNumber, - personCountry, - personFacility, - personPhone, - personPhoneNumberType, - personEmail, - personGuardianFirstName, - personGuardianLastName, - personGuardianRelationship, - personGuardianPhone, - personGuardianEmail, - personOccupation, - treatmentStarted, - treatmentNotApplicable, - treatmentStartedDate, - diagnosticDate, - deceasedDate, - sampleReports, - surveillanceReport, - externalMessageDetails, - caseComments, - reportId, - reportMessageId, - status, - assignee, - reportingUser, - automaticProcessingPossible, - personAdditionalDetails, - vaccinationStatus, - admittedToHealthFacility, - hospitalizationFacilityName, - hospitalizationFacilityExternalId, - hospitalizationFacilityDepartment, - hospitalizationAdmissionDate, - hospitalizationDischargeDate, - notifierFirstName, - notifierLastName, - notifierRegistrationNumber, - notifierAddress, - notifierEmail, - notifierPhone, - activitiesAsCase, - exposures, - radiographyCompatibility, - otherDiagnosticCriteria, - tuberculosis, - hiv, - hivArt, - tuberculosisInfectionYear, - previousTuberculosisTreatment, - complianceWithTreatment, - tuberculosisDirectlyObservedTreatment, - tuberculosisMdrXdrTuberculosis, - tuberculosisBeijingLineage, - surveyResponseData); - } } diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageFacade.java b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageFacade.java index 2c02dcdb55e..af1315137f1 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageFacade.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageFacade.java @@ -96,7 +96,7 @@ default List saveAndProcessSurveyResponses() { * the corrected field path -> value map to apply * @return updated ExternalMessageDto after reprocessing */ - ExternalMessageDto reprocessSurveyResponse(String uuid, Map correctedDictionary); + ExternalMessageDto overwriteSurveyResponse(String uuid, Map correctedDictionary); /** * Retrieves display-ready field information (translated names and current case values) for all fields @@ -106,5 +106,5 @@ default List saveAndProcessSurveyResponses() { * UUID of the external message (must be of type SURVEY_RESPONSE with a processed result) * @return displayable field info keyed by field path */ - DisplayablePartialRetrievalResponse retrieveSurveyResponseFieldsForDisplay(String externalMessageUuid); + DisplayablePartialRetrievalResponse fetchSurveyResponseFieldsForDisplay(String externalMessageUuid); } diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/DisplayablePartialRetrievalResponse.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/DisplayablePartialRetrievalResponse.java index fcab37dd9cd..f5ca8bd815c 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/DisplayablePartialRetrievalResponse.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/DisplayablePartialRetrievalResponse.java @@ -1,10 +1,13 @@ package de.symeda.sormas.api.patch.partial_retrieval; +import de.symeda.sormas.api.audit.AuditedClass; + import java.io.Serializable; import java.util.HashMap; import java.util.Map; import java.util.Objects; +@AuditedClass public class DisplayablePartialRetrievalResponse implements Serializable { private static final long serialVersionUID = 1L; diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/survey/alias/PathAliasFacade.java b/sormas-api/src/main/java/de/symeda/sormas/api/survey/alias/PathAliasFacade.java index 3b360e885c3..e33041f4ac7 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/survey/alias/PathAliasFacade.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/survey/alias/PathAliasFacade.java @@ -12,5 +12,5 @@ public interface PathAliasFacade { * that may (or may not) contain physical paths. * @return shortened path. */ - String toAliasPath(String path); + String fetchAliasPath(String path); } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java index 684d8fb05df..07a20903430 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java @@ -314,6 +314,7 @@ public ExternalMessageDto saveAndProcessLabmessage(@Valid ExternalMessageDto lab } @Override + @RightsAllowed(UserRight._EXTERNAL_MESSAGE_SURVEY_RESPONSE_VIEW) public List saveAndProcessSurveyResponses(Date since) { if (since == null) { // TODO: use shorter default range @@ -817,8 +818,7 @@ public Page getIndexPage( UserRight._SYSTEM, UserRight._EXTERNAL_MESSAGE_ACCESS, UserRight._EXTERNAL_MESSAGE_LABORATORY_VIEW, - UserRight._EXTERNAL_MESSAGE_DOCTOR_DECLARATION_VIEW, - UserRight._EXTERNAL_MESSAGE_SURVEY_RESPONSE_VIEW }) + UserRight._EXTERNAL_MESSAGE_DOCTOR_DECLARATION_VIEW }) public ExternalMessageFetchResult fetchAndSaveExternalMessages(Date since) { SystemEventDto currentSync = syncFacadeEjb.startSyncFor(SystemEventType.FETCH_EXTERNAL_MESSAGES); @@ -975,7 +975,7 @@ public ExternalMessageDto getForSurveillanceReport(SurveillanceReportReferenceDt @Override @RightsAllowed(UserRight._EXTERNAL_MESSAGE_SURVEY_RESPONSE_PROCESS) - public ExternalMessageDto reprocessSurveyResponse(String uuid, java.util.Map correctedDictionary) { + public ExternalMessageDto overwriteSurveyResponse(String uuid, java.util.Map correctedDictionary) { ExternalMessageDto externalMessage = getByUuid(uuid); ExternalMessageSurveyResponseRequest latestRequest = externalMessage.getSurveyResponseData().getLatest().getRequest(); @@ -1009,8 +1009,8 @@ public ExternalMessageDto reprocessSurveyResponse(String uuid, java.util.Map getSupportedFields(); + + /** + * Specifies if the targetType is supported by this class. + * + * @param targetFieldName + * can be a child class. + * @return true if the class will be able to perform some action with this type. + */ + default boolean supports(@NotNull String targetFieldName) { + return getSupportedFields().contains(targetFieldName); + } + + default String toFieldName(String prefix, String fieldName) { + return prefix + '.' + fieldName; + } +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/EnumToDisplayValueMapperImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/EnumToDisplayValueMapper.java similarity index 88% rename from sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/EnumToDisplayValueMapperImpl.java rename to sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/EnumToDisplayValueMapper.java index 79020d1cf7d..0cedcf2dee6 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/EnumToDisplayValueMapperImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/impl/EnumToDisplayValueMapper.java @@ -8,7 +8,7 @@ import de.symeda.sormas.backend.patch.partial_retrieval.TypeToDisplayValueMapper; @ApplicationScoped -public class EnumToDisplayValueMapperImpl implements TypeToDisplayValueMapper { +public class EnumToDisplayValueMapper implements TypeToDisplayValueMapper { public static final Set> SUPPORTED_TYPES = Set.of(Enum.class); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/Survey.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/Survey.java index e3b82704022..82687830e2f 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/Survey.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/Survey.java @@ -80,7 +80,7 @@ public void setEmailTemplate(DocumentTemplate emailTemplate) { this.emailTemplate = emailTemplate; } - @Column(nullable = false, length = FieldConstraints.CHARACTER_LIMIT_DEFAULT) + @Column(length = FieldConstraints.CHARACTER_LIMIT_DEFAULT) public String getExternalId() { return externalId; } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/systemconfiguration/SystemConfigurationValueEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/systemconfiguration/SystemConfigurationValueEjb.java index 195d080bc22..f77901dd5e1 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/systemconfiguration/SystemConfigurationValueEjb.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/systemconfiguration/SystemConfigurationValueEjb.java @@ -355,12 +355,12 @@ public void validate(@Valid final SystemConfigurationValueDto dto) throws Valida @PostConstruct public void loadData() { - LOGGER.info("Loading SystemConfiguration data into cache"); + LOGGER.debug("Loading SystemConfiguration data into cache"); configurationValuesByKey.clear(); service.getAll().forEach(value -> configurationValuesByKey.put(value.getKey(), value.getValue())); - LOGGER.info("SystemConfiguration data loaded into cache successfully"); + LOGGER.debug("SystemConfiguration data loaded into cache successfully"); } /** diff --git a/sormas-backend/src/main/resources/META-INF/glassfish-ejb-jar.xml b/sormas-backend/src/main/resources/META-INF/glassfish-ejb-jar.xml index 1590d53287f..bd79639c4d9 100644 --- a/sormas-backend/src/main/resources/META-INF/glassfish-ejb-jar.xml +++ b/sormas-backend/src/main/resources/META-INF/glassfish-ejb-jar.xml @@ -877,6 +877,11 @@ EXTERNAL_MESSAGE_DOCTOR_DECLARATION_VIEW + + EXTERNAL_MESSAGE_SURVEY_RESPONSE_VIEW + EXTERNAL_MESSAGE_SURVEY_RESPONSE_VIEW + + EXTERNAL_MESSAGE_LABORATORY_PROCESS EXTERNAL_MESSAGE_LABORATORY_PROCESS @@ -887,6 +892,12 @@ EXTERNAL_MESSAGE_DOCTOR_DECLARATION_PROCESS + + + EXTERNAL_MESSAGE_SURVEY_RESPONSE_PROCESS + EXTERNAL_MESSAGE_SURVEY_RESPONSE_PROCESS + + EXTERNAL_MESSAGE_LABORATORY_DELETE EXTERNAL_MESSAGE_LABORATORY_DELETE @@ -897,6 +908,11 @@ EXTERNAL_MESSAGE_DOCTOR_DECLARATION_DELETE + + EXTERNAL_MESSAGE_SURVEY_RESPONSE_DELETE + EXTERNAL_MESSAGE_SURVEY_RESPONSE_DELETE + + TRAVEL_ENTRY_MANAGEMENT_ACCESS TRAVEL_ENTRY_MANAGEMENT_ACCESS diff --git a/sormas-backend/src/main/resources/sql/sormas_schema_next.sql b/sormas-backend/src/main/resources/sql/sormas_schema_next.sql index 04e7f4a00e2..c9ee05107b3 100644 --- a/sormas-backend/src/main/resources/sql/sormas_schema_next.sql +++ b/sormas-backend/src/main/resources/sql/sormas_schema_next.sql @@ -2,7 +2,7 @@ -- Surveys ALTER TABLE surveys - ADD COLUMN external_survey_id TEXT; + ADD COLUMN externalid TEXT; -- Survey tokens ALTER TABLE surveytokens diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/ValueMapperRegistryTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/ValueMapperRegistryTest.java index 46e76dd6676..b43b5a8cd78 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/ValueMapperRegistryTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/ValueMapperRegistryTest.java @@ -41,8 +41,8 @@ class ValueMapperRegistryTest extends AbstractUnitTest { @BeforeEach void setUp() { - victim.init(); Mockito.lenient().when(instances.stream()).thenAnswer(ignored -> Stream.of(mapperA, mapperB)); + victim.init(); } @Test @@ -118,9 +118,6 @@ void map_noSupportingMapper_returnsUnsupportedTargetType() { request.setValue("unsupported"); request.setTargetType(ObjectMapper.class); - when(mapperA.supports(Object.class)).thenReturn(false); - when(mapperB.supports(Object.class)).thenReturn(false); - // EXECUTE ValueMappingResult result = victim.map(request); diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImplTest.java index f02de68b56c..92fd318d797 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImplTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImplTest.java @@ -3,6 +3,7 @@ import java.util.List; import java.util.Set; +import de.symeda.sormas.api.person.PersonContactDetailDto; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -176,6 +177,32 @@ void retrievePartial_null_value() { () -> Assertions.assertNull(classificationDateFieldInfo.getFieldValue())); } + @Test + void retrieve_contact_details_phone() { + // PREPARE + Disease disease = Disease.PERTUSSIS; + CaseDataDto originalCase = creator.createUnclassifiedCase(disease); + + PersonReferenceDto personRef = originalCase.getPerson(); + + PersonDto person = getPersonFacade().getByUuid(personRef.getUuid()); + + // EXECUTE + String personContactDetails = toFieldName(PersonContactDetailDto.I18N_PREFIX, PersonContactDetailDto.PHONE_NUMBER_TYPE); + PartialRetrievalResponse actual = victim() + .retrievePartial(new PartialRetrievalRequest().setCaseUuid(originalCase.getUuid()).setFieldsToRetrieve(Set.of(personContactDetails))); + + // CHECK + System.out.println("actual = " + actual); + + FieldInfo personFirstNameFieldInfo = actual.getFieldInfoDictionary().get(personContactDetails); + Assertions.assertAll( + () -> Assertions.assertTrue(actual.getFailuresDictionary().isEmpty()), + () -> Assertions.assertTrue(actual.getFieldInfoDictionary().containsKey(personContactDetails)), + () -> Assertions.assertEquals("First name", personFirstNameFieldInfo.getTranslatedFieldName()), + () -> Assertions.assertEquals(person.getFirstName(), personFirstNameFieldInfo.getFieldValue())); + } + private static String toFieldName(String prefix, String fieldName) { return prefix + '.' + fieldName; } diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/util/CollectorUtilsTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/util/CollectorUtilsTest.java index 6bd3759f998..3f37372eb68 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/backend/util/CollectorUtilsTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/util/CollectorUtilsTest.java @@ -5,10 +5,12 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; import de.symeda.sormas.backend.AbstractUnitTest; @@ -29,7 +31,7 @@ void toNullSafeMap_normalKeysAndValues_createsCorrectMap() { Map result = items.stream().collect(CollectorUtils.toNullSafeMap(Item::getKey, Item::getValue)); // CHECK - assertEquals(Map.of("key1", "value1"), result); + assertEquals(mapOf("key1", "value1"), result); } @Test @@ -41,7 +43,7 @@ void toNullSafeMap_nullValues_preservesNulls() { Map result = items.stream().collect(CollectorUtils.toNullSafeMap(Item::getKey, Item::getValue)); // CHECK - assertEquals(Map.of("key2", null), result); + assertEquals(mapOf("key2", null), result); } @Test @@ -53,7 +55,7 @@ void toNullSafeMap_nullKeys_preservesNulls() { Map result = items.stream().collect(CollectorUtils.toNullSafeMap(Item::getKey, Item::getValue)); // CHECK - assertEquals(Map.of(null, "value3"), result); + assertEquals(mapOf(null, "value3"), result); } @Test @@ -65,7 +67,15 @@ void toNullSafeMap_nullKeyAndValue_preservesNulls() { Map result = items.stream().collect(CollectorUtils.toNullSafeMap(Item::getKey, Item::getValue)); // CHECK - assertEquals(Map.of(null, null), result); + Object v1 = null; + Object k1 = null; + assertEquals(mapOf(k1, v1), result); + } + + private static @NotNull Map mapOf(Object key, Object value) { + HashMap hashMap = new HashMap<>(); + hashMap.put(key, value); + return hashMap; } @Test @@ -89,7 +99,7 @@ void toNullSafeMap_multipleItems_handlesCollisions() { @Test void toNullSafeMap_parallelStream_preservesNulls() { // PREPARE - List items = List.of(item1, item2, item3, item4); + List items = List.of(item1, item2, item3); // EXECUTE Map result = items.parallelStream().collect(CollectorUtils.toNullSafeMap(Item::getKey, Item::getValue)); @@ -98,7 +108,6 @@ void toNullSafeMap_parallelStream_preservesNulls() { assertEquals("value1", result.get("key1")); assertNull(result.get("key2")); assertEquals("value3", result.get(null)); - assertNull(result.get(null)); } @Test @@ -122,7 +131,7 @@ void toNullSafeMap_handlesNullsWhereStandardFails() { Map nullSafeResult = items.stream().collect(CollectorUtils.toNullSafeMap(Item::getKey, Item::getValue)); // CHECK - assertEquals(Map.of("key2", null), nullSafeResult); + assertEquals(mapOf("key2", null), nullSafeResult); assertThrows(NullPointerException.class, () -> items.stream().collect(Collectors.toMap(Item::getKey, Item::getValue))); } diff --git a/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java index 0b4fe9a9c12..2e3f306de0f 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java @@ -13,6 +13,7 @@ import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; @@ -648,6 +649,7 @@ void patch_noPatchInCaseOfFailureFalse() { "NO", " nein ", " unknown " }) + @Disabled("Waiting for feedback on vaccine automatic processing") void patch_addVaccine_unknown_or_no(String unknownOrNo) { // PREPARE Disease disease = Disease.RESPIRATORY_SYNCYTIAL_VIRUS; @@ -694,6 +696,7 @@ void patch_addVaccine_unknown_or_no(String unknownOrNo) { @ParameterizedTest @ValueSource(strings = { "Maternal vaccination" }) + @Disabled("Waiting for feedback on vaccine automatic processing") void patch_addVaccine_true_and_mother_vaccine(String matternalVaccination) { // PREPARE Disease disease = Disease.DENGUE; @@ -742,6 +745,7 @@ void patch_addVaccine_true_and_mother_vaccine(String matternalVaccination) { } @Test + @Disabled("Waiting for feedback on vaccine automatic processing") void patch_addVaccine_true() { // PREPARE Disease disease = Disease.DENGUE; @@ -797,6 +801,7 @@ void patch_addVaccine_true() { } @Test + @Disabled("Waiting for feedback on vaccine automatic processing") void patch_addVaccine_vaccine_name() { // PREPARE Disease disease = Disease.DENGUE; diff --git a/sormas-rest/src/main/webapp/WEB-INF/glassfish-web.xml b/sormas-rest/src/main/webapp/WEB-INF/glassfish-web.xml index 6097973ad7e..80356e3ce76 100644 --- a/sormas-rest/src/main/webapp/WEB-INF/glassfish-web.xml +++ b/sormas-rest/src/main/webapp/WEB-INF/glassfish-web.xml @@ -858,6 +858,11 @@ EXTERNAL_MESSAGE_DOCTOR_DECLARATION_VIEW + + EXTERNAL_MESSAGE_SURVEY_RESPONSE_VIEW + EXTERNAL_MESSAGE_SURVEY_RESPONSE_VIEW + + EXTERNAL_MESSAGE_LABORATORY_PROCESS EXTERNAL_MESSAGE_LABORATORY_PROCESS @@ -868,6 +873,12 @@ EXTERNAL_MESSAGE_DOCTOR_DECLARATION_PROCESS + + + EXTERNAL_MESSAGE_SURVEY_RESPONSE_PROCESS + EXTERNAL_MESSAGE_SURVEY_RESPONSE_PROCESS + + EXTERNAL_MESSAGE_LABORATORY_DELETE EXTERNAL_MESSAGE_LABORATORY_DELETE @@ -878,6 +889,11 @@ EXTERNAL_MESSAGE_DOCTOR_DECLARATION_DELETE + + EXTERNAL_MESSAGE_SURVEY_RESPONSE_DELETE + EXTERNAL_MESSAGE_SURVEY_RESPONSE_DELETE + + TRAVEL_ENTRY_MANAGEMENT_ACCESS TRAVEL_ENTRY_MANAGEMENT_ACCESS diff --git a/sormas-rest/src/main/webapp/WEB-INF/web.xml b/sormas-rest/src/main/webapp/WEB-INF/web.xml index 36e8b47bf06..cea4e109cca 100644 --- a/sormas-rest/src/main/webapp/WEB-INF/web.xml +++ b/sormas-rest/src/main/webapp/WEB-INF/web.xml @@ -696,6 +696,10 @@ EXTERNAL_MESSAGE_DOCTOR_DECLARATION_VIEW + + EXTERNAL_MESSAGE_SURVEY_RESPONSE_VIEW + + EXTERNAL_MESSAGE_LABORATORY_PROCESS @@ -704,6 +708,10 @@ EXTERNAL_MESSAGE_DOCTOR_DECLARATION_PROCESS + + EXTERNAL_MESSAGE_SURVEY_RESPONSE_PROCESS + + EXTERNAL_MESSAGE_LABORATORY_DELETE @@ -712,6 +720,10 @@ EXTERNAL_MESSAGE_DOCTOR_DECLARATION_DELETE + + EXTERNAL_MESSAGE_SURVEY_RESPONSE_DELETE + + TRAVEL_ENTRY_MANAGEMENT_ACCESS diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/ExternalMessageController.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/ExternalMessageController.java index 16c869411ac..711574e19df 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/ExternalMessageController.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/ExternalMessageController.java @@ -176,7 +176,7 @@ public void processSurveyResponse(String surveyResponseMessageUuid) { if (result.getPatchResponse() != null && result.getPatchResponse().hasFailures()) { de.symeda.sormas.api.patch.partial_retrieval.DisplayablePartialRetrievalResponse displayData; try { - displayData = FacadeProvider.getExternalMessageFacade().retrieveSurveyResponseFieldsForDisplay(surveyResponseMessageUuid); + displayData = FacadeProvider.getExternalMessageFacade().fetchSurveyResponseFieldsForDisplay(surveyResponseMessageUuid); } catch (Exception e) { logger.error("Error retrieving survey response fields for display", e); displayData = new de.symeda.sormas.api.patch.partial_retrieval.DisplayablePartialRetrievalResponse(); diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseDetailsWindow.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseDetailsWindow.java index b8a10f1d37c..683faf85260 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseDetailsWindow.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseDetailsWindow.java @@ -49,7 +49,7 @@ public SurveyResponseDetailsWindow(ExternalMessageDto externalMessage, Runnable String uuid = externalMessage.getUuid(); DisplayablePartialRetrievalResponse displayData; - displayData = FacadeProvider.getExternalMessageFacade().retrieveSurveyResponseFieldsForDisplay(uuid); + displayData = FacadeProvider.getExternalMessageFacade().fetchSurveyResponseFieldsForDisplay(uuid); VerticalLayout layout = new VerticalLayout(); layout.setMargin(true); @@ -205,7 +205,7 @@ private void addReadOnlyField(VerticalLayout layout, String caption, String valu public String resolveFieldName(String fieldPath, DisplayablePartialRetrievalResponse displayData) { DisplayableFieldInfo info = displayData.getFieldInfoDictionary().get(fieldPath); - String aliasPath = FacadeProvider.getPathAliasFacade().toAliasPath(fieldPath); + String aliasPath = FacadeProvider.getPathAliasFacade().fetchAliasPath(fieldPath); if (info != null) { String translatedFieldName = info.getTranslatedFieldName(); if (translatedFieldName != null) { diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailureEditor.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailureEditor.java index 0e7f0a35280..3a0f4ff9e14 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailureEditor.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailureEditor.java @@ -176,7 +176,7 @@ public SurveyResponseFailureEditor(ExternalMessageDto externalMessage, Displayab correctedDictionary.put(key, valueEditors.get(fieldPath).getValue()); } - FacadeProvider.getExternalMessageFacade().reprocessSurveyResponse(externalMessage.getUuid(), correctedDictionary); + FacadeProvider.getExternalMessageFacade().overwriteSurveyResponse(externalMessage.getUuid(), correctedDictionary); Notification.show(I18nProperties.getString(Strings.messageSurveyResponseReprocessed), Notification.Type.HUMANIZED_MESSAGE); close(); @@ -195,7 +195,7 @@ public SurveyResponseFailureEditor(ExternalMessageDto externalMessage, Displayab public String resolveFieldName(String fieldPath, DisplayablePartialRetrievalResponse displayData) { DisplayableFieldInfo info = displayData.getFieldInfoDictionary().get(fieldPath); - String aliasPath = FacadeProvider.getPathAliasFacade().toAliasPath(fieldPath); + String aliasPath = FacadeProvider.getPathAliasFacade().fetchAliasPath(fieldPath); if (info != null) { String translatedFieldName = info.getTranslatedFieldName(); if (translatedFieldName != null) { diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailurePanel.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailurePanel.java index e80e5c4df8d..66fe9220a10 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailurePanel.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailurePanel.java @@ -82,7 +82,7 @@ public SurveyResponseFailurePanel(Map failures, Displa public String resolveFieldName(String fieldPath, DisplayablePartialRetrievalResponse displayData) { DisplayableFieldInfo info = displayData.getFieldInfoDictionary().get(fieldPath); - String aliasPath = FacadeProvider.getPathAliasFacade().toAliasPath(fieldPath); + String aliasPath = FacadeProvider.getPathAliasFacade().fetchAliasPath(fieldPath); if (info != null) { String translatedFieldName = info.getTranslatedFieldName(); if (translatedFieldName != null) { diff --git a/sormas-ui/src/main/webapp/WEB-INF/glassfish-web.xml b/sormas-ui/src/main/webapp/WEB-INF/glassfish-web.xml index 9970219c1f3..b59008fac3e 100644 --- a/sormas-ui/src/main/webapp/WEB-INF/glassfish-web.xml +++ b/sormas-ui/src/main/webapp/WEB-INF/glassfish-web.xml @@ -848,14 +848,10 @@ EXTERNAL_MESSAGE_ACCESS - - EXTERNAL_MESSAGE_LABORATORY_VIEW - EXTERNAL_MESSAGE_LABORATORY_VIEW - - EXTERNAL_MESSAGE_DOCTOR_DECLARATION_VIEW - EXTERNAL_MESSAGE_DOCTOR_DECLARATION_VIEW + EXTERNAL_MESSAGE_SURVEY_RESPONSE_VIEW + EXTERNAL_MESSAGE_SURVEY_RESPONSE_VIEW @@ -868,6 +864,12 @@ EXTERNAL_MESSAGE_DOCTOR_DECLARATION_PROCESS + + + EXTERNAL_MESSAGE_SURVEY_RESPONSE_PROCESS + EXTERNAL_MESSAGE_SURVEY_RESPONSE_PROCESS + + EXTERNAL_MESSAGE_LABORATORY_DELETE EXTERNAL_MESSAGE_LABORATORY_DELETE @@ -878,6 +880,11 @@ EXTERNAL_MESSAGE_DOCTOR_DECLARATION_DELETE + + EXTERNAL_MESSAGE_SURVEY_RESPONSE_DELETE + EXTERNAL_MESSAGE_SURVEY_RESPONSE_DELETE + + TRAVEL_ENTRY_MANAGEMENT_ACCESS TRAVEL_ENTRY_MANAGEMENT_ACCESS diff --git a/sormas-ui/src/main/webapp/WEB-INF/web.xml b/sormas-ui/src/main/webapp/WEB-INF/web.xml index a9f10d30120..15155382a4d 100644 --- a/sormas-ui/src/main/webapp/WEB-INF/web.xml +++ b/sormas-ui/src/main/webapp/WEB-INF/web.xml @@ -701,6 +701,10 @@ EXTERNAL_MESSAGE_DOCTOR_DECLARATION_VIEW + + EXTERNAL_MESSAGE_SURVEY_RESPONSE_VIEW + + EXTERNAL_MESSAGE_LABORATORY_PROCESS @@ -709,6 +713,10 @@ EXTERNAL_MESSAGE_DOCTOR_DECLARATION_PROCESS + + EXTERNAL_MESSAGE_SURVEY_RESPONSE_PROCESS + + EXTERNAL_MESSAGE_LABORATORY_DELETE @@ -717,6 +725,14 @@ EXTERNAL_MESSAGE_DOCTOR_DECLARATION_DELETE + + EXTERNAL_MESSAGE_SURVEY_RESPONSE_DELETE + + + + EXTERNAL_MESSAGE_DOCTOR_DECLARATION_DELETE + + TRAVEL_ENTRY_MANAGEMENT_ACCESS From 745b52f6f2c841c98de0e052cb378a180225a532 Mon Sep 17 00:00:00 2001 From: = <=> Date: Thu, 30 Apr 2026 18:32:44 +0200 Subject: [PATCH 088/134] Prepared code to retrieve field with specific handling. --- .../ContactDetailsFieldValueRetriever.java | 19 ++++++++++++ .../PartialRetrieverImpl.java | 30 ++++++++++++------- .../SpecificFieldValueRetriever.java | 12 +++++++- 3 files changed, 49 insertions(+), 12 deletions(-) create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/ContactDetailsFieldValueRetriever.java diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/ContactDetailsFieldValueRetriever.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/ContactDetailsFieldValueRetriever.java new file mode 100644 index 00000000000..8d89c4637df --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/ContactDetailsFieldValueRetriever.java @@ -0,0 +1,19 @@ +package de.symeda.sormas.backend.patch.partial_retrieval; + +import de.symeda.sormas.api.EntityDto; +import de.symeda.sormas.api.patch.partial_retrieval.FieldInfo; + +import java.util.Set; + +public class ContactDetailsFieldValueRetriever implements SpecificFieldValueRetriever { + @Override + public FieldInfo getFieldInfo(String fieldName, EntityDto entityDto) { + // TODO. + return null; + } + + @Override + public Set getSupportedFields() { + return Set.of(); + } +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java index 83106fc87d0..f203c746b4e 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java @@ -1,5 +1,6 @@ package de.symeda.sormas.backend.patch.partial_retrieval; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Optional; @@ -65,6 +66,8 @@ public PartialRetrievalResponse retrievePartial(PartialRetrievalRequest request) CaseDataDto caseData = businessDtoFacade.getCaseDataDto(request.getCaseUuid()); + Map> beanCache = new HashMap<>(); + List>> results = patchFieldHelper.extractFieldTuples(request.getFieldsToRetrieve(), businessDtoFacade.fetchablePrefixes()).stream().map(tuple -> { @@ -86,7 +89,7 @@ public PartialRetrievalResponse retrievePartial(PartialRetrievalRequest request) String physicalPathName = pathWithoutAlias.substring(pathWithoutAlias.indexOf('.') + 1); String aliasPath = pathAliasHelper.toAliasPath(pathWithoutAlias); - Optional adequateBean = getAdequateBean(pathWithoutAlias, caseData); + Optional adequateBean = getAdequateBean(pathWithoutAlias, caseData, beanCache); if (adequateBean.isEmpty()) { return Tuple.of(originalFieldName, new Tuple<>((FieldInfo) null, PartialRetrievalFailureCause.ENTITY_COULD_NOT_BE_FOUND)); @@ -147,7 +150,10 @@ public DisplayablePartialRetrievalResponse retrievePartialForDisplay(PartialRetr .collect(Collectors.toMap(Map.Entry::getKey, entry -> I18nProperties.getEnumCaption(entry.getValue())))); } - private Optional getAdequateBean(@NotNull String aliasPath, @NotNull CaseDataDto caseData) { + private Optional getAdequateBean( + @NotNull String aliasPath, + @NotNull CaseDataDto caseData, + @NotNull Map> beanCache) { int i = aliasPath.indexOf("."); @@ -156,19 +162,21 @@ private Optional getAdequateBean(@NotNull String aliasPath, @NotNull if (CaseDataDto.I18N_PREFIX.equals(prefix)) { return Optional.of(caseData); } else { - List entityDtos = businessDtoFacade.fetchByI18nName(prefix, caseData); + return beanCache.computeIfAbsent(prefix, prefixCandidate -> { + List entityDtos = businessDtoFacade.fetchByI18nName(prefixCandidate, caseData); - int entitiesSize = CollectionUtils.size(entityDtos); + int entitiesSize = CollectionUtils.size(entityDtos); - if (entitiesSize == 0) { - return Optional.empty(); - } + if (entitiesSize == 0) { + return Optional.empty(); + } - if (entitiesSize != 1) { - logger.warn("Only first element is supported for now: [{}], was: [{}]", aliasPath, entitiesSize); - } + if (entitiesSize != 1) { + logger.warn("Only first element is supported for now: [{}], was: [{}]", aliasPath, entitiesSize); + } - return Optional.ofNullable(entityDtos).map(actualEntities -> actualEntities.get(0)); + return Optional.ofNullable(entityDtos).map(actualEntities -> actualEntities.get(0)); + }); } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/SpecificFieldValueRetriever.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/SpecificFieldValueRetriever.java index c886a7b3aa8..c3d879368f8 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/SpecificFieldValueRetriever.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/SpecificFieldValueRetriever.java @@ -1,14 +1,24 @@ package de.symeda.sormas.backend.patch.partial_retrieval; +import de.symeda.sormas.api.EntityDto; import de.symeda.sormas.api.patch.partial_retrieval.FieldInfo; import de.symeda.sormas.api.utils.OrderedRegisterable; import javax.validation.constraints.NotNull; +import java.util.Optional; import java.util.Set; +import java.util.function.Function; +// TODO: check for adequate entityDto / generics usage to make it nicer. public interface SpecificFieldValueRetriever { - FieldInfo getFieldInfo(String fieldName); + /** + * + * @param fieldName + * @param entityDto + * @return + */ + FieldInfo getFieldInfo(String fieldName, EntityDto entityDto); /** * Meant to be implemented by classes implementing this {@link OrderedRegisterable} contract but to be used. From a8db1b537cb8f86d438f89fa32c931231609219c Mon Sep 17 00:00:00 2001 From: = <=> Date: Fri, 1 May 2026 08:52:13 +0200 Subject: [PATCH 089/134] =?UTF-8?q?=E2=9C=A8=20displaying=20of=20person=20?= =?UTF-8?q?contact=20details:=20phone=20and=20email?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ContactDetailsFieldValueRetriever.java | 54 ++++++++++++---- .../PartialRetrieverImpl.java | 16 ++++- .../SpecificFieldValueRetriever.java | 4 -- .../SpecificFieldValueRetrieverRegistry.java | 39 ++++++++++++ .../PartialRetrieverImplTest.java | 62 ++++++++++++++++--- 5 files changed, 147 insertions(+), 28 deletions(-) create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/SpecificFieldValueRetrieverRegistry.java diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/ContactDetailsFieldValueRetriever.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/ContactDetailsFieldValueRetriever.java index 8d89c4637df..33c9571b09b 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/ContactDetailsFieldValueRetriever.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/ContactDetailsFieldValueRetriever.java @@ -1,19 +1,49 @@ package de.symeda.sormas.backend.patch.partial_retrieval; -import de.symeda.sormas.api.EntityDto; -import de.symeda.sormas.api.patch.partial_retrieval.FieldInfo; +import static de.symeda.sormas.backend.patch.PatchFieldHelper.PATH_SEPARATOR; +import java.util.List; import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import javax.enterprise.context.ApplicationScoped; + +import de.symeda.sormas.api.EntityDto; +import de.symeda.sormas.api.i18n.I18nProperties; +import de.symeda.sormas.api.patch.partial_retrieval.FieldInfo; +import de.symeda.sormas.api.person.PersonContactDetailDto; +import de.symeda.sormas.api.person.PersonContactDetailType; +import de.symeda.sormas.api.person.PersonDto; +@ApplicationScoped public class ContactDetailsFieldValueRetriever implements SpecificFieldValueRetriever { - @Override - public FieldInfo getFieldInfo(String fieldName, EntityDto entityDto) { - // TODO. - return null; - } - - @Override - public Set getSupportedFields() { - return Set.of(); - } + + @Override + public FieldInfo getFieldInfo(String fieldName, EntityDto entityDto) { + PersonDto personDto = (PersonDto) entityDto; + + boolean isPhone = fieldName.contains(PersonContactDetailDto.PHONE_NUMBER_TYPE); + PersonContactDetailType targetType = isPhone ? PersonContactDetailType.PHONE : PersonContactDetailType.EMAIL; + + String contactValues = personDto.getPersonContactDetails() + .stream() + .filter(detail -> targetType.equals(detail.getPersonContactDetailType())) + .map(PersonContactDetailDto::getContactInformation) + .collect(Collectors.joining("; ")); + + String captionKey = isPhone ? PersonContactDetailDto.PHONE_NUMBER_TYPE : PersonContactDetailDto.CONTACT_INFORMATION; + String translatedFieldName = I18nProperties.getCaption( + PersonContactDetailDto.I18N_PREFIX + PATH_SEPARATOR + captionKey, + captionKey); + + return new FieldInfo().setFieldType(List.class).setFieldValue(contactValues).setTranslatedFieldName(translatedFieldName); + } + + @Override + public Set getSupportedFields() { + return Stream.of(PersonContactDetailDto.PHONE_NUMBER_TYPE, PersonContactDetailDto.CONTACT_INFORMATION) + .map(suffix -> PersonContactDetailDto.I18N_PREFIX + PATH_SEPARATOR + suffix) + .collect(Collectors.toSet()); + } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java index f203c746b4e..510ec98ef79 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java @@ -55,6 +55,9 @@ public class PartialRetrieverImpl implements PartialRetriever { @Inject private TypeToDisplayRegistry typeToDisplayRegistry; + @Inject + private SpecificFieldValueRetrieverRegistry specificFieldValueRetrieverRegistry; + @EJB private FeatureConfigurationFacadeEjb.FeatureConfigurationFacadeEjbLocal featureConfigurationFacade; @@ -89,14 +92,21 @@ public PartialRetrievalResponse retrievePartial(PartialRetrievalRequest request) String physicalPathName = pathWithoutAlias.substring(pathWithoutAlias.indexOf('.') + 1); String aliasPath = pathAliasHelper.toAliasPath(pathWithoutAlias); - Optional adequateBean = getAdequateBean(pathWithoutAlias, caseData, beanCache); + Optional adequateBeanOpt = getAdequateBean(pathWithoutAlias, caseData, beanCache); - if (adequateBean.isEmpty()) { + if (adequateBeanOpt.isEmpty()) { return Tuple.of(originalFieldName, new Tuple<>((FieldInfo) null, PartialRetrievalFailureCause.ENTITY_COULD_NOT_BE_FOUND)); } + EntityDto adequateBean = adequateBeanOpt.orElseThrow(); + Optional specificFieldInfo = specificFieldValueRetrieverRegistry.getFieldInfo(aliasPath, adequateBean); + + if (specificFieldInfo.isPresent()) { + return Tuple.of(originalFieldName, new Tuple<>(specificFieldInfo.get(), (PartialRetrievalFailureCause) null)); + } + Tuple, Object>, PropertyAccessFailure> propertyType = PropertyAccessor - .getPropertyTypeAndValue(adequateBean.orElseThrow(), physicalPathName, getFieldVisibilityCheckers(caseData.getDisease())); + .getPropertyTypeAndValue(adequateBean, physicalPathName, getFieldVisibilityCheckers(caseData.getDisease())); PropertyAccessFailure propertyAccessFailure = propertyType.getSecond(); if (propertyAccessFailure != null) { diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/SpecificFieldValueRetriever.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/SpecificFieldValueRetriever.java index c3d879368f8..83df5364016 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/SpecificFieldValueRetriever.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/SpecificFieldValueRetriever.java @@ -39,8 +39,4 @@ public interface SpecificFieldValueRetriever { default boolean supports(@NotNull String targetFieldName) { return getSupportedFields().contains(targetFieldName); } - - default String toFieldName(String prefix, String fieldName) { - return prefix + '.' + fieldName; - } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/SpecificFieldValueRetrieverRegistry.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/SpecificFieldValueRetrieverRegistry.java new file mode 100644 index 00000000000..6105ce41fa4 --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/SpecificFieldValueRetrieverRegistry.java @@ -0,0 +1,39 @@ +package de.symeda.sormas.backend.patch.partial_retrieval; + +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + +import javax.annotation.PostConstruct; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Instance; +import javax.inject.Inject; +import javax.validation.constraints.NotNull; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import de.symeda.sormas.api.EntityDto; +import de.symeda.sormas.api.patch.partial_retrieval.FieldInfo; + +@ApplicationScoped +public class SpecificFieldValueRetrieverRegistry { + + private final static Logger logger = LoggerFactory.getLogger(SpecificFieldValueRetrieverRegistry.class); + + @Inject + private Instance instances; + + public SpecificFieldValueRetrieverRegistry() { + } + + public Optional getFieldInfo(@NotNull String fieldName, @NotNull EntityDto entityDto) { + return instances.stream() + .filter(retriever -> retriever.supports(fieldName)) + .findAny() + .map(retriever -> { + logger.debug("Field [{}] will be handled by retriever: [{}]", fieldName, retriever); + return retriever.getFieldInfo(fieldName, entityDto); + }); + } +} diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImplTest.java index 92fd318d797..301efb7c68a 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImplTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImplTest.java @@ -4,6 +4,7 @@ import java.util.Set; import de.symeda.sormas.api.person.PersonContactDetailDto; +import de.symeda.sormas.api.person.PersonContactDetailType; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -113,8 +114,6 @@ void retrievePartial_german() { .setFieldsToRetrieve(Set.of(clinicalConfirmation, symptomsAbdominalPain))); // CHECK - System.out.println("actual = " + actual); - FieldInfo caseDiseaseFieldInfo = actual.getFieldInfoDictionary().get(clinicalConfirmation); FieldInfo symptomsAbdominalPainFieldInfo = actual.getFieldInfoDictionary().get(symptomsAbdominalPain); Assertions.assertAll( @@ -145,8 +144,6 @@ void retrievePartial_person() { .retrievePartial(new PartialRetrievalRequest().setCaseUuid(originalCase.getUuid()).setFieldsToRetrieve(Set.of(personFirstNameFieldName))); // CHECK - System.out.println("actual = " + actual); - FieldInfo personFirstNameFieldInfo = actual.getFieldInfoDictionary().get(personFirstNameFieldName); Assertions.assertAll( () -> Assertions.assertTrue(actual.getFailuresDictionary().isEmpty()), @@ -167,8 +164,6 @@ void retrievePartial_null_value() { new PartialRetrievalRequest().setCaseUuid(originalCase.getUuid()).setFieldsToRetrieve(Set.of(caseClassificationDateFieldName))); // CHECK - System.out.println("actual = " + actual); - FieldInfo classificationDateFieldInfo = actual.getFieldInfoDictionary().get(caseClassificationDateFieldName); Assertions.assertAll( () -> Assertions.assertTrue(actual.getFailuresDictionary().isEmpty()), @@ -186,6 +181,20 @@ void retrieve_contact_details_phone() { PersonReferenceDto personRef = originalCase.getPerson(); PersonDto person = getPersonFacade().getByUuid(personRef.getUuid()); + List contactDetails = person.getPersonContactDetails(); + + PersonContactDetailDto primaryPhoneNumber = new PersonContactDetailDto(); + primaryPhoneNumber.setContactInformation("09876543"); + primaryPhoneNumber.setPersonContactDetailType(PersonContactDetailType.PHONE); + primaryPhoneNumber.setPrimaryContact(true); + contactDetails.add(primaryPhoneNumber); + + PersonContactDetailDto secondaryPhoneNumber = new PersonContactDetailDto(); + secondaryPhoneNumber.setContactInformation("12345678"); + secondaryPhoneNumber.setPersonContactDetailType(PersonContactDetailType.PHONE); + contactDetails.add(secondaryPhoneNumber); + + getPersonFacade().save(person); // EXECUTE String personContactDetails = toFieldName(PersonContactDetailDto.I18N_PREFIX, PersonContactDetailDto.PHONE_NUMBER_TYPE); @@ -193,14 +202,49 @@ void retrieve_contact_details_phone() { .retrievePartial(new PartialRetrievalRequest().setCaseUuid(originalCase.getUuid()).setFieldsToRetrieve(Set.of(personContactDetails))); // CHECK - System.out.println("actual = " + actual); + FieldInfo personFirstNameFieldInfo = actual.getFieldInfoDictionary().get(personContactDetails); + Assertions.assertAll( + () -> Assertions.assertTrue(actual.getFailuresDictionary().isEmpty()), + () -> Assertions.assertTrue(actual.getFieldInfoDictionary().containsKey(personContactDetails)), + () -> Assertions.assertEquals("Phone number type", personFirstNameFieldInfo.getTranslatedFieldName()), + () -> Assertions.assertEquals("09876543; 12345678", personFirstNameFieldInfo.getFieldValue())); + } + @Test + void retrieve_contact_details_email() { + // PREPARE + Disease disease = Disease.RUBELLA; + CaseDataDto originalCase = creator.createUnclassifiedCase(disease); + + PersonReferenceDto personRef = originalCase.getPerson(); + + PersonDto person = getPersonFacade().getByUuid(personRef.getUuid()); + List contactDetails = person.getPersonContactDetails(); + + PersonContactDetailDto emailContactDetail = new PersonContactDetailDto(); + emailContactDetail.setContactInformation("mail@mail.ch"); + emailContactDetail.setPersonContactDetailType(PersonContactDetailType.EMAIL); + contactDetails.add(emailContactDetail); + + PersonContactDetailDto phoneContactDetail = new PersonContactDetailDto(); + phoneContactDetail.setContactInformation("MUST_NOT_BE_RETRIEVED"); + phoneContactDetail.setPersonContactDetailType(PersonContactDetailType.PHONE); + contactDetails.add(phoneContactDetail); + + getPersonFacade().save(person); + + // EXECUTE + String personContactDetails = toFieldName(PersonContactDetailDto.I18N_PREFIX, PersonContactDetailDto.CONTACT_INFORMATION); + PartialRetrievalResponse actual = victim() + .retrievePartial(new PartialRetrievalRequest().setCaseUuid(originalCase.getUuid()).setFieldsToRetrieve(Set.of(personContactDetails))); + + // CHECK FieldInfo personFirstNameFieldInfo = actual.getFieldInfoDictionary().get(personContactDetails); Assertions.assertAll( () -> Assertions.assertTrue(actual.getFailuresDictionary().isEmpty()), () -> Assertions.assertTrue(actual.getFieldInfoDictionary().containsKey(personContactDetails)), - () -> Assertions.assertEquals("First name", personFirstNameFieldInfo.getTranslatedFieldName()), - () -> Assertions.assertEquals(person.getFirstName(), personFirstNameFieldInfo.getFieldValue())); + () -> Assertions.assertEquals("Contact information", personFirstNameFieldInfo.getTranslatedFieldName()), + () -> Assertions.assertEquals("mail@mail.ch", personFirstNameFieldInfo.getFieldValue())); } private static String toFieldName(String prefix, String fieldName) { From 2a304679049f626162f050e863265df385c2c69e Mon Sep 17 00:00:00 2001 From: = <=> Date: Fri, 1 May 2026 09:43:12 +0200 Subject: [PATCH 090/134] =?UTF-8?q?=E2=9C=85=20remaining=20broken=20unit?= =?UTF-8?q?=20tests?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sormas-ui/src/main/webapp/WEB-INF/glassfish-web.xml | 9 +++++++++ sormas-ui/src/main/webapp/WEB-INF/web.xml | 4 ---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/sormas-ui/src/main/webapp/WEB-INF/glassfish-web.xml b/sormas-ui/src/main/webapp/WEB-INF/glassfish-web.xml index b59008fac3e..f852e45244b 100644 --- a/sormas-ui/src/main/webapp/WEB-INF/glassfish-web.xml +++ b/sormas-ui/src/main/webapp/WEB-INF/glassfish-web.xml @@ -848,6 +848,15 @@ EXTERNAL_MESSAGE_ACCESS + + EXTERNAL_MESSAGE_LABORATORY_VIEW + EXTERNAL_MESSAGE_LABORATORY_VIEW + + + + EXTERNAL_MESSAGE_DOCTOR_DECLARATION_VIEW + EXTERNAL_MESSAGE_DOCTOR_DECLARATION_VIEW + EXTERNAL_MESSAGE_SURVEY_RESPONSE_VIEW diff --git a/sormas-ui/src/main/webapp/WEB-INF/web.xml b/sormas-ui/src/main/webapp/WEB-INF/web.xml index 15155382a4d..0e528ae98e9 100644 --- a/sormas-ui/src/main/webapp/WEB-INF/web.xml +++ b/sormas-ui/src/main/webapp/WEB-INF/web.xml @@ -729,10 +729,6 @@ EXTERNAL_MESSAGE_SURVEY_RESPONSE_DELETE - - EXTERNAL_MESSAGE_DOCTOR_DECLARATION_DELETE - - TRAVEL_ENTRY_MANAGEMENT_ACCESS From fa007176fcbae142683d3e8c9d72c6b821895afe Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Sun, 3 May 2026 12:35:35 +0200 Subject: [PATCH 091/134] =?UTF-8?q?=F0=9F=90=9B=20empty=20contact=20detail?= =?UTF-8?q?s=20displaying=20null;=20Otherwise=20displaying=20works=20ok.?= =?UTF-8?q?=20Added=20todo=20to=20not=20add=20contact=20details=20if=20alr?= =?UTF-8?q?eady=20present=20for=20the=20person.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PersonContactDetailsFieldMapper.java | 1 + .../ContactDetailsFieldValueRetriever.java | 8 ++-- .../PartialRetrieverImplTest.java | 44 +++++++++++-------- 3 files changed, 31 insertions(+), 22 deletions(-) diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapper.java index 16978b7185a..db03b05c8f2 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapper.java @@ -35,6 +35,7 @@ public class PersonContactDetailsFieldMapper implements FieldCustomMapper { @Override public Optional map(FieldPatchRequest request) { + // TODO: logic to not add in case of the value is already present? To avoid adding the same value X-times Object untypedTarget = request.getTarget(); if (!(untypedTarget instanceof PersonDto)) { return Optional.of(new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.TECHNICAL)); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/ContactDetailsFieldValueRetriever.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/ContactDetailsFieldValueRetriever.java index 33c9571b09b..f65766dafbf 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/ContactDetailsFieldValueRetriever.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/ContactDetailsFieldValueRetriever.java @@ -9,6 +9,8 @@ import javax.enterprise.context.ApplicationScoped; +import org.apache.commons.lang3.StringUtils; + import de.symeda.sormas.api.EntityDto; import de.symeda.sormas.api.i18n.I18nProperties; import de.symeda.sormas.api.patch.partial_retrieval.FieldInfo; @@ -30,12 +32,12 @@ public FieldInfo getFieldInfo(String fieldName, EntityDto entityDto) { .stream() .filter(detail -> targetType.equals(detail.getPersonContactDetailType())) .map(PersonContactDetailDto::getContactInformation) + .filter(StringUtils::isNotBlank) + .sorted() .collect(Collectors.joining("; ")); String captionKey = isPhone ? PersonContactDetailDto.PHONE_NUMBER_TYPE : PersonContactDetailDto.CONTACT_INFORMATION; - String translatedFieldName = I18nProperties.getCaption( - PersonContactDetailDto.I18N_PREFIX + PATH_SEPARATOR + captionKey, - captionKey); + String translatedFieldName = I18nProperties.getCaption(PersonContactDetailDto.I18N_PREFIX + PATH_SEPARATOR + captionKey, captionKey); return new FieldInfo().setFieldType(List.class).setFieldValue(contactValues).setTranslatedFieldName(translatedFieldName); } diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImplTest.java index 301efb7c68a..5cd0d7c107a 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImplTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImplTest.java @@ -3,9 +3,8 @@ import java.util.List; import java.util.Set; -import de.symeda.sormas.api.person.PersonContactDetailDto; -import de.symeda.sormas.api.person.PersonContactDetailType; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.RepeatedTest; import org.junit.jupiter.api.Test; import de.symeda.sormas.api.Disease; @@ -15,12 +14,9 @@ import de.symeda.sormas.api.i18n.I18nProperties; import de.symeda.sormas.api.immunization.ImmunizationDto; import de.symeda.sormas.api.immunization.ImmunizationStatus; -import de.symeda.sormas.api.patch.partial_retrieval.DisplayableFieldInfo; -import de.symeda.sormas.api.patch.partial_retrieval.DisplayablePartialRetrievalResponse; -import de.symeda.sormas.api.patch.partial_retrieval.FieldInfo; -import de.symeda.sormas.api.patch.partial_retrieval.PartialRetrievalRequest; -import de.symeda.sormas.api.patch.partial_retrieval.PartialRetrievalResponse; -import de.symeda.sormas.api.patch.partial_retrieval.PartialRetriever; +import de.symeda.sormas.api.patch.partial_retrieval.*; +import de.symeda.sormas.api.person.PersonContactDetailDto; +import de.symeda.sormas.api.person.PersonContactDetailType; import de.symeda.sormas.api.person.PersonDto; import de.symeda.sormas.api.person.PersonReferenceDto; import de.symeda.sormas.api.symptoms.SymptomsDto; @@ -172,7 +168,7 @@ void retrievePartial_null_value() { () -> Assertions.assertNull(classificationDateFieldInfo.getFieldValue())); } - @Test + @RepeatedTest(12) void retrieve_contact_details_phone() { // PREPARE Disease disease = Disease.PERTUSSIS; @@ -194,20 +190,30 @@ void retrieve_contact_details_phone() { secondaryPhoneNumber.setPersonContactDetailType(PersonContactDetailType.PHONE); contactDetails.add(secondaryPhoneNumber); + PersonContactDetailDto emptyPhone = new PersonContactDetailDto(); + emptyPhone.setContactInformation(" "); + emptyPhone.setPersonContactDetailType(PersonContactDetailType.PHONE); + contactDetails.add(emptyPhone); + + PersonContactDetailDto nullPhone = new PersonContactDetailDto(); + nullPhone.setContactInformation(null); + nullPhone.setPersonContactDetailType(PersonContactDetailType.PHONE); + contactDetails.add(nullPhone); + getPersonFacade().save(person); // EXECUTE String personContactDetails = toFieldName(PersonContactDetailDto.I18N_PREFIX, PersonContactDetailDto.PHONE_NUMBER_TYPE); PartialRetrievalResponse actual = victim() - .retrievePartial(new PartialRetrievalRequest().setCaseUuid(originalCase.getUuid()).setFieldsToRetrieve(Set.of(personContactDetails))); + .retrievePartial(new PartialRetrievalRequest().setCaseUuid(originalCase.getUuid()).setFieldsToRetrieve(Set.of(personContactDetails))); // CHECK FieldInfo personFirstNameFieldInfo = actual.getFieldInfoDictionary().get(personContactDetails); Assertions.assertAll( - () -> Assertions.assertTrue(actual.getFailuresDictionary().isEmpty()), - () -> Assertions.assertTrue(actual.getFieldInfoDictionary().containsKey(personContactDetails)), - () -> Assertions.assertEquals("Phone number type", personFirstNameFieldInfo.getTranslatedFieldName()), - () -> Assertions.assertEquals("09876543; 12345678", personFirstNameFieldInfo.getFieldValue())); + () -> Assertions.assertTrue(actual.getFailuresDictionary().isEmpty()), + () -> Assertions.assertTrue(actual.getFieldInfoDictionary().containsKey(personContactDetails)), + () -> Assertions.assertEquals("Phone number type", personFirstNameFieldInfo.getTranslatedFieldName()), + () -> Assertions.assertEquals("09876543; 12345678", personFirstNameFieldInfo.getFieldValue())); } @Test @@ -236,15 +242,15 @@ void retrieve_contact_details_email() { // EXECUTE String personContactDetails = toFieldName(PersonContactDetailDto.I18N_PREFIX, PersonContactDetailDto.CONTACT_INFORMATION); PartialRetrievalResponse actual = victim() - .retrievePartial(new PartialRetrievalRequest().setCaseUuid(originalCase.getUuid()).setFieldsToRetrieve(Set.of(personContactDetails))); + .retrievePartial(new PartialRetrievalRequest().setCaseUuid(originalCase.getUuid()).setFieldsToRetrieve(Set.of(personContactDetails))); // CHECK FieldInfo personFirstNameFieldInfo = actual.getFieldInfoDictionary().get(personContactDetails); Assertions.assertAll( - () -> Assertions.assertTrue(actual.getFailuresDictionary().isEmpty()), - () -> Assertions.assertTrue(actual.getFieldInfoDictionary().containsKey(personContactDetails)), - () -> Assertions.assertEquals("Contact information", personFirstNameFieldInfo.getTranslatedFieldName()), - () -> Assertions.assertEquals("mail@mail.ch", personFirstNameFieldInfo.getFieldValue())); + () -> Assertions.assertTrue(actual.getFailuresDictionary().isEmpty()), + () -> Assertions.assertTrue(actual.getFieldInfoDictionary().containsKey(personContactDetails)), + () -> Assertions.assertEquals("Contact information", personFirstNameFieldInfo.getTranslatedFieldName()), + () -> Assertions.assertEquals("mail@mail.ch", personFirstNameFieldInfo.getFieldValue())); } private static String toFieldName(String prefix, String fieldName) { From 4b5506a225ca608070b82879ecef2128a0ea73ce Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Mon, 4 May 2026 08:18:50 +0200 Subject: [PATCH 092/134] =?UTF-8?q?=F0=9F=90=9B=20multiple=20messages=20co?= =?UTF-8?q?uldn't=20be=20fetched:=20missing=20comparable=20-=20invalid=20"?= =?UTF-8?q?SQL=20WHERE=20IN"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ExternalMessageSurveyResponseRequest.java | 17 +++++++- .../backend/survey/SurveyFacadeEjb.java | 39 +++---------------- 2 files changed, 22 insertions(+), 34 deletions(-) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseRequest.java b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseRequest.java index 007de8c07f9..932dea6b992 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseRequest.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseRequest.java @@ -19,7 +19,7 @@ * Mandatory fields that require * Will be present for {@link ExternalMessageType#SURVEY_RESPONSE}. */ -public class ExternalMessageSurveyResponseRequest implements Serializable { +public class ExternalMessageSurveyResponseRequest implements Serializable, Comparable { private static final long serialVersionUID = 1L; @@ -243,4 +243,19 @@ public String toString() { + origin + '\'' + ", inputLanguages=" + inputLanguages + ", allowFallbackValues=" + allowFallbackValues + ", skipIfAlreadyProcessed=" + skipIfAlreadyProcessed + '}'; } + + @Override + public int compareTo(ExternalMessageSurveyResponseRequest o) { + + if (this.responseReceivedDate == null && o.responseReceivedDate == null) { + return 0; + } + if (this.responseReceivedDate == null) { + return -1; + } + if (o.responseReceivedDate == null) { + return 1; + } + return this.responseReceivedDate.compareTo(o.responseReceivedDate); + } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyFacadeEjb.java index 3bee0b16f79..88e9a63dd10 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyFacadeEjb.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyFacadeEjb.java @@ -19,11 +19,7 @@ import java.io.ByteArrayInputStream; import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; -import java.util.List; -import java.util.Properties; +import java.util.*; import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -35,26 +31,14 @@ import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; import javax.persistence.Tuple; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Order; -import javax.persistence.criteria.Path; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Selection; +import javax.persistence.criteria.*; import javax.validation.Valid; import javax.validation.constraints.NotNull; import de.symeda.sormas.api.Disease; import de.symeda.sormas.api.ReferenceDto; import de.symeda.sormas.api.caze.CaseDataDto; -import de.symeda.sormas.api.docgeneneration.DocumentTemplateCriteria; -import de.symeda.sormas.api.docgeneneration.DocumentTemplateDto; -import de.symeda.sormas.api.docgeneneration.DocumentTemplateEntities; -import de.symeda.sormas.api.docgeneneration.DocumentTemplateException; -import de.symeda.sormas.api.docgeneneration.DocumentVariables; -import de.symeda.sormas.api.docgeneneration.DocumentWorkflow; -import de.symeda.sormas.api.docgeneneration.RootEntityType; +import de.symeda.sormas.api.docgeneneration.*; import de.symeda.sormas.api.document.DocumentDto; import de.symeda.sormas.api.externalemail.AttachmentException; import de.symeda.sormas.api.externalemail.ExternalEmailException; @@ -62,12 +46,7 @@ import de.symeda.sormas.api.i18n.I18nProperties; import de.symeda.sormas.api.i18n.Strings; import de.symeda.sormas.api.i18n.Validations; -import de.symeda.sormas.api.survey.SurveyCriteria; -import de.symeda.sormas.api.survey.SurveyDocumentOptionsDto; -import de.symeda.sormas.api.survey.SurveyDto; -import de.symeda.sormas.api.survey.SurveyFacade; -import de.symeda.sormas.api.survey.SurveyIndexDto; -import de.symeda.sormas.api.survey.SurveyReferenceDto; +import de.symeda.sormas.api.survey.*; import de.symeda.sormas.api.user.UserRight; import de.symeda.sormas.api.utils.SortProperty; import de.symeda.sormas.api.utils.ValidationException; @@ -75,14 +54,8 @@ import de.symeda.sormas.backend.FacadeHelper; import de.symeda.sormas.backend.caze.CaseService; import de.symeda.sormas.backend.common.CriteriaBuilderHelper; -import de.symeda.sormas.backend.docgeneration.DocGenerationHelper; -import de.symeda.sormas.backend.docgeneration.DocumentTemplate; -import de.symeda.sormas.backend.docgeneration.DocumentTemplateEntitiesBuilder; -import de.symeda.sormas.backend.docgeneration.DocumentTemplateFacadeEjb; +import de.symeda.sormas.backend.docgeneration.*; import de.symeda.sormas.backend.docgeneration.DocumentTemplateFacadeEjb.DocumentTemplateFacadeEjbLocal; -import de.symeda.sormas.backend.docgeneration.DocumentTemplateService; -import de.symeda.sormas.backend.docgeneration.RootEntities; -import de.symeda.sormas.backend.docgeneration.TemplateEngine; import de.symeda.sormas.backend.document.DocumentService; import de.symeda.sormas.backend.externalemail.ExternalEmailFacadeEjb.ExternalEmailFacadeEjbLocal; import de.symeda.sormas.backend.user.UserService; @@ -241,7 +214,7 @@ public List getByExternalIds(List externalIds) { CriteriaBuilder cb = em.getCriteriaBuilder(); CriteriaQuery cq = cb.createQuery(Survey.class); Root from = cq.from(Survey.class); - cq.where(cb.equal(from.get(Survey.EXTERNAL_ID), externalIds)); + cq.where(from.get(Survey.EXTERNAL_ID).in(externalIds)); cq.orderBy(cb.desc(from.get(Survey.NAME))); return getAsStream(cq).map(this::toDto).collect(Collectors.toList()); From 47e3e4f453d06ddc6d44ae98f2ba42a591e4849f Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Mon, 4 May 2026 14:21:11 +0200 Subject: [PATCH 093/134] =?UTF-8?q?=F0=9F=90=9B=20personContact=20details?= =?UTF-8?q?=20path?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PartialRetrieverImpl.java | 26 ++++++------------- .../PartialRetrieverImplTest.java | 6 ++--- 2 files changed, 11 insertions(+), 21 deletions(-) diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java index 510ec98ef79..f1aca9f5430 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java @@ -20,22 +20,12 @@ import de.symeda.sormas.api.EntityDto; import de.symeda.sormas.api.caze.CaseDataDto; import de.symeda.sormas.api.i18n.I18nProperties; -import de.symeda.sormas.api.patch.partial_retrieval.DisplayableFieldInfo; -import de.symeda.sormas.api.patch.partial_retrieval.DisplayablePartialRetrievalResponse; -import de.symeda.sormas.api.patch.partial_retrieval.FieldInfo; -import de.symeda.sormas.api.patch.partial_retrieval.PartialRetrievalFailureCause; -import de.symeda.sormas.api.patch.partial_retrieval.PartialRetrievalRequest; -import de.symeda.sormas.api.patch.partial_retrieval.PartialRetrievalResponse; -import de.symeda.sormas.api.patch.partial_retrieval.PartialRetriever; +import de.symeda.sormas.api.patch.partial_retrieval.*; import de.symeda.sormas.api.utils.Tuple; import de.symeda.sormas.api.utils.fieldvisibility.FieldVisibilityCheckers; import de.symeda.sormas.backend.common.ConfigFacadeEjb; import de.symeda.sormas.backend.feature.FeatureConfigurationFacadeEjb; -import de.symeda.sormas.backend.patch.BusinessDtoFacade; -import de.symeda.sormas.backend.patch.PatchFieldHelper; -import de.symeda.sormas.backend.patch.PathFailureCause; -import de.symeda.sormas.backend.patch.PropertyAccessFailure; -import de.symeda.sormas.backend.patch.PropertyAccessor; +import de.symeda.sormas.backend.patch.*; import de.symeda.sormas.backend.patch.alias.PathAliasHelper; @ApplicationScoped @@ -105,8 +95,8 @@ public PartialRetrievalResponse retrievePartial(PartialRetrievalRequest request) return Tuple.of(originalFieldName, new Tuple<>(specificFieldInfo.get(), (PartialRetrievalFailureCause) null)); } - Tuple, Object>, PropertyAccessFailure> propertyType = PropertyAccessor - .getPropertyTypeAndValue(adequateBean, physicalPathName, getFieldVisibilityCheckers(caseData.getDisease())); + Tuple, Object>, PropertyAccessFailure> propertyType = + PropertyAccessor.getPropertyTypeAndValue(adequateBean, physicalPathName, getFieldVisibilityCheckers(caseData.getDisease())); PropertyAccessFailure propertyAccessFailure = propertyType.getSecond(); if (propertyAccessFailure != null) { @@ -161,13 +151,13 @@ public DisplayablePartialRetrievalResponse retrievePartialForDisplay(PartialRetr } private Optional getAdequateBean( - @NotNull String aliasPath, + @NotNull String path, @NotNull CaseDataDto caseData, @NotNull Map> beanCache) { - int i = aliasPath.indexOf("."); + int i = path.indexOf("."); - String prefix = StringUtils.substring(aliasPath, 0, i); + String prefix = StringUtils.substring(path, 0, i); if (CaseDataDto.I18N_PREFIX.equals(prefix)) { return Optional.of(caseData); @@ -182,7 +172,7 @@ private Optional getAdequateBean( } if (entitiesSize != 1) { - logger.warn("Only first element is supported for now: [{}], was: [{}]", aliasPath, entitiesSize); + logger.warn("Only first element is supported for now: [{}], was: [{}]", path, entitiesSize); } return Optional.ofNullable(entityDtos).map(actualEntities -> actualEntities.get(0)); diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImplTest.java index 5cd0d7c107a..20a0f8f93fe 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImplTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImplTest.java @@ -4,7 +4,6 @@ import java.util.Set; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.RepeatedTest; import org.junit.jupiter.api.Test; import de.symeda.sormas.api.Disease; @@ -168,7 +167,7 @@ void retrievePartial_null_value() { () -> Assertions.assertNull(classificationDateFieldInfo.getFieldValue())); } - @RepeatedTest(12) + @Test void retrieve_contact_details_phone() { // PREPARE Disease disease = Disease.PERTUSSIS; @@ -203,7 +202,8 @@ void retrieve_contact_details_phone() { getPersonFacade().save(person); // EXECUTE - String personContactDetails = toFieldName(PersonContactDetailDto.I18N_PREFIX, PersonContactDetailDto.PHONE_NUMBER_TYPE); + String personContactDetails = + toFieldName(toFieldName(PersonDto.I18N_PREFIX, PersonDto.PERSON_CONTACT_DETAILS), PersonContactDetailDto.PHONE_NUMBER_TYPE); PartialRetrievalResponse actual = victim() .retrievePartial(new PartialRetrievalRequest().setCaseUuid(originalCase.getUuid()).setFieldsToRetrieve(Set.of(personContactDetails))); From 898ba01fdc4ee16823da0dbd1efa2d9a7b9c0096 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Mon, 4 May 2026 15:04:04 +0200 Subject: [PATCH 094/134] =?UTF-8?q?=F0=9F=90=9B=20catching=20retrieval=20e?= =?UTF-8?q?xception=20to=20always=20display=20something:=20some=20fields?= =?UTF-8?q?=20do=20not=20exist=20anyway=20so=20it's=20not=20a=20problem?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PersonContactDetailsFieldMapper.java | 2 +- .../PartialRetrieverImpl.java | 110 ++++++++++-------- 2 files changed, 61 insertions(+), 51 deletions(-) diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapper.java index db03b05c8f2..2aff3aa207d 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapper.java @@ -103,7 +103,7 @@ private PersonContactDetailDto buildEmailContactDetail(FieldPatchRequest request @Override public Set supportedFields() { return Stream.of(PersonContactDetailDto.PHONE_NUMBER_TYPE, PersonContactDetailDto.CONTACT_INFORMATION) - .map(suffix -> PersonDto.I18N_PREFIX + PATH_SEPARATOR + PersonDto.PERSON_CONTACT_DETAILS + PATH_SEPARATOR + suffix) + .map(suffix -> PersonContactDetailDto.I18N_PREFIX + PATH_SEPARATOR + suffix) .collect(Collectors.toSet()); } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java index f1aca9f5430..09ca32d4819 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java @@ -64,73 +64,83 @@ public PartialRetrievalResponse retrievePartial(PartialRetrievalRequest request) List>> results = patchFieldHelper.extractFieldTuples(request.getFieldsToRetrieve(), businessDtoFacade.fetchablePrefixes()).stream().map(tuple -> { - String originalFieldName = tuple.getFirst(); - PathFailureCause pathFailureCause = tuple.getSecond(); + try { + return buildTupleImpl(tuple, caseData, beanCache); + } catch (RuntimeException e) { + logger.warn("Failure during retrieval for [{}]", tuple, e); + return Tuple.of(tuple.getFirst(), new Tuple<>((FieldInfo) null, PartialRetrievalFailureCause.TECHNICAL)); + } - Tuple unAliasedTuple = patchFieldHelper.resolveAlias(originalFieldName); + }).collect(Collectors.toList()); - PartialRetrievalFailureCause failureCause = Optional.ofNullable(pathFailureCause) - .map(PathFailureCause::getRelatedRetrieveFailureCause) - .or(() -> Optional.ofNullable(unAliasedTuple.getSecond()).map(PathFailureCause::getRelatedRetrieveFailureCause)) - .orElse(null); + Map successes = results.stream() + .filter(tuple -> tuple.getSecond().getSecond() == null) + .collect(Collectors.toMap(Tuple::getFirst, tuple -> tuple.getSecond().getFirst())); - if (failureCause != null) { - return Tuple.of(originalFieldName, new Tuple<>((FieldInfo) null, failureCause)); - } + Map failures = results.stream() + .filter(tuple -> tuple.getSecond().getSecond() != null) + .collect(Collectors.toMap(Tuple::getFirst, tuple -> tuple.getSecond().getSecond())); - String pathWithoutAlias = unAliasedTuple.getFirst(); - String physicalPathName = pathWithoutAlias.substring(pathWithoutAlias.indexOf('.') + 1); + return new PartialRetrievalResponse().setFailuresDictionary(failures).setFieldInfoDictionary(successes); + } - String aliasPath = pathAliasHelper.toAliasPath(pathWithoutAlias); - Optional adequateBeanOpt = getAdequateBean(pathWithoutAlias, caseData, beanCache); + private Tuple> buildTupleImpl( + Tuple tuple, + CaseDataDto caseData, + Map> beanCache) { + String originalFieldName = tuple.getFirst(); + PathFailureCause pathFailureCause = tuple.getSecond(); - if (adequateBeanOpt.isEmpty()) { - return Tuple.of(originalFieldName, new Tuple<>((FieldInfo) null, PartialRetrievalFailureCause.ENTITY_COULD_NOT_BE_FOUND)); - } + Tuple unAliasedTuple = patchFieldHelper.resolveAlias(originalFieldName); - EntityDto adequateBean = adequateBeanOpt.orElseThrow(); - Optional specificFieldInfo = specificFieldValueRetrieverRegistry.getFieldInfo(aliasPath, adequateBean); + PartialRetrievalFailureCause failureCause = Optional.ofNullable(pathFailureCause) + .map(PathFailureCause::getRelatedRetrieveFailureCause) + .or(() -> Optional.ofNullable(unAliasedTuple.getSecond()).map(PathFailureCause::getRelatedRetrieveFailureCause)) + .orElse(null); - if (specificFieldInfo.isPresent()) { - return Tuple.of(originalFieldName, new Tuple<>(specificFieldInfo.get(), (PartialRetrievalFailureCause) null)); - } + if (failureCause != null) { + return Tuple.of(originalFieldName, new Tuple<>((FieldInfo) null, failureCause)); + } - Tuple, Object>, PropertyAccessFailure> propertyType = - PropertyAccessor.getPropertyTypeAndValue(adequateBean, physicalPathName, getFieldVisibilityCheckers(caseData.getDisease())); + String pathWithoutAlias = unAliasedTuple.getFirst(); + String physicalPathName = pathWithoutAlias.substring(pathWithoutAlias.indexOf('.') + 1); - PropertyAccessFailure propertyAccessFailure = propertyType.getSecond(); - if (propertyAccessFailure != null) { - return Tuple.of(originalFieldName, new Tuple<>((FieldInfo) null, propertyAccessFailure.getRelatedRetrieveFailureCause())); - } + String aliasPath = pathAliasHelper.toAliasPath(pathWithoutAlias); + Optional adequateBeanOpt = getAdequateBean(pathWithoutAlias, caseData, beanCache); - Tuple, Object> fieldInfo = propertyType.getFirst(); + if (adequateBeanOpt.isEmpty()) { + return Tuple.of(originalFieldName, new Tuple<>((FieldInfo) null, PartialRetrievalFailureCause.ENTITY_COULD_NOT_BE_FOUND)); + } - // Some fields are translated only by there "physical-path" from root level - // example: Person.firstName has translation key "firstName" - // example: CaseData.disease has translation key "firstName" - String translatedFieldName = Optional.ofNullable(I18nProperties.getCaption(aliasPath, null)) - .or(() -> Optional.ofNullable(I18nProperties.getCaption(physicalPathName, null))) - .orElseGet(() -> I18nProperties.getDescription(aliasPath, aliasPath)); + EntityDto adequateBean = adequateBeanOpt.orElseThrow(); + Optional specificFieldInfo = specificFieldValueRetrieverRegistry.getFieldInfo(aliasPath, adequateBean); - return Tuple.of( - originalFieldName, - new Tuple<>( - new FieldInfo().setFieldType(fieldInfo.getFirst()) - .setFieldValue(fieldInfo.getSecond()) - .setTranslatedFieldName(translatedFieldName), - (PartialRetrievalFailureCause) null)); + if (specificFieldInfo.isPresent()) { + return Tuple.of(originalFieldName, new Tuple<>(specificFieldInfo.get(), (PartialRetrievalFailureCause) null)); + } - }).collect(Collectors.toList()); + Tuple, Object>, PropertyAccessFailure> propertyType = + PropertyAccessor.getPropertyTypeAndValue(adequateBean, physicalPathName, getFieldVisibilityCheckers(caseData.getDisease())); - Map successes = results.stream() - .filter(tuple -> tuple.getSecond().getSecond() == null) - .collect(Collectors.toMap(Tuple::getFirst, tuple -> tuple.getSecond().getFirst())); + PropertyAccessFailure propertyAccessFailure = propertyType.getSecond(); + if (propertyAccessFailure != null) { + return Tuple.of(originalFieldName, new Tuple<>((FieldInfo) null, propertyAccessFailure.getRelatedRetrieveFailureCause())); + } - Map failures = results.stream() - .filter(tuple -> tuple.getSecond().getSecond() != null) - .collect(Collectors.toMap(Tuple::getFirst, tuple -> tuple.getSecond().getSecond())); + Tuple, Object> fieldInfo = propertyType.getFirst(); - return new PartialRetrievalResponse().setFailuresDictionary(failures).setFieldInfoDictionary(successes); + // Some fields are translated only by there "physical-path" from root level + // example: Person.firstName has translation key "firstName" + // example: CaseData.disease has translation key "firstName" + String translatedFieldName = Optional.ofNullable(I18nProperties.getCaption(aliasPath, null)) + .or(() -> Optional.ofNullable(I18nProperties.getCaption(physicalPathName, null))) + .orElseGet(() -> I18nProperties.getDescription(aliasPath, aliasPath)); + + return Tuple.of( + originalFieldName, + new Tuple<>( + new FieldInfo().setFieldType(fieldInfo.getFirst()).setFieldValue(fieldInfo.getSecond()).setTranslatedFieldName(translatedFieldName), + (PartialRetrievalFailureCause) null)); } @Override From 8fa93cbdc2e2f6e4eaf5916513a2f97d00158b4c Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Mon, 4 May 2026 17:05:25 +0200 Subject: [PATCH 095/134] =?UTF-8?q?=F0=9F=90=9B=20minor=20issues.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit TO CHECK: - Cryptosporidiosis | Crypto4First | Crypto4Last: process button missing on modal but ok in grid - Description field in table should be renamed: error detail --- .../AutomaticSurveyResponseProcessor.java | 2 +- .../PersonContactDetailsFieldMapper.java | 2 +- .../sormas/patch/DataPatcherImplTest.java | 17 +++-------------- 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java index 71674c2b31f..c3c7c003e7f 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java @@ -104,7 +104,7 @@ public List processSurveyResponses(List supportedFields() { return Stream.of(PersonContactDetailDto.PHONE_NUMBER_TYPE, PersonContactDetailDto.CONTACT_INFORMATION) - .map(suffix -> PersonContactDetailDto.I18N_PREFIX + PATH_SEPARATOR + suffix) + .map(suffix -> PersonDto.I18N_PREFIX + PATH_SEPARATOR + PersonDto.PERSON_CONTACT_DETAILS + PATH_SEPARATOR + suffix) .collect(Collectors.toSet()); } } diff --git a/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java index 2e3f306de0f..f50d9cb06ee 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java @@ -32,19 +32,8 @@ import de.symeda.sormas.api.infrastructure.country.CountryReferenceDto; import de.symeda.sormas.api.infrastructure.facility.FacilityDto; import de.symeda.sormas.api.infrastructure.region.RegionFacade; -import de.symeda.sormas.api.patch.CaseDataPatchRequest; -import de.symeda.sormas.api.patch.DataPatchFailure; -import de.symeda.sormas.api.patch.DataPatchFailureCause; -import de.symeda.sormas.api.patch.DataPatchResponse; -import de.symeda.sormas.api.patch.DataPatcher; -import de.symeda.sormas.api.patch.DataReplacementStrategy; -import de.symeda.sormas.api.patch.EmptyValueBehavior; -import de.symeda.sormas.api.person.OccupationType; -import de.symeda.sormas.api.person.PersonContactDetailDto; -import de.symeda.sormas.api.person.PersonContactDetailType; -import de.symeda.sormas.api.person.PersonDto; -import de.symeda.sormas.api.person.PhoneNumberType; -import de.symeda.sormas.api.person.Sex; +import de.symeda.sormas.api.patch.*; +import de.symeda.sormas.api.person.*; import de.symeda.sormas.api.symptoms.SymptomState; import de.symeda.sormas.api.vaccination.VaccinationDto; import de.symeda.sormas.backend.AbstractBeanTest; @@ -132,7 +121,7 @@ void patch_noErrorsReplaceAlwaysPersonContactDetails() { .setReplacementStrategy(DataReplacementStrategy.ALWAYS) .setPatchDictionary( Map.of( - "Person.personContactDetails.contactInformation", + "PersonContactDetail.contactInformation", newEmail, "Person.personContactDetails.phoneNumberType", From 47dfc9814b5923d0d3bae741d2ee32c5669cdf3e Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Tue, 5 May 2026 15:02:04 +0200 Subject: [PATCH 096/134] =?UTF-8?q?=F0=9F=90=9B=20NPE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/fieldmapper/PersonContactDetailsFieldMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapper.java index db03b05c8f2..9cc1da694a2 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapper.java @@ -57,7 +57,7 @@ public Optional map(FieldPatchRequest request) { Optional alreadyPresentContactDetail = personDto.getPersonContactDetails() .stream() .filter(appropriatePredicate) - .filter(contactDetail -> contactDetail.getDetails().equals(request.getValue())) + .filter(contactDetail -> request.getValue().equals(contactDetail.getDetails())) .findAny(); if (alreadyPresentContactDetail.isPresent()) { From b6c8ad7a5b58a32a64773e9048e1a747cddf398c Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Tue, 5 May 2026 15:34:27 +0200 Subject: [PATCH 097/134] =?UTF-8?q?=F0=9F=90=9B=E2=9C=85=20Do=20not=20add?= =?UTF-8?q?=20duplicate=20contactInfo=20details?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PersonContactDetailsFieldMapper.java | 4 ++- .../PersonContactDetailsFieldMapperTest.java | 35 +++++++++++++++---- 2 files changed, 32 insertions(+), 7 deletions(-) diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapper.java index 16978b7185a..45a24858bc9 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapper.java @@ -11,6 +11,8 @@ import javax.enterprise.context.ApplicationScoped; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -56,7 +58,7 @@ public Optional map(FieldPatchRequest request) { Optional alreadyPresentContactDetail = personDto.getPersonContactDetails() .stream() .filter(appropriatePredicate) - .filter(contactDetail -> contactDetail.getDetails().equals(request.getValue())) + .filter(contactDetail -> request.getValue().equals(contactDetail.getContactInformation())) .findAny(); if (alreadyPresentContactDetail.isPresent()) { diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapperTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapperTest.java index 9db06d4214c..bc59ec83524 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapperTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/fieldmapper/PersonContactDetailsFieldMapperTest.java @@ -85,7 +85,7 @@ void map_phoneField_contactDetailAlreadyPresent_doesNotAddDuplicate() { // PREPARE PersonContactDetailDto existing = new PersonContactDetailDto(); existing.setPersonContactDetailType(PersonContactDetailType.PHONE); - existing.setDetails("0123456789"); + existing.setContactInformation("0123456789"); PersonDto personDto = new PersonDto(); personDto.setPersonContactDetails(new ArrayList<>(List.of(existing))); @@ -135,7 +135,7 @@ void map_emailField_contactDetailNotPresent_addsEmailContactDetail() { FieldPatchRequest request = mock(FieldPatchRequest.class); when(request.getTarget()).thenReturn(personDto); - when(request.getFieldName()).thenReturn("Person.PersonContactDetail.details"); + when(request.getFieldName()).thenReturn("Person.PersonContactDetail.contactInformation"); when(request.getValue()).thenReturn("test@example.com"); when(request.getOrigin()).thenReturn("someOrigin"); @@ -156,14 +156,37 @@ void map_emailField_contactDetailAlreadyPresent_doesNotAddDuplicate() { // PREPARE PersonContactDetailDto existing = new PersonContactDetailDto(); existing.setPersonContactDetailType(PersonContactDetailType.EMAIL); - existing.setDetails("test@example.com"); + existing.setContactInformation("test@example.com"); PersonDto personDto = new PersonDto(); personDto.setPersonContactDetails(new ArrayList<>(List.of(existing))); FieldPatchRequest request = mock(FieldPatchRequest.class); when(request.getTarget()).thenReturn(personDto); - when(request.getFieldName()).thenReturn("Person.PersonContactDetail.details"); + when(request.getFieldName()).thenReturn("Person.PersonContactDetail.contactInformation"); + when(request.getValue()).thenReturn("test@example.com"); + + // EXECUTE + Optional actual = victim.map(request); + + // CHECK + assertTrue(actual.isEmpty()); + assertEquals(1, personDto.getPersonContactDetails().size()); + } + + @Test + void map_emailField_contactInformationAlreadyPresent_doesNotAddDuplicate() { + // PREPARE + PersonContactDetailDto existing = new PersonContactDetailDto(); + existing.setPersonContactDetailType(PersonContactDetailType.EMAIL); + existing.setContactInformation("test@example.com"); + + PersonDto personDto = new PersonDto(); + personDto.setPersonContactDetails(new ArrayList<>(List.of(existing))); + + FieldPatchRequest request = mock(FieldPatchRequest.class); + when(request.getTarget()).thenReturn(personDto); + when(request.getFieldName()).thenReturn("PersonContactDetail.contactInformation"); when(request.getValue()).thenReturn("test@example.com"); // EXECUTE @@ -186,7 +209,7 @@ void map_emailField_differentValueAlreadyPresent_addsNewEntry() { FieldPatchRequest request = mock(FieldPatchRequest.class); when(request.getTarget()).thenReturn(personDto); - when(request.getFieldName()).thenReturn("Person.PersonContactDetail.details"); + when(request.getFieldName()).thenReturn("Person.PersonContactDetail.contactInformation"); when(request.getValue()).thenReturn("test@example.com"); when(request.getOrigin()).thenReturn("someOrigin"); @@ -234,7 +257,7 @@ void map_emailField_existingPhoneWithSameValue_addsEmailContactDetail() { FieldPatchRequest request = mock(FieldPatchRequest.class); when(request.getTarget()).thenReturn(personDto); - when(request.getFieldName()).thenReturn("Person.PersonContactDetail.details"); + when(request.getFieldName()).thenReturn("Person.PersonContactDetail.contactInformation"); when(request.getValue()).thenReturn("test@example.com"); when(request.getOrigin()).thenReturn("someOrigin"); From d198be357c8e373b295fcaee7c28a0160471a46d Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Tue, 5 May 2026 21:06:59 +0200 Subject: [PATCH 098/134] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Alias=20using=20re?= =?UTF-8?q?ferences=20to=20avoid=20'magic-strings'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backend/patch/alias/PathAliasHelper.java | 62 ++++++++++++++----- 1 file changed, 45 insertions(+), 17 deletions(-) diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java index e16d0c8832a..77bd5216a4b 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java @@ -12,12 +12,29 @@ import javax.enterprise.context.ApplicationScoped; import javax.validation.constraints.NotNull; +import de.symeda.sormas.api.epidata.EpiDataDto; import org.apache.commons.collections4.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import de.symeda.sormas.api.caze.CaseDataDto; +import de.symeda.sormas.api.clinicalcourse.HealthConditionsDto; +import de.symeda.sormas.api.exposure.ExposureDto; +import de.symeda.sormas.api.hospitalization.HospitalizationDto; +import de.symeda.sormas.api.hospitalization.PreviousHospitalizationDto; +import de.symeda.sormas.api.infrastructure.community.CommunityDto; +import de.symeda.sormas.api.infrastructure.continent.ContinentDto; +import de.symeda.sormas.api.infrastructure.country.CountryDto; +import de.symeda.sormas.api.infrastructure.district.DistrictDto; +import de.symeda.sormas.api.infrastructure.facility.FacilityDto; +import de.symeda.sormas.api.infrastructure.pointofentry.PointOfEntryDto; +import de.symeda.sormas.api.infrastructure.region.RegionDto; +import de.symeda.sormas.api.infrastructure.subcontinent.SubcontinentDto; +import de.symeda.sormas.api.location.LocationDto; +import de.symeda.sormas.api.person.PersonContactDetailDto; import de.symeda.sormas.api.person.PersonDto; +import de.symeda.sormas.api.symptoms.SymptomsDto; +import de.symeda.sormas.api.user.UserDto; import de.symeda.sormas.api.utils.Tuple; import de.symeda.sormas.backend.patch.PathFailureCause; @@ -37,32 +54,43 @@ public class PathAliasHelper { /** * Can be used as OUT: for displaying purposes but not for in. */ - public static final Map> DEFAULT_FORBIDDEN_ALIASES_DICTIONARY = - Map.of("Location", Set.of("Person.address", "Exposure.location")); + public static final Map> DEFAULT_FORBIDDEN_ALIASES_DICTIONARY = Map.of( + "Location", + Set.of(toFieldName(PersonDto.I18N_PREFIX, PersonDto.ADDRESS), toFieldName(ExposureDto.I18N_PREFIX, ExposureDto.LOCATION))); - public static final Map REFERENCE_TO_ROOT_DICTIONARY = Map.of("CaseData.person", PersonDto.I18N_PREFIX); + public static final Map REFERENCE_TO_ROOT_DICTIONARY = Map.of( + toFieldName(CaseDataDto.I18N_PREFIX, CaseDataDto.PERSON), + PersonDto.I18N_PREFIX, + toFieldName(CaseDataDto.I18N_PREFIX, CaseDataDto.EPI_DATA), + EpiDataDto.I18N_PREFIX); private static @NotNull HashMap buildDefaultAliasDictionary() { HashMap dictionary = new HashMap<>(); - dictionary.put("Symptoms", "CaseData.symptoms"); - dictionary.put("HealthConditions", "CaseData.healthConditions"); - dictionary.put("Hospitalization", "CaseData.hospitalization"); - dictionary.put("PreviousHospitalization", "CaseData.hospitalization.previousHospitalizations"); - dictionary.put("PersonContactDetail", "Person.personContactDetails"); - dictionary.put("Facility", "CaseData.healthFacility"); - dictionary.put("PointOfEntry", "CaseData.pointOfEntry"); - dictionary.put("Region", "CaseData.responsibleRegion"); - dictionary.put("District", "CaseData.responsibleDistrict"); - dictionary.put("Community", "CaseData.responsibleCommunity"); - dictionary.put("Country", "Person.birthCountry"); - dictionary.put("Subcontinent", "Person.address.subcontinent"); - dictionary.put("Continent", "Person.address.continent"); - dictionary.put("User", "CaseData.followUpStatusChangeUser"); + dictionary.put(SymptomsDto.I18N_PREFIX, toFieldName(CaseDataDto.I18N_PREFIX, CaseDataDto.SYMPTOMS)); + dictionary.put(HealthConditionsDto.I18N_PREFIX, toFieldName(CaseDataDto.I18N_PREFIX, CaseDataDto.HEALTH_CONDITIONS)); + dictionary.put(HospitalizationDto.I18N_PREFIX, toFieldName(CaseDataDto.I18N_PREFIX, CaseDataDto.HOSPITALIZATION)); + dictionary.put( + PreviousHospitalizationDto.I18N_PREFIX, + toFieldName(toFieldName(CaseDataDto.I18N_PREFIX, CaseDataDto.HOSPITALIZATION), HospitalizationDto.PREVIOUS_HOSPITALIZATIONS)); + dictionary.put(PersonContactDetailDto.I18N_PREFIX, toFieldName(PersonDto.I18N_PREFIX, PersonDto.PERSON_CONTACT_DETAILS)); + dictionary.put(FacilityDto.I18N_PREFIX, toFieldName(CaseDataDto.I18N_PREFIX, CaseDataDto.HEALTH_FACILITY)); + dictionary.put(PointOfEntryDto.I18N_PREFIX, toFieldName(CaseDataDto.I18N_PREFIX, CaseDataDto.POINT_OF_ENTRY)); + dictionary.put(RegionDto.I18N_PREFIX, toFieldName(CaseDataDto.I18N_PREFIX, CaseDataDto.RESPONSIBLE_REGION)); + dictionary.put(DistrictDto.I18N_PREFIX, toFieldName(CaseDataDto.I18N_PREFIX, CaseDataDto.RESPONSIBLE_DISTRICT)); + dictionary.put(CommunityDto.I18N_PREFIX, toFieldName(CaseDataDto.I18N_PREFIX, CaseDataDto.RESPONSIBLE_COMMUNITY)); + dictionary.put(CountryDto.I18N_PREFIX, toFieldName(PersonDto.I18N_PREFIX, PersonDto.BIRTH_COUNTRY)); + dictionary.put(SubcontinentDto.I18N_PREFIX, toFieldName(toFieldName(PersonDto.I18N_PREFIX, PersonDto.ADDRESS), LocationDto.SUB_CONTINENT)); + dictionary.put(ContinentDto.I18N_PREFIX, toFieldName(toFieldName(PersonDto.I18N_PREFIX, PersonDto.ADDRESS), LocationDto.CONTINENT)); + dictionary.put(UserDto.I18N_PREFIX, toFieldName(CaseDataDto.I18N_PREFIX, CaseDataDto.FOLLOW_UP_STATUS_CHANGE_USER)); return dictionary; } + private static String toFieldName(String prefix, String fieldName) { + return prefix + '.' + fieldName; + } + @NotNull public Tuple resolveAlias(String pathWithPotentialAlias) { int firstPathSeparatorIndex = pathWithPotentialAlias.indexOf(PATH_SEPARATOR); From 315cdac5ea23343f4c072891151dd93a037299cc Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Tue, 5 May 2026 21:27:48 +0200 Subject: [PATCH 099/134] =?UTF-8?q?=E2=9C=A8=20Added=20new=20section=20to?= =?UTF-8?q?=20be=20able=20to=20distinguish=20among=20different=20survey=20?= =?UTF-8?q?responses?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../de/symeda/sormas/api/i18n/Captions.java | 1 + .../src/main/resources/captions.properties | 1 + sormas-api/src/main/resources/enum.properties | 1 + .../SurveyResponseDetailsWindow.java | 25 ++++++++++++++++--- 4 files changed, 25 insertions(+), 3 deletions(-) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java index 17b610f6929..baa38209aac 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java @@ -2942,6 +2942,7 @@ public interface Captions { String surveyResponseField = "surveyResponseField"; String surveyResponseIgnoreField = "surveyResponseIgnoreField"; String surveyResponseKeyName = "surveyResponseKeyName"; + String surveyResponseGeneralInfo = "surveyResponseGeneralInfo"; String surveyResponseMetadata = "surveyResponseMetadata"; String surveyResponsePatchDictionary = "surveyResponsePatchDictionary"; String surveyResponseProcessingResult = "surveyResponseProcessingResult"; diff --git a/sormas-api/src/main/resources/captions.properties b/sormas-api/src/main/resources/captions.properties index ad5e337ae22..8e4868bd203 100644 --- a/sormas-api/src/main/resources/captions.properties +++ b/sormas-api/src/main/resources/captions.properties @@ -3775,6 +3775,7 @@ surveyResponseFailureCause=Failure Cause surveyResponseDescription=Description surveyResponseCaseLink=Case surveyResponseApplied=Applied +surveyResponseGeneralInfo=External Message General Info surveyResponseMetadata=Metadata surveyResponsePatchDictionary=Patch Dictionary surveyResponseExcludedFieldsDictionary=Ignored fields Dictionary diff --git a/sormas-api/src/main/resources/enum.properties b/sormas-api/src/main/resources/enum.properties index dc505857fb4..857e505f749 100644 --- a/sormas-api/src/main/resources/enum.properties +++ b/sormas-api/src/main/resources/enum.properties @@ -2541,6 +2541,7 @@ ExternalMessageStatus.UNCLEAR=Unclear # ExternalMessageType ExternalMessageType.LAB_MESSAGE=Lab message ExternalMessageType.PHYSICIANS_REPORT=Physician's report +ExternalMessageType.SURVEY_RESPONSE=Survey response # ShareRequestDataType ShareRequestDataType.CASE = Case diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseDetailsWindow.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseDetailsWindow.java index 683faf85260..5d7b8031502 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseDetailsWindow.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseDetailsWindow.java @@ -65,6 +65,21 @@ public SurveyResponseDetailsWindow(ExternalMessageDto externalMessage, Runnable ExternalMessageSurveyResponseRequest request = latest.getRequest(); ExternalMessageSurveyResponseResult result = latest.getResult(); + // --- External Message General Info section --- + Label generalInfoHeading = new Label(I18nProperties.getCaption(Captions.surveyResponseGeneralInfo)); + CssStyles.style(generalInfoHeading, CssStyles.H3); + layout.addComponent(generalInfoHeading); + + addReadOnlyField(layout, "UUID", externalMessage.getUuid()); + addReadOnlyField( + layout, + I18nProperties.getPrefixCaption(ExternalMessageDto.I18N_PREFIX, ExternalMessageDto.DISEASE), + toStringOrEmpty(externalMessage.getDisease())); + addReadOnlyField( + layout, + I18nProperties.getPrefixCaption(ExternalMessageDto.I18N_PREFIX, ExternalMessageDto.STATUS), + toStringOrEmpty(externalMessage.getStatus())); + // --- Metadata section --- Label metadataHeading = new Label(I18nProperties.getCaption(Captions.surveyResponseMetadata)); CssStyles.style(metadataHeading, CssStyles.H3); @@ -73,9 +88,9 @@ public SurveyResponseDetailsWindow(ExternalMessageDto externalMessage, Runnable addReadOnlyField(layout, "External Survey ID", request.getExternalSurveyId()); addReadOnlyField(layout, "Token", request.getToken()); addReadOnlyField(layout, "Respondent ID", request.getExternalRespondentId()); - addReadOnlyField(layout, "Response Received", request.getResponseReceivedDate() != null ? request.getResponseReceivedDate().toString() : ""); - addReadOnlyField(layout, "Replacement Strategy", request.getReplacementStrategy() != null ? request.getReplacementStrategy().name() : ""); - addReadOnlyField(layout, "Empty Value Behavior", request.getEmptyValueBehavior() != null ? request.getEmptyValueBehavior().name() : ""); + addReadOnlyField(layout, "Response Received", toStringOrEmpty(request.getResponseReceivedDate())); + addReadOnlyField(layout, "Replacement Strategy", toStringOrEmpty(request.getReplacementStrategy())); + addReadOnlyField(layout, "Empty Value Behavior", toStringOrEmpty(request.getEmptyValueBehavior())); addReadOnlyField(layout, "Patched in Case of Failures", String.valueOf(request.isPatchedInCaseOfFailures())); // --- Patch Dictionary section --- @@ -197,6 +212,10 @@ public SurveyResponseDetailsWindow(ExternalMessageDto externalMessage, Runnable UI.getCurrent().addWindow(window); } + private static String toStringOrEmpty(Object value) { + return value != null ? value.toString() : ""; + } + private void addReadOnlyField(VerticalLayout layout, String caption, String value) { Label label = new Label(value != null ? value : ""); label.setCaption(caption); From ae3b4a986878b7042013a198003d90594ef85bdd Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Tue, 5 May 2026 21:34:15 +0200 Subject: [PATCH 100/134] =?UTF-8?q?=F0=9F=92=AC=20enhanced=20value=20displ?= =?UTF-8?q?ay?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../surveyresponse/SurveyResponseDetailsWindow.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseDetailsWindow.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseDetailsWindow.java index 5d7b8031502..f5c5b142db0 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseDetailsWindow.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseDetailsWindow.java @@ -23,8 +23,10 @@ import com.vaadin.ui.*; import com.vaadin.ui.themes.ValoTheme; +import de.symeda.sormas.api.DiseaseHelper; import de.symeda.sormas.api.FacadeProvider; import de.symeda.sormas.api.externalmessage.ExternalMessageDto; +import de.symeda.sormas.api.externalmessage.ExternalMessageStatus; import de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseRequest; import de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseResult; import de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseWrapper; @@ -74,11 +76,12 @@ public SurveyResponseDetailsWindow(ExternalMessageDto externalMessage, Runnable addReadOnlyField( layout, I18nProperties.getPrefixCaption(ExternalMessageDto.I18N_PREFIX, ExternalMessageDto.DISEASE), - toStringOrEmpty(externalMessage.getDisease())); + DiseaseHelper.toString(externalMessage.getDisease(), null)); + ExternalMessageStatus status = externalMessage.getStatus(); addReadOnlyField( layout, I18nProperties.getPrefixCaption(ExternalMessageDto.I18N_PREFIX, ExternalMessageDto.STATUS), - toStringOrEmpty(externalMessage.getStatus())); + status != null ? I18nProperties.getEnumCaption(status) : ""); // --- Metadata section --- Label metadataHeading = new Label(I18nProperties.getCaption(Captions.surveyResponseMetadata)); From c1f27a05849cc78cf994acdf9091c044bee369b7 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Wed, 6 May 2026 09:36:46 +0200 Subject: [PATCH 101/134] =?UTF-8?q?=F0=9F=92=AC=20missing=20external=20ID?= =?UTF-8?q?=20translation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sormas-api/src/main/resources/captions.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/sormas-api/src/main/resources/captions.properties b/sormas-api/src/main/resources/captions.properties index 8e4868bd203..597a4d90a9a 100644 --- a/sormas-api/src/main/resources/captions.properties +++ b/sormas-api/src/main/resources/captions.properties @@ -41,6 +41,7 @@ lastName=Last name menu=Menu moreActions=More name=Name +externalId=External ID options=Options regionName=Region system=System From 445a46f563cd5898905fab0d8420a014f1422c7c Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Wed, 6 May 2026 16:11:39 +0200 Subject: [PATCH 102/134] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Simplified=20surve?= =?UTF-8?q?y=20display?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backend/patch/PatchFieldHelper.java | 27 +++++++++++++++---- .../ui/survey/SurveyQuestionnaireWindow.java | 21 +++++++-------- 2 files changed, 31 insertions(+), 17 deletions(-) diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java index 8e32e5a28d0..2d07bf8b1b3 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java @@ -1,11 +1,13 @@ package de.symeda.sormas.backend.patch; import java.util.Arrays; +import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; import javax.annotation.Nullable; +import javax.ejb.EJB; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; import javax.validation.constraints.NotNull; @@ -13,6 +15,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import de.symeda.sormas.api.systemconfiguration.SystemConfigurationValueFacade; import de.symeda.sormas.api.utils.Tuple; import de.symeda.sormas.backend.patch.alias.PathAliasHelper; @@ -30,13 +33,17 @@ public class PatchFieldHelper { private static final String CLOSING_PARENTHESIS = ")"; private static final String PIPE = "|"; - // might be more subtle: person.toto but also *.uuid (or uuid). includes approach ? - // TODO: must be twofold: enforced default fields : technical: uuid, user ... + custom config by admin - private Set forbiddenFields = Set.of("Person.birthdate", "Person.birthdateDD", "Person.birthdateMM", "Person.birthdateYYYY"); + public static final String PATCH_FORBIDDEN_FIELDS_CONFIG_KEY = "PATCH_FORBIDDEN_FIELDS"; + + private static final Set DEFAULT_FORBIDDEN_FIELDS = + Set.of("Person.birthdate", "Person.birthdateDD", "Person.birthdateMM", "Person.birthdateYYYY"); @Inject private PathAliasHelper pathAliasHelper; + @EJB + private SystemConfigurationValueFacade systemConfigurationValueFacade; + public PatchFieldHelper() { } @@ -78,7 +85,6 @@ public PathFailureCause checkIfPathIsInvalid(String path) { private PathFailureCause checkIfPathIsInvalidImpl(String path, Set additionalSupportedPrefixes) { PathFailureCause dataPatchFailureCause = null; - // TODO: check it would be required to distinguish read / write: per example Immunization can be read and write but write does not reach this code. if (!path.contains(PATH_SEPARATOR)) { dataPatchFailureCause = PathFailureCause.INVALID_PATH_FORMAT; } else if (!(startsWithAllowedPrefix(path) || pathStartsWithAllowedPrefix(path, additionalSupportedPrefixes))) { @@ -97,7 +103,18 @@ public Tuple resolveAlias(String pathWithPotentialAlia } private boolean fieldIsForbidden(String path) { - return forbiddenFields.contains(path); + Set configured = resolveConfiguredForbiddenFields(); + return configured.contains(path); + } + + private Set resolveConfiguredForbiddenFields() { + String configValue = systemConfigurationValueFacade != null + ? systemConfigurationValueFacade.getValue(PATCH_FORBIDDEN_FIELDS_CONFIG_KEY) + : null; + return Optional.ofNullable(configValue) + .filter(v -> !v.isBlank()) + .map(v -> Arrays.stream(v.split(",")).map(String::trim).filter(s -> !s.isEmpty()).collect(Collectors.toSet())) + .orElse(DEFAULT_FORBIDDEN_FIELDS); } private boolean startsWithAllowedPrefix(String path) { diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/survey/SurveyQuestionnaireWindow.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/survey/SurveyQuestionnaireWindow.java index 04f2a77d09d..43544f4d404 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/survey/SurveyQuestionnaireWindow.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/survey/SurveyQuestionnaireWindow.java @@ -27,6 +27,7 @@ import de.symeda.sormas.api.survey.SurveyTokenReferenceDto; import de.symeda.sormas.api.survey.external.views.ExternalSurveyView; import de.symeda.sormas.api.survey.external.views.QuestionAnswersView; +import org.apache.commons.lang3.StringUtils; /** * Modal window displaying a survey questionnaire as a structured HTML view. @@ -97,7 +98,7 @@ private void appendQuestion(StringBuilder sb, QuestionAnswersView q, int depth) .append(indent) .append(questionStyle) .append("\">") - .append(escapeHtml(q.getQuestion())) + .append(q.getQuestion()) .append("") .append("") .append(resolveAnswer(q)) @@ -113,19 +114,15 @@ private void appendQuestion(StringBuilder sb, QuestionAnswersView q, int depth) private String resolveAnswer(QuestionAnswersView q) { // Prefer human-readable answerText, fall back to raw answer - if (q.getAnswerText() != null && !q.getAnswerText().isEmpty()) { - return escapeHtml(q.getAnswerText()); + String answerText = q.getAnswerText(); + if (StringUtils.isNotBlank(answerText)) { + return answerText; } - if (q.getAnswer() != null && !q.getAnswer().isEmpty()) { - return escapeHtml(q.getAnswer()); + String answer = q.getAnswer(); + if (StringUtils.isNotBlank(answer)) { + return answer; } - return "—"; + return "—"; } - private String escapeHtml(String text) { - if (text == null) { - return ""; - } - return text.replace("&", "&").replace("<", "<").replace(">", ">").replace("\"", """); - } } From fbf87803f7d1ef94f7ce0b08abf7d491638e63cf Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Wed, 6 May 2026 16:32:31 +0200 Subject: [PATCH 103/134] =?UTF-8?q?=E2=9C=A8=20Added=20registry=20for=20Eq?= =?UTF-8?q?uality=20check:=20consider=20java.util.Date=20to=20equal?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sormas/backend/patch/DataPatcherImpl.java | 8 +- .../patch/mapping/EqualityChecker.java | 18 +++ .../mapping/EqualityCheckerRegistry.java | 58 +++++++++ .../equalitychecker/DateEqualityChecker.java | 35 ++++++ .../ObjectEqualityChecker.java | 24 ++++ .../DateEqualityCheckerTest.java | 118 ++++++++++++++++++ .../ObjectEqualityCheckerTest.java | 75 +++++++++++ 7 files changed, 335 insertions(+), 1 deletion(-) create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/EqualityChecker.java create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/EqualityCheckerRegistry.java create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/DateEqualityChecker.java create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/ObjectEqualityChecker.java create mode 100644 sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/DateEqualityCheckerTest.java create mode 100644 sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/ObjectEqualityCheckerTest.java diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java index 34b8ce395ae..f561ae2531a 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java @@ -30,6 +30,7 @@ import de.symeda.sormas.backend.common.ConfigFacadeEjb; import de.symeda.sormas.backend.feature.FeatureConfigurationFacadeEjb; import de.symeda.sormas.backend.json.ObjectMapperProvider; +import de.symeda.sormas.backend.patch.mapping.EqualityCheckerRegistry; import de.symeda.sormas.backend.patch.mapping.FieldCustomMapperRegistry; import de.symeda.sormas.backend.patch.mapping.GroupedFieldMapperRegistry; import de.symeda.sormas.backend.patch.mapping.ValueMapperRegistry; @@ -54,6 +55,9 @@ public class DataPatcherImpl implements DataPatcher { @Inject private GroupedFieldMapperRegistry groupedFieldMapperRegistry; + @Inject + private EqualityCheckerRegistry equalityCheckerRegistry; + @Inject private BusinessDtoFacade businessDtoFacade; @@ -71,6 +75,7 @@ public DataPatcherImpl( ValueMapperRegistry valueMapperRegistry, FieldCustomMapperRegistry fieldCustomMapperRegistry, GroupedFieldMapperRegistry groupedFieldMapperRegistry, + EqualityCheckerRegistry equalityCheckerRegistry, BusinessDtoFacade businessDtoFacade, FeatureConfigurationFacadeEjb.FeatureConfigurationFacadeEjbLocal featureConfigurationFacade, ConfigFacadeEjb.ConfigFacadeEjbLocal configFacade) { @@ -78,6 +83,7 @@ public DataPatcherImpl( this.valueMapperRegistry = valueMapperRegistry; this.fieldCustomMapperRegistry = fieldCustomMapperRegistry; this.groupedFieldMapperRegistry = groupedFieldMapperRegistry; + this.equalityCheckerRegistry = equalityCheckerRegistry; this.businessDtoFacade = businessDtoFacade; this.featureConfigurationFacade = featureConfigurationFacade; this.configFacade = configFacade; @@ -262,7 +268,7 @@ private boolean anyFieldPatchedWithPrefix(Map validPatchDictiona if (nestedPropertyValue.isPresent()) { Object currentValue = nestedPropertyValue.orElseThrow(); - if (!currentValue.equals(typedValue)) { + if (!equalityCheckerRegistry.areEqual(currentValue, typedValue)) { return singlePatchResult.setFailure( new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.FORBIDDEN_VALUE_OVERRIDE) .setExistingFieldValue(currentValue) diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/EqualityChecker.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/EqualityChecker.java new file mode 100644 index 00000000000..d36f79bb5db --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/EqualityChecker.java @@ -0,0 +1,18 @@ +package de.symeda.sormas.backend.patch.mapping; + +import de.symeda.sormas.api.utils.OrderedRegisterable; + +/** + * Contract to specify how two values of a supported type should be compared for equality. + */ +public interface EqualityChecker extends OrderedRegisterable { + + /** + * @param a + * first value — guaranteed non-null by the registry + * @param b + * second value — guaranteed non-null by the registry + * @return true if the two values are considered equal for patch purposes + */ + boolean areEqual(Object a, Object b); +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/EqualityCheckerRegistry.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/EqualityCheckerRegistry.java new file mode 100644 index 00000000000..bb1ce093048 --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/EqualityCheckerRegistry.java @@ -0,0 +1,58 @@ +package de.symeda.sormas.backend.patch.mapping; + +import java.util.List; +import java.util.stream.Collectors; + +import javax.annotation.PostConstruct; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Instance; +import javax.inject.Inject; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +@ApplicationScoped +public class EqualityCheckerRegistry { + + private final static Logger logger = LoggerFactory.getLogger(EqualityCheckerRegistry.class); + + private List orderedInstances; + + @Inject + private Instance instances; + + public EqualityCheckerRegistry() { + } + + public EqualityCheckerRegistry(Instance instances) { + this.instances = instances; + } + + @PostConstruct + void init() { + orderedInstances = instances.stream().sorted().collect(Collectors.toList()); + } + + public boolean areEqual(Object a, Object b) { + if (a == null && b == null) { + return true; + } + if (a == null || b == null) { + return false; + } + + Class type = a.getClass(); + EqualityChecker checker = orderedInstances.stream() + .filter(c -> c.supports(type)) + .findFirst() + .orElseThrow( + () -> new IllegalStateException( + String.format( + "No equality checker found for: [%s]. Must not occur, ObjectEqualityChecker handles Object. Registered checkers: [%s]", + type, + orderedInstances))); + + logger.debug("Values [{}] and [{}] will be compared with checker: [{}]", a, b, checker); + return checker.areEqual(a, b); + } +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/DateEqualityChecker.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/DateEqualityChecker.java new file mode 100644 index 00000000000..28859fc9eff --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/DateEqualityChecker.java @@ -0,0 +1,35 @@ +package de.symeda.sormas.backend.patch.mapping.impl.equalitychecker; + +import java.time.ZoneId; +import java.util.Date; +import java.util.Objects; +import java.util.Set; + +import javax.enterprise.context.ApplicationScoped; + +import de.symeda.sormas.backend.patch.mapping.EqualityChecker; + +@ApplicationScoped +public class DateEqualityChecker implements EqualityChecker { + + public static final Set> SUPPORTED_TYPES = Set.of(Date.class); + + @Override + public boolean areEqual(Object a, Object b) { + return toLocalDate((Date) a).equals(toLocalDate((Date) b)); + } + + @Override + public Set> getSupportedTypes() { + return SUPPORTED_TYPES; + } + + @Override + public int getOrder() { + return HIGH_PRECEDENCE; + } + + private java.time.LocalDate toLocalDate(Date date) { + return date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); + } +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/ObjectEqualityChecker.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/ObjectEqualityChecker.java new file mode 100644 index 00000000000..3471a7fbead --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/ObjectEqualityChecker.java @@ -0,0 +1,24 @@ +package de.symeda.sormas.backend.patch.mapping.impl.equalitychecker; + +import java.util.Objects; +import java.util.Set; + +import javax.enterprise.context.ApplicationScoped; + +import de.symeda.sormas.backend.patch.mapping.EqualityChecker; + +@ApplicationScoped +public class ObjectEqualityChecker implements EqualityChecker { + + public static final Set> SUPPORTED_TYPES = Set.of(Object.class); + + @Override + public boolean areEqual(Object a, Object b) { + return Objects.equals(a, b); + } + + @Override + public Set> getSupportedTypes() { + return SUPPORTED_TYPES; + } +} diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/DateEqualityCheckerTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/DateEqualityCheckerTest.java new file mode 100644 index 00000000000..3d2b31f98de --- /dev/null +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/DateEqualityCheckerTest.java @@ -0,0 +1,118 @@ +package de.symeda.sormas.backend.patch.mapping.impl.equalitychecker; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.util.Date; +import java.util.Set; + +import org.junit.jupiter.api.Test; +import org.mockito.InjectMocks; + +import de.symeda.sormas.api.utils.OrderedRegisterable; +import de.symeda.sormas.backend.AbstractUnitTest; + +class DateEqualityCheckerTest extends AbstractUnitTest { + + @InjectMocks + private DateEqualityChecker victim; + + @Test + void getSupportedTypes_containsDateClass() { + // PREPARE + Set> expected = Set.of(Date.class); + + // EXECUTE + Set> actual = victim.getSupportedTypes(); + + // CHECK + assertEquals(expected, actual); + } + + @Test + void getOrder_isHighPrecedence() { + assertEquals(OrderedRegisterable.HIGH_PRECEDENCE, victim.getOrder()); + } + + @Test + void areEqual_sameDateInstance_returnsTrue() { + // PREPARE + Date date = toDate(LocalDate.of(2024, 6, 15)); + + // EXECUTE & CHECK + assertTrue(victim.areEqual(date, date)); + } + + @Test + void areEqual_sameTimestamp_returnsTrue() { + // PREPARE + long millis = toDate(LocalDate.of(2024, 6, 15)).getTime(); + Date a = new Date(millis); + Date b = new Date(millis); + + // EXECUTE & CHECK + assertTrue(victim.areEqual(a, b)); + } + + @Test + void areEqual_sameDayDifferentTime_returnsTrue() { + // PREPARE + Date morning = toDate(LocalDateTime.of(2024, 6, 15, 8, 0, 0)); + Date evening = toDate(LocalDateTime.of(2024, 6, 15, 23, 59, 59)); + + // EXECUTE & CHECK + assertTrue(victim.areEqual(morning, evening)); + } + + @Test + void areEqual_differentDays_returnsFalse() { + // PREPARE + Date day1 = toDate(LocalDate.of(2024, 6, 15)); + Date day2 = toDate(LocalDate.of(2024, 6, 16)); + + // EXECUTE & CHECK + assertFalse(victim.areEqual(day1, day2)); + } + + @Test + void areEqual_differentMonths_returnsFalse() { + // PREPARE + Date june = toDate(LocalDate.of(2024, 6, 15)); + Date july = toDate(LocalDate.of(2024, 7, 15)); + + // EXECUTE & CHECK + assertFalse(victim.areEqual(june, july)); + } + + @Test + void areEqual_differentYears_returnsFalse() { + // PREPARE + Date year2023 = toDate(LocalDate.of(2023, 6, 15)); + Date year2024 = toDate(LocalDate.of(2024, 6, 15)); + + // EXECUTE & CHECK + assertFalse(victim.areEqual(year2023, year2024)); + } + + @Test + void areEqual_endOfDayAndStartOfNextDay_returnsFalse() { + // PREPARE + Date endOfDay = toDate(LocalDateTime.of(2024, 6, 15, 23, 59, 59)); + Date startOfNextDay = toDate(LocalDateTime.of(2024, 6, 16, 0, 0, 0)); + + // EXECUTE & CHECK + assertFalse(victim.areEqual(endOfDay, startOfNextDay)); + } + + private static Date toDate(LocalDate localDate) { + return Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant()); + } + + private static Date toDate(LocalDateTime localDateTime) { + return Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant()); + } +} diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/ObjectEqualityCheckerTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/ObjectEqualityCheckerTest.java new file mode 100644 index 00000000000..9ebbafeb412 --- /dev/null +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/ObjectEqualityCheckerTest.java @@ -0,0 +1,75 @@ +package de.symeda.sormas.backend.patch.mapping.impl.equalitychecker; + +import static de.symeda.sormas.api.utils.OrderedRegisterable.LOW_PRECEDENCE; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.Set; + +import org.junit.jupiter.api.Test; +import org.mockito.InjectMocks; + +import de.symeda.sormas.backend.AbstractUnitTest; + +class ObjectEqualityCheckerTest extends AbstractUnitTest { + + @InjectMocks + private ObjectEqualityChecker victim; + + @Test + void getSupportedTypes_containsObjectClass() { + // PREPARE + Set> expected = Set.of(Object.class); + + // EXECUTE + Set> actual = victim.getSupportedTypes(); + + // CHECK + assertEquals(expected, actual); + } + + @Test + void getOrder_isLowPrecedence() { + assertEquals(LOW_PRECEDENCE, victim.getOrder()); + } + + @Test + void areEqual_sameStringInstance_returnsTrue() { + // PREPARE + String value = "hello"; + + // EXECUTE & CHECK + assertTrue(victim.areEqual(value, value)); + } + + @Test + void areEqual_equalStrings_returnsTrue() { + // EXECUTE & CHECK + assertTrue(victim.areEqual("hello", "hello")); + } + + @Test + void areEqual_differentStrings_returnsFalse() { + // EXECUTE & CHECK + assertFalse(victim.areEqual("hello", "world")); + } + + @Test + void areEqual_equalIntegers_returnsTrue() { + // EXECUTE & CHECK + assertTrue(victim.areEqual(42, 42)); + } + + @Test + void areEqual_differentIntegers_returnsFalse() { + // EXECUTE & CHECK + assertFalse(victim.areEqual(1, 2)); + } + + @Test + void areEqual_differentTypes_returnsFalse() { + // EXECUTE & CHECK + assertFalse(victim.areEqual("42", 42)); + } +} From ec2fc973076ea0f1788c23e0e75bd6007f10d14b Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Wed, 6 May 2026 16:48:57 +0200 Subject: [PATCH 104/134] =?UTF-8?q?=F0=9F=94=A5=20Grouped=20field=20mappin?= =?UTF-8?q?g=20strategy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../patch/mapping/GroupedFieldsMapper.java | 37 ---- .../patch/mapping/GroupedFieldsRequest.java | 195 ------------------ .../patch/mapping/GroupedFieldsResponse.java | 60 ------ .../sormas/backend/patch/DataPatcherImpl.java | 82 ++------ .../mapping/GroupedFieldMapperRegistry.java | 96 --------- 5 files changed, 21 insertions(+), 449 deletions(-) delete mode 100644 sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsMapper.java delete mode 100644 sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsRequest.java delete mode 100644 sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsResponse.java delete mode 100644 sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/GroupedFieldMapperRegistry.java diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsMapper.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsMapper.java deleted file mode 100644 index 506cf9d3b42..00000000000 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package de.symeda.sormas.api.patch.mapping; - -import java.util.Set; - -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - -import de.symeda.sormas.api.EntityDto; - -/** - * Some complex - fields objects cannot be mapped using the simple 1 key <-> 1 value approach as some fields must be grouped together to - * make sense. - *

- * This also allows creating entities that are not accessible from the Mapping context Root (as of 2026-03-05: - * {@link de.symeda.sormas.api.caze.CaseDataDto}) - */ -public interface GroupedFieldsMapper { - - /** - * Attempts to create a response for the mapping. - * - * @param request - * to determine what may or may not be aggregated. - * @return result dictionary: key path and value the result: patched value or failure. - */ - @NotNull - GroupedFieldsResponse aggregatedPatch(@NotNull GroupedFieldsRequest request); - - /** - * Specifies the prefixes that are supported by this mapper instance. - * - * @return supported prefixes. - */ - @NotNull - @NotEmpty - Set aggregatedPrefixes(); -} diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsRequest.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsRequest.java deleted file mode 100644 index 1bea0e3b48b..00000000000 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsRequest.java +++ /dev/null @@ -1,195 +0,0 @@ -package de.symeda.sormas.api.patch.mapping; - -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.function.Supplier; - -import javax.annotation.Nullable; -import javax.validation.constraints.NotNull; - -import de.symeda.sormas.api.Disease; -import de.symeda.sormas.api.Language; -import de.symeda.sormas.api.caze.CaseReferenceDto; -import de.symeda.sormas.api.patch.DataReplacementStrategy; -import de.symeda.sormas.api.patch.EmptyValueBehavior; -import de.symeda.sormas.api.person.PersonReferenceDto; - -/** - * Request object to patch more complex objects together will all fields belonging to that object. - */ -public class GroupedFieldsRequest { - - @NotNull - private Disease disease; - - @NotNull - private CaseReferenceDto caseData; - - @NotNull - private Supplier person; - - private boolean patchedInCaseOfFailures = false; - - @NotNull - private DataReplacementStrategy replacementStrategy = DataReplacementStrategy.IF_NOT_ALREADY_PRESENT; - - @NotNull - private EmptyValueBehavior emptyValueBehavior = EmptyValueBehavior.IGNORE; - - /** - * Only contains the key and values adapted for the current {@link GroupedFieldsMapper}. - */ - @NotNull - private Map partialPatchDictionary; - - /** - * Origin that wants the patch operation. - */ - @Nullable - private String origin; - - /** - * To be able to support I18n inputs the input languages can be passed, system locale by default. - */ - @Nullable - private List inputLanguages; - - /** - * If true, for enumeration-like targetTypes the default value will be used. - * Mostly "OTHER". - */ - private boolean allowFallbackValues = true; - - public boolean isPatchedInCaseOfFailures() { - return patchedInCaseOfFailures; - } - - public GroupedFieldsRequest setPatchedInCaseOfFailures(boolean patchedInCaseOfFailures) { - this.patchedInCaseOfFailures = patchedInCaseOfFailures; - return this; - } - - public DataReplacementStrategy getReplacementStrategy() { - return replacementStrategy; - } - - public GroupedFieldsRequest setReplacementStrategy(DataReplacementStrategy replacementStrategy) { - this.replacementStrategy = replacementStrategy; - return this; - } - - public EmptyValueBehavior getEmptyValueBehavior() { - return emptyValueBehavior; - } - - public GroupedFieldsRequest setEmptyValueBehavior(EmptyValueBehavior emptyValueBehavior) { - this.emptyValueBehavior = emptyValueBehavior; - return this; - } - - public Map getPartialPatchDictionary() { - return partialPatchDictionary; - } - - public GroupedFieldsRequest setPartialPatchDictionary(Map partialPatchDictionary) { - this.partialPatchDictionary = partialPatchDictionary; - return this; - } - - @Nullable - public String getOrigin() { - return origin; - } - - public GroupedFieldsRequest setOrigin(@Nullable String origin) { - this.origin = origin; - return this; - } - - @Nullable - public List getInputLanguages() { - return inputLanguages; - } - - public GroupedFieldsRequest setInputLanguages(@Nullable List inputLanguages) { - this.inputLanguages = inputLanguages; - return this; - } - - public boolean isAllowFallbackValues() { - return allowFallbackValues; - } - - public GroupedFieldsRequest setAllowFallbackValues(boolean allowFallbackValues) { - this.allowFallbackValues = allowFallbackValues; - return this; - } - - public CaseReferenceDto getCaseData() { - return caseData; - } - - public GroupedFieldsRequest setCaseData(CaseReferenceDto caseData) { - this.caseData = caseData; - return this; - } - - public Supplier getPerson() { - return person; - } - - public GroupedFieldsRequest setPerson(Supplier person) { - this.person = person; - return this; - } - - public Disease getDisease() { - return disease; - } - - public GroupedFieldsRequest setDisease(Disease disease) { - this.disease = disease; - return this; - } - - @Override - public boolean equals(Object o) { - if (o == null || getClass() != o.getClass()) - return false; - GroupedFieldsRequest that = (GroupedFieldsRequest) o; - return patchedInCaseOfFailures == that.patchedInCaseOfFailures - && allowFallbackValues == that.allowFallbackValues - && disease == that.disease - && Objects.equals(caseData, that.caseData) - && Objects.equals(person, that.person) - && replacementStrategy == that.replacementStrategy - && emptyValueBehavior == that.emptyValueBehavior - && Objects.equals(partialPatchDictionary, that.partialPatchDictionary) - && Objects.equals(origin, that.origin) - && Objects.equals(inputLanguages, that.inputLanguages); - } - - @Override - public int hashCode() { - return Objects.hash( - disease, - caseData, - person, - patchedInCaseOfFailures, - replacementStrategy, - emptyValueBehavior, - partialPatchDictionary, - origin, - inputLanguages, - allowFallbackValues); - } - - @Override - public String toString() { - return "GroupedFieldsRequest{" + "disease=" + disease + ", caseData=" + caseData + ", person=" + person + ", patchedInCaseOfFailures=" - + patchedInCaseOfFailures + ", replacementStrategy=" + replacementStrategy + ", emptyValueBehavior=" + emptyValueBehavior - + ", partialPatchDictionary=" + partialPatchDictionary + ", origin='" + origin + '\'' + ", inputLanguages=" + inputLanguages - + ", allowFallbackValues=" + allowFallbackValues + '}'; - } -} diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsResponse.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsResponse.java deleted file mode 100644 index 5599a08ade6..00000000000 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/mapping/GroupedFieldsResponse.java +++ /dev/null @@ -1,60 +0,0 @@ -package de.symeda.sormas.api.patch.mapping; - -import java.util.List; -import java.util.Objects; - -import javax.annotation.Nullable; - -import de.symeda.sormas.api.EntityDto; -import de.symeda.sormas.api.patch.SinglePatchResult; - -public class GroupedFieldsResponse { - - /** - * In case of errors this might be null, otherwise should always be present to be stored at the very end of the patching processing. - */ - @Nullable - private List entityDto; - - /** - * Actual results from the original {@link GroupedFieldsRequest}. - */ - private List patchingResults; - - @Nullable - public List getEntityDto() { - return entityDto; - } - - public GroupedFieldsResponse setEntityDto(@Nullable List entityDto) { - this.entityDto = entityDto; - return this; - } - - public List getPatchingResults() { - return patchingResults; - } - - public GroupedFieldsResponse setPatchingResults(List patchingResults) { - this.patchingResults = patchingResults; - return this; - } - - @Override - public boolean equals(Object o) { - if (o == null || getClass() != o.getClass()) - return false; - GroupedFieldsResponse that = (GroupedFieldsResponse) o; - return Objects.equals(entityDto, that.entityDto) && Objects.equals(patchingResults, that.patchingResults); - } - - @Override - public int hashCode() { - return Objects.hash(entityDto, patchingResults); - } - - @Override - public String toString() { - return "GroupedFieldsResponse{" + "entityDto=" + entityDto + ", patchingResults=" + patchingResults + '}'; - } -} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java index f561ae2531a..022c6d7a808 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java @@ -20,10 +20,12 @@ import com.google.common.base.Suppliers; import de.symeda.sormas.api.Disease; -import de.symeda.sormas.api.EntityDto; import de.symeda.sormas.api.caze.CaseDataDto; import de.symeda.sormas.api.patch.*; -import de.symeda.sormas.api.patch.mapping.*; +import de.symeda.sormas.api.patch.mapping.FieldCustomMapper; +import de.symeda.sormas.api.patch.mapping.FieldPatchRequest; +import de.symeda.sormas.api.patch.mapping.ValueMappingResult; +import de.symeda.sormas.api.patch.mapping.ValuePatchRequest; import de.symeda.sormas.api.person.PersonDto; import de.symeda.sormas.api.utils.Tuple; import de.symeda.sormas.api.utils.fieldvisibility.FieldVisibilityCheckers; @@ -32,7 +34,6 @@ import de.symeda.sormas.backend.json.ObjectMapperProvider; import de.symeda.sormas.backend.patch.mapping.EqualityCheckerRegistry; import de.symeda.sormas.backend.patch.mapping.FieldCustomMapperRegistry; -import de.symeda.sormas.backend.patch.mapping.GroupedFieldMapperRegistry; import de.symeda.sormas.backend.patch.mapping.ValueMapperRegistry; import de.symeda.sormas.backend.util.CollectorUtils; @@ -52,9 +53,6 @@ public class DataPatcherImpl implements DataPatcher { @Inject private FieldCustomMapperRegistry fieldCustomMapperRegistry; - @Inject - private GroupedFieldMapperRegistry groupedFieldMapperRegistry; - @Inject private EqualityCheckerRegistry equalityCheckerRegistry; @@ -74,7 +72,6 @@ public DataPatcherImpl( PatchFieldHelper patchFieldHelper, ValueMapperRegistry valueMapperRegistry, FieldCustomMapperRegistry fieldCustomMapperRegistry, - GroupedFieldMapperRegistry groupedFieldMapperRegistry, EqualityCheckerRegistry equalityCheckerRegistry, BusinessDtoFacade businessDtoFacade, FeatureConfigurationFacadeEjb.FeatureConfigurationFacadeEjbLocal featureConfigurationFacade, @@ -82,7 +79,6 @@ public DataPatcherImpl( this.patchFieldHelper = patchFieldHelper; this.valueMapperRegistry = valueMapperRegistry; this.fieldCustomMapperRegistry = fieldCustomMapperRegistry; - this.groupedFieldMapperRegistry = groupedFieldMapperRegistry; this.equalityCheckerRegistry = equalityCheckerRegistry; this.businessDtoFacade = businessDtoFacade; this.featureConfigurationFacade = featureConfigurationFacade; @@ -102,33 +98,22 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { List>> patchingTuples = computePatchingTuples(request); - List> groupedFieldsSinglePatchResults = - groupedFieldMapperRegistry.aggregatedPatch(from(request, personSupplier, caseData)); - Set alreadyProcessedFields = groupedFieldsSinglePatchResults.stream() - .flatMap(response -> response.getPatchingResults().stream().map(SinglePatchResult::getFieldName)) - .collect(Collectors.toSet()); - - // TODO: patchingTuples (transform to map ?) must be passed to the group field handler so that it can be handled. - // TODO: provide only the valid one as simple object ? Once this is done the actual dictionary must be not contain does anymore - - List results = - Stream.concat(patchingTuples.stream().filter(tuple -> !alreadyProcessedFields.contains(tuple.getFirst())).map(entry -> { - String fullFieldName = entry.getFirst(); - de.symeda.sormas.api.patch.SinglePatchResult singlePatchResult = - new de.symeda.sormas.api.patch.SinglePatchResult().setFieldName(fullFieldName); - - Supplier target = () -> findAppropriateTarget(fullFieldName, caseData, personSupplier); - - try { - return produceSinglePatchResult(request, entry, disease, target); - } catch (RuntimeException e) { - logger.error("Failure during patch operation", e); - return singlePatchResult - .setFailure(new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.TECHNICAL).setDescription(e.getMessage())); - } + List results = patchingTuples.stream().map(entry -> { + String fullFieldName = entry.getFirst(); + de.symeda.sormas.api.patch.SinglePatchResult singlePatchResult = + new de.symeda.sormas.api.patch.SinglePatchResult().setFieldName(fullFieldName); - }), groupedFieldsSinglePatchResults.stream().flatMap(groupedFieldResponse -> groupedFieldResponse.getPatchingResults().stream())) - .collect(Collectors.toList()); + Supplier target = () -> findAppropriateTarget(fullFieldName, caseData, personSupplier); + + try { + return produceSinglePatchResult(request, entry, disease, target); + } catch (RuntimeException e) { + logger.error("Failure during patch operation", e); + return singlePatchResult + .setFailure(new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.TECHNICAL).setDescription(e.getMessage())); + } + + }).collect(Collectors.toList()); Map validPatchDictionary = buildDictionaryFor(results, de.symeda.sormas.api.patch.SinglePatchResult::getValue, true); DataPatchResponse response = new DataPatchResponse().setApplied(false) @@ -143,13 +128,7 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { return response; } - saveDTOsIfAppropriate( - validPatchDictionary, - caseData, - personSupplier, - groupedFieldsSinglePatchResults.stream() - .flatMap(groupedFieldsResponse -> Stream.ofNullable(groupedFieldsResponse.getEntityDto()).flatMap(Collection::stream)) - .collect(Collectors.toList())); + saveDTOsIfAppropriate(validPatchDictionary, caseData, personSupplier); logger.debug("dataPatchResponse: [{}]", response); @@ -167,24 +146,7 @@ public SinglePatchResult produceSinglePatchResult( .orElseGet(() -> valueMappingResult(entry, disease, request, target)); } - private GroupedFieldsRequest from(CaseDataPatchRequest request, Supplier personSupplier, CaseDataDto caseData) { - return new GroupedFieldsRequest().setDisease(caseData.getDisease()) - .setCaseData(caseData.toReference()) - .setPerson(() -> personSupplier.get().toReference()) - .setPartialPatchDictionary(request.getPatchDictionary()) - .setInputLanguages(request.getInputLanguages()) - .setOrigin(request.getOrigin()) - .setAllowFallbackValues(request.isAllowFallbackValues()) - .setPatchedInCaseOfFailures(request.isPatchedInCaseOfFailures()) - .setReplacementStrategy(request.getReplacementStrategy()) - .setEmptyValueBehavior(request.getEmptyValueBehavior()); - } - - private void saveDTOsIfAppropriate( - Map validPatchDictionary, - CaseDataDto caseData, - Supplier personSupplier, - List additionalEntityDTOs) { + private void saveDTOsIfAppropriate(Map validPatchDictionary, CaseDataDto caseData, Supplier personSupplier) { if (anyFieldPatchedWithPrefix(validPatchDictionary, PatchFieldHelper.CASE_DATA_PREFIX)) { logger.info("CaseData was modified will be applied for: [{}]. Enable debug to see fully patched object", caseData); @@ -205,8 +167,6 @@ private void saveDTOsIfAppropriate( businessDtoFacade.save(person); } - - additionalEntityDTOs.forEach(entityDto -> businessDtoFacade.save(entityDto)); } private boolean anyFieldPatchedWithPrefix(Map validPatchDictionary, String caseDataPrefix) { diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/GroupedFieldMapperRegistry.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/GroupedFieldMapperRegistry.java deleted file mode 100644 index 0a08314007f..00000000000 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/GroupedFieldMapperRegistry.java +++ /dev/null @@ -1,96 +0,0 @@ -package de.symeda.sormas.backend.patch.mapping; - -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.stream.Collectors; - -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.validation.constraints.NotNull; - -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import de.symeda.sormas.api.patch.mapping.GroupedFieldsMapper; -import de.symeda.sormas.api.patch.mapping.GroupedFieldsRequest; -import de.symeda.sormas.api.patch.mapping.GroupedFieldsResponse; -import de.symeda.sormas.api.utils.Tuple; -import de.symeda.sormas.backend.util.CollectorUtils; - -@ApplicationScoped -public class GroupedFieldMapperRegistry { - - private final static Logger logger = LoggerFactory.getLogger(GroupedFieldMapperRegistry.class); - - @Inject - private Instance> instances; - - private Set>> prefixMapperTuples; - - @PostConstruct - void init() { - Map>> mappersByPrefixDictionary = instances.stream() - .flatMap(mapper -> mapper.aggregatedPrefixes().stream().map(prefix -> Tuple.of(mapper, prefix))) - .collect(Collectors.groupingBy(Tuple::getSecond, Collectors.mapping(Tuple::getFirst, Collectors.toList()))); - - Set>> duplicateMappings = mappersByPrefixDictionary.entrySet() - .stream() - .filter(entry -> CollectionUtils.size(entry.getValue()) > 1) - .map( - entry -> Tuple - .of(entry.getKey(), entry.getValue().stream().map(mapper -> mapper.getClass().getSimpleName()).collect(Collectors.toSet()))) - .collect(Collectors.toSet()); - - if (CollectionUtils.isNotEmpty(duplicateMappings)) { - throw new IllegalStateException( - String.format( - "There are duplicate grouped field mappings: [%s]. \nA prefix can only be handled by a single mapper", - duplicateMappings)); - } - - prefixMapperTuples = - mappersByPrefixDictionary.entrySet().stream().map(entry -> Tuple.of(entry.getKey(), entry.getValue().get(0))).collect(Collectors.toSet()); - } - - @NotNull - public List> aggregatedPatch(@NotNull GroupedFieldsRequest request) { - Map, Map> dictionary = request.getPartialPatchDictionary() - .entrySet() - .stream() - .map( - patchKeyValueEntry -> prefixMapperTuples.stream() - .filter(prefixMapperTuple -> StringUtils.startsWith(patchKeyValueEntry.getKey(), prefixMapperTuple.getFirst())) - .findAny() - .map(tuple -> Tuple.of(tuple.getSecond(), patchKeyValueEntry))) - .flatMap(Optional::stream) - .collect( - Collectors.groupingBy( - Tuple::getFirst, - CollectorUtils.toNullSafeMap(tuple -> tuple.getSecond().getKey(), tuple -> tuple.getSecond().getValue()))); - - logger.debug("GroupedFieldsMapper dictionary: [{}] for request: [{}]", dictionary, request); - - return dictionary.entrySet() - .stream() - .map(entry -> entry.getKey().aggregatedPatch(buildCopy(request).setPartialPatchDictionary(entry.getValue()))) - .collect(Collectors.toList()); - } - - private static GroupedFieldsRequest buildCopy(GroupedFieldsRequest request) { - return new GroupedFieldsRequest().setDisease(request.getDisease()) - .setCaseData(request.getCaseData()) - .setPerson(request.getPerson()) - .setAllowFallbackValues(request.isAllowFallbackValues()) - .setEmptyValueBehavior(request.getEmptyValueBehavior()) - .setOrigin(request.getOrigin()) - .setInputLanguages(request.getInputLanguages()) - .setPatchedInCaseOfFailures(request.isPatchedInCaseOfFailures()) - .setReplacementStrategy(request.getReplacementStrategy()); - } -} From 8ca2433706b248546dd3815e2aeee5a5beeadc4e Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Wed, 6 May 2026 17:36:55 +0200 Subject: [PATCH 105/134] =?UTF-8?q?=F0=9F=93=9D=20added=20todos=20for=20Va?= =?UTF-8?q?ccination=20handling?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../de/symeda/sormas/backend/patch/BusinessDtoFacade.java | 8 ++++++++ .../de/symeda/sormas/backend/patch/DataPatcherImpl.java | 2 ++ .../sormas/backend/patch/alias/PathAliasHelper.java | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java index deb54b33ebe..e24e0e10e8c 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java @@ -49,6 +49,14 @@ public class BusinessDtoFacade { private void init() { registerSaveOperations(); registerFetchOperations(); + + // TODO: add fetch for "list elements": + // TODO: probably start fetch from highest-level element and drill down to retrive. + // Quite unsure if drill always work: Add exception: "missing parent entity". + // - Exposure + // - Activity as a case + // for save: List elements must be added to the parent + // TODO: issue with saving in order ? registerFetchByI18nOperations(); } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java index 022c6d7a808..e2363dcaf1a 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java @@ -93,6 +93,8 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { Disease disease = caseData.getDisease(); + // TODO: modify to make more "agnostic": person is any other entity. + // TODO: only case is different as it is the root. // make this generic for additional "root"-types Supplier personSupplier = Suppliers.memoize(() -> getPersonDto(caseData)); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java index 77bd5216a4b..e72f618ee1d 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java @@ -12,6 +12,7 @@ import javax.enterprise.context.ApplicationScoped; import javax.validation.constraints.NotNull; +import de.symeda.sormas.api.activityascase.ActivityAsCaseDto; import de.symeda.sormas.api.epidata.EpiDataDto; import org.apache.commons.collections4.CollectionUtils; import org.slf4j.Logger; @@ -83,6 +84,10 @@ public class PathAliasHelper { dictionary.put(SubcontinentDto.I18N_PREFIX, toFieldName(toFieldName(PersonDto.I18N_PREFIX, PersonDto.ADDRESS), LocationDto.SUB_CONTINENT)); dictionary.put(ContinentDto.I18N_PREFIX, toFieldName(toFieldName(PersonDto.I18N_PREFIX, PersonDto.ADDRESS), LocationDto.CONTINENT)); dictionary.put(UserDto.I18N_PREFIX, toFieldName(CaseDataDto.I18N_PREFIX, CaseDataDto.FOLLOW_UP_STATUS_CHANGE_USER)); + dictionary.put(EpiDataDto.I18N_PREFIX, toFieldName(CaseDataDto.I18N_PREFIX, CaseDataDto.EPI_DATA)); + // TODO: check if required + // dictionary.put(ExposureDto.I18N_PREFIX, toFieldName(CaseDataDto.I18N_PREFIX, CaseDataDto.EPI_DATA)); + // dictionary.put(ActivityAsCaseDto.I18N_PREFIX, toFieldName(CaseDataDto.I18N_PREFIX, CaseDataDto.EPI_DATA)); return dictionary; } From 777bed639e6ae57901c2a5c61085448788ada597 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Thu, 7 May 2026 09:45:02 +0200 Subject: [PATCH 106/134] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20BusinessDtoFacade?= =?UTF-8?q?=20allowing=20creation=20of=20new=20elements?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backend/patch/BusinessDtoFacade.java | 65 +++++++++++++++---- .../PartialRetrieverImpl.java | 2 +- .../sormas/patch/DataPatcherImplTest.java | 2 - 3 files changed, 55 insertions(+), 14 deletions(-) diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java index e24e0e10e8c..baf0fc53b97 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java @@ -23,6 +23,7 @@ import de.symeda.sormas.backend.caze.CaseFacadeEjb; import de.symeda.sormas.backend.immunization.ImmunizationFacadeEjb; import de.symeda.sormas.backend.person.PersonFacadeEjb; +import de.symeda.sormas.backend.user.UserFacadeEjb; /** * Meant as single entry point for usages were multiple Business DTOs must be fetched or saved. @@ -39,11 +40,16 @@ public class BusinessDtoFacade { @EJB private ImmunizationFacadeEjb.ImmunizationFacadeEjbLocal immunizationFacade; + @EJB + private UserFacadeEjb.UserFacadeEjbLocal userFacade; + private final Map, Function> dtoSaveDictionary = new HashMap<>(); private final Map, Function> dtoRetrieverDictionary = new HashMap<>(); - private final Map>> dtoRetrieverByI18nDictionary = new HashMap<>(); + private final Map>> dtoRetrieverByI18nDictionaryRead = new HashMap<>(); + + private final Map> dtoRetrieverByI18nDictionaryCreateUpdate = new HashMap<>(); @PostConstruct private void init() { @@ -57,9 +63,12 @@ private void init() { // - Activity as a case // for save: List elements must be added to the parent // TODO: issue with saving in order ? - registerFetchByI18nOperations(); + registerFetchByI18nOperationsRead(); + + registerFetchByI18nOperationsCreateUpdate(); } + private void registerSaveOperations() { registerSave(CaseDataDto.class, caseDataDto -> caseFacade.save(caseDataDto)); registerSave(PersonDto.class, personDto -> personFacade.save(personDto)); @@ -78,25 +87,46 @@ private void registerFetch(Class dtoClass, Function Collections.singletonList(personFacade.getByUuid(caseDataDto.getPerson().getUuid()))); - registerFetchByI18n( + registerFetchByI18nRead( ImmunizationDto.I18N_PREFIX, caseDataDto -> immunizationFacade.getByPersonUuids(Collections.singletonList(caseDataDto.getPerson().getUuid()))); - registerFetchByI18n( + registerFetchByI18nRead( VaccinationDto.I18N_PREFIX, caseDataDto -> immunizationFacade.getByPersonUuids(Collections.singletonList(caseDataDto.getPerson().getUuid())) .stream() .flatMap(immunization -> immunization.getVaccinations().stream()) .collect(Collectors.toList())); + } + + private void registerFetchByI18nOperationsCreateUpdate() { + registerFetchByI18nCreateUpdate( + PersonDto.I18N_PREFIX, + caseDataDto -> personFacade.getByUuid(caseDataDto.getPerson().getUuid())); + registerFetchByI18nCreateUpdate( + ImmunizationDto.I18N_PREFIX, + caseDataDto -> { + ImmunizationDto build = ImmunizationDto.build(caseDataDto.getPerson()); + build.setRelatedCase(caseDataDto.toReference()); + return build; + }); + + registerFetchByI18nCreateUpdate( + VaccinationDto.I18N_PREFIX, + caseDataDto -> VaccinationDto.build(userFacade.getCurrentUserAsReference())); } - private void registerFetchByI18n(String i18nName, Function> fct) { - dtoRetrieverByI18nDictionary.put(i18nName, fct); + private void registerFetchByI18nRead(String i18nName, Function> fct) { + dtoRetrieverByI18nDictionaryRead.put(i18nName, fct); + } + + private void registerFetchByI18nCreateUpdate(String i18nName, Function fct) { + dtoRetrieverByI18nDictionaryCreateUpdate.put(i18nName, fct); } @Nullable @@ -138,19 +168,32 @@ public T fetch(@NotNull Class entityClass, CaseDataDto * @return entity dto if found. */ @Nullable - public List fetchByI18nName(@NotNull String i18nName, CaseDataDto caseDataDto) { - return Optional.ofNullable(dtoRetrieverByI18nDictionary.get(i18nName)) + public List fetchByI18nNameForDisplay(@NotNull String i18nName, CaseDataDto caseDataDto) { + return Optional.ofNullable(dtoRetrieverByI18nDictionaryRead.get(i18nName)) .orElseThrow(() -> new IllegalStateException(String.format("No fetch function defined for: [%s]", i18nName))) .apply(caseDataDto); } + /** + * Warning: Will retrieve a new instance on every fetch, MUST be cached within a single patch operation. + * @param i18nName I18N translation key + * @param caseDataDto root/reference entity + * @return "un-attached" DTO that will be thrown away if not saved. + */ + @Nullable + public EntityDto fetchByI18nNameForCreateUpdate(@NotNull String i18nName, CaseDataDto caseDataDto) { + return Optional.ofNullable(dtoRetrieverByI18nDictionaryCreateUpdate.get(i18nName)) + .orElseThrow(() -> new IllegalStateException(String.format("No fetch function defined for: [%s]", i18nName))) + .apply(caseDataDto); + } + /** * For displaying purposes what purposes can be retrieved. * * @return prefixes that can be fetched through their I18n Prefix. */ public Set fetchablePrefixes() { - return dtoRetrieverByI18nDictionary.keySet(); + return dtoRetrieverByI18nDictionaryRead.keySet(); } /** diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java index 09ca32d4819..4833308d69c 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java @@ -173,7 +173,7 @@ private Optional getAdequateBean( return Optional.of(caseData); } else { return beanCache.computeIfAbsent(prefix, prefixCandidate -> { - List entityDtos = businessDtoFacade.fetchByI18nName(prefixCandidate, caseData); + List entityDtos = businessDtoFacade.fetchByI18nNameForDisplay(prefixCandidate, caseData); int entitiesSize = CollectionUtils.size(entityDtos); diff --git a/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java index f50d9cb06ee..92bebef4b64 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java @@ -43,8 +43,6 @@ class DataPatcherImplTest extends AbstractBeanTest { - // TODO: test different replacement strategy: with/without failure - @Test void patch_noErrorsReplaceAlways() { // PREPARE From 76f5480844eae179ca5d984108288dec73b42db1 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Thu, 7 May 2026 10:04:46 +0200 Subject: [PATCH 107/134] =?UTF-8?q?=E2=9C=85=20same=20day=20Date=20patchin?= =?UTF-8?q?g?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backend/patch/BusinessDtoFacade.java | 20 ++++++++----- .../sormas/patch/DataPatcherImplTest.java | 29 +++++++++++++++++++ 2 files changed, 41 insertions(+), 8 deletions(-) diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java index baf0fc53b97..c1fa4c2fe19 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java @@ -43,7 +43,7 @@ public class BusinessDtoFacade { @EJB private UserFacadeEjb.UserFacadeEjbLocal userFacade; - private final Map, Function> dtoSaveDictionary = new HashMap<>(); + private final Map, Function> directDtoSaveDictionary = new HashMap<>(); private final Map, Function> dtoRetrieverDictionary = new HashMap<>(); @@ -76,7 +76,7 @@ private void registerSaveOperations() { } private void registerSave(Class dtoClass, Function consumer) { - dtoSaveDictionary.put(dtoClass, consumer); + directDtoSaveDictionary.put(dtoClass, consumer); } private void registerFetchOperations() { @@ -110,17 +110,21 @@ private void registerFetchByI18nOperationsCreateUpdate() { caseDataDto -> personFacade.getByUuid(caseDataDto.getPerson().getUuid())); registerFetchByI18nCreateUpdate( ImmunizationDto.I18N_PREFIX, - caseDataDto -> { - ImmunizationDto build = ImmunizationDto.build(caseDataDto.getPerson()); - build.setRelatedCase(caseDataDto.toReference()); - return build; - }); + createImmunizationDtoFromCaseFct()); registerFetchByI18nCreateUpdate( VaccinationDto.I18N_PREFIX, caseDataDto -> VaccinationDto.build(userFacade.getCurrentUserAsReference())); } + private static Function createImmunizationDtoFromCaseFct() { + return caseDataDto -> { + ImmunizationDto build = ImmunizationDto.build(caseDataDto.getPerson()); + build.setRelatedCase(caseDataDto.toReference()); + return build; + }; + } + private void registerFetchByI18nRead(String i18nName, Function> fct) { dtoRetrieverByI18nDictionaryRead.put(i18nName, fct); } @@ -208,7 +212,7 @@ public Set fetchablePrefixes() { public T save(@NotNull EntityDto entityDto) { Class entityDtoClass = entityDto.getClass(); - return Optional.ofNullable((Function) dtoSaveDictionary.get(entityDtoClass)) + return Optional.ofNullable((Function) directDtoSaveDictionary.get(entityDtoClass)) .orElseThrow(() -> new IllegalStateException(String.format("No save function defined for: [%s]", entityDtoClass))) .apply((T) entityDto); } diff --git a/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java index 92bebef4b64..0e079adb315 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java @@ -2,6 +2,7 @@ import java.sql.Date; import java.time.LocalDate; +import java.time.LocalDateTime; import java.time.ZoneId; import java.util.Collections; import java.util.HashMap; @@ -941,6 +942,34 @@ void patch_fieldDoesNoExist() { () -> Assertions.assertEquals(Map.of(), response.getValidPatchDictionary())); } + @Test + void patch_ifNotAlreadyPresent_sameDayDifferentTime_noForbiddenValueOverride() { + // PREPARE + CaseDataDto originalCase = creator.createUnclassifiedCase(Disease.PERTUSSIS); + + // Set classificationDate to 08:30 on 2024-06-15 — a non-midnight timestamp on the same calendar day that will be patched + java.util.Date existingDate = + java.util.Date.from(LocalDateTime.of(2024, 6, 15, 8, 30, 0).atZone(ZoneId.systemDefault()).toInstant()); + originalCase.setClassificationDate(existingDate); + getCaseFacade().save(originalCase); + + // Patch with the same calendar day as a plain date string — DatePatchMapper resolves this to midnight (00:00:00), + // which differs in time from existingDate. Without DateEqualityChecker this would trigger FORBIDDEN_VALUE_OVERRIDE. + String patchDate = "2024-06-15"; + CaseDataPatchRequest request = new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()) + .setPatchDictionary(Map.of("CaseData.classificationDate", patchDate)); + + // EXECUTE + DataPatchResponse response = victim().patch(request); + + // CHECK + logger.info("response: [{}]", response); + + Assertions.assertAll( + () -> Assertions.assertTrue(response.getFailures().isEmpty(), "FORBIDDEN_VALUE_OVERRIDE must not fire for same-day dates"), + () -> Assertions.assertTrue(response.isApplied())); + } + private DataPatcher victim() { return getCaseDataPatcher(); } From 269e84543b6240520e9d7deaabfd24b3f412bb23 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Thu, 7 May 2026 10:30:22 +0200 Subject: [PATCH 108/134] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Cleanup=20before?= =?UTF-8?q?=20trying=20to=20refactor=20data=20patcher=20to=20be=20similar?= =?UTF-8?q?=20to=20retriever?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backend/patch/BusinessDtoFacade.java | 7 ++-- .../backend/patch/alias/PathAliasHelper.java | 13 +++---- .../PartialRetrieverImpl.java | 20 +++++------ .../PartialRetrieverImplTest.java | 35 +++++++++++++++++++ .../sormas/patch/DataPatcherImplTest.java | 30 ++++++++++++++++ 5 files changed, 87 insertions(+), 18 deletions(-) diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java index c1fa4c2fe19..fe9db108fab 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java @@ -6,6 +6,7 @@ import java.util.Map; import java.util.Optional; import java.util.Set; +import java.util.function.BiFunction; import java.util.function.Function; import java.util.stream.Collectors; @@ -44,6 +45,7 @@ public class BusinessDtoFacade { private UserFacadeEjb.UserFacadeEjbLocal userFacade; private final Map, Function> directDtoSaveDictionary = new HashMap<>(); + private final Map, BiFunction> saveFromCaseDictionary = new HashMap<>(); private final Map, Function> dtoRetrieverDictionary = new HashMap<>(); @@ -209,11 +211,12 @@ public Set fetchablePrefixes() { * @param * type */ + public T save(@NotNull EntityDto entityDto) { Class entityDtoClass = entityDto.getClass(); return Optional.ofNullable((Function) directDtoSaveDictionary.get(entityDtoClass)) - .orElseThrow(() -> new IllegalStateException(String.format("No save function defined for: [%s]", entityDtoClass))) - .apply((T) entityDto); + .orElseThrow(() -> new IllegalStateException(String.format("No save function defined for: [%s]", entityDtoClass))) + .apply((T) entityDto); } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java index e72f618ee1d..ce6d427ded4 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java @@ -59,11 +59,12 @@ public class PathAliasHelper { "Location", Set.of(toFieldName(PersonDto.I18N_PREFIX, PersonDto.ADDRESS), toFieldName(ExposureDto.I18N_PREFIX, ExposureDto.LOCATION))); + /** + * Meant for fields that are only references from another entity. + */ public static final Map REFERENCE_TO_ROOT_DICTIONARY = Map.of( toFieldName(CaseDataDto.I18N_PREFIX, CaseDataDto.PERSON), - PersonDto.I18N_PREFIX, - toFieldName(CaseDataDto.I18N_PREFIX, CaseDataDto.EPI_DATA), - EpiDataDto.I18N_PREFIX); + PersonDto.I18N_PREFIX); private static @NotNull HashMap buildDefaultAliasDictionary() { HashMap dictionary = new HashMap<>(); @@ -84,10 +85,10 @@ public class PathAliasHelper { dictionary.put(SubcontinentDto.I18N_PREFIX, toFieldName(toFieldName(PersonDto.I18N_PREFIX, PersonDto.ADDRESS), LocationDto.SUB_CONTINENT)); dictionary.put(ContinentDto.I18N_PREFIX, toFieldName(toFieldName(PersonDto.I18N_PREFIX, PersonDto.ADDRESS), LocationDto.CONTINENT)); dictionary.put(UserDto.I18N_PREFIX, toFieldName(CaseDataDto.I18N_PREFIX, CaseDataDto.FOLLOW_UP_STATUS_CHANGE_USER)); + dictionary.put(EpiDataDto.I18N_PREFIX, toFieldName(CaseDataDto.I18N_PREFIX, CaseDataDto.EPI_DATA)); - // TODO: check if required - // dictionary.put(ExposureDto.I18N_PREFIX, toFieldName(CaseDataDto.I18N_PREFIX, CaseDataDto.EPI_DATA)); - // dictionary.put(ActivityAsCaseDto.I18N_PREFIX, toFieldName(CaseDataDto.I18N_PREFIX, CaseDataDto.EPI_DATA)); + dictionary.put(ExposureDto.I18N_PREFIX, toFieldName(toFieldName(CaseDataDto.I18N_PREFIX, CaseDataDto.EPI_DATA), EpiDataDto.EXPOSURES)); + dictionary.put(ActivityAsCaseDto.I18N_PREFIX, toFieldName(toFieldName(CaseDataDto.I18N_PREFIX, CaseDataDto.EPI_DATA), EpiDataDto.ACTIVITIES_AS_CASE)); return dictionary; } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java index 4833308d69c..9861349357e 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java @@ -99,7 +99,7 @@ private Tuple> buildTuple .orElse(null); if (failureCause != null) { - return Tuple.of(originalFieldName, new Tuple<>((FieldInfo) null, failureCause)); + return Tuple.of(originalFieldName, new Tuple<>(null, failureCause)); } String pathWithoutAlias = unAliasedTuple.getFirst(); @@ -109,22 +109,22 @@ private Tuple> buildTuple Optional adequateBeanOpt = getAdequateBean(pathWithoutAlias, caseData, beanCache); if (adequateBeanOpt.isEmpty()) { - return Tuple.of(originalFieldName, new Tuple<>((FieldInfo) null, PartialRetrievalFailureCause.ENTITY_COULD_NOT_BE_FOUND)); + return Tuple.of(originalFieldName, new Tuple<>(null, PartialRetrievalFailureCause.ENTITY_COULD_NOT_BE_FOUND)); } EntityDto adequateBean = adequateBeanOpt.orElseThrow(); Optional specificFieldInfo = specificFieldValueRetrieverRegistry.getFieldInfo(aliasPath, adequateBean); if (specificFieldInfo.isPresent()) { - return Tuple.of(originalFieldName, new Tuple<>(specificFieldInfo.get(), (PartialRetrievalFailureCause) null)); + return Tuple.of(originalFieldName, new Tuple<>(specificFieldInfo.get(), null)); } - Tuple, Object>, PropertyAccessFailure> propertyType = + @NotNull Tuple, Object>, PropertyAccessFailure> propertyType = PropertyAccessor.getPropertyTypeAndValue(adequateBean, physicalPathName, getFieldVisibilityCheckers(caseData.getDisease())); PropertyAccessFailure propertyAccessFailure = propertyType.getSecond(); if (propertyAccessFailure != null) { - return Tuple.of(originalFieldName, new Tuple<>((FieldInfo) null, propertyAccessFailure.getRelatedRetrieveFailureCause())); + return Tuple.of(originalFieldName, new Tuple<>(null, propertyAccessFailure.getRelatedRetrieveFailureCause())); } Tuple, Object> fieldInfo = propertyType.getFirst(); @@ -140,7 +140,7 @@ private Tuple> buildTuple originalFieldName, new Tuple<>( new FieldInfo().setFieldType(fieldInfo.getFirst()).setFieldValue(fieldInfo.getSecond()).setTranslatedFieldName(translatedFieldName), - (PartialRetrievalFailureCause) null)); + null)); } @Override @@ -161,13 +161,13 @@ public DisplayablePartialRetrievalResponse retrievePartialForDisplay(PartialRetr } private Optional getAdequateBean( - @NotNull String path, + @NotNull String pathWithoutAlias, @NotNull CaseDataDto caseData, @NotNull Map> beanCache) { - int i = path.indexOf("."); + int i = pathWithoutAlias.indexOf("."); - String prefix = StringUtils.substring(path, 0, i); + String prefix = StringUtils.substring(pathWithoutAlias, 0, i); if (CaseDataDto.I18N_PREFIX.equals(prefix)) { return Optional.of(caseData); @@ -182,7 +182,7 @@ private Optional getAdequateBean( } if (entitiesSize != 1) { - logger.warn("Only first element is supported for now: [{}], was: [{}]", path, entitiesSize); + logger.warn("Only first element is supported for now: [{}], was: [{}]", pathWithoutAlias, entitiesSize); } return Optional.ofNullable(entityDtos).map(actualEntities -> actualEntities.get(0)); diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImplTest.java index 20a0f8f93fe..c9dedca5c87 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImplTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImplTest.java @@ -10,6 +10,8 @@ import de.symeda.sormas.api.Language; import de.symeda.sormas.api.caze.CaseDataDto; import de.symeda.sormas.api.caze.Vaccine; +import de.symeda.sormas.api.epidata.EpiDataDto; +import de.symeda.sormas.api.utils.YesNoUnknown; import de.symeda.sormas.api.i18n.I18nProperties; import de.symeda.sormas.api.immunization.ImmunizationDto; import de.symeda.sormas.api.immunization.ImmunizationStatus; @@ -253,6 +255,39 @@ void retrieve_contact_details_email() { () -> Assertions.assertEquals("mail@mail.ch", personFirstNameFieldInfo.getFieldValue())); } + @Test + void retrievePartial_epiData_twoFields() { + // PREPARE + Disease disease = Disease.PERTUSSIS; + CaseDataDto originalCase = creator.createUnclassifiedCase(disease); + + originalCase.getEpiData().setExposureDetailsKnown(YesNoUnknown.YES); + originalCase.getEpiData().setContactWithSourceCaseKnown(YesNoUnknown.NO); + getCaseFacade().save(originalCase); + + String exposureDetailsKnownFieldName = toFieldName(EpiDataDto.I18N_PREFIX, EpiDataDto.EXPOSURE_DETAILS_KNOWN); + String contactWithSourceCaseKnownFieldName = toFieldName(EpiDataDto.I18N_PREFIX, EpiDataDto.CONTACT_WITH_SOURCE_CASE_KNOWN); + + // EXECUTE + PartialRetrievalResponse actual = victim().retrievePartial( + new PartialRetrievalRequest().setCaseUuid(originalCase.getUuid()) + .setFieldsToRetrieve(Set.of(exposureDetailsKnownFieldName, contactWithSourceCaseKnownFieldName))); + + // CHECK + FieldInfo exposureDetailsKnownFieldInfo = actual.getFieldInfoDictionary().get(exposureDetailsKnownFieldName); + FieldInfo contactWithSourceCaseKnownFieldInfo = actual.getFieldInfoDictionary().get(contactWithSourceCaseKnownFieldName); + Assertions.assertAll( + () -> Assertions.assertTrue(actual.getFailuresDictionary().isEmpty()), + + () -> Assertions.assertTrue(actual.getFieldInfoDictionary().containsKey(exposureDetailsKnownFieldName)), + () -> Assertions.assertEquals("Exposure details known", exposureDetailsKnownFieldInfo.getTranslatedFieldName()), + () -> Assertions.assertEquals(YesNoUnknown.YES, exposureDetailsKnownFieldInfo.getFieldValue()), + + () -> Assertions.assertTrue(actual.getFieldInfoDictionary().containsKey(contactWithSourceCaseKnownFieldName)), + () -> Assertions.assertEquals("Contacts with source case known", contactWithSourceCaseKnownFieldInfo.getTranslatedFieldName()), + () -> Assertions.assertEquals(YesNoUnknown.NO, contactWithSourceCaseKnownFieldInfo.getFieldValue())); + } + private static String toFieldName(String prefix, String fieldName) { return prefix + '.' + fieldName; } diff --git a/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java index 0e079adb315..f265443e0d1 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java @@ -36,6 +36,7 @@ import de.symeda.sormas.api.patch.*; import de.symeda.sormas.api.person.*; import de.symeda.sormas.api.symptoms.SymptomState; +import de.symeda.sormas.api.utils.YesNoUnknown; import de.symeda.sormas.api.vaccination.VaccinationDto; import de.symeda.sormas.backend.AbstractBeanTest; import de.symeda.sormas.backend.MockProducer; @@ -942,6 +943,35 @@ void patch_fieldDoesNoExist() { () -> Assertions.assertEquals(Map.of(), response.getValidPatchDictionary())); } + @Test + void patch_epiData() { + // PREPARE + CaseDataDto originalCase = creator.createUnclassifiedCase(Disease.PERTUSSIS); + + CaseDataPatchRequest request = new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()) + .setReplacementStrategy(DataReplacementStrategy.ALWAYS) + .setPatchDictionary( + Map.of( + "EpiData.exposureDetailsKnown", + "YES", + + "EpiData.contactWithSourceCaseKnown", + "NO")); + + // EXECUTE + DataPatchResponse response = victim().patch(request); + + // CHECK + logger.info("response: [{}]", response); + + CaseDataDto actualCase = getCaseFacade().getByUuid(originalCase.getUuid()); + + Assertions.assertAll( + () -> Assertions.assertTrue(response.getFailures().isEmpty(), "Failure found, but should be empty"), + () -> Assertions.assertEquals(YesNoUnknown.YES, actualCase.getEpiData().getExposureDetailsKnown()), + () -> Assertions.assertEquals(YesNoUnknown.NO, actualCase.getEpiData().getContactWithSourceCaseKnown())); + } + @Test void patch_ifNotAlreadyPresent_sameDayDifferentTime_noForbiddenValueOverride() { // PREPARE From db631d4eec15eb99afa28454307f930f3db4fd13 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Thu, 7 May 2026 11:17:36 +0200 Subject: [PATCH 109/134] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Unified=20"entity"?= =?UTF-8?q?=20storage=20in=20patcher?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backend/patch/BusinessDtoFacade.java | 10 +++ .../sormas/backend/patch/DataPatcherImpl.java | 73 ++++++++----------- 2 files changed, 40 insertions(+), 43 deletions(-) diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java index fe9db108fab..f5507a7c00d 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java @@ -193,6 +193,11 @@ public EntityDto fetchByI18nNameForCreateUpdate(@NotNull String i18nName, CaseDa .apply(caseDataDto); } + public Optional tryFetchByI18nNameForCreateUpdate(@NotNull String i18nName, CaseDataDto caseDataDto) { + return Optional.ofNullable(dtoRetrieverByI18nDictionaryCreateUpdate.get(i18nName)) + .map(fct -> fct.apply(caseDataDto)); + } + /** * For displaying purposes what purposes can be retrieved. * @@ -219,4 +224,9 @@ public T save(@NotNull EntityDto entityDto) { .orElseThrow(() -> new IllegalStateException(String.format("No save function defined for: [%s]", entityDtoClass))) .apply((T) entityDto); } + + public void save(@NotNull List entityDtos) { + entityDtos.forEach(this::save); + } + } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java index e2363dcaf1a..7618ccf8007 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java @@ -17,16 +17,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Suppliers; - import de.symeda.sormas.api.Disease; +import de.symeda.sormas.api.EntityDto; import de.symeda.sormas.api.caze.CaseDataDto; import de.symeda.sormas.api.patch.*; import de.symeda.sormas.api.patch.mapping.FieldCustomMapper; import de.symeda.sormas.api.patch.mapping.FieldPatchRequest; import de.symeda.sormas.api.patch.mapping.ValueMappingResult; import de.symeda.sormas.api.patch.mapping.ValuePatchRequest; -import de.symeda.sormas.api.person.PersonDto; import de.symeda.sormas.api.utils.Tuple; import de.symeda.sormas.api.utils.fieldvisibility.FieldVisibilityCheckers; import de.symeda.sormas.backend.common.ConfigFacadeEjb; @@ -40,8 +38,6 @@ @ApplicationScoped public class DataPatcherImpl implements DataPatcher { - public static final String PERSON_FIELD_NAME_PREFIX = "Person."; - private final static Logger logger = LoggerFactory.getLogger(DataPatcherImpl.class); @Inject @@ -93,10 +89,8 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { Disease disease = caseData.getDisease(); - // TODO: modify to make more "agnostic": person is any other entity. - // TODO: only case is different as it is the root. - // make this generic for additional "root"-types - Supplier personSupplier = Suppliers.memoize(() -> getPersonDto(caseData)); + Map entityCache = new HashMap<>(); + entityCache.put(CaseDataDto.I18N_PREFIX, caseData); List>> patchingTuples = computePatchingTuples(request); @@ -105,7 +99,7 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { de.symeda.sormas.api.patch.SinglePatchResult singlePatchResult = new de.symeda.sormas.api.patch.SinglePatchResult().setFieldName(fullFieldName); - Supplier target = () -> findAppropriateTarget(fullFieldName, caseData, personSupplier); + Supplier target = () -> findAppropriateTarget(fullFieldName, caseData, entityCache); try { return produceSinglePatchResult(request, entry, disease, target); @@ -130,7 +124,7 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { return response; } - saveDTOsIfAppropriate(validPatchDictionary, caseData, personSupplier); + saveDTOsIfAppropriate(entityCache); logger.debug("dataPatchResponse: [{}]", response); @@ -148,31 +142,21 @@ public SinglePatchResult produceSinglePatchResult( .orElseGet(() -> valueMappingResult(entry, disease, request, target)); } - private void saveDTOsIfAppropriate(Map validPatchDictionary, CaseDataDto caseData, Supplier personSupplier) { - if (anyFieldPatchedWithPrefix(validPatchDictionary, PatchFieldHelper.CASE_DATA_PREFIX)) { - logger.info("CaseData was modified will be applied for: [{}]. Enable debug to see fully patched object", caseData); - - if (logger.isDebugEnabled()) { - logger.debug("CaseData: \n{}", ObjectMapperProvider.writeValueAsStringFailSafe(caseData)); - } + private void saveDTOsIfAppropriate(Map entityCache) { + List toSave = new ArrayList<>(entityCache.values()); - businessDtoFacade.save(caseData); + if (toSave.isEmpty()) { + return; } - if (anyFieldPatchedWithPrefix(validPatchDictionary, PatchFieldHelper.PERSON_PREFIX)) { - PersonDto person = personSupplier.get(); - logger.info("Person was modified will be applied for: [{}]. Enable debug fully patched object", person); - + toSave.forEach(entity -> { + logger.info("{} was modified, will be saved. Enable debug to see fully patched object", entity.getClass().getSimpleName()); if (logger.isDebugEnabled()) { - logger.debug("Person: \n{}", ObjectMapperProvider.writeValueAsStringFailSafe(person)); + logger.debug("{}: \n{}", entity.getClass().getSimpleName(), ObjectMapperProvider.writeValueAsStringFailSafe(entity)); } + }); - businessDtoFacade.save(person); - } - } - - private boolean anyFieldPatchedWithPrefix(Map validPatchDictionary, String caseDataPrefix) { - return validPatchDictionary.keySet().stream().anyMatch(key -> key.startsWith(caseDataPrefix)); + businessDtoFacade.save(toSave); } private @NotNull Map buildDictionaryFor( @@ -378,16 +362,6 @@ private Tuple> buildMapTupleEntryFr return request.getEmptyValueBehavior() == EmptyValueBehavior.REPLACE ? ignored -> true : buildEmptyValuePredicate(); } - private @NotNull PersonDto getPersonDto(CaseDataDto caseData) { - String personUuid = caseData.getPerson().getUuid(); - PersonDto person = businessDtoFacade.fetch(PersonDto.class, caseData); - - if (person == null) { - throw new IllegalStateException(String.format("No person found for uuid: [%s]", personUuid)); - } - return person; - } - private @NotNull CaseDataDto getCaseDataDto(CaseDataPatchRequest request) { String caseUuid = request.getCaseUuid(); CaseDataDto caseData = businessDtoFacade.getCaseDataDtoNullable(caseUuid); @@ -398,14 +372,27 @@ private Tuple> buildMapTupleEntryFr return caseData; } - private Object findAppropriateTarget(String fieldName, CaseDataDto caseData, Supplier person) { - if (fieldName.startsWith(PERSON_FIELD_NAME_PREFIX)) { - return person.get(); + private EntityDto findAppropriateTarget(String resolvedPath, CaseDataDto caseData, Map entityCache) { + String prefix = extractPrefix(resolvedPath); + + if (entityCache.containsKey(prefix)) { + return entityCache.get(prefix); + } + + Optional fetched = businessDtoFacade.tryFetchByI18nNameForCreateUpdate(prefix, caseData); + if (fetched.isPresent()) { + entityCache.put(prefix, fetched.get()); + return fetched.get(); } return caseData; } + private String extractPrefix(String fieldName) { + int dotIndex = fieldName.indexOf('.'); + return dotIndex == -1 ? fieldName : fieldName.substring(0, dotIndex); + } + private Predicate> buildEmptyValuePredicate() { return stringObjectEntry -> { From d448ac3124aa8d4b1cfa5cb093393aa4a72fbf2e Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Thu, 7 May 2026 11:37:17 +0200 Subject: [PATCH 110/134] =?UTF-8?q?=F0=9F=9A=A7=20prepared=20storing=20vac?= =?UTF-8?q?cinations?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backend/patch/BusinessDtoFacade.java | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java index f5507a7c00d..5820f814804 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java @@ -110,6 +110,7 @@ private void registerFetchByI18nOperationsCreateUpdate() { registerFetchByI18nCreateUpdate( PersonDto.I18N_PREFIX, caseDataDto -> personFacade.getByUuid(caseDataDto.getPerson().getUuid())); + registerFetchByI18nCreateUpdate( ImmunizationDto.I18N_PREFIX, createImmunizationDtoFromCaseFct()); @@ -123,6 +124,7 @@ private static Function createImmunizationDtoFromCaseFct return caseDataDto -> { ImmunizationDto build = ImmunizationDto.build(caseDataDto.getPerson()); build.setRelatedCase(caseDataDto.toReference()); + build.setPerson(caseDataDto.getPerson()); return build; }; } @@ -226,7 +228,28 @@ public T save(@NotNull EntityDto entityDto) { } public void save(@NotNull List entityDtos) { + + Optional immunizationDto = fetchType(entityDtos, ImmunizationDto.class); + Optional vaccinationDto = fetchType(entityDtos, VaccinationDto.class); + Optional caseDataDtoOpt = fetchType(entityDtos, CaseDataDto.class); + + if (vaccinationDto.isPresent()) { + ImmunizationDto actualImmunizationDto; + if (immunizationDto.isPresent()) { + actualImmunizationDto = immunizationDto.orElseThrow(); + } else { + actualImmunizationDto = (ImmunizationDto) createImmunizationDtoFromCaseFct().apply(caseDataDtoOpt.orElseThrow()); + } + + actualImmunizationDto.getVaccinations().add(vaccinationDto.orElseThrow()); + } + + // TODO: filter out those that are already done through "case-drilling" entityDtos.forEach(this::save); } + private static @NotNull Optional fetchType(List entityDtos, Class targetClass) { + return entityDtos.stream().filter(targetClass::isInstance).map(targetClass::cast).findAny(); + } + } From 9e91187d395cb4b5e9dbf11c358e66a898cdbc9f Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Thu, 7 May 2026 14:19:07 +0200 Subject: [PATCH 111/134] =?UTF-8?q?=F0=9F=9A=A7=20prepared=20leaf-linked?= =?UTF-8?q?=20entities=20for=20storage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backend/patch/BusinessDtoFacade.java | 47 ++++++++++--------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java index 5820f814804..eb3d1614a1c 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java @@ -1,11 +1,6 @@ package de.symeda.sormas.backend.patch; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; +import java.util.*; import java.util.function.BiFunction; import java.util.function.Function; import java.util.stream.Collectors; @@ -122,10 +117,15 @@ private void registerFetchByI18nOperationsCreateUpdate() { private static Function createImmunizationDtoFromCaseFct() { return caseDataDto -> { - ImmunizationDto build = ImmunizationDto.build(caseDataDto.getPerson()); - build.setRelatedCase(caseDataDto.toReference()); - build.setPerson(caseDataDto.getPerson()); - return build; + ImmunizationDto immunization = ImmunizationDto.build(caseDataDto.getPerson()); + + immunization.setRelatedCase(caseDataDto.toReference()); + immunization.setPerson(caseDataDto.getPerson()); + immunization.setDisease(caseDataDto.getDisease()); + immunization.setResponsibleRegion(caseDataDto.getResponsibleRegion()); + immunization.setResponsibleDistrict(caseDataDto.getResponsibleDistrict()); + + return immunization; }; } @@ -218,8 +218,7 @@ public Set fetchablePrefixes() { * @param * type */ - - public T save(@NotNull EntityDto entityDto) { + private T saveDirectEntity(@NotNull EntityDto entityDto) { Class entityDtoClass = entityDto.getClass(); return Optional.ofNullable((Function) directDtoSaveDictionary.get(entityDtoClass)) @@ -228,24 +227,30 @@ public T save(@NotNull EntityDto entityDto) { } public void save(@NotNull List entityDtos) { + ArrayList dtosToSave = new ArrayList<>(entityDtos); + + Optional immunizationDtoOpt = fetchType(entityDtos, ImmunizationDto.class); + Optional vaccinationDtoOpt = fetchType(entityDtos, VaccinationDto.class); - Optional immunizationDto = fetchType(entityDtos, ImmunizationDto.class); - Optional vaccinationDto = fetchType(entityDtos, VaccinationDto.class); Optional caseDataDtoOpt = fetchType(entityDtos, CaseDataDto.class); - if (vaccinationDto.isPresent()) { + if (vaccinationDtoOpt.isPresent()) { ImmunizationDto actualImmunizationDto; - if (immunizationDto.isPresent()) { - actualImmunizationDto = immunizationDto.orElseThrow(); + if (immunizationDtoOpt.isPresent()) { + actualImmunizationDto = immunizationDtoOpt.orElseThrow(); } else { - actualImmunizationDto = (ImmunizationDto) createImmunizationDtoFromCaseFct().apply(caseDataDtoOpt.orElseThrow()); + actualImmunizationDto = (ImmunizationDto) createImmunizationDtoFromCaseFct() + .apply(caseDataDtoOpt.orElseThrow(() -> new IllegalStateException(String.format("When saving child leaf entities the caseData must be present, but was not: [%s]", entityDtos)))); } - actualImmunizationDto.getVaccinations().add(vaccinationDto.orElseThrow()); + VaccinationDto vaccinationDto = vaccinationDtoOpt.orElseThrow(); + actualImmunizationDto.getVaccinations().add(vaccinationDto); + + dtosToSave.remove(actualImmunizationDto); + dtosToSave.remove(vaccinationDto); } - // TODO: filter out those that are already done through "case-drilling" - entityDtos.forEach(this::save); + dtosToSave.forEach(this::saveDirectEntity); } private static @NotNull Optional fetchType(List entityDtos, Class targetClass) { From c1ec22e4ebc2f3a09a5aaa20447e3f58ff7ccc1b Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Thu, 7 May 2026 15:12:00 +0200 Subject: [PATCH 112/134] =?UTF-8?q?=E2=9C=A8=20Patching=20single=20vaccina?= =?UTF-8?q?tion=20and=20single=20immunization.=20To=20check=20if=20can=20b?= =?UTF-8?q?e=20easily=20extended=20to=20multiple=20for=20RSV?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backend/patch/BusinessDtoFacade.java | 46 ++-- .../sormas/backend/patch/DataPatcherImpl.java | 13 ++ .../backend/patch/PatchFieldHelper.java | 12 +- .../backend/patch/alias/PathAliasHelper.java | 4 + .../backend/patch/BusinessDtoFacadeTest.java | 216 ++++++++++++++++++ .../sormas/patch/DataPatcherImplTest.java | 108 +++++++++ 6 files changed, 374 insertions(+), 25 deletions(-) create mode 100644 sormas-backend/src/test/java/de/symeda/sormas/backend/patch/BusinessDtoFacadeTest.java diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java index eb3d1614a1c..362d9907f6a 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java @@ -1,7 +1,6 @@ package de.symeda.sormas.backend.patch; import java.util.*; -import java.util.function.BiFunction; import java.util.function.Function; import java.util.stream.Collectors; @@ -40,7 +39,6 @@ public class BusinessDtoFacade { private UserFacadeEjb.UserFacadeEjbLocal userFacade; private final Map, Function> directDtoSaveDictionary = new HashMap<>(); - private final Map, BiFunction> saveFromCaseDictionary = new HashMap<>(); private final Map, Function> dtoRetrieverDictionary = new HashMap<>(); @@ -50,7 +48,7 @@ public class BusinessDtoFacade { @PostConstruct private void init() { - registerSaveOperations(); + registerDirectSaveOperations(); registerFetchOperations(); // TODO: add fetch for "list elements": @@ -66,7 +64,7 @@ private void init() { } - private void registerSaveOperations() { + private void registerDirectSaveOperations() { registerSave(CaseDataDto.class, caseDataDto -> caseFacade.save(caseDataDto)); registerSave(PersonDto.class, personDto -> personFacade.save(personDto)); registerSave(ImmunizationDto.class, immunizationDto -> immunizationFacade.save(immunizationDto)); @@ -115,7 +113,7 @@ private void registerFetchByI18nOperationsCreateUpdate() { caseDataDto -> VaccinationDto.build(userFacade.getCurrentUserAsReference())); } - private static Function createImmunizationDtoFromCaseFct() { + private Function createImmunizationDtoFromCaseFct() { return caseDataDto -> { ImmunizationDto immunization = ImmunizationDto.build(caseDataDto.getPerson()); @@ -124,6 +122,7 @@ private static Function createImmunizationDtoFromCaseFct immunization.setDisease(caseDataDto.getDisease()); immunization.setResponsibleRegion(caseDataDto.getResponsibleRegion()); immunization.setResponsibleDistrict(caseDataDto.getResponsibleDistrict()); + immunization.setReportingUser(userFacade.getCurrentUserAsReference()); return immunization; }; @@ -188,27 +187,32 @@ public List fetchByI18nNameForDisplay(@NotNull String i18nN * @param caseDataDto root/reference entity * @return "un-attached" DTO that will be thrown away if not saved. */ - @Nullable - public EntityDto fetchByI18nNameForCreateUpdate(@NotNull String i18nName, CaseDataDto caseDataDto) { - return Optional.ofNullable(dtoRetrieverByI18nDictionaryCreateUpdate.get(i18nName)) - .orElseThrow(() -> new IllegalStateException(String.format("No fetch function defined for: [%s]", i18nName))) - .apply(caseDataDto); - } - public Optional tryFetchByI18nNameForCreateUpdate(@NotNull String i18nName, CaseDataDto caseDataDto) { return Optional.ofNullable(dtoRetrieverByI18nDictionaryCreateUpdate.get(i18nName)) .map(fct -> fct.apply(caseDataDto)); } /** - * For displaying purposes what purposes can be retrieved. - * - * @return prefixes that can be fetched through their I18n Prefix. + * @return I18n prefixes registered for display retrieval. */ public Set fetchablePrefixes() { return dtoRetrieverByI18nDictionaryRead.keySet(); } + /** + * @return I18n prefixes registered for create/update retrieval. + */ + public Set createUpdatePrefixes() { + return Collections.unmodifiableSet(dtoRetrieverByI18nDictionaryCreateUpdate.keySet()); + } + + /** + * @return DTO classes that have a direct save function registered. + */ + public Set> savableDtoClasses() { + return Collections.unmodifiableSet(directDtoSaveDictionary.keySet()); + } + /** * Single entry for saving a business DTO. * @@ -235,19 +239,23 @@ public void save(@NotNull List entityDtos) { Optional caseDataDtoOpt = fetchType(entityDtos, CaseDataDto.class); if (vaccinationDtoOpt.isPresent()) { + VaccinationDto vaccinationDto = vaccinationDtoOpt.orElseThrow(); ImmunizationDto actualImmunizationDto; if (immunizationDtoOpt.isPresent()) { actualImmunizationDto = immunizationDtoOpt.orElseThrow(); } else { actualImmunizationDto = (ImmunizationDto) createImmunizationDtoFromCaseFct() - .apply(caseDataDtoOpt.orElseThrow(() -> new IllegalStateException(String.format("When saving child leaf entities the caseData must be present, but was not: [%s]", entityDtos)))); + .apply( + caseDataDtoOpt.orElseThrow( + () -> new IllegalStateException( + String.format("When saving child leaf entities the caseData must be present, but was not: [%s]", entityDtos)))); } - VaccinationDto vaccinationDto = vaccinationDtoOpt.orElseThrow(); actualImmunizationDto.getVaccinations().add(vaccinationDto); - - dtosToSave.remove(actualImmunizationDto); dtosToSave.remove(vaccinationDto); + if (!dtosToSave.contains(actualImmunizationDto)) { + dtosToSave.add(actualImmunizationDto); + } } dtosToSave.forEach(this::saveDirectEntity); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java index 7618ccf8007..fe1bc9dd4a0 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java @@ -20,7 +20,9 @@ import de.symeda.sormas.api.Disease; import de.symeda.sormas.api.EntityDto; import de.symeda.sormas.api.caze.CaseDataDto; +import de.symeda.sormas.api.immunization.ImmunizationDto; import de.symeda.sormas.api.patch.*; +import de.symeda.sormas.api.vaccination.VaccinationDto; import de.symeda.sormas.api.patch.mapping.FieldCustomMapper; import de.symeda.sormas.api.patch.mapping.FieldPatchRequest; import de.symeda.sormas.api.patch.mapping.ValueMappingResult; @@ -146,6 +148,7 @@ private void saveDTOsIfAppropriate(Map entityCache) { List toSave = new ArrayList<>(entityCache.values()); if (toSave.isEmpty()) { + logger.warn("Nothing to save in entity cache"); return; } @@ -159,6 +162,16 @@ private void saveDTOsIfAppropriate(Map entityCache) { businessDtoFacade.save(toSave); } + private void attachVaccinationToImmunization(Map entityCache) { + VaccinationDto vaccination = (VaccinationDto) entityCache.get(VaccinationDto.I18N_PREFIX); + entityCache.computeIfAbsent(ImmunizationDto.I18N_PREFIX, prefix -> { + CaseDataDto caseData = (CaseDataDto) entityCache.get(CaseDataDto.I18N_PREFIX); + return businessDtoFacade.tryFetchByI18nNameForCreateUpdate(prefix, caseData) + .orElseThrow(() -> new IllegalStateException("No immunization factory registered for vaccination attachment")); + }); + ((ImmunizationDto) entityCache.get(ImmunizationDto.I18N_PREFIX)).getVaccinations().add(vaccination); + } + private @NotNull Map buildDictionaryFor( List results, Function fct, diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java index 2d07bf8b1b3..20ed2b9ec80 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java @@ -26,9 +26,6 @@ public class PatchFieldHelper { public static final String PATH_SEPARATOR = "."; - public static final String CASE_DATA_PREFIX = "CaseData."; - public static final String PERSON_PREFIX = "Person."; - private static final String OPENING_PARENTHESIS = "("; private static final String CLOSING_PARENTHESIS = ")"; private static final String PIPE = "|"; @@ -44,6 +41,9 @@ public class PatchFieldHelper { @EJB private SystemConfigurationValueFacade systemConfigurationValueFacade; + @Inject + private BusinessDtoFacade businessDtoFacade; + public PatchFieldHelper() { } @@ -118,11 +118,11 @@ private Set resolveConfiguredForbiddenFields() { } private boolean startsWithAllowedPrefix(String path) { - return pathStartsWithAllowedPrefix(path, pathAliasHelper.supportedPrefixes()); + return pathStartsWithAllowedPrefix(path, pathAliasHelper.supportedPrefixes()) || pathStartsWithAllowedPrefix(path, businessDtoFacade.fetchablePrefixes()); } - private static boolean pathStartsWithAllowedPrefix(String path, Set strings) { - return strings.stream().anyMatch(path::startsWith); + private static boolean pathStartsWithAllowedPrefix(String path, Set prefixes) { + return prefixes.stream().anyMatch(path::startsWith); } public boolean isMultipleFieldFormat(String path) { diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java index ce6d427ded4..8f00693c5e5 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java @@ -14,6 +14,8 @@ import de.symeda.sormas.api.activityascase.ActivityAsCaseDto; import de.symeda.sormas.api.epidata.EpiDataDto; +import de.symeda.sormas.api.immunization.ImmunizationDto; +import de.symeda.sormas.api.vaccination.VaccinationDto; import org.apache.commons.collections4.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -87,6 +89,8 @@ public class PathAliasHelper { dictionary.put(UserDto.I18N_PREFIX, toFieldName(CaseDataDto.I18N_PREFIX, CaseDataDto.FOLLOW_UP_STATUS_CHANGE_USER)); dictionary.put(EpiDataDto.I18N_PREFIX, toFieldName(CaseDataDto.I18N_PREFIX, CaseDataDto.EPI_DATA)); + + // TODO: list seem to not work well | will probably be removed to only match singular and covered by businessDtoFacade dictionary.put(ExposureDto.I18N_PREFIX, toFieldName(toFieldName(CaseDataDto.I18N_PREFIX, CaseDataDto.EPI_DATA), EpiDataDto.EXPOSURES)); dictionary.put(ActivityAsCaseDto.I18N_PREFIX, toFieldName(toFieldName(CaseDataDto.I18N_PREFIX, CaseDataDto.EPI_DATA), EpiDataDto.ACTIVITIES_AS_CASE)); diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/BusinessDtoFacadeTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/BusinessDtoFacadeTest.java new file mode 100644 index 00000000000..a4a6c4b0233 --- /dev/null +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/BusinessDtoFacadeTest.java @@ -0,0 +1,216 @@ +package de.symeda.sormas.backend.patch; + +import static org.junit.jupiter.api.Assertions.assertAll; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyList; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import java.lang.reflect.Method; +import java.util.List; +import java.util.Optional; +import java.util.Set; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.ArgumentCaptor; +import org.mockito.ArgumentMatchers; +import org.mockito.InjectMocks; +import org.mockito.Mock; + +import de.symeda.sormas.api.EntityDto; +import de.symeda.sormas.api.caze.CaseDataDto; +import de.symeda.sormas.api.immunization.ImmunizationDto; +import de.symeda.sormas.api.person.PersonDto; +import de.symeda.sormas.api.person.PersonReferenceDto; +import de.symeda.sormas.api.vaccination.VaccinationDto; +import de.symeda.sormas.backend.AbstractUnitTest; +import de.symeda.sormas.backend.caze.CaseFacadeEjb; +import de.symeda.sormas.backend.immunization.ImmunizationFacadeEjb; +import de.symeda.sormas.backend.person.PersonFacadeEjb; +import de.symeda.sormas.backend.user.UserFacadeEjb; + +import javax.validation.Valid; +import javax.validation.constraints.NotNull; + +class BusinessDtoFacadeTest extends AbstractUnitTest { + + @InjectMocks + private BusinessDtoFacade victim; + + @Mock + private CaseFacadeEjb.CaseFacadeEjbLocal caseFacade; + @Mock + private PersonFacadeEjb.PersonFacadeEjbLocal personFacade; + @Mock + private ImmunizationFacadeEjb.ImmunizationFacadeEjbLocal immunizationFacade; + @Mock + private UserFacadeEjb.UserFacadeEjbLocal userFacade; + + @BeforeEach + void init() throws ReflectiveOperationException { + Method initMethod = BusinessDtoFacade.class.getDeclaredMethod("init"); + initMethod.setAccessible(true); + initMethod.invoke(victim); + } + + @Test + void readAndCreateUpdatePrefixes_containSameKeys() { + assertEquals(victim.fetchablePrefixes(), victim.createUpdatePrefixes()); + } + + @Test + void allNonRootSavableDtoClasses_arePresentInBothI18nDictionaries() throws ReflectiveOperationException { + Set readPrefixes = victim.fetchablePrefixes(); + Set createUpdatePrefixes = victim.createUpdatePrefixes(); + + for (Class clazz : victim.savableDtoClasses()) { + if (CaseDataDto.class.equals(clazz)) { + continue; + } + String i18nPrefix = (String) clazz.getDeclaredField("I18N_PREFIX").get(null); + assertAll( + () -> assertTrue(readPrefixes.contains(i18nPrefix), clazz.getSimpleName() + " missing from read dictionary"), + () -> assertTrue(createUpdatePrefixes.contains(i18nPrefix), clazz.getSimpleName() + " missing from createUpdate dictionary")); + } + } + + @Test + void getCaseDataDtoNullable_returnsNull_whenNotFound() { + when(caseFacade.getByUuid("unknown")).thenReturn(null); + + assertNull(victim.getCaseDataDtoNullable("unknown")); + } + + @Test + void getCaseDataDtoNullable_returnsDto_whenFound() { + CaseDataDto expected = new CaseDataDto(); + when(caseFacade.getByUuid("uuid-1")).thenReturn(expected); + + assertSame(expected, victim.getCaseDataDtoNullable("uuid-1")); + } + + @Test + void getCaseDataDto_throwsIllegalState_whenNotFound() { + when(caseFacade.getByUuid("unknown")).thenReturn(null); + + assertThrows(IllegalStateException.class, () -> victim.getCaseDataDto("unknown")); + } + + + @Test + void tryFetchByI18nNameForCreateUpdate_returnsEmpty_forUnknownPrefix() { + Optional result = victim.tryFetchByI18nNameForCreateUpdate("UnknownPrefix", new CaseDataDto()); + + assertTrue(result.isEmpty()); + } + + @Test + void tryFetchByI18nNameForCreateUpdate_returnsPersonDto_forPersonPrefix() { + PersonDto personDto = new PersonDto(); + CaseDataDto caseData = buildCaseDataWithPerson("person-uuid"); + when(personFacade.getByUuid("person-uuid")).thenReturn(personDto); + + Optional result = victim.tryFetchByI18nNameForCreateUpdate(PersonDto.I18N_PREFIX, caseData); + + assertAll( + () -> assertTrue(result.isPresent()), + () -> assertSame(personDto, result.get())); + } + + @Test + void tryFetchByI18nNameForCreateUpdate_returnsNewImmunization_forImmunizationPrefix() { + CaseDataDto caseData = buildCaseDataWithPerson("person-uuid"); + + Optional result = victim.tryFetchByI18nNameForCreateUpdate(ImmunizationDto.I18N_PREFIX, caseData); + + assertTrue(result.isPresent()); + assertTrue(result.get() instanceof ImmunizationDto); + } + + // — save(List) — + + @Test + void save_list_caseData_delegatesToCaseFacade() { + CaseDataDto caseData = new CaseDataDto(); + + victim.save(List.of(caseData)); + + verify(caseFacade).save(caseData); + } + + @Test + void save_list_personDto_delegatesToPersonFacade() { + PersonDto personDto = new PersonDto(); + + victim.save(List.of(personDto)); + + verify(personFacade).save(personDto); + } + + @Test + void save_list_immunizationDto_delegatesToImmunizationFacade() { + ImmunizationDto immunization = new ImmunizationDto(); + + victim.save(List.of(immunization)); + + verify(immunizationFacade).save(immunization); + } + + @Test + void save_list_vaccinationWithExistingImmunization_attachesVaccinationThenSavesImmunization() { + ImmunizationDto immunization = new ImmunizationDto(); + VaccinationDto vaccination = new VaccinationDto(); + + victim.save(List.of(immunization, vaccination)); + + verify(immunizationFacade).save(immunization); + assertAll( + () -> assertEquals(1, immunization.getVaccinations().size()), + () -> assertSame(vaccination, immunization.getVaccinations().get(0))); + } + + @Test + void save_list_vaccinationWithoutImmunization_autoCreatesImmunizationAttachesAndSaves() { + CaseDataDto caseData = buildCaseDataWithPerson("person-uuid"); + VaccinationDto vaccination = new VaccinationDto(); + + victim.save(List.of(caseData, vaccination)); + + ArgumentCaptor captor = ArgumentCaptor.forClass(ImmunizationDto.class); + verify(immunizationFacade).save(captor.capture()); + ImmunizationDto savedImmunization = captor.getValue(); + assertAll( + () -> assertEquals(1, savedImmunization.getVaccinations().size()), + () -> assertSame(vaccination, savedImmunization.getVaccinations().get(0))); + } + + @Test + void save_list_vaccinationWithoutImmunizationOrCaseData_throwsIllegalState() { + VaccinationDto vaccination = new VaccinationDto(); + + assertThrows(IllegalStateException.class, () -> victim.save(List.of(vaccination))); + } + + @Test + void save_list_vaccinationWithImmunization_doesNotCallCaseFacadeSave() { + ImmunizationDto immunization = new ImmunizationDto(); + VaccinationDto vaccination = new VaccinationDto(); + + victim.save(List.of(immunization, vaccination)); + + verify(caseFacade, never()).save(ArgumentMatchers.<@Valid @NotNull CaseDataDto>any()); + } + + private static CaseDataDto buildCaseDataWithPerson(String personUuid) { + CaseDataDto caseData = new CaseDataDto(); + caseData.setPerson(new PersonReferenceDto(personUuid)); + return caseData; + } +} diff --git a/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java index f265443e0d1..8d68c43082f 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java @@ -1000,6 +1000,114 @@ void patch_ifNotAlreadyPresent_sameDayDifferentTime_noForbiddenValueOverride() { () -> Assertions.assertTrue(response.isApplied())); } + @Test + void patch_vaccination_only() { + // PREPARE + Disease disease = Disease.RESPIRATORY_SYNCYTIAL_VIRUS; + CaseDataDto originalCase = creator.createUnclassifiedCase(disease); + + // EXECUTE + DataPatchResponse response = victim().patch( + new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()) + .setReplacementStrategy(DataReplacementStrategy.ALWAYS) + .setPatchDictionary(Map.of("Vaccination.vaccineName", "COMIRNATY"))); + + // CHECK + List immunizations = getImmunizationFacade().getByPersonUuids(List.of(originalCase.getPerson().getUuid())); + Assertions.assertAll( + () -> Assertions.assertTrue(response.getFailures().isEmpty(), "Failures: " + response.getFailures()), + () -> Assertions.assertTrue(response.isApplied()), + () -> Assertions.assertEquals(1, immunizations.size()), + () -> Assertions.assertEquals(1, immunizations.get(0).getVaccinations().size()), + () -> Assertions.assertEquals(Vaccine.COMIRNATY, immunizations.get(0).getVaccinations().get(0).getVaccineName())); + } + + @Test + void patch_vaccination_and_immunization() { + // PREPARE + Disease disease = Disease.DENGUE; + CaseDataDto originalCase = creator.createUnclassifiedCase(disease); + + // EXECUTE + DataPatchResponse response = victim().patch( + new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()) + .setReplacementStrategy(DataReplacementStrategy.ALWAYS) + .setPatchDictionary( + Map.of( + "Vaccination.vaccineName", + "COMIRNATY", + + "Immunization.immunizationStatus", + "ACQUIRED"))); + + // CHECK + List immunizations = getImmunizationFacade().getByPersonUuids(List.of(originalCase.getPerson().getUuid())); + Assertions.assertAll( + () -> Assertions.assertTrue(response.getFailures().isEmpty(), "Failures: " + response.getFailures()), + () -> Assertions.assertTrue(response.isApplied()), + () -> Assertions.assertEquals(1, immunizations.size()), + () -> Assertions.assertEquals(ImmunizationStatus.ACQUIRED, immunizations.get(0).getImmunizationStatus()), + () -> Assertions.assertEquals(1, immunizations.get(0).getVaccinations().size()), + () -> Assertions.assertEquals(Vaccine.COMIRNATY, immunizations.get(0).getVaccinations().get(0).getVaccineName())); + } + + @Test + void patch_vaccination_and_immunization_with_existing_creates_new_without_override() { + // PREPARE + Disease disease = Disease.PERTUSSIS; + CaseDataDto originalCase = creator.createUnclassifiedCase(disease); + + ImmunizationDto existingImmunization = ImmunizationDto.build(originalCase.getPerson()); + existingImmunization.setRelatedCase(originalCase.toReference()); + existingImmunization.setImmunizationStatus(ImmunizationStatus.NOT_ACQUIRED); + existingImmunization.setReportingUser(originalCase.getReportingUser()); + VaccinationDto existingVaccination = VaccinationDto.build(originalCase.getReportingUser()); + existingVaccination.setVaccineName(Vaccine.COMIRNATY); + existingImmunization.setVaccinations(List.of(existingVaccination)); + getImmunizationFacade().save(existingImmunization); + + // EXECUTE — patch with ALWAYS strategy creates new immunization + vaccination, never modifies existing ones + DataPatchResponse response = victim().patch( + new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()) + .setReplacementStrategy(DataReplacementStrategy.ALWAYS) + .setPatchDictionary( + Map.of( + "Vaccination.vaccineName", + "MRNA_1273", + + "Immunization.immunizationStatus", + "ACQUIRED"))); + + // CHECK + List immunizations = getImmunizationFacade().getByPersonUuids(List.of(originalCase.getPerson().getUuid())); + Assertions.assertAll( + () -> Assertions.assertTrue(response.getFailures().isEmpty(), "Failures: " + response.getFailures()), + () -> Assertions.assertTrue(response.isApplied()), + + // Two immunizations: original unchanged + new one from patch + () -> Assertions.assertEquals(2, immunizations.size()), + + // Original immunization is untouched + () -> Assertions.assertTrue( + immunizations.stream().anyMatch(imm -> ImmunizationStatus.NOT_ACQUIRED.equals(imm.getImmunizationStatus()))), + + // New immunization was created with the patched status + () -> Assertions.assertTrue( + immunizations.stream().anyMatch(imm -> ImmunizationStatus.ACQUIRED.equals(imm.getImmunizationStatus()))), + + // Original vaccination (COMIRNATY) is still there + () -> Assertions.assertTrue( + immunizations.stream() + .flatMap(imm -> imm.getVaccinations().stream()) + .anyMatch(vac -> Vaccine.COMIRNATY.equals(vac.getVaccineName()))), + + // New vaccination (MRNA_1273) was created by the patch + () -> Assertions.assertTrue( + immunizations.stream() + .flatMap(imm -> imm.getVaccinations().stream()) + .anyMatch(vac -> Vaccine.MRNA_1273.equals(vac.getVaccineName())))); + } + private DataPatcher victim() { return getCaseDataPatcher(); } From 6daed729c94c23bab63f61074d7d31985ce54b65 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Thu, 7 May 2026 15:53:50 +0200 Subject: [PATCH 113/134] =?UTF-8?q?=E2=9C=85=20Validated=20hospitalization?= =?UTF-8?q?=20patching?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sormas/patch/DataPatcherImplTest.java | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java index 8d68c43082f..d07dbf0a77d 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java @@ -23,6 +23,8 @@ import de.symeda.sormas.api.Disease; import de.symeda.sormas.api.Language; import de.symeda.sormas.api.caze.CaseDataDto; +import de.symeda.sormas.api.hospitalization.HospitalizationDto; +import de.symeda.sormas.api.hospitalization.HospitalizationReasonType; import de.symeda.sormas.api.caze.Vaccine; import de.symeda.sormas.api.customizableenum.CustomizableEnumTranslation; import de.symeda.sormas.api.customizableenum.CustomizableEnumType; @@ -1000,6 +1002,47 @@ void patch_ifNotAlreadyPresent_sameDayDifferentTime_noForbiddenValueOverride() { () -> Assertions.assertTrue(response.isApplied())); } + @Test + void patch_hospitalization() { + // PREPARE + CaseDataDto originalCase = creator.createUnclassifiedCase(Disease.DENGUE); + + // EXECUTE + DataPatchResponse response = victim().patch( + new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()) + .setReplacementStrategy(DataReplacementStrategy.ALWAYS) + .setPatchDictionary( + Map.of( + // YesNoUnknown enum + toFieldName(HospitalizationDto.I18N_PREFIX, HospitalizationDto.ADMITTED_TO_HEALTH_FACILITY), + "YES", + + // Date + toFieldName(HospitalizationDto.I18N_PREFIX, HospitalizationDto.ADMISSION_DATE), + "2024-05-10", + + // String + toFieldName(HospitalizationDto.I18N_PREFIX, HospitalizationDto.DESCRIPTION), + "patient admitted urgently", + + // HospitalizationReasonType enum + toFieldName(HospitalizationDto.I18N_PREFIX, HospitalizationDto.HOSPITALIZATION_REASON), + "ISOLATION"))); + + // CHECK + logger.info("response: [{}]", response); + + CaseDataDto actualCase = getCaseFacade().getByUuid(originalCase.getUuid()); + Assertions.assertAll( + () -> Assertions.assertTrue(response.getFailures().isEmpty(), "Failures: " + response.getFailures()), + () -> Assertions.assertEquals(YesNoUnknown.YES, actualCase.getHospitalization().getAdmittedToHealthFacility()), + () -> Assertions.assertEquals( + Date.from(LocalDate.parse("2024-05-10").atStartOfDay(ZoneId.systemDefault()).toInstant()), + actualCase.getHospitalization().getAdmissionDate()), + () -> Assertions.assertEquals("patient admitted urgently", actualCase.getHospitalization().getDescription()), + () -> Assertions.assertEquals(HospitalizationReasonType.ISOLATION, actualCase.getHospitalization().getHospitalizationReason())); + } + @Test void patch_vaccination_only() { // PREPARE @@ -1108,6 +1151,10 @@ void patch_vaccination_and_immunization_with_existing_creates_new_without_overri .anyMatch(vac -> Vaccine.MRNA_1273.equals(vac.getVaccineName())))); } + private static String toFieldName(String prefix, String field) { + return prefix + '.' + field; + } + private DataPatcher victim() { return getCaseDataPatcher(); } From da9647b353ad782103e267528513b0ff4f0bbb63 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Thu, 7 May 2026 16:21:22 +0200 Subject: [PATCH 114/134] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Added=20registry?= =?UTF-8?q?=20for=20leaf=20elements=20to=20make=20it=20more=20readable=20a?= =?UTF-8?q?nd=20less=20intrusive=20for=20adding=20new=20types?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backend/patch/BusinessDtoFacade.java | 94 +++++++++++++------ .../PartialRetrieverImplTest.java | 27 ++++++ 2 files changed, 90 insertions(+), 31 deletions(-) diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java index 362d9907f6a..889bbc5c0a3 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java @@ -11,7 +11,11 @@ import javax.validation.constraints.NotNull; import de.symeda.sormas.api.EntityDto; +import de.symeda.sormas.api.activityascase.ActivityAsCaseDto; +import de.symeda.sormas.api.activityascase.ActivityAsCaseType; import de.symeda.sormas.api.caze.CaseDataDto; +import de.symeda.sormas.api.exposure.ExposureDto; +import de.symeda.sormas.api.exposure.ExposureType; import de.symeda.sormas.api.immunization.ImmunizationDto; import de.symeda.sormas.api.person.PersonDto; import de.symeda.sormas.api.vaccination.VaccinationDto; @@ -46,21 +50,21 @@ public class BusinessDtoFacade { private final Map> dtoRetrieverByI18nDictionaryCreateUpdate = new HashMap<>(); + /** + * Some {@link EntityDto} must be attached to a "parent" to be saved. + */ + private final Map, LeafAttacher> leafAttacherRegistry = new LinkedHashMap<>(); + @PostConstruct private void init() { registerDirectSaveOperations(); registerFetchOperations(); - // TODO: add fetch for "list elements": - // TODO: probably start fetch from highest-level element and drill down to retrive. - // Quite unsure if drill always work: Add exception: "missing parent entity". - // - Exposure - // - Activity as a case - // for save: List elements must be added to the parent - // TODO: issue with saving in order ? registerFetchByI18nOperationsRead(); registerFetchByI18nOperationsCreateUpdate(); + + registerLeafAttacherOperations(); } @@ -96,6 +100,10 @@ private void registerFetchByI18nOperationsRead() { .stream() .flatMap(immunization -> immunization.getVaccinations().stream()) .collect(Collectors.toList())); + + registerFetchByI18nRead(ExposureDto.I18N_PREFIX, caseDataDto -> caseDataDto.getEpiData().getExposures()); + + registerFetchByI18nRead(ActivityAsCaseDto.I18N_PREFIX, caseDataDto -> caseDataDto.getEpiData().getActivitiesAsCase()); } @@ -111,6 +119,10 @@ private void registerFetchByI18nOperationsCreateUpdate() { registerFetchByI18nCreateUpdate( VaccinationDto.I18N_PREFIX, caseDataDto -> VaccinationDto.build(userFacade.getCurrentUserAsReference())); + + registerFetchByI18nCreateUpdate(ExposureDto.I18N_PREFIX, caseDataDto -> ExposureDto.build(ExposureType.UNKNOWN)); + + registerFetchByI18nCreateUpdate(ActivityAsCaseDto.I18N_PREFIX, caseDataDto -> ActivityAsCaseDto.build(ActivityAsCaseType.UNKNOWN)); } private Function createImmunizationDtoFromCaseFct() { @@ -136,6 +148,36 @@ private void registerFetchByI18nCreateUpdate(String i18nName, Function { + ImmunizationDto immunization = fetchType(list, ImmunizationDto.class) + .orElseGet(() -> (ImmunizationDto) createImmunizationDtoFromCaseFct().apply(requireCaseData(list))); + immunization.getVaccinations().add((VaccinationDto) leaf); + return immunization; + }); + registerLeafAttacher(ExposureDto.class, (leaf, list) -> { + CaseDataDto caseData = requireCaseData(list); + caseData.getEpiData().getExposures().add((ExposureDto) leaf); + return caseData; + }); + registerLeafAttacher(ActivityAsCaseDto.class, (leaf, list) -> { + CaseDataDto caseData = requireCaseData(list); + caseData.getEpiData().getActivitiesAsCase().add((ActivityAsCaseDto) leaf); + return caseData; + }); + } + + private void registerLeafAttacher(Class leafClass, LeafAttacher attacher) { + leafAttacherRegistry.put(leafClass, attacher); + } + + private CaseDataDto requireCaseData(List dtosInProgress) { + return fetchType(dtosInProgress, CaseDataDto.class) + .orElseThrow( + () -> new IllegalStateException( + String.format("When saving child leaf entities the caseData must be present, but was not: [%s]", dtosInProgress))); + } + @Nullable public CaseDataDto getCaseDataDtoNullable(String caseUuid) { return caseFacade.getByUuid(caseUuid); @@ -233,30 +275,14 @@ private T saveDirectEntity(@NotNull EntityDto entityDto) public void save(@NotNull List entityDtos) { ArrayList dtosToSave = new ArrayList<>(entityDtos); - Optional immunizationDtoOpt = fetchType(entityDtos, ImmunizationDto.class); - Optional vaccinationDtoOpt = fetchType(entityDtos, VaccinationDto.class); - - Optional caseDataDtoOpt = fetchType(entityDtos, CaseDataDto.class); - - if (vaccinationDtoOpt.isPresent()) { - VaccinationDto vaccinationDto = vaccinationDtoOpt.orElseThrow(); - ImmunizationDto actualImmunizationDto; - if (immunizationDtoOpt.isPresent()) { - actualImmunizationDto = immunizationDtoOpt.orElseThrow(); - } else { - actualImmunizationDto = (ImmunizationDto) createImmunizationDtoFromCaseFct() - .apply( - caseDataDtoOpt.orElseThrow( - () -> new IllegalStateException( - String.format("When saving child leaf entities the caseData must be present, but was not: [%s]", entityDtos)))); - } - - actualImmunizationDto.getVaccinations().add(vaccinationDto); - dtosToSave.remove(vaccinationDto); - if (!dtosToSave.contains(actualImmunizationDto)) { - dtosToSave.add(actualImmunizationDto); - } - } + leafAttacherRegistry.forEach((leafClass, attacher) -> + dtosToSave.stream().filter(leafClass::isInstance).findAny().ifPresent(leaf -> { + EntityDto parent = attacher.attachAndReturnParent(leaf, dtosToSave); + dtosToSave.remove(leaf); + if (!dtosToSave.contains(parent)) { + dtosToSave.add(parent); + } + })); dtosToSave.forEach(this::saveDirectEntity); } @@ -265,4 +291,10 @@ public void save(@NotNull List entityDtos) { return entityDtos.stream().filter(targetClass::isInstance).map(targetClass::cast).findAny(); } + + @FunctionalInterface + private interface LeafAttacher { + EntityDto attachAndReturnParent(EntityDto leaf, List dtosInProgress); + } + } diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImplTest.java index c9dedca5c87..e4455415124 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImplTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImplTest.java @@ -11,6 +11,8 @@ import de.symeda.sormas.api.caze.CaseDataDto; import de.symeda.sormas.api.caze.Vaccine; import de.symeda.sormas.api.epidata.EpiDataDto; +import de.symeda.sormas.api.exposure.ExposureDto; +import de.symeda.sormas.api.exposure.ExposureType; import de.symeda.sormas.api.utils.YesNoUnknown; import de.symeda.sormas.api.i18n.I18nProperties; import de.symeda.sormas.api.immunization.ImmunizationDto; @@ -288,6 +290,31 @@ void retrievePartial_epiData_twoFields() { () -> Assertions.assertEquals(YesNoUnknown.NO, contactWithSourceCaseKnownFieldInfo.getFieldValue())); } + @Test + void retrievePartial_epiData_exposureType() { + // PREPARE + Disease disease = Disease.PERTUSSIS; + CaseDataDto originalCase = creator.createUnclassifiedCase(disease); + + ExposureDto exposure = ExposureDto.build(ExposureType.WORK); + originalCase.getEpiData().getExposures().add(exposure); + getCaseFacade().save(originalCase); + + String exposureTypeFieldName = toFieldName(ExposureDto.I18N_PREFIX, ExposureDto.EXPOSURE_TYPE); + + // EXECUTE + PartialRetrievalResponse actual = victim() + .retrievePartial(new PartialRetrievalRequest().setCaseUuid(originalCase.getUuid()).setFieldsToRetrieve(Set.of(exposureTypeFieldName))); + + // CHECK + FieldInfo exposureTypeFieldInfo = actual.getFieldInfoDictionary().get(exposureTypeFieldName); + Assertions.assertAll( + () -> Assertions.assertTrue(actual.getFailuresDictionary().isEmpty()), + () -> Assertions.assertTrue(actual.getFieldInfoDictionary().containsKey(exposureTypeFieldName)), + () -> Assertions.assertEquals("Type of activity", exposureTypeFieldInfo.getTranslatedFieldName()), + () -> Assertions.assertEquals(ExposureType.WORK, exposureTypeFieldInfo.getFieldValue())); + } + private static String toFieldName(String prefix, String fieldName) { return prefix + '.' + fieldName; } From dec43b71bbe8b9dab1bd5052fe0a5e76f160ee54 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Thu, 7 May 2026 17:16:03 +0200 Subject: [PATCH 115/134] =?UTF-8?q?=E2=9C=85=20Validated=20Exposure=20and?= =?UTF-8?q?=20ActivityAsCase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backend/patch/alias/PathAliasHelper.java | 4 -- .../sormas/patch/DataPatcherImplTest.java | 56 +++++++++++++++++++ 2 files changed, 56 insertions(+), 4 deletions(-) diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java index 8f00693c5e5..524a6d35fe5 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java @@ -90,10 +90,6 @@ public class PathAliasHelper { dictionary.put(EpiDataDto.I18N_PREFIX, toFieldName(CaseDataDto.I18N_PREFIX, CaseDataDto.EPI_DATA)); - // TODO: list seem to not work well | will probably be removed to only match singular and covered by businessDtoFacade - dictionary.put(ExposureDto.I18N_PREFIX, toFieldName(toFieldName(CaseDataDto.I18N_PREFIX, CaseDataDto.EPI_DATA), EpiDataDto.EXPOSURES)); - dictionary.put(ActivityAsCaseDto.I18N_PREFIX, toFieldName(toFieldName(CaseDataDto.I18N_PREFIX, CaseDataDto.EPI_DATA), EpiDataDto.ACTIVITIES_AS_CASE)); - return dictionary; } diff --git a/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java index d07dbf0a77d..88aeb5f9dd0 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java @@ -22,7 +22,11 @@ import de.symeda.sormas.api.Disease; import de.symeda.sormas.api.Language; +import de.symeda.sormas.api.activityascase.ActivityAsCaseDto; +import de.symeda.sormas.api.activityascase.ActivityAsCaseType; import de.symeda.sormas.api.caze.CaseDataDto; +import de.symeda.sormas.api.exposure.ExposureDto; +import de.symeda.sormas.api.exposure.ExposureType; import de.symeda.sormas.api.hospitalization.HospitalizationDto; import de.symeda.sormas.api.hospitalization.HospitalizationReasonType; import de.symeda.sormas.api.caze.Vaccine; @@ -1151,6 +1155,58 @@ void patch_vaccination_and_immunization_with_existing_creates_new_without_overri .anyMatch(vac -> Vaccine.MRNA_1273.equals(vac.getVaccineName())))); } + @Test + void patch_exposure() { + // PREPARE + Disease disease = Disease.DENGUE; + CaseDataDto originalCase = creator.createUnclassifiedCase(disease); + + // EXECUTE + DataPatchResponse response = victim().patch( + new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()) + .setReplacementStrategy(DataReplacementStrategy.ALWAYS) + .setPatchDictionary( + Map.of( + toFieldName(ExposureDto.I18N_PREFIX, ExposureDto.EXPOSURE_TYPE), "WORK", + toFieldName(ExposureDto.I18N_PREFIX, ExposureDto.DESCRIPTION), "market visit"))); + + // CHECK + CaseDataDto actualCase = getCaseFacade().getByUuid(originalCase.getUuid()); + List exposures = actualCase.getEpiData().getExposures(); + Assertions.assertAll( + () -> Assertions.assertTrue(response.getFailures().isEmpty(), "Failures: " + response.getFailures()), + () -> Assertions.assertTrue(response.isApplied()), + () -> Assertions.assertEquals(1, exposures.size()), + () -> Assertions.assertEquals(ExposureType.WORK, exposures.get(0).getExposureType()), + () -> Assertions.assertEquals("market visit", exposures.get(0).getDescription())); + } + + @Test + void patch_activityAsCase() { + // PREPARE + Disease disease = Disease.PERTUSSIS; + CaseDataDto originalCase = creator.createUnclassifiedCase(disease); + + // EXECUTE + DataPatchResponse response = victim().patch( + new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()) + .setReplacementStrategy(DataReplacementStrategy.ALWAYS) + .setPatchDictionary( + Map.of( + toFieldName(ActivityAsCaseDto.I18N_PREFIX, ActivityAsCaseDto.ACTIVITY_AS_CASE_TYPE), "WORK", + toFieldName(ActivityAsCaseDto.I18N_PREFIX, ActivityAsCaseDto.DESCRIPTION), "office work"))); + + // CHECK + CaseDataDto actualCase = getCaseFacade().getByUuid(originalCase.getUuid()); + List activities = actualCase.getEpiData().getActivitiesAsCase(); + Assertions.assertAll( + () -> Assertions.assertTrue(response.getFailures().isEmpty(), "Failures: " + response.getFailures()), + () -> Assertions.assertTrue(response.isApplied()), + () -> Assertions.assertEquals(1, activities.size()), + () -> Assertions.assertEquals(ActivityAsCaseType.WORK, activities.get(0).getActivityAsCaseType()), + () -> Assertions.assertEquals("office work", activities.get(0).getDescription())); + } + private static String toFieldName(String prefix, String field) { return prefix + '.' + field; } From 885dab5825fefc0c0e77de69af7cfac1bc323f59 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Thu, 7 May 2026 17:36:13 +0200 Subject: [PATCH 116/134] =?UTF-8?q?=E2=9C=A8=20PreviousHospitalization?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backend/patch/BusinessDtoFacade.java | 12 ++++++ .../backend/patch/alias/PathAliasHelper.java | 3 -- .../sormas/patch/DataPatcherImplTest.java | 37 +++++++++++++++++++ 3 files changed, 49 insertions(+), 3 deletions(-) diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java index 889bbc5c0a3..a4cf97a8ad9 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java @@ -16,6 +16,7 @@ import de.symeda.sormas.api.caze.CaseDataDto; import de.symeda.sormas.api.exposure.ExposureDto; import de.symeda.sormas.api.exposure.ExposureType; +import de.symeda.sormas.api.hospitalization.PreviousHospitalizationDto; import de.symeda.sormas.api.immunization.ImmunizationDto; import de.symeda.sormas.api.person.PersonDto; import de.symeda.sormas.api.vaccination.VaccinationDto; @@ -104,6 +105,10 @@ private void registerFetchByI18nOperationsRead() { registerFetchByI18nRead(ExposureDto.I18N_PREFIX, caseDataDto -> caseDataDto.getEpiData().getExposures()); registerFetchByI18nRead(ActivityAsCaseDto.I18N_PREFIX, caseDataDto -> caseDataDto.getEpiData().getActivitiesAsCase()); + + registerFetchByI18nRead( + PreviousHospitalizationDto.I18N_PREFIX, + caseDataDto -> caseDataDto.getHospitalization().getPreviousHospitalizations()); } @@ -123,6 +128,8 @@ private void registerFetchByI18nOperationsCreateUpdate() { registerFetchByI18nCreateUpdate(ExposureDto.I18N_PREFIX, caseDataDto -> ExposureDto.build(ExposureType.UNKNOWN)); registerFetchByI18nCreateUpdate(ActivityAsCaseDto.I18N_PREFIX, caseDataDto -> ActivityAsCaseDto.build(ActivityAsCaseType.UNKNOWN)); + + registerFetchByI18nCreateUpdate(PreviousHospitalizationDto.I18N_PREFIX, PreviousHospitalizationDto::build); } private Function createImmunizationDtoFromCaseFct() { @@ -165,6 +172,11 @@ private void registerLeafAttacherOperations() { caseData.getEpiData().getActivitiesAsCase().add((ActivityAsCaseDto) leaf); return caseData; }); + registerLeafAttacher(PreviousHospitalizationDto.class, (leaf, list) -> { + CaseDataDto caseData = requireCaseData(list); + caseData.getHospitalization().getPreviousHospitalizations().add((PreviousHospitalizationDto) leaf); + return caseData; + }); } private void registerLeafAttacher(Class leafClass, LeafAttacher attacher) { diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java index 524a6d35fe5..0c8b162b43b 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/alias/PathAliasHelper.java @@ -74,9 +74,6 @@ public class PathAliasHelper { dictionary.put(SymptomsDto.I18N_PREFIX, toFieldName(CaseDataDto.I18N_PREFIX, CaseDataDto.SYMPTOMS)); dictionary.put(HealthConditionsDto.I18N_PREFIX, toFieldName(CaseDataDto.I18N_PREFIX, CaseDataDto.HEALTH_CONDITIONS)); dictionary.put(HospitalizationDto.I18N_PREFIX, toFieldName(CaseDataDto.I18N_PREFIX, CaseDataDto.HOSPITALIZATION)); - dictionary.put( - PreviousHospitalizationDto.I18N_PREFIX, - toFieldName(toFieldName(CaseDataDto.I18N_PREFIX, CaseDataDto.HOSPITALIZATION), HospitalizationDto.PREVIOUS_HOSPITALIZATIONS)); dictionary.put(PersonContactDetailDto.I18N_PREFIX, toFieldName(PersonDto.I18N_PREFIX, PersonDto.PERSON_CONTACT_DETAILS)); dictionary.put(FacilityDto.I18N_PREFIX, toFieldName(CaseDataDto.I18N_PREFIX, CaseDataDto.HEALTH_FACILITY)); dictionary.put(PointOfEntryDto.I18N_PREFIX, toFieldName(CaseDataDto.I18N_PREFIX, CaseDataDto.POINT_OF_ENTRY)); diff --git a/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java index 88aeb5f9dd0..649837b389f 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java @@ -27,6 +27,7 @@ import de.symeda.sormas.api.caze.CaseDataDto; import de.symeda.sormas.api.exposure.ExposureDto; import de.symeda.sormas.api.exposure.ExposureType; +import de.symeda.sormas.api.hospitalization.PreviousHospitalizationDto; import de.symeda.sormas.api.hospitalization.HospitalizationDto; import de.symeda.sormas.api.hospitalization.HospitalizationReasonType; import de.symeda.sormas.api.caze.Vaccine; @@ -1181,6 +1182,42 @@ void patch_exposure() { () -> Assertions.assertEquals("market visit", exposures.get(0).getDescription())); } + @Test + void patch_previousHospitalization() { + // PREPARE + Disease disease = Disease.DENGUE; + CaseDataDto originalCase = creator.createUnclassifiedCase(disease); + String facilityCaption = originalCase.getHealthFacility().getCaption(); + + // EXECUTE + DataPatchResponse response = victim().patch( + new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()) + .setReplacementStrategy(DataReplacementStrategy.ALWAYS) + .setPatchDictionary( + Map.of( + toFieldName(PreviousHospitalizationDto.I18N_PREFIX, PreviousHospitalizationDto.ADMITTED_TO_HEALTH_FACILITY), + "YES", + + toFieldName(PreviousHospitalizationDto.I18N_PREFIX, PreviousHospitalizationDto.ADMISSION_DATE), + "2024-03-15", + + toFieldName(PreviousHospitalizationDto.I18N_PREFIX, PreviousHospitalizationDto.ICU_LENGTH_OF_STAY), + "7"))); + + // CHECK + CaseDataDto actualCase = getCaseFacade().getByUuid(originalCase.getUuid()); + List previousHospitalizations = actualCase.getHospitalization().getPreviousHospitalizations(); + Assertions.assertAll( + () -> Assertions.assertTrue(response.getFailures().isEmpty(), "Failures: " + response.getFailures()), + () -> Assertions.assertTrue(response.isApplied()), + () -> Assertions.assertEquals(1, previousHospitalizations.size()), + () -> Assertions.assertEquals(YesNoUnknown.YES, previousHospitalizations.get(0).getAdmittedToHealthFacility()), + () -> Assertions.assertEquals( + Date.from(LocalDate.parse("2024-03-15").atStartOfDay(ZoneId.systemDefault()).toInstant()), + previousHospitalizations.get(0).getAdmissionDate()), + () -> Assertions.assertEquals(7, previousHospitalizations.get(0).getIcuLengthOfStay())); + } + @Test void patch_activityAsCase() { // PREPARE From f9527e2744a895f1a5833b91c19943fa82240584 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Sat, 9 May 2026 20:18:22 +0200 Subject: [PATCH 117/134] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20MR-comments=20enha?= =?UTF-8?q?ncements.=20Code=20coverage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AutomaticSurveyResponseProcessor.java | 17 +- .../sormas/backend/patch/DataPatcherImpl.java | 46 +- .../backend/patch/PropertyAccessor.java | 3 +- .../equalitychecker/DateEqualityChecker.java | 5 + .../CustomizableEnumPatchMapper.java | 23 +- .../AutomaticSurveyResponseProcessorTest.java | 469 ++++++++++++++++++ .../backend/patch/PropertyAccessorTest.java | 431 ++++++++++++---- .../patch/alias/PathAliasHelperTest.java | 25 - .../CustomizableEnumPatchMapperTest.java | 242 +++++++++ .../sormas/patch/DataPatcherImplTest.java | 177 +------ .../sormas/patch/PropertyAccessorTest.java | 192 ------- 11 files changed, 1095 insertions(+), 535 deletions(-) create mode 100644 sormas-backend/src/test/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessorTest.java create mode 100644 sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapperTest.java delete mode 100644 sormas-backend/src/test/java/de/symeda/sormas/patch/PropertyAccessorTest.java diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java index c3c7c003e7f..6739547d9ed 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java @@ -1,9 +1,6 @@ package de.symeda.sormas.backend.externalmessage.survey; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Optional; +import java.util.*; import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; @@ -12,6 +9,9 @@ import javax.inject.Inject; import javax.transaction.Transactional; +import de.symeda.sormas.backend.survey.SurveyFacadeEjb; +import de.symeda.sormas.backend.survey.SurveyTokenFacadeEjb; +import org.apache.commons.collections4.CollectionUtils; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -24,12 +24,12 @@ import de.symeda.sormas.api.patch.CaseDataPatchRequest; import de.symeda.sormas.api.patch.DataPatchResponse; import de.symeda.sormas.api.patch.DataPatcher; +import de.symeda.sormas.api.survey.SurveyFacade; import de.symeda.sormas.api.survey.SurveyReferenceDto; import de.symeda.sormas.api.survey.SurveyTokenDto; +import de.symeda.sormas.api.survey.SurveyTokenFacade; import de.symeda.sormas.api.utils.Tuple; import de.symeda.sormas.api.utils.dataprocessing.ProcessingResultStatus; -import de.symeda.sormas.backend.survey.SurveyFacadeEjb; -import de.symeda.sormas.backend.survey.SurveyTokenFacadeEjb; import de.symeda.sormas.backend.util.CollectorUtils; @ApplicationScoped @@ -50,6 +50,10 @@ public class AutomaticSurveyResponseProcessor { public List processSurveyResponses(List externalMessages) throws InterruptedException, ExecutionException { + if (CollectionUtils.isEmpty(externalMessages)) { + return Collections.emptyList(); + } + Map tokenByExternalSurveyIdDictionary = externalMessages.stream().map(ExternalMessageDto::getSurveyResponseData).map(responseData -> { ExternalMessageSurveyResponseRequest request = responseData.getLatest().getRequest(); @@ -76,7 +80,6 @@ public List processSurveyResponses(List>> patchingTuples = computePatchingTuples(request); - List results = patchingTuples.stream().map(entry -> { + List results = patchingTuples.stream().map(entry -> { String fullFieldName = entry.getFirst(); - de.symeda.sormas.api.patch.SinglePatchResult singlePatchResult = - new de.symeda.sormas.api.patch.SinglePatchResult().setFieldName(fullFieldName); + SinglePatchResult singlePatchResult = + new SinglePatchResult().setFieldName(fullFieldName); Supplier target = () -> findAppropriateTarget(fullFieldName, caseData, entityCache); @@ -113,9 +111,9 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { }).collect(Collectors.toList()); - Map validPatchDictionary = buildDictionaryFor(results, de.symeda.sormas.api.patch.SinglePatchResult::getValue, true); + Map validPatchDictionary = buildDictionaryFor(results, SinglePatchResult::getValue, true); DataPatchResponse response = new DataPatchResponse().setApplied(false) - .setFailures(buildDictionaryFor(results, de.symeda.sormas.api.patch.SinglePatchResult::getFailure, false)) + .setFailures(buildDictionaryFor(results, SinglePatchResult::getFailure, false)) .setValidPatchDictionary(validPatchDictionary); if (validPatchDictionary.isEmpty() || (!request.isPatchedInCaseOfFailures() && response.hasFailures())) { @@ -162,29 +160,19 @@ private void saveDTOsIfAppropriate(Map entityCache) { businessDtoFacade.save(toSave); } - private void attachVaccinationToImmunization(Map entityCache) { - VaccinationDto vaccination = (VaccinationDto) entityCache.get(VaccinationDto.I18N_PREFIX); - entityCache.computeIfAbsent(ImmunizationDto.I18N_PREFIX, prefix -> { - CaseDataDto caseData = (CaseDataDto) entityCache.get(CaseDataDto.I18N_PREFIX); - return businessDtoFacade.tryFetchByI18nNameForCreateUpdate(prefix, caseData) - .orElseThrow(() -> new IllegalStateException("No immunization factory registered for vaccination attachment")); - }); - ((ImmunizationDto) entityCache.get(ImmunizationDto.I18N_PREFIX)).getVaccinations().add(vaccination); - } - private @NotNull Map buildDictionaryFor( - List results, - Function fct, + List results, + Function fct, boolean valueContext) { return results.stream() // edge case were target value is null: this is allowed, which makes both fields null. .filter( singlePatchResult -> fct.apply(singlePatchResult) != null || (valueContext && singlePatchResult.getFailure() == null && singlePatchResult.getValue() == null)) - .collect(CollectorUtils.toNullSafeMap(de.symeda.sormas.api.patch.SinglePatchResult::getFieldName, fct)); + .collect(CollectorUtils.toNullSafeMap(SinglePatchResult::getFieldName, fct)); } - private @NotNull de.symeda.sormas.api.patch.SinglePatchResult valueMappingResult( + private @NotNull SinglePatchResult valueMappingResult( Tuple> entry, Disease disease, CaseDataPatchRequest request, @@ -192,8 +180,8 @@ private void attachVaccinationToImmunization(Map entityCache) String fullFieldName = entry.getFirst(); - de.symeda.sormas.api.patch.SinglePatchResult singlePatchResult = - new de.symeda.sormas.api.patch.SinglePatchResult().setFieldName(fullFieldName); + SinglePatchResult singlePatchResult = + new SinglePatchResult().setFieldName(fullFieldName); Object target = targetOpt.get(); String relativeFieldName = fullFieldName.substring(fullFieldName.indexOf('.') + 1); @@ -253,7 +241,7 @@ private DataPatchFailure buildFailure(DataPatchFailureCause fieldDoesNotExist, O return new DataPatchFailure().setDataPatchFailureCause(fieldDoesNotExist).setProvidedFieldValue(untypedTargetValue); } - private @NotNull Optional invalidFieldResult( + private @NotNull Optional invalidFieldResult( Tuple> entry) { return Optional.ofNullable(extractFailureCause(entry)).map(invalidFieldFailureCause -> buildFailureFor(entry, invalidFieldFailureCause)); } @@ -262,7 +250,7 @@ private DataPatchFailureCause extractFailureCause(Tuple fieldMappingResult( + private Optional fieldMappingResult( Tuple> entry, Disease disease, CaseDataPatchRequest request, @@ -274,8 +262,8 @@ private Optional fieldMappingResul Object untypedTargetValue = extractValue(entry); if (mapper.isPresent()) { - de.symeda.sormas.api.patch.SinglePatchResult singlePatchResult = - new de.symeda.sormas.api.patch.SinglePatchResult().setFieldName(fullFieldName); + SinglePatchResult singlePatchResult = + new SinglePatchResult().setFieldName(fullFieldName); Optional dataPatchFailureOpt = mapper.orElseThrow() .map( @@ -291,11 +279,11 @@ private Optional fieldMappingResul return Optional.empty(); } - private de.symeda.sormas.api.patch.SinglePatchResult buildFailureFor( + private SinglePatchResult buildFailureFor( Tuple> entry, DataPatchFailureCause fieldFailureCause) { - return new de.symeda.sormas.api.patch.SinglePatchResult().setFieldName(entry.getFirst()) + return new SinglePatchResult().setFieldName(entry.getFirst()) .setFailure(buildFailure(fieldFailureCause, extractValue(entry))); } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessor.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessor.java index 143ffffdb17..6022ff8236f 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessor.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessor.java @@ -67,8 +67,7 @@ public static Tuple, PropertyAccessFailure> getNestedPropertyType( String leafPath = fieldName.substring(fieldName.lastIndexOf(PATH_SEPARATOR) + 1); - return Optional.ofNullable(getNestedProperty(bean, fieldName)) - .map(leafParent -> getPropertyType(leafParent, leafPath, fieldVisibilityCheckers)) + return getNestedProperty(bean, fieldName).map(leafParent -> getPropertyType(leafParent, leafPath, fieldVisibilityCheckers)) .orElse(FIELD_DOES_NOT_EXIST); } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/DateEqualityChecker.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/DateEqualityChecker.java index 28859fc9eff..861465fe6e7 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/DateEqualityChecker.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/DateEqualityChecker.java @@ -16,6 +16,11 @@ public class DateEqualityChecker implements EqualityChecker { @Override public boolean areEqual(Object a, Object b) { + if (a == null && b == null) { + return true; + } else if (a == null || b == null) { + return false; + } return toLocalDate((Date) a).equals(toLocalDate((Date) b)); } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapper.java index 4d4ee932a70..59826d78889 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapper.java @@ -8,19 +8,21 @@ import javax.ejb.EJB; import javax.enterprise.context.ApplicationScoped; +import de.symeda.sormas.backend.customizableenum.CustomizableEnumFacadeEjb; import org.apache.commons.collections4.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import de.symeda.sormas.api.Language; import de.symeda.sormas.api.customizableenum.CustomizableEnum; +import de.symeda.sormas.api.customizableenum.CustomizableEnumFacade; import de.symeda.sormas.api.customizableenum.CustomizableEnumType; import de.symeda.sormas.api.i18n.I18nProperties; import de.symeda.sormas.api.i18n.I18nPropertiesRequest; +import de.symeda.sormas.api.patch.DataPatchFailureCause; import de.symeda.sormas.api.patch.mapping.ValueMappingResult; import de.symeda.sormas.api.patch.mapping.ValuePatchMapper; import de.symeda.sormas.api.patch.mapping.ValuePatchRequest; -import de.symeda.sormas.backend.customizableenum.CustomizableEnumFacadeEjb; import de.symeda.sormas.backend.util.StringNormalizer; /** @@ -54,16 +56,23 @@ public ValueMappingResult map(ValuePatchRequest request) { logger.warn("For now only disease-agnostic enum values are retrieved"); - return ValueMappingResult.withData((T) findCustomizableEnum(captionCandidate, enumType, request)); + return ((Optional) findCustomizableEnum(captionCandidate, enumType, request)).map(ValueMappingResult::withData).orElseGet(() -> { + logger.warn("Could not match value: [{}] to customizableEnumType: [{}]", captionCandidate, enumType); + + return ValueMappingResult.withCause(DataPatchFailureCause.NOT_PRESENT_IN_REFERENCE_DATA_LIST); + }); } - private CustomizableEnum findCustomizableEnum(String captionCandidate, CustomizableEnumType type, ValuePatchRequest request) { + private Optional findCustomizableEnum(String captionCandidate, CustomizableEnumType type, ValuePatchRequest request) { String normalizedInput = StringNormalizer.normalize(captionCandidate); - return searchByDefaultLanguage(type, normalizedInput).or(() -> searchByLanguages(normalizedInput, type, request)) - .or(() -> Optional.ofNullable(customizableEnumFacade.getEnumValue(type, null, FALLBACK_NAME))) - .orElseThrow( - () -> new IllegalStateException(String.format("Could not match value: [%s] to customizableEnumType: [%s]", captionCandidate, type))); + return searchByDefaultLanguage(type, normalizedInput).or(() -> searchByLanguages(normalizedInput, type, request)).or(() -> { + if (request.isAllowFallbackValues()) { + return Optional.ofNullable(customizableEnumFacade.getEnumValue(type, null, FALLBACK_NAME)); + } + + return Optional.empty(); + }); } private Optional searchByDefaultLanguage(CustomizableEnumType type, String normalizedInput) { diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessorTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessorTest.java new file mode 100644 index 00000000000..5d5014680d0 --- /dev/null +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessorTest.java @@ -0,0 +1,469 @@ +package de.symeda.sormas.backend.externalmessage.survey; + +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.ArgumentCaptor.forClass; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.*; + +import java.util.Date; +import java.util.List; +import java.util.Map; + +import org.junit.jupiter.api.Test; +import org.mockito.ArgumentCaptor; +import org.mockito.InjectMocks; +import org.mockito.Mock; + +import de.symeda.sormas.api.Language; +import de.symeda.sormas.api.caze.CaseReferenceDto; +import de.symeda.sormas.api.externalmessage.ExternalMessageDto; +import de.symeda.sormas.api.externalmessage.ExternalMessageStatus; +import de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseRequest; +import de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseResult; +import de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseWrapper; +import de.symeda.sormas.api.externalmessage.survey.ExternalSurveyResponseData; +import de.symeda.sormas.api.patch.*; +import de.symeda.sormas.api.survey.SurveyDto; +import de.symeda.sormas.api.survey.SurveyFacade; +import de.symeda.sormas.api.survey.SurveyTokenDto; +import de.symeda.sormas.api.survey.SurveyTokenFacade; +import de.symeda.sormas.api.utils.DataHelper; +import de.symeda.sormas.api.utils.dataprocessing.ProcessingResultStatus; +import de.symeda.sormas.backend.AbstractUnitTest; + +class AutomaticSurveyResponseProcessorTest extends AbstractUnitTest { + + @Mock + private DataPatcher dataPatcher; + + @Mock + private SurveyFacade surveyFacade; + + @Mock + private SurveyTokenFacade surveyTokenFacade; + + @InjectMocks + private AutomaticSurveyResponseProcessor victim; + + // processSurveyResponses - happy path + + @Test + void processSurveyResponses_singleMessage_patchApplied_returnsDone() throws Exception { + // PREPARE + String caseUuid = DataHelper.createUuid(); + String token = "TOKEN-1"; + String externalSurveyId = "SURVEY-EXT-1"; + + ExternalMessageDto message = buildMessage(externalSurveyId, token, null); + SurveyTokenDto surveyToken = buildSurveyToken(token, caseUuid); + SurveyDto survey = buildSurvey(externalSurveyId); + + when(surveyFacade.getByExternalIds(List.of(externalSurveyId))).thenReturn(List.of(survey)); + when(surveyTokenFacade.getBySurveyReferenceTokenTuples(any())).thenReturn(List.of(surveyToken)); + when(dataPatcher.patch(any())).thenReturn(new DataPatchResponse().setApplied(true)); + + // EXECUTE + List results = victim.processSurveyResponses(List.of(message)); + + // CHECK + assertEquals(1, results.size()); + assertEquals(ProcessingResultStatus.DONE, results.get(0).getResultStatus()); + assertEquals(ExternalMessageStatus.PROCESSED, message.getStatus()); + assertNotNull(message.getSurveyResponseData().getLatest().getResult()); + } + + @Test + void processSurveyResponses_emptyMessageList_returnsEmptyResult() throws Exception { + // EXECUTE + List results = victim.processSurveyResponses(List.of()); + + // CHECK + assertEquals(0, results.size()); + verify(surveyFacade, never()).getByExternalIds(any()); + } + + @Test + void processSurveyResponses_multipleMessages_allSucceed_allReturnDone() throws Exception { + // PREPARE + String caseUuid1 = DataHelper.createUuid(); + String caseUuid2 = DataHelper.createUuid(); + SurveyTokenDto token1 = buildSurveyToken("T1", caseUuid1); + SurveyTokenDto token2 = buildSurveyToken("T2", caseUuid2); + + ExternalMessageDto msg1 = buildMessage("S1", "T1", null); + ExternalMessageDto msg2 = buildMessage("S2", "T2", null); + SurveyDto survey1 = buildSurvey("S1"); + SurveyDto survey2 = buildSurvey("S2"); + + when(surveyFacade.getByExternalIds(any())).thenReturn(List.of(survey1, survey2)); + when(surveyTokenFacade.getBySurveyReferenceTokenTuples(any())).thenReturn(List.of(token1, token2)); + when(dataPatcher.patch(any())).thenReturn(new DataPatchResponse().setApplied(true)); + + // EXECUTE + List results = victim.processSurveyResponses(List.of(msg1, msg2)); + + // CHECK + assertEquals(2, results.size()); + assertEquals(ProcessingResultStatus.DONE, results.get(0).getResultStatus()); + assertEquals(ProcessingResultStatus.DONE, results.get(1).getResultStatus()); + verify(dataPatcher, times(2)).patch(any()); + } + + // processSurveyResponses - skipIfAlreadyProcessed + + @Test + void processSurveyResponses_skipIfAlreadyProcessed_resultAlreadySet_returnsCanceled() throws Exception { + // PREPARE - message already has a result + ExternalMessageSurveyResponseResult existingResult = new ExternalMessageSurveyResponseResult().setCaseUuid(DataHelper.createUuid()); + ExternalMessageDto message = buildMessage("S1", "T1", existingResult); + message.getSurveyResponseData().getLatest().getRequest().setSkipIfAlreadyProcessed(true); + + when(surveyFacade.getByExternalIds(any())).thenReturn(List.of()); + when(surveyTokenFacade.getBySurveyReferenceTokenTuples(any())).thenReturn(List.of()); + + // EXECUTE + List results = victim.processSurveyResponses(List.of(message)); + + // CHECK + assertEquals(ProcessingResultStatus.CANCELED, results.get(0).getResultStatus()); + verify(dataPatcher, never()).patch(any()); + } + + @Test + void processSurveyResponses_skipIfAlreadyProcessed_false_resultAlreadySet_reprocesses() throws Exception { + // PREPARE - message already has a result but skipIfAlreadyProcessed=false + String caseUuid = DataHelper.createUuid(); + ExternalMessageSurveyResponseResult existingResult = new ExternalMessageSurveyResponseResult().setCaseUuid(caseUuid); + ExternalMessageDto message = buildMessage("S1", "T1", existingResult); + message.getSurveyResponseData().getLatest().getRequest().setSkipIfAlreadyProcessed(false); + + SurveyTokenDto surveyToken = buildSurveyToken("T1", caseUuid); + SurveyDto survey = buildSurvey("S1"); + + when(surveyFacade.getByExternalIds(any())).thenReturn(List.of(survey)); + when(surveyTokenFacade.getBySurveyReferenceTokenTuples(any())).thenReturn(List.of(surveyToken)); + when(dataPatcher.patch(any())).thenReturn(new DataPatchResponse().setApplied(true)); + + // EXECUTE + List results = victim.processSurveyResponses(List.of(message)); + + // CHECK + assertEquals(ProcessingResultStatus.DONE, results.get(0).getResultStatus()); + verify(dataPatcher).patch(any()); + } + + @Test + void processSurveyResponses_skipIfAlreadyProcessed_resultNull_processes() throws Exception { + // PREPARE - no result yet, skipIfAlreadyProcessed=true should not block first processing + String caseUuid = DataHelper.createUuid(); + ExternalMessageDto message = buildMessage("S1", "T1", null); + message.getSurveyResponseData().getLatest().getRequest().setSkipIfAlreadyProcessed(true); + + SurveyTokenDto surveyToken = buildSurveyToken("T1", caseUuid); + SurveyDto survey = buildSurvey("S1"); + + when(surveyFacade.getByExternalIds(any())).thenReturn(List.of(survey)); + when(surveyTokenFacade.getBySurveyReferenceTokenTuples(any())).thenReturn(List.of(surveyToken)); + when(dataPatcher.patch(any())).thenReturn(new DataPatchResponse().setApplied(true)); + + // EXECUTE + List results = victim.processSurveyResponses(List.of(message)); + + // CHECK + assertEquals(ProcessingResultStatus.DONE, results.get(0).getResultStatus()); + } + + // processSurveyResponses - token not found + + @Test + void processSurveyResponses_tokenNotInAvailableTokens_returnsCanceled() throws Exception { + // PREPARE - token in message doesn't match any fetched survey token + ExternalMessageDto message = buildMessage("S1", "TOKEN-UNKNOWN", null); + SurveyDto survey = buildSurvey("S1"); + SurveyTokenDto unrelatedToken = buildSurveyToken("DIFFERENT-TOKEN", DataHelper.createUuid()); + + when(surveyFacade.getByExternalIds(any())).thenReturn(List.of(survey)); + when(surveyTokenFacade.getBySurveyReferenceTokenTuples(any())).thenReturn(List.of(unrelatedToken)); + + // EXECUTE + List results = victim.processSurveyResponses(List.of(message)); + + // CHECK + assertEquals(ProcessingResultStatus.CANCELED, results.get(0).getResultStatus()); + verify(dataPatcher, never()).patch(any()); + } + + @Test + void processSurveyResponses_surveyNotFound_tokenListEmpty_returnsCanceled() throws Exception { + // PREPARE - survey not found → no tokens fetched + ExternalMessageDto message = buildMessage("S1", "T1", null); + + when(surveyFacade.getByExternalIds(any())).thenReturn(List.of()); + when(surveyTokenFacade.getBySurveyReferenceTokenTuples(any())).thenReturn(List.of()); + + // EXECUTE + List results = victim.processSurveyResponses(List.of(message)); + + // CHECK + assertEquals(ProcessingResultStatus.CANCELED, results.get(0).getResultStatus()); + } + + // processSurveyResponses - patch not applied + + @Test + void processSurveyResponses_patchNotApplied_resultSetOnWrapper_statusCanceled() throws Exception { + // PREPARE + String caseUuid = DataHelper.createUuid(); + ExternalMessageDto message = buildMessage("S1", "T1", null); + SurveyTokenDto surveyToken = buildSurveyToken("T1", caseUuid); + SurveyDto survey = buildSurvey("S1"); + + DataPatchResponse failedResponse = new DataPatchResponse().setApplied(false); + when(surveyFacade.getByExternalIds(any())).thenReturn(List.of(survey)); + when(surveyTokenFacade.getBySurveyReferenceTokenTuples(any())).thenReturn(List.of(surveyToken)); + when(dataPatcher.patch(any())).thenReturn(failedResponse); + + // EXECUTE + List results = victim.processSurveyResponses(List.of(message)); + + // CHECK + assertEquals(ProcessingResultStatus.CANCELED, results.get(0).getResultStatus()); + // Result IS set even when patch fails — records the attempt + assertNotNull(message.getSurveyResponseData().getLatest().getResult()); + assertEquals(failedResponse, message.getSurveyResponseData().getLatest().getResult().getPatchResponse()); + // Message is NOT marked as processed when patch fails + assertEquals(ExternalMessageStatus.UNPROCESSED, message.getStatus()); + } + + // processSurveyResponses - runtime exception + // BUG: resultStatus is left null when a RuntimeException is caught + + @Test + void processSurveyResponses_runtimeException_exceptionCaptured_resultStatusIsNull() throws Exception { + // PREPARE + String caseUuid = DataHelper.createUuid(); + ExternalMessageDto message = buildMessage("S1", "T1", null); + SurveyTokenDto surveyToken = buildSurveyToken("T1", caseUuid); + SurveyDto survey = buildSurvey("S1"); + + RuntimeException thrown = new RuntimeException("patching failed"); + when(surveyFacade.getByExternalIds(any())).thenReturn(List.of(survey)); + when(surveyTokenFacade.getBySurveyReferenceTokenTuples(any())).thenReturn(List.of(surveyToken)); + when(dataPatcher.patch(any())).thenThrow(thrown); + + // EXECUTE + List results = victim.processSurveyResponses(List.of(message)); + + // CHECK + SurveyResponseProcessingResult result = results.get(0); + assertEquals(thrown, result.getRuntimeException()); + // BUG: resultStatus is never set in the catch block — it remains null + assertNull(result.getResultStatus()); + } + + @Test + void processSurveyResponses_runtimeException_doesNotAbortOtherMessages() throws Exception { + // PREPARE - first message throws, second should still be processed + String caseUuid2 = DataHelper.createUuid(); + ExternalMessageDto msg1 = buildMessage("S1", "T1", null); + ExternalMessageDto msg2 = buildMessage("S2", "T2", null); + SurveyTokenDto token1 = buildSurveyToken("T1", DataHelper.createUuid()); + SurveyTokenDto token2 = buildSurveyToken("T2", caseUuid2); + SurveyDto survey1 = buildSurvey("S1"); + SurveyDto survey2 = buildSurvey("S2"); + + when(surveyFacade.getByExternalIds(any())).thenReturn(List.of(survey1, survey2)); + when(surveyTokenFacade.getBySurveyReferenceTokenTuples(any())).thenReturn(List.of(token1, token2)); + when(dataPatcher.patch(any())).thenThrow(new RuntimeException("fail")).thenReturn(new DataPatchResponse().setApplied(true)); + + // EXECUTE + List results = victim.processSurveyResponses(List.of(msg1, msg2)); + + // CHECK + assertEquals(2, results.size()); + assertNotNull(results.get(0).getRuntimeException()); + assertEquals(ProcessingResultStatus.DONE, results.get(1).getResultStatus()); + } + + // processSurveyResponses - survey token is updated before patching + + @Test + void processSurveyResponses_surveyTokenUpdatedWithResponseData() throws Exception { + // PREPARE + String caseUuid = DataHelper.createUuid(); + Date responseDate = new Date(); + String respondentId = "RESPONDENT-123"; + String token = "TOKEN-XYZ"; + + ExternalMessageDto message = buildMessage("S1", token, null); + message.getSurveyResponseData().getLatest().getRequest().setResponseReceivedDate(responseDate).setExternalRespondentId(respondentId); + + SurveyTokenDto surveyToken = buildSurveyToken(token, caseUuid); + SurveyDto survey = buildSurvey("S1"); + + when(surveyFacade.getByExternalIds(any())).thenReturn(List.of(survey)); + when(surveyTokenFacade.getBySurveyReferenceTokenTuples(any())).thenReturn(List.of(surveyToken)); + when(dataPatcher.patch(any())).thenReturn(new DataPatchResponse().setApplied(true)); + + // EXECUTE + victim.processSurveyResponses(List.of(message)); + + // CHECK - token was updated and saved before patch + ArgumentCaptor tokenCaptor = forClass(SurveyTokenDto.class); + verify(surveyTokenFacade).save(tokenCaptor.capture()); + SurveyTokenDto saved = tokenCaptor.getValue(); + assertEquals(true, saved.isResponseReceived()); + assertEquals(responseDate, saved.getResponseReceivedDate()); + assertEquals(respondentId, saved.getExternalRespondentId()); + } + + @Test + void processSurveyResponses_surveyTokenSavedEvenWhenPatchFails() throws Exception { + // PREPARE + ExternalMessageDto message = buildMessage("S1", "T1", null); + SurveyTokenDto surveyToken = buildSurveyToken("T1", DataHelper.createUuid()); + SurveyDto survey = buildSurvey("S1"); + + when(surveyFacade.getByExternalIds(any())).thenReturn(List.of(survey)); + when(surveyTokenFacade.getBySurveyReferenceTokenTuples(any())).thenReturn(List.of(surveyToken)); + when(dataPatcher.patch(any())).thenReturn(new DataPatchResponse().setApplied(false)); + + // EXECUTE + victim.processSurveyResponses(List.of(message)); + + // CHECK + verify(surveyTokenFacade).save(any()); + } + + // processSurveyResponses - CaseDataPatchRequest is built correctly from the survey request + + @Test + void processSurveyResponses_patchRequestBuiltCorrectlyFromSurveyRequest() throws Exception { + // PREPARE + String caseUuid = DataHelper.createUuid(); + String origin = "NGSurvey"; + Map patchDict = Map.of("person.firstName", "Alice"); + + ExternalMessageDto message = buildMessage("S1", "T1", null); + message.getSurveyResponseData() + .getLatest() + .getRequest() + .setOrigin(origin) + .setPatchDictionary(patchDict) + .setReplacementStrategy(DataReplacementStrategy.ALWAYS) + .setEmptyValueBehavior(EmptyValueBehavior.REPLACE) + .setPatchedInCaseOfFailures(true) + .setAllowFallbackValues(false) + .setInputLanguages(List.of(Language.FR)); + + SurveyTokenDto surveyToken = buildSurveyToken("T1", caseUuid); + SurveyDto survey = buildSurvey("S1"); + + when(surveyFacade.getByExternalIds(any())).thenReturn(List.of(survey)); + when(surveyTokenFacade.getBySurveyReferenceTokenTuples(any())).thenReturn(List.of(surveyToken)); + when(dataPatcher.patch(any())).thenReturn(new DataPatchResponse().setApplied(true)); + + // EXECUTE + victim.processSurveyResponses(List.of(message)); + + // CHECK + ArgumentCaptor patchCaptor = forClass(CaseDataPatchRequest.class); + verify(dataPatcher).patch(patchCaptor.capture()); + CaseDataPatchRequest builtRequest = patchCaptor.getValue(); + + assertEquals(caseUuid, builtRequest.getCaseUuid()); + assertEquals(origin, builtRequest.getOrigin()); + assertEquals(patchDict, builtRequest.getPatchDictionary()); + assertEquals(DataReplacementStrategy.ALWAYS, builtRequest.getReplacementStrategy()); + assertEquals(EmptyValueBehavior.REPLACE, builtRequest.getEmptyValueBehavior()); + assertEquals(true, builtRequest.isPatchedInCaseOfFailures()); + assertEquals(false, builtRequest.isAllowFallbackValues()); + assertEquals(List.of(Language.FR), builtRequest.getInputLanguages()); + } + + // processSurveyResponses - result is stored on the response wrapper + + @Test + void processSurveyResponses_patchApplied_resultContainsCaseUuidAndResponse() throws Exception { + // PREPARE + String caseUuid = DataHelper.createUuid(); + ExternalMessageDto message = buildMessage("S1", "T1", null); + SurveyTokenDto surveyToken = buildSurveyToken("T1", caseUuid); + SurveyDto survey = buildSurvey("S1"); + DataPatchResponse patchResponse = new DataPatchResponse().setApplied(true); + + when(surveyFacade.getByExternalIds(any())).thenReturn(List.of(survey)); + when(surveyTokenFacade.getBySurveyReferenceTokenTuples(any())).thenReturn(List.of(surveyToken)); + when(dataPatcher.patch(any())).thenReturn(patchResponse); + + // EXECUTE + victim.processSurveyResponses(List.of(message)); + + // CHECK + ExternalMessageSurveyResponseResult result = message.getSurveyResponseData().getLatest().getResult(); + assertNotNull(result); + assertEquals(caseUuid, result.getCaseUuid()); + assertEquals(patchResponse, result.getPatchResponse()); + } + + // processSurveyResponses - duplicate externalSurveyId BUG + // BUG: when two messages share the same externalSurveyId but have different tokens, + // the first token is overwritten in the map, causing the first message to be canceled. + + @Test + void processSurveyResponses_duplicateExternalSurveyId_differentTokens_firstMessageCanceled() throws Exception { + // PREPARE + String caseUuid1 = DataHelper.createUuid(); + String caseUuid2 = DataHelper.createUuid(); + ExternalMessageDto msg1 = buildMessage("SAME-SURVEY", "TOKEN-A", null); + ExternalMessageDto msg2 = buildMessage("SAME-SURVEY", "TOKEN-B", null); + + SurveyTokenDto tokenB = buildSurveyToken("TOKEN-B", caseUuid2); + SurveyDto survey = buildSurvey("SAME-SURVEY"); + + when(surveyFacade.getByExternalIds(List.of("SAME-SURVEY"))).thenReturn(List.of(survey)); + // The bug: only one token is passed to getBySurveyReferenceTokenTuples because the map + // stores only one token per externalSurveyId (last one wins) + when(surveyTokenFacade.getBySurveyReferenceTokenTuples(any())).thenReturn(List.of(tokenB)); + when(dataPatcher.patch(any())).thenReturn(new DataPatchResponse().setApplied(true)); + + // EXECUTE + List results = victim.processSurveyResponses(List.of(msg1, msg2)); + + // CHECK - BUG: msg1 (TOKEN-A) is canceled because TOKEN-A was lost from the map + assertEquals(ProcessingResultStatus.CANCELED, results.get(0).getResultStatus()); + assertEquals(ProcessingResultStatus.DONE, results.get(1).getResultStatus()); + } + + // helpers + + private static ExternalMessageDto buildMessage(String externalSurveyId, String token, ExternalMessageSurveyResponseResult result) { + ExternalMessageSurveyResponseRequest request = new ExternalMessageSurveyResponseRequest().setExternalSurveyId(externalSurveyId) + .setToken(token) + .setPatchDictionary(Map.of()) + .setExcludedPatchDictionary(Map.of()); + + ExternalMessageSurveyResponseWrapper wrapper = new ExternalMessageSurveyResponseWrapper().setRequest(request).setResult(result); + + ExternalSurveyResponseData responseData = new ExternalSurveyResponseData().setOriginal(wrapper); + + ExternalMessageDto message = ExternalMessageDto.build(); + message.setSurveyResponseData(responseData); + + return message; + } + + private static SurveyTokenDto buildSurveyToken(String token, String caseUuid) { + SurveyTokenDto dto = new SurveyTokenDto(); + dto.setUuid(DataHelper.createUuid()); + dto.setToken(token); + dto.setCaseAssignedTo(new CaseReferenceDto(caseUuid)); + return dto; + } + + private static SurveyDto buildSurvey(String externalId) { + SurveyDto survey = SurveyDto.build(); + survey.setExternalId(externalId); + return survey; + } +} diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/PropertyAccessorTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/PropertyAccessorTest.java index bf4130bffc9..76514d4f25c 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/PropertyAccessorTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/PropertyAccessorTest.java @@ -1,115 +1,330 @@ package de.symeda.sormas.backend.patch; -import java.util.Date; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.jupiter.api.BeforeEach; +import java.util.Optional; -import de.symeda.sormas.api.caze.CaseDataDto; -import de.symeda.sormas.api.caze.DengueFeverType; -import de.symeda.sormas.api.caze.RabiesType; +import org.junit.jupiter.api.Test; + +import de.symeda.sormas.api.utils.Tuple; +import de.symeda.sormas.api.utils.fieldvisibility.FieldVisibilityCheckers; import de.symeda.sormas.backend.AbstractUnitTest; -class PropertyAccessorTest extends AbstractUnitTest { - - private CaseDataDto caseDataDto; - - @BeforeEach - void setUp() { - caseDataDto = new CaseDataDto(); - caseDataDto.setDengueFeverType(DengueFeverType.DENGUE_FEVER); - caseDataDto.setRabiesType(RabiesType.FURIOUS_RABIES); - caseDataDto.setClassificationComment("test comment"); - caseDataDto.setDistrictLevelDate(new Date()); - } - - // getNestedPropertyType - simple field - -// @Test -// void getNestedPropertyType_simpleField_dengueFeverType() { -// // EXECUTE -// Optional, Set>> result = PropertyAccessor.getNestedPropertyType(caseDataDto, "dengueFeverType"); -// -// // CHECK -// assertTrue(result.isPresent()); -// assertEquals(DengueFeverType.class, result.get().getFirst()); -// assertEquals(Set.of(Disease.DENGUE), result.get().getSecond()); -// } -// -// @Test -// void getNestedPropertyType_simpleField_rabiesType() { -// // EXECUTE -// Optional, Set>> result = PropertyAccessor.getNestedPropertyType(caseDataDto, "rabiesType"); -// -// // CHECK -// assertTrue(result.isPresent()); -// assertEquals(RabiesType.class, result.get().getFirst()); -// assertEquals(Set.of(Disease.RABIES), result.get().getSecond()); -// } -// -// @Test -// void getNestedPropertyType_simpleField_allDiseases() { -// // EXECUTE -// Optional, Set>> result = PropertyAccessor.getNestedPropertyType(caseDataDto, "districtLevelDate"); -// -// // CHECK -// assertTrue(result.isPresent()); -// assertEquals(Date.class, result.get().getFirst()); -// assertTrue(result.get().getSecond().contains(Disease.DENGUE)); -// } -// -// @Test -// void getNestedPropertyType_simpleField_hideDiseases() { -// // EXECUTE -// Optional, Set>> result = PropertyAccessor.getNestedPropertyType(caseDataDto, "classificationComment"); -// -// // CHECK -// assertTrue(result.isPresent()); -// assertEquals(String.class, result.get().getFirst()); -// assertFalse(result.get().getSecond().contains(Disease.RESPIRATORY_SYNCYTIAL_VIRUS)); -// assertFalse(result.get().getSecond().contains(Disease.PLAGUE)); -// assertTrue(result.get().getSecond().contains(Disease.DENGUE)); -// } -// -// // getPropertyType -// -// @Test -// void getPropertyType_fieldNotFound_returnsEmpty() { -// // EXECUTE -// Optional, Set>> result = PropertyAccessor.getPropertyType(caseDataDto, "nonExistentField"); -// -// // CHECK -// assertTrue(result.isEmpty()); -// } -// -// @Test -// void getNestedProperty_nullPath_returnsEmpty() { -// // EXECUTE & CHECK -// assertTrue(PropertyAccessor.getNestedProperty(caseDataDto, null).isEmpty()); -// } -// -// // edge cases -// -// @Test -// void getNestedPropertyType_nullBean_returnsEmpty() { -// // EXECUTE & CHECK -// assertTrue(PropertyAccessor.getNestedPropertyType(null, "field").isEmpty()); -// } -// -// @Test -// void getNestedPropertyType_emptyFieldName_returnsEmpty() { -// // EXECUTE & CHECK -// assertTrue(PropertyAccessor.getNestedPropertyType(caseDataDto, "").isEmpty()); -// } -// -// @Test -// void getNestedPropertyType_nullFieldName_returnsEmpty() { -// // EXECUTE & CHECK -// assertTrue(PropertyAccessor.getNestedPropertyType(caseDataDto, null).isEmpty()); -// } -// -// @Test -// void getNestedProperty_emptyPath_returnsEmpty() { -// // EXECUTE & CHECK -// assertTrue(PropertyAccessor.getNestedProperty(caseDataDto, "").isEmpty()); -// } +public class PropertyAccessorTest extends AbstractUnitTest { + + // Both classes must be public static for Apache Commons PropertyUtils to introspect them via reflection. + // The self-referential "address" property on AddressBean is required so that for 3-segment path tests + // getPropertyType(leafValue, "address", ...) can succeed: the navigated leaf value must itself expose + // the leaf segment name as a bean property (see getNestedPropertyType implementation). + public static class PersonBean { + + private AddressBean address; + + public AddressBean getAddress() { + return address; + } + + public void setAddress(AddressBean address) { + this.address = address; + } + } + + public static class AddressBean { + + private AddressBean address; + private String street; + + public AddressBean getAddress() { + return address; + } + + public void setAddress(AddressBean address) { + this.address = address; + } + + public String getStreet() { + return street; + } + + public void setStreet(String street) { + this.street = street; + } + } + + // ---- getNestedPropertyType ---- + + @Test + void getNestedPropertyType_threeSegmentPath_returnsType() { + // PREPARE + // Build a 3-deep address chain so that navigating "address.address.address" + // reaches a non-null AddressBean leaf. + AddressBean level3 = new AddressBean(); + AddressBean level2 = new AddressBean(); + level2.setAddress(level3); + AddressBean level1 = new AddressBean(); + level1.setAddress(level2); + PersonBean person = new PersonBean(); + person.setAddress(level1); + + // EXECUTE + // "address.address.address" has 2 dots → 3 segments → triggers the nested-path branch. + // Regression: Optional.ofNullable(getNestedProperty(...)) wrapped Optional + // in a second Optional, so leafParent became Optional instead of AddressBean. + // PropertyUtils.getPropertyType(Optional, "address") then threw NoSuchMethodException, + // which was silently caught and returned FIELD_DOES_NOT_EXIST for any existing 3-segment path. + Tuple, PropertyAccessFailure> result = + PropertyAccessor.getNestedPropertyType(person, "address.address.address", FieldVisibilityCheckers.getNoop()); + + // CHECK + assertNull(result.getSecond(), "Expected no failure for existing 3-segment path, but got: " + result.getSecond()); + assertEquals(AddressBean.class, result.getFirst()); + } + + @Test + void getNestedPropertyType_threeSegmentPath_nonExistentLeaf_returnsFieldDoesNotExist() { + // PREPARE + AddressBean level3 = new AddressBean(); + AddressBean level2 = new AddressBean(); + level2.setAddress(level3); + AddressBean level1 = new AddressBean(); + level1.setAddress(level2); + PersonBean person = new PersonBean(); + person.setAddress(level1); + + // EXECUTE + Tuple, PropertyAccessFailure> result = + PropertyAccessor.getNestedPropertyType(person, "address.address.nonExistent", FieldVisibilityCheckers.getNoop()); + + // CHECK + assertEquals(PropertyAccessFailure.FIELD_DOES_NOT_EXIST, result.getSecond()); + } + + @Test + void getNestedPropertyType_twoSegmentPath_returnsType() { + // PREPARE + AddressBean address = new AddressBean(); + address.setStreet("Main St"); + PersonBean person = new PersonBean(); + person.setAddress(address); + + // EXECUTE — 1 dot → notNestedPath = true → takes the early-return branch + Tuple, PropertyAccessFailure> result = + PropertyAccessor.getNestedPropertyType(person, "address.street", FieldVisibilityCheckers.getNoop()); + + // CHECK + assertNull(result.getSecond()); + assertEquals(String.class, result.getFirst()); + } + + @Test + void getNestedPropertyType_nullBean_returnsInvalidInput() { + Tuple, PropertyAccessFailure> result = + PropertyAccessor.getNestedPropertyType(null, "address.street", FieldVisibilityCheckers.getNoop()); + + assertEquals(PropertyAccessFailure.INVALID_INPUT, result.getSecond()); + } + + @Test + void getNestedPropertyType_nullFieldName_returnsInvalidInput() { + Tuple, PropertyAccessFailure> result = + PropertyAccessor.getNestedPropertyType(new PersonBean(), null, FieldVisibilityCheckers.getNoop()); + + assertEquals(PropertyAccessFailure.INVALID_INPUT, result.getSecond()); + } + + @Test + void getNestedPropertyType_invisibleField_returnsUnsupportedField() { + // PREPARE + AddressBean address = new AddressBean(); + PersonBean person = new PersonBean(); + person.setAddress(address); + FieldVisibilityCheckers hideAll = + FieldVisibilityCheckers.withCheckers((FieldVisibilityCheckers.FieldNameBaseChecker) (type, id) -> false); + + // EXECUTE + Tuple, PropertyAccessFailure> result = + PropertyAccessor.getNestedPropertyType(person, "address.street", hideAll); + + // CHECK + assertEquals(PropertyAccessFailure.UNSUPPORTED_FIELD_FOR_DISEASE_OR_COUNTRY_OR_FEATURE, result.getSecond()); + } + + // ---- getNestedPropertyAndType ---- + + @Test + void getNestedPropertyAndType_nullBean_returnsInvalidInput() { + Tuple, Object>, PropertyAccessFailure> result = + PropertyAccessor.getNestedPropertyAndType(null, "address.street", FieldVisibilityCheckers.getNoop()); + + assertEquals(PropertyAccessFailure.INVALID_INPUT, result.getSecond()); + } + + @Test + void getNestedPropertyAndType_twoSegmentPath_returnsTypeAndValue() { + // PREPARE + AddressBean address = new AddressBean(); + address.setStreet("Baker St"); + PersonBean person = new PersonBean(); + person.setAddress(address); + + // EXECUTE + Tuple, Object>, PropertyAccessFailure> result = + PropertyAccessor.getNestedPropertyAndType(person, "address.street", FieldVisibilityCheckers.getNoop()); + + // CHECK + assertNull(result.getSecond()); + assertEquals(String.class, result.getFirst().getFirst()); + assertEquals("Baker St", result.getFirst().getSecond()); + } + + @Test + void getNestedPropertyAndType_threeSegmentPath_returnsTypeAndValue() { + // PREPARE + AddressBean level4 = new AddressBean(); + AddressBean level3 = new AddressBean(); + level3.setAddress(level4); + AddressBean level2 = new AddressBean(); + level2.setAddress(level3); + AddressBean level1 = new AddressBean(); + level1.setAddress(level2); + PersonBean person = new PersonBean(); + person.setAddress(level1); + + // EXECUTE + Tuple, Object>, PropertyAccessFailure> result = + PropertyAccessor.getNestedPropertyAndType(person, "address.address.address", FieldVisibilityCheckers.getNoop()); + + // CHECK + assertNull(result.getSecond()); + assertEquals(AddressBean.class, result.getFirst().getFirst()); + assertEquals(level4, result.getFirst().getSecond()); + } + + @Test + void getNestedPropertyAndType_threeSegmentPath_nonExistentLeaf_returnsFieldDoesNotExist() { + // PREPARE + AddressBean level3 = new AddressBean(); + AddressBean level2 = new AddressBean(); + level2.setAddress(level3); + AddressBean level1 = new AddressBean(); + level1.setAddress(level2); + PersonBean person = new PersonBean(); + person.setAddress(level1); + + // EXECUTE + Tuple, Object>, PropertyAccessFailure> result = + PropertyAccessor.getNestedPropertyAndType(person, "address.address.nonExistent", FieldVisibilityCheckers.getNoop()); + + // CHECK + assertEquals(PropertyAccessFailure.FIELD_DOES_NOT_EXIST, result.getSecond()); + } + + // ---- getPropertyTypeAndValue ---- + + @Test + void getPropertyTypeAndValue_existingField_returnsTypeAndValue() { + // PREPARE + AddressBean address = new AddressBean(); + address.setStreet("Elm Ave"); + + // EXECUTE + Tuple, Object>, PropertyAccessFailure> result = + PropertyAccessor.getPropertyTypeAndValue(address, "street", FieldVisibilityCheckers.getNoop()); + + // CHECK + assertNull(result.getSecond()); + assertEquals(String.class, result.getFirst().getFirst()); + assertEquals("Elm Ave", result.getFirst().getSecond()); + } + + @Test + void getPropertyTypeAndValue_nonExistentField_returnsFieldDoesNotExist() { + AddressBean address = new AddressBean(); + + Tuple, Object>, PropertyAccessFailure> result = + PropertyAccessor.getPropertyTypeAndValue(address, "nonExistent", FieldVisibilityCheckers.getNoop()); + + assertEquals(PropertyAccessFailure.FIELD_DOES_NOT_EXIST, result.getSecond()); + } + + @Test + void getPropertyTypeAndValue_invisibleField_returnsUnsupportedField() { + // PREPARE + AddressBean address = new AddressBean(); + FieldVisibilityCheckers hideAll = + FieldVisibilityCheckers.withCheckers((FieldVisibilityCheckers.FieldNameBaseChecker) (type, id) -> false); + + // EXECUTE + Tuple, Object>, PropertyAccessFailure> result = + PropertyAccessor.getPropertyTypeAndValue(address, "street", hideAll); + + // CHECK + assertEquals(PropertyAccessFailure.UNSUPPORTED_FIELD_FOR_DISEASE_OR_COUNTRY_OR_FEATURE, result.getSecond()); + } + + // ---- getNestedProperty ---- + + @Test + void getNestedProperty_simpleField_returnsValue() { + // PREPARE + AddressBean address = new AddressBean(); + address.setStreet("Oak Lane"); + + // EXECUTE + Optional result = PropertyAccessor.getNestedProperty(address, "street"); + + // CHECK + assertTrue(result.isPresent()); + assertEquals("Oak Lane", result.get()); + } + + @Test + void getNestedProperty_nestedField_returnsValue() { + // PREPARE + AddressBean inner = new AddressBean(); + inner.setStreet("Nested St"); + AddressBean outer = new AddressBean(); + outer.setAddress(inner); + + // EXECUTE + Optional result = PropertyAccessor.getNestedProperty(outer, "address.street"); + + // CHECK + assertTrue(result.isPresent()); + assertEquals("Nested St", result.get()); + } + + @Test + void getNestedProperty_nonExistentField_returnsEmpty() { + // NoSuchMethodException is caught internally and converted to Optional.empty() + Optional result = PropertyAccessor.getNestedProperty(new AddressBean(), "nonExistent"); + + assertFalse(result.isPresent()); + } + + // ---- setNestedProperty ---- + + @Test + void setNestedProperty_success_returnsEmpty() { + // PREPARE + AddressBean address = new AddressBean(); + + // EXECUTE + Optional result = PropertyAccessor.setNestedProperty(address, "street", "New Street"); + + // CHECK + assertFalse(result.isPresent()); + assertEquals("New Street", address.getStreet()); + } + + @Test + void setNestedProperty_nonExistentField_returnsException() { + // NoSuchMethodException is caught and returned as Optional + Optional result = PropertyAccessor.setNestedProperty(new AddressBean(), "nonExistent", "value"); + + assertTrue(result.isPresent()); + } } diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/alias/PathAliasHelperTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/alias/PathAliasHelperTest.java index 3465ea8a015..66be113e93e 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/alias/PathAliasHelperTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/alias/PathAliasHelperTest.java @@ -52,19 +52,6 @@ void resolveAlias_validAlias_symptoms() { assertNull(result.getSecond()); } - @Test - void resolveAlias_validAlias_nestedPreviousHospitalization() { - // PREPARE - String aliasPath = "PreviousHospitalization.admissionDate"; - - // EXECUTE - Tuple result = victim.resolveAlias(aliasPath); - - // CHECK - assertEquals("CaseData.hospitalization.previousHospitalizations.admissionDate", result.getFirst()); - assertNull(result.getSecond()); - } - @Test void resolveAlias_unknownAlias_returnsOriginalPath() { // PREPARE @@ -142,18 +129,6 @@ void toAliasPath_symptomsPath_isMappedToSymptomsAlias() { assertEquals("Symptoms.cough", result); } - @Test - void toAliasPath_nestedPreviousHospitalization_isMappedToAlias() { - // PREPARE - String pathWithoutAlias = "CaseData.hospitalization.previousHospitalizations.admissionDate"; - - // EXECUTE - String result = victim.toAliasPath(pathWithoutAlias); - - // CHECK - assertEquals("PreviousHospitalization.admissionDate", result); - } - @Test void toAliasPath_healthFacility_isMappedToFacilityAlias() { // PREPARE diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapperTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapperTest.java new file mode 100644 index 00000000000..4d08d44ee92 --- /dev/null +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapperTest.java @@ -0,0 +1,242 @@ +package de.symeda.sormas.backend.patch.mapping.impl.valuemapper; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mockStatic; +import static org.mockito.Mockito.when; + +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.junit.jupiter.api.Test; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.MockedStatic; + +import de.symeda.sormas.api.Language; +import de.symeda.sormas.api.customizableenum.CustomizableEnum; +import de.symeda.sormas.api.customizableenum.CustomizableEnumType; +import de.symeda.sormas.api.i18n.I18nProperties; +import de.symeda.sormas.api.i18n.I18nPropertiesRequest; +import de.symeda.sormas.api.patch.DataPatchFailureCause; +import de.symeda.sormas.api.customizableenum.CustomizableEnumFacade; +import de.symeda.sormas.api.patch.mapping.ValuePatchRequest; +import de.symeda.sormas.api.person.OccupationType; +import de.symeda.sormas.backend.AbstractUnitTest; + +class CustomizableEnumPatchMapperTest extends AbstractUnitTest { + + @Mock + private CustomizableEnumFacade customizableEnumFacade; + + @InjectMocks + private CustomizableEnumPatchMapper victim; + + // getSupportedTypes + + @Test + void getSupportedTypes_containsCustomizableEnumClass() { + assertEquals(Set.of(CustomizableEnum.class), victim.getSupportedTypes()); + } + + // map - illegal argument scenarios + + @Test + void map_nonCustomizableEnumTargetType_throwsIllegalArgumentException() { + assertThrows(IllegalArgumentException.class, () -> victim.map("HEALTHCARE_WORKER", String.class)); + } + + @Test + void map_unregisteredCustomizableEnumType_throwsIllegalArgumentException() { + assertThrows( + IllegalArgumentException.class, + () -> victim.map(new ValuePatchRequest().setValue("VALUE").setTargetType(UnregisteredEnum.class))); + } + + + @Test + void map_matchByValue_returnsEnumValue() { + // PREPARE + OccupationType expected = occupationType("HEALTHCARE_WORKER", "Healthcare Worker"); + when(customizableEnumFacade.getEnumValues(CustomizableEnumType.OCCUPATION_TYPE, null)).thenReturn(List.of(expected)); + + // EXECUTE + OccupationType actual = victim.map("HEALTHCARE_WORKER", OccupationType.class).getData(); + + // CHECK + assertEquals(expected, actual); + } + + @Test + void map_matchByCaption_returnsEnumValue() { + // PREPARE + OccupationType expected = occupationType("HEALTHCARE_WORKER", "Healthcare Worker"); + when(customizableEnumFacade.getEnumValues(CustomizableEnumType.OCCUPATION_TYPE, null)).thenReturn(List.of(expected)); + + // EXECUTE + OccupationType actual = victim.map("Healthcare Worker", OccupationType.class).getData(); + + // CHECK + assertEquals(expected, actual); + } + + @Test + void map_matchByValueCaseInsensitive_returnsEnumValue() { + // PREPARE + OccupationType expected = occupationType("HEALTHCARE_WORKER", "Healthcare Worker"); + when(customizableEnumFacade.getEnumValues(CustomizableEnumType.OCCUPATION_TYPE, null)).thenReturn(List.of(expected)); + + // EXECUTE + OccupationType actual = victim.map("healthcare_worker", OccupationType.class).getData(); + + // CHECK + assertEquals(expected, actual); + } + + @Test + void map_matchByCaptionWithAccents_returnsEnumValue() { + // PREPARE - stored caption has no accent, input does + OccupationType expected = occupationType("INFIRMIER", "Infirmier"); + when(customizableEnumFacade.getEnumValues(CustomizableEnumType.OCCUPATION_TYPE, null)).thenReturn(List.of(expected)); + + // EXECUTE + OccupationType actual = victim.map("Infïrmier", OccupationType.class).getData(); + + // CHECK + assertEquals(expected, actual); + } + + + @Test + void map_notFoundInDefaultLanguage_foundByInputLanguage_returnsEnumValue() { + // PREPARE + OccupationType expected = occupationType("HEALTHCARE_WORKER", "Healthcare Worker"); + when(customizableEnumFacade.getEnumValues(CustomizableEnumType.OCCUPATION_TYPE, null)).thenReturn(List.of()); + when(customizableEnumFacade.getEnumValue(CustomizableEnumType.OCCUPATION_TYPE, null, "HEALTHCARE_WORKER")).thenReturn(expected); + + try (MockedStatic mockedI18n = mockStatic(I18nProperties.class)) { + mockedI18n.when(() -> I18nProperties.buildKeyValueDictionary(any(I18nPropertiesRequest.class))) + .thenReturn(Map.of("HEALTHCARE_WORKER", "Agent de sante")); + + ValuePatchRequest request = new ValuePatchRequest().setValue("Agent de sante") + .setTargetType(OccupationType.class) + .setInputLanguages(List.of(Language.FR)); + + // EXECUTE + OccupationType actual = victim.map(request).getData(); + + // CHECK + assertEquals(expected, actual); + } + } + + @Test + void map_notFoundInDefaultLanguage_noInputLanguages_usesUserLanguage() { + // PREPARE + OccupationType expected = occupationType("HEALTHCARE_WORKER", "Healthcare Worker"); + when(customizableEnumFacade.getEnumValues(CustomizableEnumType.OCCUPATION_TYPE, null)).thenReturn(List.of()); + when(customizableEnumFacade.getEnumValue(CustomizableEnumType.OCCUPATION_TYPE, null, "HEALTHCARE_WORKER")).thenReturn(expected); + + try (MockedStatic mockedI18n = mockStatic(I18nProperties.class)) { + mockedI18n.when(I18nProperties::getUserLanguage).thenReturn(Language.DE); + mockedI18n.when(() -> I18nProperties.buildKeyValueDictionary(any(I18nPropertiesRequest.class))) + .thenReturn(Map.of("HEALTHCARE_WORKER", "Gesundheitsarbeiter")); + + ValuePatchRequest request = + new ValuePatchRequest().setValue("Gesundheitsarbeiter").setTargetType(OccupationType.class); + + // EXECUTE + OccupationType actual = victim.map(request).getData(); + + // CHECK + assertEquals(expected, actual); + } + } + + + @Test + void map_noMatch_fallbackAllowed_otherPresent_returnsOtherEnumValue() { + // PREPARE + OccupationType otherEnum = occupationType(CustomizableEnumPatchMapper.FALLBACK_NAME, "Other"); + when(customizableEnumFacade.getEnumValues(CustomizableEnumType.OCCUPATION_TYPE, null)).thenReturn(List.of()); + when(customizableEnumFacade.getEnumValue(CustomizableEnumType.OCCUPATION_TYPE, null, CustomizableEnumPatchMapper.FALLBACK_NAME)) + .thenReturn(otherEnum); + + try (MockedStatic mockedI18n = mockStatic(I18nProperties.class)) { + mockedI18n.when(I18nProperties::getUserLanguage).thenReturn(Language.EN); + mockedI18n.when(() -> I18nProperties.buildKeyValueDictionary(any(I18nPropertiesRequest.class))).thenReturn(Map.of()); + + ValuePatchRequest request = + new ValuePatchRequest().setValue("UNKNOWN_VALUE").setTargetType(OccupationType.class).setAllowFallbackValues(true); + + // EXECUTE + OccupationType actual = victim.map(request).getData(); + + // CHECK + assertEquals(otherEnum, actual); + } + } + + @Test + void map_noMatch_fallbackAllowed_otherNotPresent_returnsFailureCause() { + // PREPARE + when(customizableEnumFacade.getEnumValues(CustomizableEnumType.OCCUPATION_TYPE, null)).thenReturn(List.of()); + when(customizableEnumFacade.getEnumValue(CustomizableEnumType.OCCUPATION_TYPE, null, CustomizableEnumPatchMapper.FALLBACK_NAME)) + .thenReturn(null); + + try (MockedStatic mockedI18n = mockStatic(I18nProperties.class)) { + mockedI18n.when(I18nProperties::getUserLanguage).thenReturn(Language.EN); + mockedI18n.when(() -> I18nProperties.buildKeyValueDictionary(any(I18nPropertiesRequest.class))).thenReturn(Map.of()); + + ValuePatchRequest request = + new ValuePatchRequest().setValue("UNKNOWN_VALUE").setTargetType(OccupationType.class).setAllowFallbackValues(true); + + // EXECUTE & CHECK + assertEquals(DataPatchFailureCause.NOT_PRESENT_IN_REFERENCE_DATA_LIST, victim.map(request).getDataPatchFailureCause()); + } + } + + @Test + void map_noMatch_fallbackDisabled_returnsFailureCause() { + // PREPARE + when(customizableEnumFacade.getEnumValues(CustomizableEnumType.OCCUPATION_TYPE, null)).thenReturn(List.of()); + + try (MockedStatic mockedI18n = mockStatic(I18nProperties.class)) { + mockedI18n.when(I18nProperties::getUserLanguage).thenReturn(Language.EN); + mockedI18n.when(() -> I18nProperties.buildKeyValueDictionary(any(I18nPropertiesRequest.class))).thenReturn(Map.of()); + + ValuePatchRequest request = + new ValuePatchRequest().setValue("UNKNOWN_VALUE").setTargetType(OccupationType.class).setAllowFallbackValues(false); + + // EXECUTE & CHECK + assertEquals(DataPatchFailureCause.NOT_PRESENT_IN_REFERENCE_DATA_LIST, victim.map(request).getDataPatchFailureCause()); + } + } + + + private static OccupationType occupationType(String value, String caption) { + OccupationType occupationType = new OccupationType(); + occupationType.setValue(value); + occupationType.setCaption(caption); + return occupationType; + } + + private static class UnregisteredEnum extends CustomizableEnum { + + @Override + public void setProperties(Map properties) { + } + + @Override + public boolean matchPropertyValue(String property, Object value) { + return false; + } + + @Override + public Map> getAllProperties() { + return Map.of(); + } + } +} diff --git a/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java index 649837b389f..c77d959f232 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java @@ -610,12 +610,12 @@ void patch_noPatchInCaseOfFailureFalse() { String trueString = " ja "; Map patchDictionary = - Map.of("CaseData.symptoms.cough", trueString, "CaseData.quarantineOrderedOfficialDocumentDate", ignoredValue); + Map.of("CaseData.symptoms.cough", trueString, "CaseData.quarantineOrderedOfficialDocumentDate", ignoredValue); CaseDataPatchRequest request = new CaseDataPatchRequest().setPatchedInCaseOfFailures(false) - .setCaseUuid(originalCase.getUuid()) - .setPatchDictionary(patchDictionary) - .setInputLanguages(List.of(Language.DE)); + .setCaseUuid(originalCase.getUuid()) + .setPatchDictionary(patchDictionary) + .setInputLanguages(List.of(Language.DE)); // EXECUTE DataPatchResponse response = victim().patch(request); @@ -624,120 +624,20 @@ void patch_noPatchInCaseOfFailureFalse() { // CHECK Map expectedFailures = buildDictionaryOfFailureType( - Map.of("CaseData.quarantineOrderedOfficialDocumentDate", ignoredValue), - DataPatchFailureCause.UNSUPPORTED_FIELD_FOR_DISEASE_OR_COUNTRY_OR_FEATURE); + Map.of("CaseData.quarantineOrderedOfficialDocumentDate", ignoredValue), + DataPatchFailureCause.UNSUPPORTED_FIELD_FOR_DISEASE_OR_COUNTRY_OR_FEATURE); Assertions.assertAll( - () -> Assertions.assertFalse(response.isApplied()), - - () -> Assertions.assertEquals(Map.of("CaseData.symptoms.cough", trueString), response.getValidPatchDictionary()), - - () -> Assertions.assertNull(actual.getSymptoms().getCough()), - - () -> Assertions.assertNull(actual.getQuarantineOrderedOfficialDocumentDate()), - - // FAILURES - () -> Assertions.assertEquals(expectedFailures, response.getFailures())); - } - - @ParameterizedTest - @ValueSource(strings = { - "NO", - " nein ", - " unknown " }) - @Disabled("Waiting for feedback on vaccine automatic processing") - void patch_addVaccine_unknown_or_no(String unknownOrNo) { - // PREPARE - Disease disease = Disease.RESPIRATORY_SYNCYTIAL_VIRUS; - CaseDataDto originalCase = creator.createUnclassifiedCase(disease); - - getCaseFacade().save(originalCase); - - Assertions.assertFalse(originalCase.getSymptoms().getSymptomatic()); - - Map patchDictionary = new HashMap<>(); - patchDictionary.put("Immunization.immunizationStatus", unknownOrNo); - - CaseDataPatchRequest request = new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()) - .setPatchDictionary(patchDictionary) - .setInputLanguages(List.of(Language.EN, Language.DE_CH)); - - // EXECUTE - DataPatchResponse response = victim().patch(request); - - List immunizationDtos = getImmunizationFacade().getByPersonUuids(List.of(originalCase.getPerson().getUuid())); - - ImmunizationDto createdImmunizationDto = immunizationDtos.get(0); - - // CHECK - Assertions.assertAll(() -> Assertions.assertTrue(response.isApplied()), - -// TODO: check what about patch dictionary for those values. -// () -> Assertions.assertEquals(patchDictionary, response.getValidPatchDictionary()), - - () -> Assertions.assertEquals(1, immunizationDtos.size()), - - () -> Assertions.assertEquals(ImmunizationStatus.NOT_ACQUIRED, createdImmunizationDto.getImmunizationStatus()), - () -> Assertions.assertEquals(0, createdImmunizationDto.getVaccinations().size()), - () -> Assertions.assertEquals(disease, createdImmunizationDto.getDisease()), - - () -> Assertions.assertNotNull(createdImmunizationDto.getReportDate()), - - () -> Assertions.assertNotNull(createdImmunizationDto.getReportingUser()), - - // FAILURES - () -> Assertions.assertEquals(Map.of(), response.getFailures())); - } - - @ParameterizedTest - @ValueSource(strings = { - "Maternal vaccination" }) - @Disabled("Waiting for feedback on vaccine automatic processing") - void patch_addVaccine_true_and_mother_vaccine(String matternalVaccination) { - // PREPARE - Disease disease = Disease.DENGUE; - CaseDataDto originalCase = creator.createUnclassifiedCase(disease); - - getCaseFacade().save(originalCase); - - Assertions.assertFalse(originalCase.getSymptoms().getSymptomatic()); - - Map patchDictionary = new HashMap<>(); - patchDictionary.put("Immunization.immunizationStatus", " ja "); - patchDictionary.put("Immunization.meansOfImmunization", matternalVaccination); - - CaseDataPatchRequest request = new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()) - .setPatchDictionary(patchDictionary) - .setInputLanguages(List.of(Language.DE, Language.EN)); - - // EXECUTE - DataPatchResponse response = victim().patch(request); - - // CHECK - List immunizationDtos = getImmunizationFacade().getByPersonUuids(List.of(originalCase.getPerson().getUuid())); - - ImmunizationDto matternalImmunizationDto = immunizationDtos.get(1); - - Assertions.assertAll(() -> Assertions.assertTrue(response.isApplied()), - -// TODO: check what about patch dictionary for those values. -// () -> Assertions.assertEquals(patchDictionary, response.getValidPatchDictionary()), - - () -> Assertions.assertEquals(2, immunizationDtos.size()), - - () -> Assertions.assertEquals(ImmunizationStatus.ACQUIRED, matternalImmunizationDto.getImmunizationStatus()), - () -> Assertions.assertEquals(MeansOfImmunization.MATERNAL_VACCINATION, matternalImmunizationDto.getMeansOfImmunization()), + () -> Assertions.assertFalse(response.isApplied()), - () -> Assertions.assertEquals(disease, matternalImmunizationDto.getDisease()), + () -> Assertions.assertEquals(Map.of("CaseData.symptoms.cough", trueString), response.getValidPatchDictionary()), - () -> Assertions.assertEquals(0, matternalImmunizationDto.getVaccinations().size()), + () -> Assertions.assertNull(actual.getSymptoms().getCough()), - () -> Assertions.assertNotNull(matternalImmunizationDto.getReportDate()), + () -> Assertions.assertNull(actual.getQuarantineOrderedOfficialDocumentDate()), - () -> Assertions.assertNotNull(matternalImmunizationDto.getReportingUser()), - - // FAILURES - () -> Assertions.assertEquals(Map.of(), response.getFailures())); + // FAILURES + () -> Assertions.assertEquals(expectedFailures, response.getFailures())); } @Test @@ -796,59 +696,6 @@ void patch_addVaccine_true() { () -> Assertions.assertEquals(Map.of(), response.getFailures())); } - @Test - @Disabled("Waiting for feedback on vaccine automatic processing") - void patch_addVaccine_vaccine_name() { - // PREPARE - Disease disease = Disease.DENGUE; - CaseDataDto originalCase = creator.createUnclassifiedCase(disease); - - getCaseFacade().save(originalCase); - - Assertions.assertFalse(originalCase.getSymptoms().getSymptomatic()); - - Map patchDictionary = new HashMap<>(); - String vaccineName = "Beyfortus"; - patchDictionary.put("Immunization.immunizationStatus", vaccineName); - - CaseDataPatchRequest request = new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()) - .setPatchDictionary(patchDictionary) - .setInputLanguages(Collections.singletonList(Language.DE)); - - // EXECUTE - DataPatchResponse response = victim().patch(request); - - List immunizationDtos = getImmunizationFacade().getByPersonUuids(List.of(originalCase.getPerson().getUuid())); - - ImmunizationDto createdImmunizationDto = immunizationDtos.get(0); - - // CHECK - List vaccinations = createdImmunizationDto.getVaccinations(); - VaccinationDto vaccinationDto = vaccinations.get(0); - Assertions.assertAll(() -> Assertions.assertTrue(response.isApplied()), - -// TODO: check what about patch dictionary for those values. -// () -> Assertions.assertEquals(patchDictionary, response.getValidPatchDictionary()), - - () -> Assertions.assertEquals(1, immunizationDtos.size()), - - () -> Assertions.assertEquals(ImmunizationStatus.ACQUIRED, createdImmunizationDto.getImmunizationStatus()), - () -> Assertions.assertEquals(MeansOfImmunization.VACCINATION, createdImmunizationDto.getMeansOfImmunization()), - () -> Assertions.assertEquals(disease, createdImmunizationDto.getDisease()), - - () -> Assertions.assertNotNull(createdImmunizationDto.getReportDate()), - - () -> Assertions.assertNotNull(createdImmunizationDto.getReportingUser()), - - () -> Assertions.assertEquals(1, vaccinations.size()), - - () -> Assertions.assertEquals(Vaccine.OTHER, vaccinationDto.getVaccineName()), - () -> Assertions.assertEquals(vaccineName, vaccinationDto.getOtherVaccineName()), - - // FAILURES - () -> Assertions.assertEquals(Map.of(), response.getFailures())); - } - @Test void patch_replacementMode_null_value() { // PREPARE diff --git a/sormas-backend/src/test/java/de/symeda/sormas/patch/PropertyAccessorTest.java b/sormas-backend/src/test/java/de/symeda/sormas/patch/PropertyAccessorTest.java deleted file mode 100644 index 93a304a1372..00000000000 --- a/sormas-backend/src/test/java/de/symeda/sormas/patch/PropertyAccessorTest.java +++ /dev/null @@ -1,192 +0,0 @@ -package de.symeda.sormas.patch; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertInstanceOf; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.lang.reflect.InvocationTargetException; -import java.util.List; -import java.util.Map; -import java.util.Optional; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.junit.jupiter.MockitoExtension; - -import de.symeda.sormas.backend.patch.PropertyAccessor; - -@ExtendWith(MockitoExtension.class) -class PropertyAccessorTest { - - private static class TestBean { - - private String name; - private Address address; - private List items; - private String[] array; - private Map map; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public Address getAddress() { - return address; - } - - public void setAddress(Address address) { - this.address = address; - } - - public List getItems() { - return items; - } - - public void setItems(List items) { - this.items = items; - } - - public String[] getArray() { - return array; - } - - public void setArray(String[] array) { - this.array = array; - } - - public Map getMap() { - return map; - } - - public void setMap(Map map) { - this.map = map; - } - } - - private static class Address { - - private String city; - - public String getCity() { - return city; - } - - public void setCity(String city) { - this.city = city; - } - } - - private static class Item { - - private String name; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - } - - private TestBean bean; - - @BeforeEach - void setUp() { - bean = new TestBean(); - bean.setName("test"); - bean.address = new Address(); - bean.address.setCity("Paris"); - bean.items = List.of(new Item()); // single item for [0] - bean.items.get(0).setName("item1"); - bean.array = new String[] { - "a", - "b" }; - bean.map = Map.of("key", "value"); - } - - @Test - void getNestedProperty_readsSimpleProperty() { - Optional value = PropertyAccessor.getNestedProperty(bean, "name"); - assertTrue(value.isPresent()); - assertEquals("test", value.get()); - } - - @Test - void getNestedProperty_readsNestedProperty() { - Optional value = PropertyAccessor.getNestedProperty(bean, "address.city"); - assertTrue(value.isPresent()); - assertEquals("Paris", value.get()); - } - - @Test - void getNestedProperty_readsIndexedProperty() { - Optional value = PropertyAccessor.getNestedProperty(bean, "items[0].name"); - assertTrue(value.isPresent()); - assertEquals("item1", value.get()); - } - - @Test - void getNestedProperty_readsArrayElement() { - Optional value = PropertyAccessor.getNestedProperty(bean, "array[0]"); - assertTrue(value.isPresent()); - assertEquals("a", value.get()); - } - - @Test - void getNestedProperty_invalidPath_returnsEmpty() { - Optional value = PropertyAccessor.getNestedProperty(bean, "nonexistent"); - assertFalse(value.isPresent()); - } - - @Test - void setNestedProperty_success_returnsEmpty() { - Optional result = PropertyAccessor.setNestedProperty(bean, "name", "newName"); - assertFalse(result.isPresent()); - assertEquals("newName", bean.getName()); - } - - @Test - void setNestedProperty_nested_success_returnsEmpty() { - Optional result = PropertyAccessor.setNestedProperty(bean, "address.city", "London"); - assertFalse(result.isPresent()); - assertEquals("London", bean.address.getCity()); - } - - @Test - void setNestedProperty_indexed_success_returnsEmpty() { - Optional result = PropertyAccessor.setNestedProperty(bean, "items[0].name", "newItem"); - assertFalse(result.isPresent()); - assertEquals("newItem", bean.items.get(0).getName()); - } - - @Test - void setNestedProperty_invalidPath_returnsException() { - Optional result = PropertyAccessor.setNestedProperty(bean, "nonexistent", "value"); - assertTrue(result.isPresent()); - assertInstanceOf(InvocationTargetException.class, result.get()); // or other expected types - } - -// @Test -// void getNestedPropertyType_mappedProperty_throwsUnsupported() { -// assertThrows(UnsupportedOperationException.class, () -> PropertyAccessor.getNestedPropertyType(bean, "map[key]")); -// } -// -// @Test -// void getNestedPropertyType_exception_returnsEmpty() { -// class PrivateBean { -// -// private String secret; // private field -// } -// PrivateBean privateBean = new PrivateBean(); -// -// Optional, Set>> type = PropertyAccessor.getNestedPropertyType(privateBean, "secret"); -// assertFalse(type.isPresent()); -// } -} From 0a8810860fc8f543a50983fcc6dab2f871381268 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Sat, 9 May 2026 20:35:15 +0200 Subject: [PATCH 118/134] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20data=20patcher,=20?= =?UTF-8?q?created=20helper=20class=20to=20ease=20readability?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sormas/backend/patch/DataPatcherImpl.java | 96 ++++++++----------- 1 file changed, 42 insertions(+), 54 deletions(-) diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java index dce6873cb9b..8f1d8265269 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java @@ -7,7 +7,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.annotation.Nullable; import javax.ejb.EJB; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; @@ -92,17 +91,16 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { Map entityCache = new HashMap<>(); entityCache.put(CaseDataDto.I18N_PREFIX, caseData); - List>> patchingTuples = computePatchingTuples(request); + List patchingTuples = computePatchingTuples(request); - List results = patchingTuples.stream().map(entry -> { - String fullFieldName = entry.getFirst(); - SinglePatchResult singlePatchResult = - new SinglePatchResult().setFieldName(fullFieldName); + List results = patchingTuples.stream().map(singleFieldPatchResult -> { + String fullFieldName = singleFieldPatchResult.path; + SinglePatchResult singlePatchResult = new SinglePatchResult().setFieldName(fullFieldName); Supplier target = () -> findAppropriateTarget(fullFieldName, caseData, entityCache); try { - return produceSinglePatchResult(request, entry, disease, target); + return produceSinglePatchResult(request, singleFieldPatchResult, disease, target); } catch (RuntimeException e) { logger.error("Failure during patch operation", e); return singlePatchResult @@ -132,14 +130,14 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { } @NotNull - public SinglePatchResult produceSinglePatchResult( + private SinglePatchResult produceSinglePatchResult( CaseDataPatchRequest request, - Tuple> entry, + SingleFieldPatchResult singleFieldPatchResult, Disease disease, Supplier target) { - return invalidFieldResult(entry).or(() -> fieldMappingResult(entry, disease, request, target)) - .orElseGet(() -> valueMappingResult(entry, disease, request, target)); + return invalidFieldResult(singleFieldPatchResult).or(() -> fieldMappingResult(singleFieldPatchResult, disease, request, target)) + .orElseGet(() -> valueMappingResult(singleFieldPatchResult, disease, request, target)); } private void saveDTOsIfAppropriate(Map entityCache) { @@ -173,21 +171,20 @@ private void saveDTOsIfAppropriate(Map entityCache) { } private @NotNull SinglePatchResult valueMappingResult( - Tuple> entry, + SingleFieldPatchResult singleFieldPatchResult, Disease disease, CaseDataPatchRequest request, Supplier targetOpt) { - String fullFieldName = entry.getFirst(); + String fullFieldName = singleFieldPatchResult.path; - SinglePatchResult singlePatchResult = - new SinglePatchResult().setFieldName(fullFieldName); + SinglePatchResult singlePatchResult = new SinglePatchResult().setFieldName(fullFieldName); Object target = targetOpt.get(); String relativeFieldName = fullFieldName.substring(fullFieldName.indexOf('.') + 1); Tuple, PropertyAccessFailure> nestedPropertyTypeTuple = PropertyAccessor.getNestedPropertyType(target, relativeFieldName, getFieldVisibilityCheckers(disease)); - Object untypedTargetValue = extractValue(entry); + Object untypedTargetValue = singleFieldPatchResult.value; PropertyAccessFailure propertyAccessFailure = nestedPropertyTypeTuple.getSecond(); if (propertyAccessFailure != null) { @@ -241,29 +238,24 @@ private DataPatchFailure buildFailure(DataPatchFailureCause fieldDoesNotExist, O return new DataPatchFailure().setDataPatchFailureCause(fieldDoesNotExist).setProvidedFieldValue(untypedTargetValue); } - private @NotNull Optional invalidFieldResult( - Tuple> entry) { - return Optional.ofNullable(extractFailureCause(entry)).map(invalidFieldFailureCause -> buildFailureFor(entry, invalidFieldFailureCause)); - } - - private DataPatchFailureCause extractFailureCause(Tuple> entry) { - return entry.getSecond().getFirst(); + private @NotNull Optional invalidFieldResult(SingleFieldPatchResult singleFieldPatchResult) { + return Optional.ofNullable(singleFieldPatchResult.failureCause) + .map(invalidFieldFailureCause -> buildFailureFor(singleFieldPatchResult, invalidFieldFailureCause)); } private Optional fieldMappingResult( - Tuple> entry, + SingleFieldPatchResult singleFieldPatchResult, Disease disease, CaseDataPatchRequest request, Supplier target) { - String fullFieldName = entry.getFirst(); + String fullFieldName = singleFieldPatchResult.path; Optional mapper = fieldCustomMapperRegistry.getMapper(fullFieldName, disease); - Object untypedTargetValue = extractValue(entry); + Object untypedTargetValue = singleFieldPatchResult.value; if (mapper.isPresent()) { - SinglePatchResult singlePatchResult = - new SinglePatchResult().setFieldName(fullFieldName); + SinglePatchResult singlePatchResult = new SinglePatchResult().setFieldName(fullFieldName); Optional dataPatchFailureOpt = mapper.orElseThrow() .map( @@ -279,16 +271,9 @@ private Optional fieldMappingResult( return Optional.empty(); } - private SinglePatchResult buildFailureFor( - Tuple> entry, - DataPatchFailureCause fieldFailureCause) { - - return new SinglePatchResult().setFieldName(entry.getFirst()) - .setFailure(buildFailure(fieldFailureCause, extractValue(entry))); - } - - private Object extractValue(Tuple> entry) { - return entry.getSecond().getSecond(); + private SinglePatchResult buildFailureFor(SingleFieldPatchResult singleFieldPatchResult, DataPatchFailureCause fieldFailureCause) { + return new SinglePatchResult().setFieldName(singleFieldPatchResult.path) + .setFailure(buildFailure(fieldFailureCause, singleFieldPatchResult.value)); } private FieldVisibilityCheckers getFieldVisibilityCheckers(Disease disease) { @@ -297,7 +282,7 @@ private FieldVisibilityCheckers getFieldVisibilityCheckers(Disease disease) { .andWithFeatureType(featureConfigurationFacade.getActiveServerFeatureConfigurations()); } - private List>> computePatchingTuples(CaseDataPatchRequest request) { + private List computePatchingTuples(CaseDataPatchRequest request) { Predicate> filterPredicate = buildAdequateDictionaryValuePredicate(request); return request.getPatchDictionary() @@ -319,16 +304,15 @@ private List>> computePatchin .orElse(null); if (dataPatchFailureCause != null) { - return Stream.of(buildMapTupleEntryFrom(entry, dataPatchFailureCause)); + return Stream.of(new SingleFieldPatchResult(entry.getKey(), dataPatchFailureCause, entry.getValue())); } if (!patchFieldHelper.isMultipleFieldFormat(path)) { - return Stream.of(buildMapTupleEntryFrom(entry)); + return Stream.of(new SingleFieldPatchResult(entry.getKey(), null, entry.getValue())); } return splitMultipleFieldsPath(entry); }) - .map(tuple -> Tuple.of(tuple.getFirst(), tuple.getSecond())) .collect(Collectors.toList()); } @@ -337,7 +321,7 @@ private List>> computePatchin } @NotNull - private Stream>> splitMultipleFieldsPath(Map.Entry entry) { + private Stream splitMultipleFieldsPath(Map.Entry entry) { String path = entry.getKey(); int openingParenthesisIndex = path.indexOf("("); String prefix = path.substring(0, openingParenthesisIndex); @@ -346,17 +330,7 @@ private Stream>> splitMultipl String restPath = path.substring(openingParenthesisIndex + 1, closeParen); - return Arrays.stream(restPath.split("\\|")).map(suffix -> Tuple.of(prefix + suffix, Tuple.of(null, entry.getValue()))); - } - - private Tuple> buildMapTupleEntryFrom( - Map.Entry entry, - @Nullable DataPatchFailureCause dataPatchFailureCause) { - return Tuple.of(entry.getKey(), Tuple.of(dataPatchFailureCause, entry.getValue())); - } - - private Tuple> buildMapTupleEntryFrom(Map.Entry entry) { - return Tuple.of(entry.getKey(), Tuple.of(null, entry.getValue())); + return Arrays.stream(restPath.split("\\|")).map(suffix -> new SingleFieldPatchResult(prefix + suffix, null, entry.getValue())); } private @NotNull Predicate> buildAdequateDictionaryValuePredicate(CaseDataPatchRequest request) { @@ -411,4 +385,18 @@ private Predicate> buildEmptyValuePredicate() { }; } + + private static final class SingleFieldPatchResult { + + final String path; + final DataPatchFailureCause failureCause; + final Object value; + + SingleFieldPatchResult(String fieldPath, DataPatchFailureCause cause, Object value) { + this.path = fieldPath; + this.failureCause = cause; + this.value = value; + } + } + } From 10051daabd54837d76cafe86ab870be45054bc48 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Mon, 11 May 2026 07:28:25 +0200 Subject: [PATCH 119/134] Missing translations --- .../api/patch/DataPatchFailureCause.java | 8 ++ .../PartialRetrievalFailureCause.java | 8 ++ sormas-api/src/main/resources/enum.properties | 1 + .../backend/patch/PatchFieldHelper.java | 11 +- .../backend/patch/PathFailureCause.java | 3 +- .../main/resources/sql/sormas_schema_next.sql | 7 +- .../backend/patch/PatchFieldHelperTest.java | 103 ++++++++++++++++++ 7 files changed, 135 insertions(+), 6 deletions(-) create mode 100644 sormas-backend/src/test/java/de/symeda/sormas/backend/patch/PatchFieldHelperTest.java diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java index af49732addf..31574996b84 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java @@ -64,6 +64,14 @@ public enum DataPatchFailureCause { UNSUPPORTED_TARGET_TYPE, INVALID_PATH_FORMAT, + + /** + * The path contains the {@code _duplicate_} marker, meaning the key appeared more than once in the input and this is the duplicate + * occurrence. + * Duplicate entries cannot be processed because their intended target is ambiguous. + */ + DUPLICATE_FIELD, + /** * This means there is a hole in the implementation. */ diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetrievalFailureCause.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetrievalFailureCause.java index 06a58bbb9cd..55c4ee04b07 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetrievalFailureCause.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetrievalFailureCause.java @@ -40,6 +40,14 @@ public enum PartialRetrievalFailureCause { FORBIDDEN_FIELD, INVALID_PATH_FORMAT, + + /** + * The path contains the {@code _duplicate_} marker, meaning the key appeared more than once in the input and this is the duplicate + * occurrence. + * Duplicate entries cannot be processed because their intended target is ambiguous. + */ + DUPLICATE_FIELD, + /** * This means there is a hole in the implementation. */ diff --git a/sormas-api/src/main/resources/enum.properties b/sormas-api/src/main/resources/enum.properties index 857e505f749..ca924b7afaa 100644 --- a/sormas-api/src/main/resources/enum.properties +++ b/sormas-api/src/main/resources/enum.properties @@ -3078,4 +3078,5 @@ DataPatchFailureCause.FORBIDDEN_VALUE_OVERRIDE=Overriding existing value is not DataPatchFailureCause.INVALID_VALUE_TYPE=Invalid value type DataPatchFailureCause.UNSUPPORTED_TARGET_TYPE=Unsupported target type DataPatchFailureCause.INVALID_PATH_FORMAT=Invalid path format +DataPatchFailureCause.DUPLICATE_FIELD=Duplicate field — key appeared more than once in the input DataPatchFailureCause.TECHNICAL=Technical error \ No newline at end of file diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java index 20ed2b9ec80..c13cada7aba 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java @@ -25,6 +25,7 @@ public class PatchFieldHelper { private final static Logger logger = LoggerFactory.getLogger(PatchFieldHelper.class); public static final String PATH_SEPARATOR = "."; + public static final String DUPLICATE_MARKER = "_duplicate_"; private static final String OPENING_PARENTHESIS = "("; private static final String CLOSING_PARENTHESIS = ")"; @@ -87,6 +88,8 @@ private PathFailureCause checkIfPathIsInvalidImpl(String path, Set addit if (!path.contains(PATH_SEPARATOR)) { dataPatchFailureCause = PathFailureCause.INVALID_PATH_FORMAT; + } else if (path.contains(DUPLICATE_MARKER)) { + dataPatchFailureCause = PathFailureCause.DUPLICATE_FIELD; } else if (!(startsWithAllowedPrefix(path) || pathStartsWithAllowedPrefix(path, additionalSupportedPrefixes))) { dataPatchFailureCause = PathFailureCause.UNSUPPORTED_PREFIX; } else if (fieldIsForbidden(path)) { @@ -108,9 +111,8 @@ private boolean fieldIsForbidden(String path) { } private Set resolveConfiguredForbiddenFields() { - String configValue = systemConfigurationValueFacade != null - ? systemConfigurationValueFacade.getValue(PATCH_FORBIDDEN_FIELDS_CONFIG_KEY) - : null; + String configValue = + systemConfigurationValueFacade != null ? systemConfigurationValueFacade.getValue(PATCH_FORBIDDEN_FIELDS_CONFIG_KEY) : null; return Optional.ofNullable(configValue) .filter(v -> !v.isBlank()) .map(v -> Arrays.stream(v.split(",")).map(String::trim).filter(s -> !s.isEmpty()).collect(Collectors.toSet())) @@ -118,7 +120,8 @@ private Set resolveConfiguredForbiddenFields() { } private boolean startsWithAllowedPrefix(String path) { - return pathStartsWithAllowedPrefix(path, pathAliasHelper.supportedPrefixes()) || pathStartsWithAllowedPrefix(path, businessDtoFacade.fetchablePrefixes()); + return pathStartsWithAllowedPrefix(path, pathAliasHelper.supportedPrefixes()) + || pathStartsWithAllowedPrefix(path, businessDtoFacade.fetchablePrefixes()); } private static boolean pathStartsWithAllowedPrefix(String path, Set prefixes) { diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PathFailureCause.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PathFailureCause.java index 086aa48ce15..bf350c9fb09 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PathFailureCause.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PathFailureCause.java @@ -14,7 +14,8 @@ public enum PathFailureCause { FORBIDDEN_NON_UNIQUE_ALIAS(DataPatchFailureCause.FORBIDDEN_NON_UNIQUE_ALIAS, PartialRetrievalFailureCause.FORBIDDEN_NON_UNIQUE_ALIAS), UNSUPPORTED_PREFIX(DataPatchFailureCause.UNSUPPORTED_PREFIX, PartialRetrievalFailureCause.UNSUPPORTED_PREFIX), FORBIDDEN_FIELD(DataPatchFailureCause.FORBIDDEN_FIELD, PartialRetrievalFailureCause.FORBIDDEN_FIELD), - INVALID_MULTIPLE_FIELDS_FORMAT(DataPatchFailureCause.INVALID_MULTIPLE_FIELDS_FORMAT, PartialRetrievalFailureCause.INVALID_MULTIPLE_FIELDS_FORMAT); + INVALID_MULTIPLE_FIELDS_FORMAT(DataPatchFailureCause.INVALID_MULTIPLE_FIELDS_FORMAT, PartialRetrievalFailureCause.INVALID_MULTIPLE_FIELDS_FORMAT), + DUPLICATE_FIELD(DataPatchFailureCause.DUPLICATE_FIELD, PartialRetrievalFailureCause.DUPLICATE_FIELD); @NotNull private final DataPatchFailureCause relatedPatchFailureCause; diff --git a/sormas-backend/src/main/resources/sql/sormas_schema_next.sql b/sormas-backend/src/main/resources/sql/sormas_schema_next.sql index c9ee05107b3..5e467f95610 100644 --- a/sormas-backend/src/main/resources/sql/sormas_schema_next.sql +++ b/sormas-backend/src/main/resources/sql/sormas_schema_next.sql @@ -54,7 +54,7 @@ VALUES ('NG_SUVEY_BASE_URI', null, 'i18n/infoSystemConfigurationValueDescription INSERT INTO systemconfigurationvalue(config_key, config_value, value_description, category_id, value_optional, value_pattern, value_encrypt, data_provider, validation_message, changedate, creationdate, id, uuid) -VALUES ('NG_SUVEY_CRYPTED_TOKEN', null, 'i18n/infoSystemConfigurationValueDescriptionNgSurveyCryptedToken', general_category_id, true, +VALUES ('NG_SUVEY_ENCRYPTED_TOKEN', null, 'i18n/infoSystemConfigurationValueDescriptionNgSurveyEncryptedToken', general_category_id, true, '', true, null, 'i18n/systemConfigurationValueInvalidValue', now(), now(), nextval('entity_seq'), generate_base32_uuid()); @@ -90,5 +90,10 @@ LANGUAGE plpgsql; CREATE INDEX idx_externalmessage_report_id ON externalmessage (reportid); +UPDATE featureconfiguration +SET properties = '{"FETCH_MODE":false,"FORCE_AUTOMATIC_PROCESSING":true,"SURVEY_FETCH_ENABLED":true}' +where featuretype = 'EXTERNAL_MESSAGES' + + INSERT INTO schema_version (version_number, comment) VALUES (609, '#13832 - External Survey facade'); \ No newline at end of file diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/PatchFieldHelperTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/PatchFieldHelperTest.java new file mode 100644 index 00000000000..60c65217f6f --- /dev/null +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/PatchFieldHelperTest.java @@ -0,0 +1,103 @@ +package de.symeda.sormas.backend.patch; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.mockito.Mockito.when; + +import java.util.Set; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; +import org.mockito.InjectMocks; +import org.mockito.Mock; + +import de.symeda.sormas.api.systemconfiguration.SystemConfigurationValueFacade; +import de.symeda.sormas.backend.AbstractUnitTest; +import de.symeda.sormas.backend.patch.alias.PathAliasHelper; + +class PatchFieldHelperTest extends AbstractUnitTest { + + @InjectMocks + private PatchFieldHelper victim; + + @Mock + private PathAliasHelper pathAliasHelper; + + @Mock + private SystemConfigurationValueFacade systemConfigurationValueFacade; + + @Mock + private BusinessDtoFacade businessDtoFacade; + + @BeforeEach + void setUp() { + when(pathAliasHelper.supportedPrefixes()).thenReturn(Set.of("CaseData", "Person", "Symptoms")); + when(businessDtoFacade.fetchablePrefixes()).thenReturn(Set.of("CaseData", "Person", "Symptoms")); + } + + // -- DUPLICATE_FIELD -- + + @ParameterizedTest + @ValueSource(strings = { + "Person.firstName_duplicate_", + "Person._duplicate_firstName", + "CaseData.symptoms_duplicate_.onsetDate", + "Person.firstName_duplicate_2" }) + void checkIfPathIsInvalid_duplicateMarker_returnsDuplicateField(String path) { + // EXECUTE + PathFailureCause result = victim.checkIfPathIsInvalid(path); + + // CHECK + assertEquals(PathFailureCause.DUPLICATE_FIELD, result); + } + + @Test + void checkIfPathIsInvalid_duplicateMarkerRelatedPatchCause_mapsToDataPatchFailureCause() { + // PREPARE + PathFailureCause cause = PathFailureCause.DUPLICATE_FIELD; + + // EXECUTE & CHECK + assertEquals(de.symeda.sormas.api.patch.DataPatchFailureCause.DUPLICATE_FIELD, cause.getRelatedPatchFailureCause()); + } + + @Test + void checkIfPathIsInvalid_duplicateMarkerRelatedRetrievalCause_mapsToPartialRetrievalFailureCause() { + // PREPARE + PathFailureCause cause = PathFailureCause.DUPLICATE_FIELD; + + // EXECUTE & CHECK + assertEquals( + de.symeda.sormas.api.patch.partial_retrieval.PartialRetrievalFailureCause.DUPLICATE_FIELD, + cause.getRelatedRetrieveFailureCause()); + } + + // -- valid path —- no failure expected -- + + @Test + void checkIfPathIsInvalid_validPath_returnsNull() { + // PREPARE + String path = "Person.firstName"; + + // EXECUTE + PathFailureCause result = victim.checkIfPathIsInvalid(path); + + // CHECK + assertNull(result); + } + + // -- INVALID_PATH_FORMAT takes precedence over DUPLICATE_FIELD -- + + @Test + void checkIfPathIsInvalid_noDotAndDuplicateMarker_returnsInvalidPathFormat() { + // PREPARE + String path = "firstName_duplicate_"; + + // EXECUTE + PathFailureCause result = victim.checkIfPathIsInvalid(path); + + // CHECK + assertEquals(PathFailureCause.INVALID_PATH_FORMAT, result); + } +} From c52a71995f265ec8a960e6006ff9cae89f388490 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Mon, 11 May 2026 10:22:57 +0200 Subject: [PATCH 120/134] =?UTF-8?q?=E2=9C=A8:=20FEAT:=20Allowing=20overrid?= =?UTF-8?q?ing=20of=20newly=20created=20DTOs=20to=20override=20default=20v?= =?UTF-8?q?alues=20=F0=9F=90=9B:=20FIX:=20ReferenceData=20fetching=20-=20?= =?UTF-8?q?=F0=9F=92=AC=20Missing=20translations?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...eferenceDataValueInstanceProviderImpl.java | 25 +-- .../sormas/backend/common/CronService.java | 2 +- .../backend/patch/AttachedEntityWrapper.java | 67 ++++++++ .../backend/patch/BusinessDtoFacade.java | 72 +++++---- .../sormas/backend/patch/DataPatcherImpl.java | 36 +++-- .../backend/patch/BusinessDtoFacadeTest.java | 38 ++--- .../sormas/patch/DataPatcherImplTest.java | 152 ++++++++---------- 7 files changed, 217 insertions(+), 175 deletions(-) create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/backend/patch/AttachedEntityWrapper.java diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/ReferenceDataValueInstanceProviderImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/ReferenceDataValueInstanceProviderImpl.java index eae74e9645f..a41c2ade05c 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/ReferenceDataValueInstanceProviderImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/ReferenceDataValueInstanceProviderImpl.java @@ -1,24 +1,23 @@ package de.symeda.sormas.backend; -import java.util.Collections; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.Optional; +import java.util.*; import java.util.function.Supplier; import java.util.stream.Collectors; import javax.annotation.PostConstruct; import javax.enterprise.context.ApplicationScoped; +import de.symeda.sormas.api.InfrastructureDataReferenceDto; import de.symeda.sormas.api.ReferenceDto; import de.symeda.sormas.api.infrastructure.community.CommunityDto; +import de.symeda.sormas.api.infrastructure.community.CommunityFacade; import de.symeda.sormas.api.infrastructure.community.CommunityReferenceDto; import de.symeda.sormas.api.infrastructure.country.CountryFacade; import de.symeda.sormas.api.infrastructure.country.CountryReferenceDto; import de.symeda.sormas.api.infrastructure.district.DistrictFacade; import de.symeda.sormas.api.infrastructure.district.DistrictReferenceDto; import de.symeda.sormas.api.infrastructure.facility.FacilityDto; +import de.symeda.sormas.api.infrastructure.facility.FacilityFacade; import de.symeda.sormas.api.infrastructure.facility.FacilityReferenceDto; import de.symeda.sormas.api.infrastructure.pointofentry.PointOfEntryDto; import de.symeda.sormas.api.infrastructure.pointofentry.PointOfEntryFacade; @@ -26,8 +25,6 @@ import de.symeda.sormas.api.infrastructure.region.RegionFacade; import de.symeda.sormas.api.infrastructure.region.RegionReferenceDto; import de.symeda.sormas.api.referencedata.ReferenceDataValueInstanceProvider; -import de.symeda.sormas.backend.infrastructure.community.CommunityFacadeEjb; -import de.symeda.sormas.backend.infrastructure.facility.FacilityFacadeEjb; import de.symeda.sormas.backend.util.InstanceProvider; import de.symeda.sormas.backend.util.StringNormalizer; @@ -45,13 +42,13 @@ private void init() { Map.entry(DistrictReferenceDto.class, () -> getInstance(DistrictFacade.class).getAllActiveAsReference()), Map.entry( CommunityReferenceDto.class, - () -> getInstance(CommunityFacadeEjb.class).getAllAfter(DATE_ALL_VALUES) + () -> getInstance(CommunityFacade.class).getAllAfter(DATE_ALL_VALUES) .stream() .map(CommunityDto::toReference) .collect(Collectors.toList())), Map.entry( FacilityReferenceDto.class, - () -> getInstance(FacilityFacadeEjb.class).getAllWithoutRegionAfter(DATE_ALL_VALUES) + () -> getInstance(FacilityFacade.class).getAllWithoutRegionAfter(DATE_ALL_VALUES) .stream() .map(FacilityDto::toReference) .collect(Collectors.toList())), @@ -74,9 +71,13 @@ public List getAll(Class referenceType) { @Override public Optional getOne(String caption, Class referenceType) { - return getAll(referenceType).stream() - .filter(referenceDto -> StringNormalizer.normalize(referenceDto.getCaption()).equals(StringNormalizer.normalize(caption))) - .findAny(); + return getAll(referenceType).stream().filter(referenceDto -> { + String normalizedCaptionCandidate = StringNormalizer.normalize(caption); + return StringNormalizer.normalize(referenceDto.getCaption()).equals(normalizedCaptionCandidate) + && (referenceDto instanceof InfrastructureDataReferenceDto + && normalizedCaptionCandidate + .equals(StringNormalizer.normalize(((InfrastructureDataReferenceDto) referenceDto).getExternalId()))); + }).findAny(); } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/common/CronService.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/common/CronService.java index 717b00e239c..7283266242b 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/common/CronService.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/common/CronService.java @@ -232,7 +232,7 @@ public void fetchExternalMessages() { } } - @Schedule(hour = "*", minute = "*/5", persistent = false) + @Schedule(hour = "*", persistent = false) public void fetchSurveyResponses() { if (!featureConfigurationFacade.isFeatureEnabled(FeatureType.EXTERNAL_MESSAGES) || featureConfigurationFacade.isPropertyValueTrue(FeatureType.EXTERNAL_MESSAGES, FeatureTypeProperty.SURVEY_FETCH_ENABLED)) { diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/AttachedEntityWrapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/AttachedEntityWrapper.java new file mode 100644 index 00000000000..dbd684c0f17 --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/AttachedEntityWrapper.java @@ -0,0 +1,67 @@ +package de.symeda.sormas.backend.patch; + +import java.util.Objects; + +import javax.validation.constraints.NotNull; + +import de.symeda.sormas.api.EntityDto; + +/** + * It's required to know if the DTO was already "attached" (known in Persistence Context / EntityManager). + */ +public class AttachedEntityWrapper { + + @NotNull + private EntityDto entityDto; + + /** + * True if already persisted: false otherwise to indicate the entity must be merged. + */ + private boolean attached = true; + + public static AttachedEntityWrapper attached(EntityDto entityDto) { + AttachedEntityWrapper attachedEntityWrapper = new AttachedEntityWrapper(); + attachedEntityWrapper.setAttached(true); + attachedEntityWrapper.setEntityDto(entityDto); + return attachedEntityWrapper; + } + + public static AttachedEntityWrapper notYetAttached(EntityDto entityDto) { + AttachedEntityWrapper attachedEntityWrapper = new AttachedEntityWrapper(); + attachedEntityWrapper.setAttached(false); + attachedEntityWrapper.setEntityDto(entityDto); + return attachedEntityWrapper; + } + + @NotNull + public EntityDto getEntityDto() { + return entityDto; + } + + public AttachedEntityWrapper setEntityDto(EntityDto entityDto) { + this.entityDto = entityDto; + return this; + } + + public boolean isAttached() { + return attached; + } + + public AttachedEntityWrapper setAttached(boolean attached) { + this.attached = attached; + return this; + } + + @Override + public boolean equals(Object o) { + if (o == null || getClass() != o.getClass()) + return false; + AttachedEntityWrapper that = (AttachedEntityWrapper) o; + return attached == that.attached && Objects.equals(entityDto, that.entityDto); + } + + @Override + public int hashCode() { + return Objects.hash(entityDto, attached); + } +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java index a4cf97a8ad9..aaa94567c33 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java @@ -49,7 +49,7 @@ public class BusinessDtoFacade { private final Map>> dtoRetrieverByI18nDictionaryRead = new HashMap<>(); - private final Map> dtoRetrieverByI18nDictionaryCreateUpdate = new HashMap<>(); + private final Map> dtoRetrieverByI18nDictionaryCreateUpdate = new HashMap<>(); /** * Some {@link EntityDto} must be attached to a "parent" to be saved. @@ -68,7 +68,6 @@ private void init() { registerLeafAttacherOperations(); } - private void registerDirectSaveOperations() { registerSave(CaseDataDto.class, caseDataDto -> caseFacade.save(caseDataDto)); registerSave(PersonDto.class, personDto -> personFacade.save(personDto)); @@ -111,25 +110,30 @@ private void registerFetchByI18nOperationsRead() { caseDataDto -> caseDataDto.getHospitalization().getPreviousHospitalizations()); } - private void registerFetchByI18nOperationsCreateUpdate() { registerFetchByI18nCreateUpdate( - PersonDto.I18N_PREFIX, - caseDataDto -> personFacade.getByUuid(caseDataDto.getPerson().getUuid())); + PersonDto.I18N_PREFIX, + caseDataDto -> AttachedEntityWrapper.attached(personFacade.getByUuid(caseDataDto.getPerson().getUuid()))); registerFetchByI18nCreateUpdate( - ImmunizationDto.I18N_PREFIX, - createImmunizationDtoFromCaseFct()); + ImmunizationDto.I18N_PREFIX, + createImmunizationDtoFromCaseFct().andThen(AttachedEntityWrapper::notYetAttached)); registerFetchByI18nCreateUpdate( - VaccinationDto.I18N_PREFIX, - caseDataDto -> VaccinationDto.build(userFacade.getCurrentUserAsReference())); + VaccinationDto.I18N_PREFIX, + caseDataDto -> AttachedEntityWrapper.notYetAttached(VaccinationDto.build(userFacade.getCurrentUserAsReference()))); - registerFetchByI18nCreateUpdate(ExposureDto.I18N_PREFIX, caseDataDto -> ExposureDto.build(ExposureType.UNKNOWN)); + registerFetchByI18nCreateUpdate( + ExposureDto.I18N_PREFIX, + caseDataDto -> AttachedEntityWrapper.notYetAttached(ExposureDto.build(ExposureType.UNKNOWN))); - registerFetchByI18nCreateUpdate(ActivityAsCaseDto.I18N_PREFIX, caseDataDto -> ActivityAsCaseDto.build(ActivityAsCaseType.UNKNOWN)); + registerFetchByI18nCreateUpdate( + ActivityAsCaseDto.I18N_PREFIX, + caseDataDto -> AttachedEntityWrapper.notYetAttached(ActivityAsCaseDto.build(ActivityAsCaseType.UNKNOWN))); - registerFetchByI18nCreateUpdate(PreviousHospitalizationDto.I18N_PREFIX, PreviousHospitalizationDto::build); + registerFetchByI18nCreateUpdate( + PreviousHospitalizationDto.I18N_PREFIX, + caze -> AttachedEntityWrapper.notYetAttached(PreviousHospitalizationDto.build(caze))); } private Function createImmunizationDtoFromCaseFct() { @@ -151,7 +155,7 @@ private void registerFetchByI18nRead(String i18nName, Function fct) { + private void registerFetchByI18nCreateUpdate(String i18nName, Function fct) { dtoRetrieverByI18nDictionaryCreateUpdate.put(i18nName, fct); } @@ -184,10 +188,9 @@ private void registerLeafAttacher(Class leafClass, Leaf } private CaseDataDto requireCaseData(List dtosInProgress) { - return fetchType(dtosInProgress, CaseDataDto.class) - .orElseThrow( - () -> new IllegalStateException( - String.format("When saving child leaf entities the caseData must be present, but was not: [%s]", dtosInProgress))); + return fetchType(dtosInProgress, CaseDataDto.class).orElseThrow( + () -> new IllegalStateException( + String.format("When saving child leaf entities the caseData must be present, but was not: [%s]", dtosInProgress))); } @Nullable @@ -237,13 +240,15 @@ public List fetchByI18nNameForDisplay(@NotNull String i18nN /** * Warning: Will retrieve a new instance on every fetch, MUST be cached within a single patch operation. - * @param i18nName I18N translation key - * @param caseDataDto root/reference entity + * + * @param i18nName + * I18N translation key + * @param caseDataDto + * root/reference entity * @return "un-attached" DTO that will be thrown away if not saved. */ - public Optional tryFetchByI18nNameForCreateUpdate(@NotNull String i18nName, CaseDataDto caseDataDto) { - return Optional.ofNullable(dtoRetrieverByI18nDictionaryCreateUpdate.get(i18nName)) - .map(fct -> fct.apply(caseDataDto)); + public Optional tryFetchByI18nNameForCreateUpdate(@NotNull String i18nName, CaseDataDto caseDataDto) { + return Optional.ofNullable(dtoRetrieverByI18nDictionaryCreateUpdate.get(i18nName)).map(fct -> fct.apply(caseDataDto)); } /** @@ -276,25 +281,24 @@ public Set> savableDtoClasses() { * @param * type */ - private T saveDirectEntity(@NotNull EntityDto entityDto) { + private T saveDirectEntity(@NotNull EntityDto entityDto) { Class entityDtoClass = entityDto.getClass(); return Optional.ofNullable((Function) directDtoSaveDictionary.get(entityDtoClass)) - .orElseThrow(() -> new IllegalStateException(String.format("No save function defined for: [%s]", entityDtoClass))) - .apply((T) entityDto); + .orElseThrow(() -> new IllegalStateException(String.format("No save function defined for: [%s]", entityDtoClass))) + .apply((T) entityDto); } public void save(@NotNull List entityDtos) { ArrayList dtosToSave = new ArrayList<>(entityDtos); - leafAttacherRegistry.forEach((leafClass, attacher) -> - dtosToSave.stream().filter(leafClass::isInstance).findAny().ifPresent(leaf -> { - EntityDto parent = attacher.attachAndReturnParent(leaf, dtosToSave); - dtosToSave.remove(leaf); - if (!dtosToSave.contains(parent)) { - dtosToSave.add(parent); - } - })); + leafAttacherRegistry.forEach((leafClass, attacher) -> dtosToSave.stream().filter(leafClass::isInstance).findAny().ifPresent(leaf -> { + EntityDto parent = attacher.attachAndReturnParent(leaf, dtosToSave); + dtosToSave.remove(leaf); + if (!dtosToSave.contains(parent)) { + dtosToSave.add(parent); + } + })); dtosToSave.forEach(this::saveDirectEntity); } @@ -303,9 +307,9 @@ public void save(@NotNull List entityDtos) { return entityDtos.stream().filter(targetClass::isInstance).map(targetClass::cast).findAny(); } - @FunctionalInterface private interface LeafAttacher { + EntityDto attachAndReturnParent(EntityDto leaf, List dtosInProgress); } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java index 8f1d8265269..b94d654abbf 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java @@ -88,8 +88,8 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { Disease disease = caseData.getDisease(); - Map entityCache = new HashMap<>(); - entityCache.put(CaseDataDto.I18N_PREFIX, caseData); + Map entityCache = new HashMap<>(); + entityCache.put(CaseDataDto.I18N_PREFIX, AttachedEntityWrapper.attached(caseData)); List patchingTuples = computePatchingTuples(request); @@ -97,7 +97,7 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { String fullFieldName = singleFieldPatchResult.path; SinglePatchResult singlePatchResult = new SinglePatchResult().setFieldName(fullFieldName); - Supplier target = () -> findAppropriateTarget(fullFieldName, caseData, entityCache); + Supplier target = () -> findAppropriateTarget(fullFieldName, caseData, entityCache); try { return produceSinglePatchResult(request, singleFieldPatchResult, disease, target); @@ -134,14 +134,14 @@ private SinglePatchResult produceSinglePatchResult( CaseDataPatchRequest request, SingleFieldPatchResult singleFieldPatchResult, Disease disease, - Supplier target) { + Supplier target) { return invalidFieldResult(singleFieldPatchResult).or(() -> fieldMappingResult(singleFieldPatchResult, disease, request, target)) .orElseGet(() -> valueMappingResult(singleFieldPatchResult, disease, request, target)); } - private void saveDTOsIfAppropriate(Map entityCache) { - List toSave = new ArrayList<>(entityCache.values()); + private void saveDTOsIfAppropriate(Map entityCache) { + List toSave = new ArrayList<>(entityCache.values().stream().map(AttachedEntityWrapper::getEntityDto).collect(Collectors.toList())); if (toSave.isEmpty()) { logger.warn("Nothing to save in entity cache"); @@ -174,13 +174,14 @@ private void saveDTOsIfAppropriate(Map entityCache) { SingleFieldPatchResult singleFieldPatchResult, Disease disease, CaseDataPatchRequest request, - Supplier targetOpt) { + Supplier targetOpt) { String fullFieldName = singleFieldPatchResult.path; SinglePatchResult singlePatchResult = new SinglePatchResult().setFieldName(fullFieldName); - Object target = targetOpt.get(); + AttachedEntityWrapper attachedEntityWrapper = targetOpt.get(); + Object target = attachedEntityWrapper.getEntityDto(); String relativeFieldName = fullFieldName.substring(fullFieldName.indexOf('.') + 1); Tuple, PropertyAccessFailure> nestedPropertyTypeTuple = PropertyAccessor.getNestedPropertyType(target, relativeFieldName, getFieldVisibilityCheckers(disease)); @@ -206,7 +207,12 @@ private void saveDTOsIfAppropriate(Map entityCache) { Object typedValue = result.getData(); - if (request.getReplacementStrategy() == DataReplacementStrategy.IF_NOT_ALREADY_PRESENT) { + if (!attachedEntityWrapper.isAttached() && !StringUtils.contains(relativeFieldName, ".")) { + logger.debug( + "Entity was not yet attached and relative field name: [{}] is not for sub-Objects, therefore overwrite is allowed and ignored for this target only: [{}]", + relativeFieldName, + target.getClass()); + } else if (request.getReplacementStrategy() == DataReplacementStrategy.IF_NOT_ALREADY_PRESENT) { Optional nestedPropertyValue = PropertyAccessor.getNestedProperty(target, relativeFieldName); if (nestedPropertyValue.isPresent()) { @@ -247,7 +253,7 @@ private Optional fieldMappingResult( SingleFieldPatchResult singleFieldPatchResult, Disease disease, CaseDataPatchRequest request, - Supplier target) { + Supplier target) { String fullFieldName = singleFieldPatchResult.path; @@ -262,7 +268,7 @@ private Optional fieldMappingResult( new FieldPatchRequest().setFieldName(fullFieldName) .setReplacementType(request.getReplacementStrategy()) .setOrigin(request.getOrigin()) - .setTarget(target.get()) + .setTarget(target.get().getEntityDto()) .setValue(untypedTargetValue)); return dataPatchFailureOpt.map(singlePatchResult::setFailure).or(() -> Optional.of(singlePatchResult.setValue(untypedTargetValue))); @@ -347,20 +353,21 @@ private Stream splitMultipleFieldsPath(Map.Entry entityCache) { + private AttachedEntityWrapper findAppropriateTarget(String resolvedPath, CaseDataDto caseData, Map entityCache) { String prefix = extractPrefix(resolvedPath); if (entityCache.containsKey(prefix)) { return entityCache.get(prefix); } - Optional fetched = businessDtoFacade.tryFetchByI18nNameForCreateUpdate(prefix, caseData); + Optional fetched = businessDtoFacade.tryFetchByI18nNameForCreateUpdate(prefix, caseData); if (fetched.isPresent()) { entityCache.put(prefix, fetched.get()); return fetched.get(); } - return caseData; + logger.error("Fallbacked to entity for resolved path: [{}]. This should not occur as CaseData is already in entityCache", resolvedPath); + return AttachedEntityWrapper.attached(caseData); } private String extractPrefix(String fieldName) { @@ -385,7 +392,6 @@ private Predicate> buildEmptyValuePredicate() { }; } - private static final class SingleFieldPatchResult { final String path; diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/BusinessDtoFacadeTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/BusinessDtoFacadeTest.java index a4a6c4b0233..225b252fb08 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/BusinessDtoFacadeTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/BusinessDtoFacadeTest.java @@ -1,22 +1,16 @@ package de.symeda.sormas.backend.patch; -import static org.junit.jupiter.api.Assertions.assertAll; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertSame; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyList; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.*; import java.lang.reflect.Method; import java.util.List; import java.util.Optional; import java.util.Set; +import javax.validation.Valid; +import javax.validation.constraints.NotNull; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; @@ -36,9 +30,6 @@ import de.symeda.sormas.backend.person.PersonFacadeEjb; import de.symeda.sormas.backend.user.UserFacadeEjb; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - class BusinessDtoFacadeTest extends AbstractUnitTest { @InjectMocks @@ -103,10 +94,9 @@ void getCaseDataDto_throwsIllegalState_whenNotFound() { assertThrows(IllegalStateException.class, () -> victim.getCaseDataDto("unknown")); } - @Test void tryFetchByI18nNameForCreateUpdate_returnsEmpty_forUnknownPrefix() { - Optional result = victim.tryFetchByI18nNameForCreateUpdate("UnknownPrefix", new CaseDataDto()); + Optional result = victim.tryFetchByI18nNameForCreateUpdate("UnknownPrefix", new CaseDataDto()); assertTrue(result.isEmpty()); } @@ -117,21 +107,19 @@ void tryFetchByI18nNameForCreateUpdate_returnsPersonDto_forPersonPrefix() { CaseDataDto caseData = buildCaseDataWithPerson("person-uuid"); when(personFacade.getByUuid("person-uuid")).thenReturn(personDto); - Optional result = victim.tryFetchByI18nNameForCreateUpdate(PersonDto.I18N_PREFIX, caseData); + Optional result = victim.tryFetchByI18nNameForCreateUpdate(PersonDto.I18N_PREFIX, caseData); - assertAll( - () -> assertTrue(result.isPresent()), - () -> assertSame(personDto, result.get())); + assertAll(() -> assertTrue(result.isPresent()), () -> assertSame(personDto, result.get().getEntityDto())); } @Test void tryFetchByI18nNameForCreateUpdate_returnsNewImmunization_forImmunizationPrefix() { CaseDataDto caseData = buildCaseDataWithPerson("person-uuid"); - Optional result = victim.tryFetchByI18nNameForCreateUpdate(ImmunizationDto.I18N_PREFIX, caseData); + Optional result = victim.tryFetchByI18nNameForCreateUpdate(ImmunizationDto.I18N_PREFIX, caseData); assertTrue(result.isPresent()); - assertTrue(result.get() instanceof ImmunizationDto); + assertTrue(result.get().getEntityDto() instanceof ImmunizationDto); } // — save(List) — @@ -171,9 +159,7 @@ void save_list_vaccinationWithExistingImmunization_attachesVaccinationThenSavesI victim.save(List.of(immunization, vaccination)); verify(immunizationFacade).save(immunization); - assertAll( - () -> assertEquals(1, immunization.getVaccinations().size()), - () -> assertSame(vaccination, immunization.getVaccinations().get(0))); + assertAll(() -> assertEquals(1, immunization.getVaccinations().size()), () -> assertSame(vaccination, immunization.getVaccinations().get(0))); } @Test @@ -205,7 +191,7 @@ void save_list_vaccinationWithImmunization_doesNotCallCaseFacadeSave() { victim.save(List.of(immunization, vaccination)); - verify(caseFacade, never()).save(ArgumentMatchers.<@Valid @NotNull CaseDataDto>any()); + verify(caseFacade, never()).save(ArgumentMatchers.<@Valid @NotNull CaseDataDto> any()); } private static CaseDataDto buildCaseDataWithPerson(String personUuid) { diff --git a/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java index c77d959f232..3363e3b30ca 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java @@ -4,7 +4,6 @@ import java.time.LocalDate; import java.time.LocalDateTime; import java.time.ZoneId; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -14,7 +13,6 @@ import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; @@ -25,17 +23,16 @@ import de.symeda.sormas.api.activityascase.ActivityAsCaseDto; import de.symeda.sormas.api.activityascase.ActivityAsCaseType; import de.symeda.sormas.api.caze.CaseDataDto; +import de.symeda.sormas.api.caze.Vaccine; +import de.symeda.sormas.api.customizableenum.CustomizableEnumTranslation; +import de.symeda.sormas.api.customizableenum.CustomizableEnumType; import de.symeda.sormas.api.exposure.ExposureDto; import de.symeda.sormas.api.exposure.ExposureType; -import de.symeda.sormas.api.hospitalization.PreviousHospitalizationDto; import de.symeda.sormas.api.hospitalization.HospitalizationDto; import de.symeda.sormas.api.hospitalization.HospitalizationReasonType; -import de.symeda.sormas.api.caze.Vaccine; -import de.symeda.sormas.api.customizableenum.CustomizableEnumTranslation; -import de.symeda.sormas.api.customizableenum.CustomizableEnumType; +import de.symeda.sormas.api.hospitalization.PreviousHospitalizationDto; import de.symeda.sormas.api.immunization.ImmunizationDto; import de.symeda.sormas.api.immunization.ImmunizationStatus; -import de.symeda.sormas.api.immunization.MeansOfImmunization; import de.symeda.sormas.api.infrastructure.country.CountryDto; import de.symeda.sormas.api.infrastructure.country.CountryReferenceDto; import de.symeda.sormas.api.infrastructure.facility.FacilityDto; @@ -66,7 +63,6 @@ void patch_noErrorsReplaceAlways() { Map.of( "Person.lastName", newLastname, - "CaseData.classificationDate", classificationDate, @@ -610,12 +606,12 @@ void patch_noPatchInCaseOfFailureFalse() { String trueString = " ja "; Map patchDictionary = - Map.of("CaseData.symptoms.cough", trueString, "CaseData.quarantineOrderedOfficialDocumentDate", ignoredValue); + Map.of("CaseData.symptoms.cough", trueString, "CaseData.quarantineOrderedOfficialDocumentDate", ignoredValue); CaseDataPatchRequest request = new CaseDataPatchRequest().setPatchedInCaseOfFailures(false) - .setCaseUuid(originalCase.getUuid()) - .setPatchDictionary(patchDictionary) - .setInputLanguages(List.of(Language.DE)); + .setCaseUuid(originalCase.getUuid()) + .setPatchDictionary(patchDictionary) + .setInputLanguages(List.of(Language.DE)); // EXECUTE DataPatchResponse response = victim().patch(request); @@ -624,76 +620,20 @@ void patch_noPatchInCaseOfFailureFalse() { // CHECK Map expectedFailures = buildDictionaryOfFailureType( - Map.of("CaseData.quarantineOrderedOfficialDocumentDate", ignoredValue), - DataPatchFailureCause.UNSUPPORTED_FIELD_FOR_DISEASE_OR_COUNTRY_OR_FEATURE); + Map.of("CaseData.quarantineOrderedOfficialDocumentDate", ignoredValue), + DataPatchFailureCause.UNSUPPORTED_FIELD_FOR_DISEASE_OR_COUNTRY_OR_FEATURE); Assertions.assertAll( - () -> Assertions.assertFalse(response.isApplied()), - - () -> Assertions.assertEquals(Map.of("CaseData.symptoms.cough", trueString), response.getValidPatchDictionary()), - - () -> Assertions.assertNull(actual.getSymptoms().getCough()), - - () -> Assertions.assertNull(actual.getQuarantineOrderedOfficialDocumentDate()), - - // FAILURES - () -> Assertions.assertEquals(expectedFailures, response.getFailures())); - } - - @Test - @Disabled("Waiting for feedback on vaccine automatic processing") - void patch_addVaccine_true() { - // PREPARE - Disease disease = Disease.DENGUE; - CaseDataDto originalCase = creator.createUnclassifiedCase(disease); - - getCaseFacade().save(originalCase); - - Assertions.assertFalse(originalCase.getSymptoms().getSymptomatic()); - - Map patchDictionary = new HashMap<>(); - patchDictionary.put("Immunization.immunizationStatus", " ja "); - patchDictionary.put("Immunization.country", "France"); - patchDictionary.put("Vaccination.country", "France"); - - CaseDataPatchRequest request = new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()) - .setPatchDictionary(patchDictionary) - .setInputLanguages(Collections.singletonList(Language.DE)); - - // EXECUTE - DataPatchResponse response = victim().patch(request); - - // CHECK - List immunizationDtos = getImmunizationFacade().getByPersonUuids(List.of(originalCase.getPerson().getUuid())); - - ImmunizationDto createdImmunizationDto = immunizationDtos.get(0); - - List vaccinations = createdImmunizationDto.getVaccinations(); - VaccinationDto vaccinationDto = vaccinations.get(0); - - Assertions.assertAll(() -> Assertions.assertTrue(response.isApplied()), - -// TODO: check what about patch dictionary for those values. -// () -> Assertions.assertEquals(patchDictionary, response.getValidPatchDictionary()), - - () -> Assertions.assertEquals(1, immunizationDtos.size()), - - () -> Assertions.assertEquals(ImmunizationStatus.ACQUIRED, createdImmunizationDto.getImmunizationStatus()), - () -> Assertions.assertEquals(MeansOfImmunization.VACCINATION, createdImmunizationDto.getMeansOfImmunization()), - - () -> Assertions.assertEquals(disease, createdImmunizationDto.getDisease()), - - () -> Assertions.assertNotNull(createdImmunizationDto.getReportDate()), + () -> Assertions.assertFalse(response.isApplied()), - () -> Assertions.assertNotNull(createdImmunizationDto.getReportingUser()), + () -> Assertions.assertEquals(Map.of("CaseData.symptoms.cough", trueString), response.getValidPatchDictionary()), - () -> Assertions.assertEquals(1, vaccinations.size()), + () -> Assertions.assertNull(actual.getSymptoms().getCough()), - () -> Assertions.assertEquals(Vaccine.OTHER, vaccinationDto.getVaccineName()), - () -> Assertions.assertNull(vaccinationDto.getOtherVaccineName()), + () -> Assertions.assertNull(actual.getQuarantineOrderedOfficialDocumentDate()), // FAILURES - () -> Assertions.assertEquals(Map.of(), response.getFailures())); + () -> Assertions.assertEquals(expectedFailures, response.getFailures())); } @Test @@ -832,16 +772,15 @@ void patch_ifNotAlreadyPresent_sameDayDifferentTime_noForbiddenValueOverride() { CaseDataDto originalCase = creator.createUnclassifiedCase(Disease.PERTUSSIS); // Set classificationDate to 08:30 on 2024-06-15 — a non-midnight timestamp on the same calendar day that will be patched - java.util.Date existingDate = - java.util.Date.from(LocalDateTime.of(2024, 6, 15, 8, 30, 0).atZone(ZoneId.systemDefault()).toInstant()); + java.util.Date existingDate = java.util.Date.from(LocalDateTime.of(2024, 6, 15, 8, 30, 0).atZone(ZoneId.systemDefault()).toInstant()); originalCase.setClassificationDate(existingDate); getCaseFacade().save(originalCase); // Patch with the same calendar day as a plain date string — DatePatchMapper resolves this to midnight (00:00:00), // which differs in time from existingDate. Without DateEqualityChecker this would trigger FORBIDDEN_VALUE_OVERRIDE. String patchDate = "2024-06-15"; - CaseDataPatchRequest request = new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()) - .setPatchDictionary(Map.of("CaseData.classificationDate", patchDate)); + CaseDataPatchRequest request = + new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()).setPatchDictionary(Map.of("CaseData.classificationDate", patchDate)); // EXECUTE DataPatchResponse response = victim().patch(request); @@ -983,12 +922,10 @@ void patch_vaccination_and_immunization_with_existing_creates_new_without_overri () -> Assertions.assertEquals(2, immunizations.size()), // Original immunization is untouched - () -> Assertions.assertTrue( - immunizations.stream().anyMatch(imm -> ImmunizationStatus.NOT_ACQUIRED.equals(imm.getImmunizationStatus()))), + () -> Assertions.assertTrue(immunizations.stream().anyMatch(imm -> ImmunizationStatus.NOT_ACQUIRED.equals(imm.getImmunizationStatus()))), // New immunization was created with the patched status - () -> Assertions.assertTrue( - immunizations.stream().anyMatch(imm -> ImmunizationStatus.ACQUIRED.equals(imm.getImmunizationStatus()))), + () -> Assertions.assertTrue(immunizations.stream().anyMatch(imm -> ImmunizationStatus.ACQUIRED.equals(imm.getImmunizationStatus()))), // Original vaccination (COMIRNATY) is still there () -> Assertions.assertTrue( @@ -1015,8 +952,10 @@ void patch_exposure() { .setReplacementStrategy(DataReplacementStrategy.ALWAYS) .setPatchDictionary( Map.of( - toFieldName(ExposureDto.I18N_PREFIX, ExposureDto.EXPOSURE_TYPE), "WORK", - toFieldName(ExposureDto.I18N_PREFIX, ExposureDto.DESCRIPTION), "market visit"))); + toFieldName(ExposureDto.I18N_PREFIX, ExposureDto.EXPOSURE_TYPE), + "WORK", + toFieldName(ExposureDto.I18N_PREFIX, ExposureDto.DESCRIPTION), + "market visit"))); // CHECK CaseDataDto actualCase = getCaseFacade().getByUuid(originalCase.getUuid()); @@ -1065,6 +1004,43 @@ void patch_previousHospitalization() { () -> Assertions.assertEquals(7, previousHospitalizations.get(0).getIcuLengthOfStay())); } + @Test + void patch_previousHospitalization_admissionAndDischargeDates() { + // PREPARE + Disease disease = Disease.DENGUE; + CaseDataDto originalCase = creator.createUnclassifiedCase(disease); + + String admissionDate = "2026-02-02"; + String dischargeDate = "2026-02-04"; + + // EXECUTE + DataPatchResponse response = victim().patch( + new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()) + .setPatchDictionary( + Map.of( + toFieldName(PreviousHospitalizationDto.I18N_PREFIX, PreviousHospitalizationDto.ADMISSION_DATE), + admissionDate, + + toFieldName(PreviousHospitalizationDto.I18N_PREFIX, PreviousHospitalizationDto.DISCHARGE_DATE), + dischargeDate))); + + // CHECK + logger.info("response: [{}]", response); + + CaseDataDto actualCase = getCaseFacade().getByUuid(originalCase.getUuid()); + List previousHospitalizations = actualCase.getHospitalization().getPreviousHospitalizations(); + Assertions.assertAll( + () -> Assertions.assertTrue(response.getFailures().isEmpty(), "Failures: " + response.getFailures()), + () -> Assertions.assertTrue(response.isApplied()), + () -> Assertions.assertEquals(1, previousHospitalizations.size()), + () -> Assertions.assertEquals( + Date.from(LocalDate.parse(admissionDate).atStartOfDay(ZoneId.systemDefault()).toInstant()), + previousHospitalizations.get(0).getAdmissionDate()), + () -> Assertions.assertEquals( + Date.from(LocalDate.parse(dischargeDate).atStartOfDay(ZoneId.systemDefault()).toInstant()), + previousHospitalizations.get(0).getDischargeDate())); + } + @Test void patch_activityAsCase() { // PREPARE @@ -1077,8 +1053,10 @@ void patch_activityAsCase() { .setReplacementStrategy(DataReplacementStrategy.ALWAYS) .setPatchDictionary( Map.of( - toFieldName(ActivityAsCaseDto.I18N_PREFIX, ActivityAsCaseDto.ACTIVITY_AS_CASE_TYPE), "WORK", - toFieldName(ActivityAsCaseDto.I18N_PREFIX, ActivityAsCaseDto.DESCRIPTION), "office work"))); + toFieldName(ActivityAsCaseDto.I18N_PREFIX, ActivityAsCaseDto.ACTIVITY_AS_CASE_TYPE), + "WORK", + toFieldName(ActivityAsCaseDto.I18N_PREFIX, ActivityAsCaseDto.DESCRIPTION), + "office work"))); // CHECK CaseDataDto actualCase = getCaseFacade().getByUuid(originalCase.getUuid()); From 3a26abb3308c734ed031536d6b060156de77b795 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Mon, 11 May 2026 17:04:05 +0200 Subject: [PATCH 121/134] fixing self PR-review comments --- .../externalmessage/ExternalMessageDto.java | 7 +++++- .../ExternalMessageSurveyResponseRequest.java | 2 +- .../ExternalMessageSurveyResponseResult.java | 3 +++ .../ExternalMessageSurveyResponseWrapper.java | 3 +++ .../survey/ExternalSurveyResponseData.java | 3 ++- .../sormas/api/i18n/I18nProperties.java | 5 ++-- .../sormas/api/patch/DataPatchFailure.java | 2 +- .../api/patch/DataPatchFailureCause.java | 3 +++ .../sormas/api/patch/DataPatchResponse.java | 2 +- .../api/patch/DataReplacementStrategy.java | 3 +++ .../DisplayablePartialRetrievalResponse.java | 5 ++++ .../PartialRetrievalFailureCause.java | 3 +++ .../api/survey/alias/PathAliasFacade.java | 5 +++- .../ExternalSurveyProviderFacade.java | 9 +++++++ .../external/views/QuestionAnswersView.java | 3 +++ .../symeda/sormas/api/utils/JsonWrapper.java | 25 ------------------- .../ExternalMessageService.java | 4 +-- .../AutomaticSurveyResponseProcessor.java | 16 +++++++++--- 18 files changed, 65 insertions(+), 38 deletions(-) delete mode 100644 sormas-api/src/main/java/de/symeda/sormas/api/utils/JsonWrapper.java diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageDto.java index 3e7fe6bdb06..81bb2675a35 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageDto.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageDto.java @@ -205,7 +205,9 @@ public class ExternalMessageDto extends SormasToSormasShareableDto { @Size(max = FieldConstraints.CHARACTER_LIMIT_TEXT, message = Validations.textTooLong) private String caseComments; - // TODO: reportId can be used as dedup - idempotency key + /** + * Used as deduplication key for {@link ExternalMessageType#SURVEY_RESPONSE}. + */ @Size(max = FieldConstraints.CHARACTER_LIMIT_DEFAULT, message = Validations.textTooLong) private String reportId; @@ -271,6 +273,9 @@ public class ExternalMessageDto extends SormasToSormasShareableDto { private Boolean tuberculosisMdrXdrTuberculosis; private Boolean tuberculosisBeijingLineage; + /** + * Will only be present for: {@link ExternalMessageType#SURVEY_RESPONSE} to represent the pair. + */ @Nullable private ExternalSurveyResponseData surveyResponseData; diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseRequest.java b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseRequest.java index 932dea6b992..9547cdf160e 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseRequest.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseRequest.java @@ -16,7 +16,7 @@ import de.symeda.sormas.api.patch.EmptyValueBehavior; /** - * Mandatory fields that require + * Request object that represents a Patching request from a survey response. * Will be present for {@link ExternalMessageType#SURVEY_RESPONSE}. */ public class ExternalMessageSurveyResponseRequest implements Serializable, Comparable { diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseResult.java b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseResult.java index f72c4dcc26d..2c07e70e89f 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseResult.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseResult.java @@ -5,6 +5,9 @@ import de.symeda.sormas.api.patch.DataPatchResponse; +/** + * Used to represent a patching response from a survey response for a specific case. + */ public class ExternalMessageSurveyResponseResult implements Serializable { private static final long serialVersionUID = 1L; diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseWrapper.java b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseWrapper.java index 65ab7696807..628b527428e 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseWrapper.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseWrapper.java @@ -3,6 +3,9 @@ import java.io.Serializable; import java.util.Objects; +/** + * A survey response creates a request(from the response) -result(from patch-attempt) pair, this wraps this pair. + */ public class ExternalMessageSurveyResponseWrapper implements Serializable { private static final long serialVersionUID = 1L; diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalSurveyResponseData.java b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalSurveyResponseData.java index 92ed4cfe288..8c338e7540b 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalSurveyResponseData.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalSurveyResponseData.java @@ -10,7 +10,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; /** - * Some survey mapping might be valid and processed on first try, but for others another attempt might be required. + * Some survey mapping might be valid and processed on first try, but for others X-attempts might be required. + * Original will not be mutated but updated will change on each attempt for the give survey-response - case combination. */ public class ExternalSurveyResponseData implements Serializable { diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/I18nProperties.java b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/I18nProperties.java index 4dc2c9179a5..3a6f48691e8 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/I18nProperties.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/I18nProperties.java @@ -434,7 +434,8 @@ public static ResourceBundle loadProperties(String propertiesGroup, Locale local } /** - * Meant to be used for "matching purposes", you have a value, but you don't know which value it belongs to. + * Meant to be used for "matching purposes", you have a value, but you don't know which ResourceBundle / translationType it belongs to. + * Implemented on a best-effort basis. * * @param request * to return the adequate dictionary. @@ -449,7 +450,7 @@ public static Map buildKeyValueDictionary(I18nPropertiesRequest I18nPropertiesRequest.ResourceBundleType resourceBundleType = request.getResourceBundleType(); ResourceBundle resourceBundle = Optional.of(instance.resourceBundlesDictionary.get(resourceBundleType)) - .orElseThrow(() -> new IllegalStateException(String.format("Resource bundle type %s not found", resourceBundleType))); + .orElseThrow(() -> new IllegalStateException(String.format("Resource bundle type [%s] not found", resourceBundleType))); Class targetType = request.getTargetType(); diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailure.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailure.java index d07c41dc133..b79b637cb70 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailure.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailure.java @@ -7,7 +7,7 @@ import javax.validation.constraints.NotNull; /** - * Resulting object that is built in case some field couldn't be mapped during data patching. + * Resulting object that is built in case a single field couldn't be mapped during data patching. */ public class DataPatchFailure implements Serializable { diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java index 31574996b84..3ae1652ef4f 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailureCause.java @@ -1,5 +1,8 @@ package de.symeda.sormas.api.patch; +/** + * Reason a specific field couldn't be patched. + */ public enum DataPatchFailureCause { /** diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchResponse.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchResponse.java index 3c518ebf378..a335af8d96e 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchResponse.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchResponse.java @@ -15,7 +15,7 @@ public class DataPatchResponse implements Serializable { private static final long serialVersionUID = 1L; /** - * True if the dictionary was applied to the specified fields. + * True if the dictionary was applied to the specified fields on the given entities. *

* Will be false in case of {@link CaseDataPatchRequest#isPatchedInCaseOfFailures()} is false and response contains * {@link DataPatchResponse#failures} diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataReplacementStrategy.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataReplacementStrategy.java index 67f5ef33acd..fd77175710f 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataReplacementStrategy.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataReplacementStrategy.java @@ -1,5 +1,8 @@ package de.symeda.sormas.api.patch; +/** + * Specifies how during a patch operation the override of existing data must be handled. + */ public enum DataReplacementStrategy { /** * No matter what the current value is, it will be replaced with the provided value. diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/DisplayablePartialRetrievalResponse.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/DisplayablePartialRetrievalResponse.java index f5ca8bd815c..f0bc8226529 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/DisplayablePartialRetrievalResponse.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/DisplayablePartialRetrievalResponse.java @@ -7,6 +7,11 @@ import java.util.Map; import java.util.Objects; +/** + * In symmetry to the partial patching / partial retrieval is also possible, this represents an attempt to partially retrieve some fields. + *

+ * Implementation is inspired from patching. + */ @AuditedClass public class DisplayablePartialRetrievalResponse implements Serializable { diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetrievalFailureCause.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetrievalFailureCause.java index 55c4ee04b07..5b7c7f948da 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetrievalFailureCause.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/partial_retrieval/PartialRetrievalFailureCause.java @@ -1,5 +1,8 @@ package de.symeda.sormas.api.patch.partial_retrieval; +/** + * Reason for partial retrieval of a field to fail. + */ public enum PartialRetrievalFailureCause { /** diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/survey/alias/PathAliasFacade.java b/sormas-api/src/main/java/de/symeda/sormas/api/survey/alias/PathAliasFacade.java index e33041f4ac7..8c6c458f552 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/survey/alias/PathAliasFacade.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/survey/alias/PathAliasFacade.java @@ -2,6 +2,9 @@ import javax.ejb.Remote; +/** + * Alias can be (but not exclusively) used for Field ids. + */ @Remote public interface PathAliasFacade { @@ -10,7 +13,7 @@ public interface PathAliasFacade { * * @param path * that may (or may not) contain physical paths. - * @return shortened path. + * @return shortened path with aliases. */ String fetchAliasPath(String path); } diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/ExternalSurveyProviderFacade.java b/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/ExternalSurveyProviderFacade.java index 3425d2aad59..eb2482f42f6 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/ExternalSurveyProviderFacade.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/ExternalSurveyProviderFacade.java @@ -10,5 +10,14 @@ @Remote public interface ExternalSurveyProviderFacade { + /** + * Must return a view to display Survey-results from an external tool. + * + * @param externalSurveyId + * identifier in the external tool. + * @param externalRespondentId + * response identifier in the external tool. + * @return View that can be displayed within SORMAS. + */ ExternalSurveyView getExternalSurveyView(String externalSurveyId, String externalRespondentId); } diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/views/QuestionAnswersView.java b/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/views/QuestionAnswersView.java index aed3cd3e27b..81d181cb4f1 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/views/QuestionAnswersView.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/survey/external/views/QuestionAnswersView.java @@ -10,6 +10,9 @@ import com.fasterxml.jackson.annotation.JsonIgnore; +/** + * Agnostic-Wrapper to display a survey result in SORMAS from an external tool. + */ public class QuestionAnswersView implements Serializable { private static final long serialVersionUID = -1635618566991671402L; diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/utils/JsonWrapper.java b/sormas-api/src/main/java/de/symeda/sormas/api/utils/JsonWrapper.java deleted file mode 100644 index 4e0242d5651..00000000000 --- a/sormas-api/src/main/java/de/symeda/sormas/api/utils/JsonWrapper.java +++ /dev/null @@ -1,25 +0,0 @@ -package de.symeda.sormas.api.utils; - -import java.io.Serializable; - -/** - * Meant to wrap JSON serialized objects. - */ -public class JsonWrapper> implements Serializable { - - private final String json; - private final T classType; - - public JsonWrapper(String json, T classType) { - this.json = json; - this.classType = classType; - } - - public String getJson() { - return json; - } - - public T getClassType() { - return classType; - } -} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageService.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageService.java index 767df2baf41..511adf9c0da 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageService.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageService.java @@ -335,8 +335,8 @@ public Map t.get(1, String.class), - t -> new de.symeda.sormas.api.utils.Tuple<>(t.get(2, ExternalMessageStatus.class), t.get(0, String.class)), + tuple -> tuple.get(1, String.class), + tuple -> new de.symeda.sormas.api.utils.Tuple<>(tuple.get(2, ExternalMessageStatus.class), tuple.get(0, String.class)), (a, b) -> a)); } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java index 6739547d9ed..ba4efdcbb5d 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java @@ -32,6 +32,9 @@ import de.symeda.sormas.api.utils.dataprocessing.ProcessingResultStatus; import de.symeda.sormas.backend.util.CollectorUtils; +/** + * Performs the coordinating for patch operations out of Survey-responses. + */ @ApplicationScoped public class AutomaticSurveyResponseProcessor { @@ -50,7 +53,8 @@ public class AutomaticSurveyResponseProcessor { public List processSurveyResponses(List externalMessages) throws InterruptedException, ExecutionException { - if (CollectionUtils.isEmpty(externalMessages)) { + if (CollectionUtils.isEmpty(externalMessages)) { + logger.info("processSurveyResponses: no external messages, nothing to process"); return Collections.emptyList(); } @@ -75,6 +79,7 @@ public List processSurveyResponses(List surveyTokens) { + logger.trace("tryProcessExternalMessage: [{}], [{}]", externalMessage, surveyTokens); SurveyResponseProcessingResult surveyResponseProcessingResult = new SurveyResponseProcessingResult().setExternalMessage(externalMessage); ExternalMessageSurveyResponseWrapper latestResponseWrapper = externalMessage.getSurveyResponseData().getLatest(); @@ -107,7 +112,7 @@ public List processSurveyResponses(List processSurveyResponses(List processSurveyResponses(List Date: Tue, 12 May 2026 08:44:16 +0200 Subject: [PATCH 122/134] self review-mr comments --- .../de/symeda/sormas/api/i18n/Captions.java | 3 +- .../ExternalMessageFacadeEjb.java | 45 ++++++++++---- .../hospitalization/Hospitalization.java | 11 +++- .../backend/json/ObjectMapperProvider.java | 7 +++ .../sormas/backend/patch/DataPatcherImpl.java | 10 +-- ...ava => PatchEqualityCheckersRegistry.java} | 22 ++++--- ...cker.java => PatchingEqualityChecker.java} | 2 +- .../exceptions/ErrorDescriptionMapper.java | 45 -------------- ....java => DatePatchingEqualityChecker.java} | 8 ++- ...ava => ObjectPatchingEqualityChecker.java} | 4 +- .../CustomizableEnumPatchMapper.java | 2 - .../PartialRetrieverImpl.java | 16 +++-- .../SpecificFieldValueRetriever.java | 62 +++++++++++-------- ...a => DatePatchingEqualityCheckerTest.java} | 4 +- ...=> ObjectPatchingEqualityCheckerTest.java} | 4 +- 15 files changed, 129 insertions(+), 116 deletions(-) rename sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/{EqualityCheckerRegistry.java => PatchEqualityCheckersRegistry.java} (61%) rename sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/{EqualityChecker.java => PatchingEqualityChecker.java} (83%) delete mode 100644 sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/exceptions/ErrorDescriptionMapper.java rename sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/{DateEqualityChecker.java => DatePatchingEqualityChecker.java} (75%) rename sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/{ObjectEqualityChecker.java => ObjectPatchingEqualityChecker.java} (74%) rename sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/{DateEqualityCheckerTest.java => DatePatchingEqualityCheckerTest.java} (96%) rename sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/{ObjectEqualityCheckerTest.java => ObjectPatchingEqualityCheckerTest.java} (93%) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java index baa38209aac..0b8c01f234d 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java @@ -1968,6 +1968,7 @@ public interface Captions { String externalEmailSentBy = "externalEmailSentBy"; String externalEmailSentTo = "externalEmailSentTo"; String externalEmailUsedTemplate = "externalEmailUsedTemplate"; + String externalId = "externalId"; String ExternalMessage = "ExternalMessage"; String ExternalMessage_assignee = "ExternalMessage.assignee"; String ExternalMessage_caseReportDate = "ExternalMessage.caseReportDate"; @@ -2940,9 +2941,9 @@ public interface Captions { String surveyResponseExcludedFieldsDictionary = "surveyResponseExcludedFieldsDictionary"; String surveyResponseFailureCause = "surveyResponseFailureCause"; String surveyResponseField = "surveyResponseField"; + String surveyResponseGeneralInfo = "surveyResponseGeneralInfo"; String surveyResponseIgnoreField = "surveyResponseIgnoreField"; String surveyResponseKeyName = "surveyResponseKeyName"; - String surveyResponseGeneralInfo = "surveyResponseGeneralInfo"; String surveyResponseMetadata = "surveyResponseMetadata"; String surveyResponsePatchDictionary = "surveyResponsePatchDictionary"; String surveyResponseProcessingResult = "surveyResponseProcessingResult"; diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java index 07a20903430..6070c2aa39f 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java @@ -114,8 +114,9 @@ UserRight._EXTERNAL_MESSAGE_DOCTOR_DECLARATION_VIEW }) public class ExternalMessageFacadeEjb implements ExternalMessageFacade { - public static final String SURVEY_PERIOD_INTERVAL_DAYS = "SURVEY_PERIOD_INTERVAL_DAYS"; - private static final String SURVEY_AS_EXTERNAL_MESSAGE_ADAPTER_JNDI_KEY = "SURVEY_AS_EXTERNAL_MESSAGE_ADAPTER_JNDI_KEY"; + private static final String SURVEY_PERIOD_INTERVAL_DAYS_CONFIG_KEY = "SURVEY_PERIOD_INTERVAL_DAYS"; + private static final String SURVEY_AS_EXTERNAL_MESSAGE_ADAPTER_JNDI_CONFIG_KEY = "SURVEY_AS_EXTERNAL_MESSAGE_ADAPTER_JNDI_KEY"; + public static final String DEFAULT_SURVEY_PERIOD_INTERVAL_DAYS = "5"; private final Logger logger = LoggerFactory.getLogger(getClass()); @@ -317,13 +318,15 @@ public ExternalMessageDto saveAndProcessLabmessage(@Valid ExternalMessageDto lab @RightsAllowed(UserRight._EXTERNAL_MESSAGE_SURVEY_RESPONSE_VIEW) public List saveAndProcessSurveyResponses(Date since) { - if (since == null) { // TODO: use shorter default range - int dateRange = Integer.parseInt(Optional.ofNullable(systemConfigurationValueFacade.getValue(SURVEY_PERIOD_INTERVAL_DAYS)).orElse("350")); + if (since == null) { + int dateRange = Integer.parseInt( + Optional.ofNullable(systemConfigurationValueFacade.getValue(SURVEY_PERIOD_INTERVAL_DAYS_CONFIG_KEY)) + .orElse(DEFAULT_SURVEY_PERIOD_INTERVAL_DAYS)); since = DateHelper.addDays(new Date(), -dateRange); } - logger.error("Since date: [{}]", since); + logger.debug("Since date: [{}] to fetch external survey responses", since); ExternalMessageAdapterFacade externalLabResultsFacade = getExternalSurveyProviderFacade(); ExternalMessageResult> externalMessagesResult = externalLabResultsFacade.getExternalMessages(since); @@ -332,6 +335,7 @@ public List saveAndProcessSurveyResponses(Date since) { List reportIds = surveyResponses.stream().map(ExternalMessageDto::getReportId).filter(Objects::nonNull).collect(toList()); if (!reportIds.isEmpty()) { + logger.debug("ReportIds that will be processed: [{}]", reportIds); Map> statusUuidTuplesByReportId = externalMessageService.getUuidsByReportIds(reportIds); @@ -355,6 +359,10 @@ public List saveAndProcessSurveyResponses(Date since) { externalMessage -> !alreadyPresentReportIds.contains(externalMessage.getReportId()) || unProcessedMessagesReportIds.contains(externalMessage.getReportId())) .collect(toList()); + + if (logger.isTraceEnabled()) { + logger.trace("Computed survey responses: \n{}", ObjectMapperProvider.writeValueAsStringFailSafe(surveyResponses)); + } } List savedDtos; @@ -376,6 +384,10 @@ public List saveAndProcessSurveyResponses(Date since) { savedDtos = surveyResponses.stream().map(this::save).collect(toList()); } + if (logger.isTraceEnabled()) { + logger.trace("Saved survey responses external messages: \n{}", ObjectMapperProvider.writeValueAsStringFailSafe(savedDtos)); + } + return savedDtos; } @@ -567,7 +579,7 @@ public ExternalMessageDto toDto(ExternalMessage source) { additionalDataInstance.getClass().getName())); } } catch (JsonProcessingException e) { - throw new RuntimeException(e); + throw new RuntimeException("Couldn't read additionalData into: ExternalSurveyResponseData", e); } } @@ -886,10 +898,12 @@ private ExternalMessageAdapterFacade getSurveyExternalMessageFacade() { } private SurveyAsExternalMessageAdapterFacade getExternalSurveyProviderFacade() { - String jndiName = Optional.ofNullable(systemConfigurationValueFacade.getValue(SURVEY_AS_EXTERNAL_MESSAGE_ADAPTER_JNDI_KEY)).orElseGet(() -> { - logger.info("External Survey Provider JNDI Key not found, using default"); - return "java:global/sormas-esante-adapter/SurveyExternalMessageAdapterFacadeEjb"; - }); + String jndiName = + Optional.ofNullable(systemConfigurationValueFacade.getValue(SURVEY_AS_EXTERNAL_MESSAGE_ADAPTER_JNDI_CONFIG_KEY)).orElseGet(() -> { + String defaultName = "java:global/sormas-esante-adapter/SurveyExternalMessageAdapterFacadeEjb"; + logger.info("External Survey Provider JNDI Key not found, using default: [{}]", defaultName); + return defaultName; + }); try { return (SurveyAsExternalMessageAdapterFacade) new InitialContext().lookup(jndiName); } catch (NamingException e) { @@ -976,10 +990,13 @@ public ExternalMessageDto getForSurveillanceReport(SurveillanceReportReferenceDt @Override @RightsAllowed(UserRight._EXTERNAL_MESSAGE_SURVEY_RESPONSE_PROCESS) public ExternalMessageDto overwriteSurveyResponse(String uuid, java.util.Map correctedDictionary) { + logger.debug("overwriteSurveyResponse: [{}],[{}]", uuid, correctedDictionary); ExternalMessageDto externalMessage = getByUuid(uuid); ExternalMessageSurveyResponseRequest latestRequest = externalMessage.getSurveyResponseData().getLatest().getRequest(); - logger.info("On reprocessing replacement strategy is set to ALWAYS to allow override values"); + logger.info("On reprocessing replacement strategy is set to ALWAYS to allow override values, enable debug to see request"); + logger.debug("Request before transformation: [{}]", latestRequest); + ExternalMessageSurveyResponseRequest correctedRequest = new ExternalMessageSurveyResponseRequest().setToken(latestRequest.getToken()) .setExternalSurveyId(latestRequest.getExternalSurveyId()) .setExternalRespondentId(latestRequest.getExternalRespondentId()) @@ -993,6 +1010,8 @@ public ExternalMessageDto overwriteSurveyResponse(String uuid, java.util.Map patchDictionary = latest.getRequest().getPatchDictionary(); if (patchDictionary == null || patchDictionary.isEmpty()) { + logger.warn("patchDictionary was null or emtpy, this should not occur. [{}],[{}]", externalMessage, latest); return new de.symeda.sormas.api.patch.partial_retrieval.DisplayablePartialRetrievalResponse(); } @@ -1033,7 +1054,7 @@ public de.symeda.sormas.api.patch.partial_retrieval.DisplayablePartialRetrievalR .setFieldsToRetrieve(fieldPaths); DisplayablePartialRetrievalResponse response = partialRetriever.retrievePartialForDisplay(request); - logger.error("retrieveSurveyResponseFieldsForDisplay: [{}]", response); + logger.debug("retrieveSurveyResponseFieldsForDisplay: [{}]", response); return response; } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/hospitalization/Hospitalization.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/hospitalization/Hospitalization.java index 96009adbe25..95cfa8b10da 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/hospitalization/Hospitalization.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/hospitalization/Hospitalization.java @@ -23,7 +23,14 @@ import java.util.Date; import java.util.List; -import javax.persistence.*; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; +import javax.persistence.OneToMany; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; import de.symeda.sormas.api.hospitalization.HospitalizationReasonType; import de.symeda.sormas.api.utils.YesNoUnknown; @@ -140,7 +147,7 @@ public void setAdmittedToHealthFacility(YesNoUnknown admittedToHealthFacility) { /** * This change date has to be set whenever one of the embedded lists is modified: !oldList.equals(newList) - * + * * @return */ public Date getChangeDateOfEmbeddedLists() { diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/json/ObjectMapperProvider.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/json/ObjectMapperProvider.java index 2b4f09ca054..86c2fd4bff4 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/json/ObjectMapperProvider.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/json/ObjectMapperProvider.java @@ -50,6 +50,13 @@ public static ObjectMapper getInstance() { return instance; } + /** + * Produces JSON or swallows error and return null, meant for logging purposes, were null as fallback is not business-critical. + * + * @param object + * to be serialized as JSON + * @return JSON representation or null if exception. + */ @Nullable public static String writeValueAsStringFailSafe(Object object) { try { diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java index b94d654abbf..faf25c34ba2 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java @@ -29,7 +29,7 @@ import de.symeda.sormas.backend.common.ConfigFacadeEjb; import de.symeda.sormas.backend.feature.FeatureConfigurationFacadeEjb; import de.symeda.sormas.backend.json.ObjectMapperProvider; -import de.symeda.sormas.backend.patch.mapping.EqualityCheckerRegistry; +import de.symeda.sormas.backend.patch.mapping.PatchEqualityCheckersRegistry; import de.symeda.sormas.backend.patch.mapping.FieldCustomMapperRegistry; import de.symeda.sormas.backend.patch.mapping.ValueMapperRegistry; import de.symeda.sormas.backend.util.CollectorUtils; @@ -49,7 +49,7 @@ public class DataPatcherImpl implements DataPatcher { private FieldCustomMapperRegistry fieldCustomMapperRegistry; @Inject - private EqualityCheckerRegistry equalityCheckerRegistry; + private PatchEqualityCheckersRegistry patchEqualityCheckersRegistry; @Inject private BusinessDtoFacade businessDtoFacade; @@ -67,14 +67,14 @@ public DataPatcherImpl( PatchFieldHelper patchFieldHelper, ValueMapperRegistry valueMapperRegistry, FieldCustomMapperRegistry fieldCustomMapperRegistry, - EqualityCheckerRegistry equalityCheckerRegistry, + PatchEqualityCheckersRegistry patchEqualityCheckersRegistry, BusinessDtoFacade businessDtoFacade, FeatureConfigurationFacadeEjb.FeatureConfigurationFacadeEjbLocal featureConfigurationFacade, ConfigFacadeEjb.ConfigFacadeEjbLocal configFacade) { this.patchFieldHelper = patchFieldHelper; this.valueMapperRegistry = valueMapperRegistry; this.fieldCustomMapperRegistry = fieldCustomMapperRegistry; - this.equalityCheckerRegistry = equalityCheckerRegistry; + this.patchEqualityCheckersRegistry = patchEqualityCheckersRegistry; this.businessDtoFacade = businessDtoFacade; this.featureConfigurationFacade = featureConfigurationFacade; this.configFacade = configFacade; @@ -218,7 +218,7 @@ private void saveDTOsIfAppropriate(Map entityCach if (nestedPropertyValue.isPresent()) { Object currentValue = nestedPropertyValue.orElseThrow(); - if (!equalityCheckerRegistry.areEqual(currentValue, typedValue)) { + if (!patchEqualityCheckersRegistry.areEqual(currentValue, typedValue)) { return singlePatchResult.setFailure( new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.FORBIDDEN_VALUE_OVERRIDE) .setExistingFieldValue(currentValue) diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/EqualityCheckerRegistry.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/PatchEqualityCheckersRegistry.java similarity index 61% rename from sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/EqualityCheckerRegistry.java rename to sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/PatchEqualityCheckersRegistry.java index bb1ce093048..e6d4fd5c158 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/EqualityCheckerRegistry.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/PatchEqualityCheckersRegistry.java @@ -12,19 +12,19 @@ import org.slf4j.LoggerFactory; @ApplicationScoped -public class EqualityCheckerRegistry { +public class PatchEqualityCheckersRegistry { - private final static Logger logger = LoggerFactory.getLogger(EqualityCheckerRegistry.class); + private final static Logger logger = LoggerFactory.getLogger(PatchEqualityCheckersRegistry.class); - private List orderedInstances; + private List orderedInstances; @Inject - private Instance instances; + private Instance instances; - public EqualityCheckerRegistry() { + public PatchEqualityCheckersRegistry() { } - public EqualityCheckerRegistry(Instance instances) { + public PatchEqualityCheckersRegistry(Instance instances) { this.instances = instances; } @@ -35,14 +35,16 @@ void init() { public boolean areEqual(Object a, Object b) { if (a == null && b == null) { + logger.debug("Both values were null, returning true"); return true; } if (a == null || b == null) { + logger.debug("One of both value was null, returning false."); return false; } Class type = a.getClass(); - EqualityChecker checker = orderedInstances.stream() + PatchingEqualityChecker checker = orderedInstances.stream() .filter(c -> c.supports(type)) .findFirst() .orElseThrow( @@ -53,6 +55,10 @@ public boolean areEqual(Object a, Object b) { orderedInstances))); logger.debug("Values [{}] and [{}] will be compared with checker: [{}]", a, b, checker); - return checker.areEqual(a, b); + boolean areEqual = checker.areEqual(a, b); + + logger.debug("areEqual: [{}]", areEqual); + + return areEqual; } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/EqualityChecker.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/PatchingEqualityChecker.java similarity index 83% rename from sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/EqualityChecker.java rename to sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/PatchingEqualityChecker.java index d36f79bb5db..8b243899f4e 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/EqualityChecker.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/PatchingEqualityChecker.java @@ -5,7 +5,7 @@ /** * Contract to specify how two values of a supported type should be compared for equality. */ -public interface EqualityChecker extends OrderedRegisterable { +public interface PatchingEqualityChecker extends OrderedRegisterable { /** * @param a diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/exceptions/ErrorDescriptionMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/exceptions/ErrorDescriptionMapper.java deleted file mode 100644 index e51d47ae13a..00000000000 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/exceptions/ErrorDescriptionMapper.java +++ /dev/null @@ -1,45 +0,0 @@ -package de.symeda.sormas.backend.patch.mapping.exceptions; - -import java.text.ParseException; -import java.util.Map; -import java.util.Optional; -import java.util.function.Function; - -public class ErrorDescriptionMapper { - - // TODO: I18N - private static final Map, Function> MAPPERS = Map.ofEntries( - Map.entry(IllegalArgumentException.class, e -> formatIllegalArgument((IllegalArgumentException) e)), - Map.entry(NumberFormatException.class, e -> "Invalid number format"), - Map.entry(ParseException.class, e -> "Invalid date format"), - Map.entry(IllegalStateException.class, e -> "Invalid operation state"), - Map.entry(EnumConstantNotPresentException.class, e -> "Invalid enum member"), - // Add more: ClassCastException, NoSuchMethodException, etc. - Map.entry(RuntimeException.class, RuntimeException::getMessage) // final fallback - ); - - @SuppressWarnings("unchecked") - public static String toUserDescription(RuntimeException e) { - return findHandler(e.getClass()).orElse(RuntimeException::getMessage).apply(e); - } - - private static Optional> findHandler(Class exceptionClass) { - Class current = exceptionClass; - while (current != null) { - if (MAPPERS.containsKey(current)) { - return Optional.of((Function) MAPPERS.get(current)); - } - current = current.getSuperclass(); - } - return Optional.empty(); - } - - private static String formatIllegalArgument(IllegalArgumentException e) { - return "Invalid input: " + extractKey(e.getMessage()); - } - - // Extract field name from common patterns like "Cannot map field 'age'" - private static String extractKey(String msg) { - return msg.replaceAll(".*['\"]([^'\"]*)['\"].*", "$1"); - } -} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/DateEqualityChecker.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/DatePatchingEqualityChecker.java similarity index 75% rename from sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/DateEqualityChecker.java rename to sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/DatePatchingEqualityChecker.java index 861465fe6e7..a693d9ba32f 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/DateEqualityChecker.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/DatePatchingEqualityChecker.java @@ -2,15 +2,17 @@ import java.time.ZoneId; import java.util.Date; -import java.util.Objects; import java.util.Set; import javax.enterprise.context.ApplicationScoped; -import de.symeda.sormas.backend.patch.mapping.EqualityChecker; +import de.symeda.sormas.backend.patch.mapping.PatchingEqualityChecker; +/** + * Dates are stored as {@link Date} but only the day is relevant, not time therefore using this approach. + */ @ApplicationScoped -public class DateEqualityChecker implements EqualityChecker { +public class DatePatchingEqualityChecker implements PatchingEqualityChecker { public static final Set> SUPPORTED_TYPES = Set.of(Date.class); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/ObjectEqualityChecker.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/ObjectPatchingEqualityChecker.java similarity index 74% rename from sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/ObjectEqualityChecker.java rename to sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/ObjectPatchingEqualityChecker.java index 3471a7fbead..43af07e31b4 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/ObjectEqualityChecker.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/ObjectPatchingEqualityChecker.java @@ -5,10 +5,10 @@ import javax.enterprise.context.ApplicationScoped; -import de.symeda.sormas.backend.patch.mapping.EqualityChecker; +import de.symeda.sormas.backend.patch.mapping.PatchingEqualityChecker; @ApplicationScoped -public class ObjectEqualityChecker implements EqualityChecker { +public class ObjectPatchingEqualityChecker implements PatchingEqualityChecker { public static final Set> SUPPORTED_TYPES = Set.of(Object.class); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapper.java index 59826d78889..628e0a1eb89 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapper.java @@ -54,8 +54,6 @@ public ValueMappingResult map(ValuePatchRequest request) { throw new IllegalArgumentException(String.format("No CustomizableEnumType could be found for [%s]", targetType.getName())); } - logger.warn("For now only disease-agnostic enum values are retrieved"); - return ((Optional) findCustomizableEnum(captionCandidate, enumType, request)).map(ValueMappingResult::withData).orElseGet(() -> { logger.warn("Could not match value: [{}] to customizableEnumType: [{}]", captionCandidate, enumType); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java index 9861349357e..90a2fbfcde4 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java @@ -56,6 +56,7 @@ public class PartialRetrieverImpl implements PartialRetriever { @Override public PartialRetrievalResponse retrievePartial(PartialRetrievalRequest request) { + logger.debug("retrievePartial: [{}]", request); CaseDataDto caseData = businessDtoFacade.getCaseDataDto(request.getCaseUuid()); @@ -81,7 +82,11 @@ public PartialRetrievalResponse retrievePartial(PartialRetrievalRequest request) .filter(tuple -> tuple.getSecond().getSecond() != null) .collect(Collectors.toMap(Tuple::getFirst, tuple -> tuple.getSecond().getSecond())); - return new PartialRetrievalResponse().setFailuresDictionary(failures).setFieldInfoDictionary(successes); + PartialRetrievalResponse result = new PartialRetrievalResponse().setFailuresDictionary(failures).setFieldInfoDictionary(successes); + + logger.debug("result: [{}]", result); + + return result; } private Tuple> buildTupleImpl( @@ -119,7 +124,8 @@ private Tuple> buildTuple return Tuple.of(originalFieldName, new Tuple<>(specificFieldInfo.get(), null)); } - @NotNull Tuple, Object>, PropertyAccessFailure> propertyType = + @NotNull + Tuple, Object>, PropertyAccessFailure> propertyType = PropertyAccessor.getPropertyTypeAndValue(adequateBean, physicalPathName, getFieldVisibilityCheckers(caseData.getDisease())); PropertyAccessFailure propertyAccessFailure = propertyType.getSecond(); @@ -130,8 +136,8 @@ private Tuple> buildTuple Tuple, Object> fieldInfo = propertyType.getFirst(); // Some fields are translated only by there "physical-path" from root level - // example: Person.firstName has translation key "firstName" - // example: CaseData.disease has translation key "firstName" + // example: Person.firstName has translation key "firstName", CaseData.disease has translation key "Disease" + // best effort: UI falls-back to String translatedFieldName = Optional.ofNullable(I18nProperties.getCaption(aliasPath, null)) .or(() -> Optional.ofNullable(I18nProperties.getCaption(physicalPathName, null))) .orElseGet(() -> I18nProperties.getDescription(aliasPath, aliasPath)); @@ -140,7 +146,7 @@ private Tuple> buildTuple originalFieldName, new Tuple<>( new FieldInfo().setFieldType(fieldInfo.getFirst()).setFieldValue(fieldInfo.getSecond()).setTranslatedFieldName(translatedFieldName), - null)); + null)); } @Override diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/SpecificFieldValueRetriever.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/SpecificFieldValueRetriever.java index 83df5364016..d8701915a45 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/SpecificFieldValueRetriever.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/SpecificFieldValueRetriever.java @@ -9,34 +9,44 @@ import java.util.Set; import java.util.function.Function; -// TODO: check for adequate entityDto / generics usage to make it nicer. +/** + * Allows custom implementation to retrieve field info a specific field. + * Might be required for : + * - fields that are stored as multiple fields but displayed as a single + * - Custom type + * - Enumeration + * etc. + */ public interface SpecificFieldValueRetriever { - /** - * - * @param fieldName - * @param entityDto - * @return - */ - FieldInfo getFieldInfo(String fieldName, EntityDto entityDto); + /** + * Returns descriptor for a specific field for a given instance. + * + * @param fieldName + * name of the field on which info will be returned. + * @param entityDto + * instance on which the field must be retrieved. + * @return descriptor for a specific field for a given instance. + */ + FieldInfo getFieldInfo(String fieldName, EntityDto entityDto); - /** - * Meant to be implemented by classes implementing this {@link OrderedRegisterable} contract but to be used. - * For usages prefer {@link #supports(String)}. - * - * @return types that are supported by this class. - */ - @NotNull - Set getSupportedFields(); + /** + * Meant to be implemented by classes implementing this {@link OrderedRegisterable} contract but to be used. + * For usages prefer {@link #supports(String)}. + * + * @return types that are supported by this class. + */ + @NotNull + Set getSupportedFields(); - /** - * Specifies if the targetType is supported by this class. - * - * @param targetFieldName - * can be a child class. - * @return true if the class will be able to perform some action with this type. - */ - default boolean supports(@NotNull String targetFieldName) { - return getSupportedFields().contains(targetFieldName); - } + /** + * Specifies if the targetType is supported by this class. + * + * @param targetFieldName + * can be a child class. + * @return true if the class will be able to perform some action with this type. + */ + default boolean supports(@NotNull String targetFieldName) { + return getSupportedFields().contains(targetFieldName); + } } diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/DateEqualityCheckerTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/DatePatchingEqualityCheckerTest.java similarity index 96% rename from sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/DateEqualityCheckerTest.java rename to sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/DatePatchingEqualityCheckerTest.java index 3d2b31f98de..0f7348d9ecb 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/DateEqualityCheckerTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/DatePatchingEqualityCheckerTest.java @@ -16,10 +16,10 @@ import de.symeda.sormas.api.utils.OrderedRegisterable; import de.symeda.sormas.backend.AbstractUnitTest; -class DateEqualityCheckerTest extends AbstractUnitTest { +class DatePatchingEqualityCheckerTest extends AbstractUnitTest { @InjectMocks - private DateEqualityChecker victim; + private DatePatchingEqualityChecker victim; @Test void getSupportedTypes_containsDateClass() { diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/ObjectEqualityCheckerTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/ObjectPatchingEqualityCheckerTest.java similarity index 93% rename from sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/ObjectEqualityCheckerTest.java rename to sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/ObjectPatchingEqualityCheckerTest.java index 9ebbafeb412..dc81c5f00f5 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/ObjectEqualityCheckerTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/equalitychecker/ObjectPatchingEqualityCheckerTest.java @@ -12,10 +12,10 @@ import de.symeda.sormas.backend.AbstractUnitTest; -class ObjectEqualityCheckerTest extends AbstractUnitTest { +class ObjectPatchingEqualityCheckerTest extends AbstractUnitTest { @InjectMocks - private ObjectEqualityChecker victim; + private ObjectPatchingEqualityChecker victim; @Test void getSupportedTypes_containsObjectClass() { From a927df52d53d0a6d6469e1d6b4dab0f6f759148a Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Tue, 12 May 2026 08:44:43 +0200 Subject: [PATCH 123/134] missing test --- ...ContactDetailsFieldValueRetrieverTest.java | 159 ++++++++++++++++++ 1 file changed, 159 insertions(+) create mode 100644 sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/ContactDetailsFieldValueRetrieverTest.java diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/ContactDetailsFieldValueRetrieverTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/ContactDetailsFieldValueRetrieverTest.java new file mode 100644 index 00000000000..d918c271fea --- /dev/null +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/ContactDetailsFieldValueRetrieverTest.java @@ -0,0 +1,159 @@ +package de.symeda.sormas.backend.patch.partial_retrieval; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.List; +import java.util.Set; + +import org.junit.jupiter.api.Test; +import org.mockito.InjectMocks; + +import de.symeda.sormas.api.patch.partial_retrieval.FieldInfo; +import de.symeda.sormas.api.person.PersonContactDetailDto; +import de.symeda.sormas.api.person.PersonContactDetailType; +import de.symeda.sormas.api.person.PersonDto; +import de.symeda.sormas.backend.AbstractUnitTest; + +class ContactDetailsFieldValueRetrieverTest extends AbstractUnitTest { + + @InjectMocks + private ContactDetailsFieldValueRetriever victim; + + private static final String PHONE_FIELD = PersonContactDetailDto.I18N_PREFIX + "." + PersonContactDetailDto.PHONE_NUMBER_TYPE; + private static final String EMAIL_FIELD = PersonContactDetailDto.I18N_PREFIX + "." + PersonContactDetailDto.CONTACT_INFORMATION; + + @Test + void getSupportedFields_returnsPhoneAndEmailFields() { + assertEquals(Set.of(PHONE_FIELD, EMAIL_FIELD), victim.getSupportedFields()); + } + + @Test + void supports_phoneField_returnsTrue() { + assertTrue(victim.supports(PHONE_FIELD)); + } + + @Test + void supports_emailField_returnsTrue() { + assertTrue(victim.supports(EMAIL_FIELD)); + } + + @Test + void supports_unknownField_returnsFalse() { + assertFalse(victim.supports("Person.firstName")); + } + + @Test + void getFieldInfo_phone_noContacts_returnsEmptyValue() { + FieldInfo result = victim.getFieldInfo(PHONE_FIELD, new PersonDto()); + + assertEquals("", result.getFieldValue()); + } + + @Test + void getFieldInfo_phone_fieldTypeIsList() { + FieldInfo result = victim.getFieldInfo(PHONE_FIELD, new PersonDto()); + + assertEquals(List.class, result.getFieldType()); + } + + @Test + void getFieldInfo_phone_translatedFieldName() { + FieldInfo result = victim.getFieldInfo(PHONE_FIELD, new PersonDto()); + + assertEquals("Phone number type", result.getTranslatedFieldName()); + } + + @Test + void getFieldInfo_phone_singlePhone_returnsNumber() { + PersonDto person = personWithContacts(phoneContact("0987654321")); + + FieldInfo result = victim.getFieldInfo(PHONE_FIELD, person); + + assertEquals("0987654321", result.getFieldValue()); + } + + @Test + void getFieldInfo_phone_multiplePhones_returnsSortedAndJoined() { + PersonDto person = personWithContacts(phoneContact("9999999"), phoneContact("1111111"), phoneContact("5555555")); + + FieldInfo result = victim.getFieldInfo(PHONE_FIELD, person); + + assertEquals("1111111; 5555555; 9999999", result.getFieldValue()); + } + + @Test + void getFieldInfo_phone_blankContactInfoFiltered() { + PersonDto person = personWithContacts(phoneContact("0987654321"), phoneContact(" "), phoneContact(null)); + + FieldInfo result = victim.getFieldInfo(PHONE_FIELD, person); + + assertEquals("0987654321", result.getFieldValue()); + } + + @Test + void getFieldInfo_phone_emailContactsExcluded() { + PersonDto person = personWithContacts(phoneContact("0987654321"), emailContact("test@example.com")); + + FieldInfo result = victim.getFieldInfo(PHONE_FIELD, person); + + assertEquals("0987654321", result.getFieldValue()); + } + + @Test + void getFieldInfo_email_singleEmail_returnsEmail() { + PersonDto person = personWithContacts(emailContact("user@example.com")); + + FieldInfo result = victim.getFieldInfo(EMAIL_FIELD, person); + + assertEquals("user@example.com", result.getFieldValue()); + } + + @Test + void getFieldInfo_email_multipleEmails_returnsSortedAndJoined() { + PersonDto person = personWithContacts(emailContact("z@example.com"), emailContact("a@example.com")); + + FieldInfo result = victim.getFieldInfo(EMAIL_FIELD, person); + + assertEquals("a@example.com; z@example.com", result.getFieldValue()); + } + + @Test + void getFieldInfo_email_phoneContactsExcluded() { + PersonDto person = personWithContacts(emailContact("user@example.com"), phoneContact("0987654321")); + + FieldInfo result = victim.getFieldInfo(EMAIL_FIELD, person); + + assertEquals("user@example.com", result.getFieldValue()); + } + + @Test + void getFieldInfo_email_translatedFieldName() { + FieldInfo result = victim.getFieldInfo(EMAIL_FIELD, new PersonDto()); + + assertEquals("Contact information", result.getTranslatedFieldName()); + } + + private PersonDto personWithContacts(PersonContactDetailDto... details) { + PersonDto person = new PersonDto(); + for (PersonContactDetailDto detail : details) { + person.getPersonContactDetails().add(detail); + } + return person; + } + + private PersonContactDetailDto phoneContact(String number) { + PersonContactDetailDto dto = new PersonContactDetailDto(); + dto.setPersonContactDetailType(PersonContactDetailType.PHONE); + dto.setContactInformation(number); + return dto; + } + + private PersonContactDetailDto emailContact(String email) { + PersonContactDetailDto dto = new PersonContactDetailDto(); + dto.setPersonContactDetailType(PersonContactDetailType.EMAIL); + dto.setContactInformation(email); + return dto; + } +} From 18d564d7f42b6e71e978f38f53cd42f5f285abdf Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Tue, 12 May 2026 09:29:48 +0200 Subject: [PATCH 124/134] continued self review --- .../sormas/api/patch/DataPatchFailure.java | 19 +++----------- .../sormas/backend/patch/DataPatcherImpl.java | 26 +++++++------------ .../backend/patch/PatchFieldHelper.java | 2 +- .../backend/patch/PropertyAccessor.java | 4 +-- .../SurveyResponseFailurePanel.java | 5 ---- 5 files changed, 15 insertions(+), 41 deletions(-) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailure.java b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailure.java index b79b637cb70..47f8a9092e0 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailure.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailure.java @@ -22,9 +22,6 @@ public class DataPatchFailure implements Serializable { @Nullable private Object providedFieldValue; - @Nullable - private String description; - public DataPatchFailureCause getDataPatchFailureCause() { return dataPatchFailureCause; } @@ -52,19 +49,10 @@ public DataPatchFailure setProvidedFieldValue(Object providedFieldValue) { return this; } - public String getDescription() { - return description; - } - - public DataPatchFailure setDescription(String description) { - this.description = description; - return this; - } - @Override public String toString() { return "DataPatchFailure{" + "dataPatchFailureCause=" + dataPatchFailureCause + ", existingFieldValue=" + existingFieldValue - + ", providedFieldValue=" + providedFieldValue + ", description='" + description + '\'' + '}'; + + ", providedFieldValue=" + providedFieldValue + "\"" + '\'' + '}'; } @Override @@ -74,12 +62,11 @@ public boolean equals(Object o) { DataPatchFailure that = (DataPatchFailure) o; return dataPatchFailureCause == that.dataPatchFailureCause && Objects.equals(existingFieldValue, that.existingFieldValue) - && Objects.equals(providedFieldValue, that.providedFieldValue) - && Objects.equals(description, that.description); + && Objects.equals(providedFieldValue, that.providedFieldValue); } @Override public int hashCode() { - return Objects.hash(dataPatchFailureCause, existingFieldValue, providedFieldValue, description); + return Objects.hash(dataPatchFailureCause, existingFieldValue, providedFieldValue); } } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java index faf25c34ba2..266c7534a8b 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java @@ -29,8 +29,8 @@ import de.symeda.sormas.backend.common.ConfigFacadeEjb; import de.symeda.sormas.backend.feature.FeatureConfigurationFacadeEjb; import de.symeda.sormas.backend.json.ObjectMapperProvider; -import de.symeda.sormas.backend.patch.mapping.PatchEqualityCheckersRegistry; import de.symeda.sormas.backend.patch.mapping.FieldCustomMapperRegistry; +import de.symeda.sormas.backend.patch.mapping.PatchEqualityCheckersRegistry; import de.symeda.sormas.backend.patch.mapping.ValueMapperRegistry; import de.symeda.sormas.backend.util.CollectorUtils; @@ -71,6 +71,7 @@ public DataPatcherImpl( BusinessDtoFacade businessDtoFacade, FeatureConfigurationFacadeEjb.FeatureConfigurationFacadeEjbLocal featureConfigurationFacade, ConfigFacadeEjb.ConfigFacadeEjbLocal configFacade) { + this.patchFieldHelper = patchFieldHelper; this.valueMapperRegistry = valueMapperRegistry; this.fieldCustomMapperRegistry = fieldCustomMapperRegistry; @@ -102,9 +103,8 @@ public DataPatchResponse patch(CaseDataPatchRequest request) { try { return produceSinglePatchResult(request, singleFieldPatchResult, disease, target); } catch (RuntimeException e) { - logger.error("Failure during patch operation", e); - return singlePatchResult - .setFailure(new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.TECHNICAL).setDescription(e.getMessage())); + logger.error("Failure during patch operation for request: [{}], [{}]", request, singleFieldPatchResult, e); + return singlePatchResult.setFailure(new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.TECHNICAL)); } }).collect(Collectors.toList()); @@ -230,11 +230,9 @@ private void saveDTOsIfAppropriate(Map entityCach Optional exception = PropertyAccessor.setNestedProperty(target, relativeFieldName, typedValue); if (exception.isPresent()) { Exception e = exception.orElseThrow(); - logger.error("Setting nested property failed", e); + logger.error("Setting nested property failed for: field [{}] on [{}] with value: [{}]", relativeFieldName, target, typedValue, e); return singlePatchResult.setFailure( - new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.TECHNICAL) - .setDescription(e.getMessage()) - .setProvidedFieldValue(untypedTargetValue)); + new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.TECHNICAL).setProvidedFieldValue(untypedTargetValue)); } else { return singlePatchResult.setValue(untypedTargetValue); } @@ -328,15 +326,8 @@ private List computePatchingTuples(CaseDataPatchRequest @NotNull private Stream splitMultipleFieldsPath(Map.Entry entry) { - String path = entry.getKey(); - int openingParenthesisIndex = path.indexOf("("); - String prefix = path.substring(0, openingParenthesisIndex); - - int closeParen = path.indexOf(')'); - - String restPath = path.substring(openingParenthesisIndex + 1, closeParen); - - return Arrays.stream(restPath.split("\\|")).map(suffix -> new SingleFieldPatchResult(prefix + suffix, null, entry.getValue())); + return patchFieldHelper.splitMultipleFieldsPath(entry.getKey()) + .map(singlePath -> new SingleFieldPatchResult(singlePath, null, entry.getValue())); } private @NotNull Predicate> buildAdequateDictionaryValuePredicate(CaseDataPatchRequest request) { @@ -350,6 +341,7 @@ private Stream splitMultipleFieldsPath(Map.Entry> extractFieldTuples(Set field } @NotNull - private Stream splitMultipleFieldsPath(String path) { + public Stream splitMultipleFieldsPath(String path) { int openingParenthesisIndex = path.indexOf("("); String prefix = path.substring(0, openingParenthesisIndex); diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessor.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessor.java index 6022ff8236f..7457126ca15 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessor.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PropertyAccessor.java @@ -89,7 +89,7 @@ public static Tuple, Object>, PropertyAccessFailure> getPropertyT }) .orElseGet(() -> Tuple.of(null, PropertyAccessFailure.FIELD_DOES_NOT_EXIST)); } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) { - logger.info("Could not get property type for [{}], [{}]", fieldName, bean.getClass().getSimpleName(), e); + logger.info("Could not get property type for [{}], [{}]", fieldName, bean, e); return null; } } @@ -109,7 +109,7 @@ public static Tuple, PropertyAccessFailure> getPropertyType( return new Tuple<>(propertyType, null); }).orElse(FIELD_DOES_NOT_EXIST); } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) { - logger.info("Could not get property type for [{}], [{}]", fieldName, bean.getClass().getSimpleName(), e); + logger.info("Could not get property type for [{}], [{}]", fieldName, bean, e); return FIELD_DOES_NOT_EXIST; } } diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailurePanel.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailurePanel.java index 66fe9220a10..abe6a8721d1 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailurePanel.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailurePanel.java @@ -70,11 +70,6 @@ public SurveyResponseFailurePanel(Map failures, Displa .setId("currentValue") .setExpandRatio(2); - grid.addColumn(entry -> entry.getValue().getDescription() != null ? entry.getValue().getDescription() : "") - .setCaption(I18nProperties.getCaption(Captions.surveyResponseDescription)) - .setId("description") - .setExpandRatio(3); - grid.setHeightByRows(Math.max(failureEntries.size(), 1)); addComponent(grid); From 35e498698c3db75c7da1a49b5631e157021c7ff4 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Tue, 12 May 2026 10:06:55 +0200 Subject: [PATCH 125/134] enhancements --- .../backend/patch/DefaultForbiddenFields.java | 57 +++++++++++++++++++ .../backend/patch/PatchFieldHelper.java | 13 +++-- .../PartialRetrieverImpl.java | 9 ++- .../sormas/backend/util/InstanceProvider.java | 3 + .../main/resources/sql/sormas_schema_next.sql | 7 ++- .../AutomaticSurveyResponseProcessorTest.java | 23 -------- .../backend/patch/PatchFieldHelperTest.java | 29 +++++++--- .../CustomizableEnumPatchMapperTest.java | 8 --- .../impl/valuemapper/EnumMapperTest.java | 8 --- .../PartialRetrieverImplTest.java | 11 ++++ .../sormas/patch/DataPatcherImplTest.java | 16 ++---- sormas-base/setup/keycloak/keycloak-setup.sh | 32 ++++++----- .../rest/resources/LabMessageResource.java | 15 +---- .../ImportSurveyTokensLayout.java | 6 +- 14 files changed, 136 insertions(+), 101 deletions(-) create mode 100644 sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DefaultForbiddenFields.java diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DefaultForbiddenFields.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DefaultForbiddenFields.java new file mode 100644 index 00000000000..d984ae580b2 --- /dev/null +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DefaultForbiddenFields.java @@ -0,0 +1,57 @@ +package de.symeda.sormas.backend.patch; + +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; + +/** + * List it too big to keep directly within {@link PatchFieldHelper}. + */ +public class DefaultForbiddenFields { + + private DefaultForbiddenFields() { + } + + private static final Set DEFAULT_FORBIDDEN_FIELDS = buildDefaultForbiddenFieldsList(); + + private static Set buildDefaultForbiddenFieldsList() { + Set forbiddenFields = new HashSet<>(); + + // TECHNICAL + forbiddenFields.add(".uuid"); + forbiddenFields.add(".creationDate"); + forbiddenFields.add(".changeDate"); + forbiddenFields.add(".pseudonymized"); + forbiddenFields.add(".inJurisdiction"); + + // lifecycle + forbiddenFields.add(".deleted"); + forbiddenFields.add(".archived"); + forbiddenFields.add(".deletionReason"); + forbiddenFields.add(".otherDeletionReason"); + + // users + forbiddenFields.add(".reportingUser"); + forbiddenFields.add(".surveillanceOfficer"); + forbiddenFields.add(".classificationUser"); + forbiddenFields.add(".classifiedBy"); + forbiddenFields.add(".classificationDate"); + + // references + forbiddenFields.add("Immunization.relatedCase"); + forbiddenFields.add("Immunization.person"); + forbiddenFields.add("Vaccination.immunization"); + + // PERSON + forbiddenFields.add("Person.birthdate"); + forbiddenFields.add("Person.birthdateDD"); + forbiddenFields.add("Person.birthdateMM"); + forbiddenFields.add("Person.birthdateYYYY"); + + return Collections.unmodifiableSet(forbiddenFields); + } + + public static Set getDefaultForbiddenFields() { + return DEFAULT_FORBIDDEN_FIELDS; + } +} diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java index de5b3b2eb92..fb468b04595 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/PatchFieldHelper.java @@ -1,6 +1,7 @@ package de.symeda.sormas.backend.patch; import java.util.Arrays; +import java.util.HashSet; import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; @@ -33,9 +34,6 @@ public class PatchFieldHelper { public static final String PATCH_FORBIDDEN_FIELDS_CONFIG_KEY = "PATCH_FORBIDDEN_FIELDS"; - private static final Set DEFAULT_FORBIDDEN_FIELDS = - Set.of("Person.birthdate", "Person.birthdateDD", "Person.birthdateMM", "Person.birthdateYYYY"); - @Inject private PathAliasHelper pathAliasHelper; @@ -106,8 +104,11 @@ public Tuple resolveAlias(String pathWithPotentialAlia } private boolean fieldIsForbidden(String path) { - Set configured = resolveConfiguredForbiddenFields(); - return configured.contains(path); + Set configuredForbiddenFields = resolveConfiguredForbiddenFields(); + return configuredForbiddenFields.contains(path) + || configuredForbiddenFields.stream() + .anyMatch( + forbiddenField -> forbiddenField.startsWith(".") ? path.endsWith(forbiddenField) : configuredForbiddenFields.contains(path)); } private Set resolveConfiguredForbiddenFields() { @@ -116,7 +117,7 @@ private Set resolveConfiguredForbiddenFields() { return Optional.ofNullable(configValue) .filter(v -> !v.isBlank()) .map(v -> Arrays.stream(v.split(",")).map(String::trim).filter(s -> !s.isEmpty()).collect(Collectors.toSet())) - .orElse(DEFAULT_FORBIDDEN_FIELDS); + .orElseGet(DefaultForbiddenFields::getDefaultForbiddenFields); } private boolean startsWithAllowedPrefix(String path) { diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java index 90a2fbfcde4..4d5c7e76e71 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java @@ -137,10 +137,10 @@ private Tuple> buildTuple // Some fields are translated only by there "physical-path" from root level // example: Person.firstName has translation key "firstName", CaseData.disease has translation key "Disease" - // best effort: UI falls-back to + // best effort: UI falls-back to humanized last segment of aliasPath String translatedFieldName = Optional.ofNullable(I18nProperties.getCaption(aliasPath, null)) .or(() -> Optional.ofNullable(I18nProperties.getCaption(physicalPathName, null))) - .orElseGet(() -> I18nProperties.getDescription(aliasPath, aliasPath)); + .orElseGet(() -> humanizeCamelCase(physicalPathName)); return Tuple.of( originalFieldName, @@ -196,6 +196,11 @@ private Optional getAdequateBean( } } + static String humanizeCamelCase(String camelCase) { + String spaced = camelCase.replaceAll("([A-Z])", " $1").toLowerCase(); + return Character.toUpperCase(spaced.charAt(0)) + spaced.substring(1); + } + private FieldVisibilityCheckers getFieldVisibilityCheckers(Disease disease) { return FieldVisibilityCheckers.withCountry(configFacade.getCountryLocale()) .andWithDisease(disease) diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/util/InstanceProvider.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/util/InstanceProvider.java index 8c8616b1f3b..ea27ee9eb22 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/util/InstanceProvider.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/util/InstanceProvider.java @@ -3,6 +3,9 @@ import javax.naming.InitialContext; import javax.naming.NamingException; +/** + * Equivalent of {@link de.symeda.sormas.api.FacadeProvider} for backend code. + */ public class InstanceProvider { private final InitialContext ic; diff --git a/sormas-backend/src/main/resources/sql/sormas_schema_next.sql b/sormas-backend/src/main/resources/sql/sormas_schema_next.sql index 5e467f95610..9d276dfed92 100644 --- a/sormas-backend/src/main/resources/sql/sormas_schema_next.sql +++ b/sormas-backend/src/main/resources/sql/sormas_schema_next.sql @@ -92,7 +92,12 @@ CREATE INDEX idx_externalmessage_report_id UPDATE featureconfiguration SET properties = '{"FETCH_MODE":false,"FORCE_AUTOMATIC_PROCESSING":true,"SURVEY_FETCH_ENABLED":true}' -where featuretype = 'EXTERNAL_MESSAGES' +where featuretype = 'EXTERNAL_MESSAGES'; + + +INSERT INTO userroles_userrights (userrole_id, userright) SELECT id, 'EXTERNAL_MESSAGE_SURVEY_RESPONSE_VIEW' FROM public.userroles WHERE userroles.linkeddefaultuserrole in ('ADMIN'); +INSERT INTO userroles_userrights (userrole_id, userright) SELECT id, 'EXTERNAL_MESSAGE_SURVEY_RESPONSE_PROCESS' FROM public.userroles WHERE userroles.linkeddefaultuserrole in ('ADMIN'); +INSERT INTO userroles_userrights (userrole_id, userright) SELECT id, 'EXTERNAL_MESSAGE_SURVEY_RESPONSE_DELETE' FROM public.userroles WHERE userroles.linkeddefaultuserrole in ('ADMIN'); INSERT INTO schema_version (version_number, comment) diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessorTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessorTest.java index 5d5014680d0..d0dd95ecf8c 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessorTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessorTest.java @@ -45,8 +45,6 @@ class AutomaticSurveyResponseProcessorTest extends AbstractUnitTest { @InjectMocks private AutomaticSurveyResponseProcessor victim; - // processSurveyResponses - happy path - @Test void processSurveyResponses_singleMessage_patchApplied_returnsDone() throws Exception { // PREPARE @@ -109,8 +107,6 @@ void processSurveyResponses_multipleMessages_allSucceed_allReturnDone() throws E verify(dataPatcher, times(2)).patch(any()); } - // processSurveyResponses - skipIfAlreadyProcessed - @Test void processSurveyResponses_skipIfAlreadyProcessed_resultAlreadySet_returnsCanceled() throws Exception { // PREPARE - message already has a result @@ -173,8 +169,6 @@ void processSurveyResponses_skipIfAlreadyProcessed_resultNull_processes() throws assertEquals(ProcessingResultStatus.DONE, results.get(0).getResultStatus()); } - // processSurveyResponses - token not found - @Test void processSurveyResponses_tokenNotInAvailableTokens_returnsCanceled() throws Exception { // PREPARE - token in message doesn't match any fetched survey token @@ -208,8 +202,6 @@ void processSurveyResponses_surveyNotFound_tokenListEmpty_returnsCanceled() thro assertEquals(ProcessingResultStatus.CANCELED, results.get(0).getResultStatus()); } - // processSurveyResponses - patch not applied - @Test void processSurveyResponses_patchNotApplied_resultSetOnWrapper_statusCanceled() throws Exception { // PREPARE @@ -235,9 +227,6 @@ void processSurveyResponses_patchNotApplied_resultSetOnWrapper_statusCanceled() assertEquals(ExternalMessageStatus.UNPROCESSED, message.getStatus()); } - // processSurveyResponses - runtime exception - // BUG: resultStatus is left null when a RuntimeException is caught - @Test void processSurveyResponses_runtimeException_exceptionCaptured_resultStatusIsNull() throws Exception { // PREPARE @@ -285,8 +274,6 @@ void processSurveyResponses_runtimeException_doesNotAbortOtherMessages() throws assertEquals(ProcessingResultStatus.DONE, results.get(1).getResultStatus()); } - // processSurveyResponses - survey token is updated before patching - @Test void processSurveyResponses_surveyTokenUpdatedWithResponseData() throws Exception { // PREPARE @@ -335,8 +322,6 @@ void processSurveyResponses_surveyTokenSavedEvenWhenPatchFails() throws Exceptio verify(surveyTokenFacade).save(any()); } - // processSurveyResponses - CaseDataPatchRequest is built correctly from the survey request - @Test void processSurveyResponses_patchRequestBuiltCorrectlyFromSurveyRequest() throws Exception { // PREPARE @@ -381,8 +366,6 @@ void processSurveyResponses_patchRequestBuiltCorrectlyFromSurveyRequest() throws assertEquals(List.of(Language.FR), builtRequest.getInputLanguages()); } - // processSurveyResponses - result is stored on the response wrapper - @Test void processSurveyResponses_patchApplied_resultContainsCaseUuidAndResponse() throws Exception { // PREPARE @@ -406,10 +389,6 @@ void processSurveyResponses_patchApplied_resultContainsCaseUuidAndResponse() thr assertEquals(patchResponse, result.getPatchResponse()); } - // processSurveyResponses - duplicate externalSurveyId BUG - // BUG: when two messages share the same externalSurveyId but have different tokens, - // the first token is overwritten in the map, causing the first message to be canceled. - @Test void processSurveyResponses_duplicateExternalSurveyId_differentTokens_firstMessageCanceled() throws Exception { // PREPARE @@ -435,8 +414,6 @@ void processSurveyResponses_duplicateExternalSurveyId_differentTokens_firstMessa assertEquals(ProcessingResultStatus.DONE, results.get(1).getResultStatus()); } - // helpers - private static ExternalMessageDto buildMessage(String externalSurveyId, String token, ExternalMessageSurveyResponseResult result) { ExternalMessageSurveyResponseRequest request = new ExternalMessageSurveyResponseRequest().setExternalSurveyId(externalSurveyId) .setToken(token) diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/PatchFieldHelperTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/PatchFieldHelperTest.java index 60c65217f6f..5f7ee1313da 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/PatchFieldHelperTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/PatchFieldHelperTest.java @@ -16,6 +16,7 @@ import de.symeda.sormas.api.systemconfiguration.SystemConfigurationValueFacade; import de.symeda.sormas.backend.AbstractUnitTest; import de.symeda.sormas.backend.patch.alias.PathAliasHelper; +import org.mockito.Mockito; class PatchFieldHelperTest extends AbstractUnitTest { @@ -33,12 +34,14 @@ class PatchFieldHelperTest extends AbstractUnitTest { @BeforeEach void setUp() { - when(pathAliasHelper.supportedPrefixes()).thenReturn(Set.of("CaseData", "Person", "Symptoms")); - when(businessDtoFacade.fetchablePrefixes()).thenReturn(Set.of("CaseData", "Person", "Symptoms")); + Mockito.lenient() + .when(pathAliasHelper.supportedPrefixes()) + .thenReturn(Set.of("CaseData", "Person", "Symptoms", "Immunization", "Vaccination")); + Mockito.lenient() + .when(businessDtoFacade.fetchablePrefixes()) + .thenReturn(Set.of("CaseData", "Person", "Symptoms", "Immunization", "Vaccination")); } - // -- DUPLICATE_FIELD -- - @ParameterizedTest @ValueSource(strings = { "Person.firstName_duplicate_", @@ -73,8 +76,6 @@ void checkIfPathIsInvalid_duplicateMarkerRelatedRetrievalCause_mapsToPartialRetr cause.getRelatedRetrieveFailureCause()); } - // -- valid path —- no failure expected -- - @Test void checkIfPathIsInvalid_validPath_returnsNull() { // PREPARE @@ -87,8 +88,6 @@ void checkIfPathIsInvalid_validPath_returnsNull() { assertNull(result); } - // -- INVALID_PATH_FORMAT takes precedence over DUPLICATE_FIELD -- - @Test void checkIfPathIsInvalid_noDotAndDuplicateMarker_returnsInvalidPathFormat() { // PREPARE @@ -100,4 +99,18 @@ void checkIfPathIsInvalid_noDotAndDuplicateMarker_returnsInvalidPathFormat() { // CHECK assertEquals(PathFailureCause.INVALID_PATH_FORMAT, result); } + + @ParameterizedTest + @ValueSource(strings = { + "CaseData.uuid", + "Person.deleted", + "CaseData.reportingUser", + "Immunization.relatedCase" }) + void checkIfPathIsInvalid_forbiddenField_returnsForbiddenField(String path) { + // EXECUTE + PathFailureCause result = victim.checkIfPathIsInvalid(path); + + // CHECK + assertEquals(PathFailureCause.FORBIDDEN_FIELD, result); + } } diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapperTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapperTest.java index 4d08d44ee92..e566259d356 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapperTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapperTest.java @@ -34,15 +34,11 @@ class CustomizableEnumPatchMapperTest extends AbstractUnitTest { @InjectMocks private CustomizableEnumPatchMapper victim; - // getSupportedTypes - @Test void getSupportedTypes_containsCustomizableEnumClass() { assertEquals(Set.of(CustomizableEnum.class), victim.getSupportedTypes()); } - // map - illegal argument scenarios - @Test void map_nonCustomizableEnumTargetType_throwsIllegalArgumentException() { assertThrows(IllegalArgumentException.class, () -> victim.map("HEALTHCARE_WORKER", String.class)); @@ -55,7 +51,6 @@ void map_unregisteredCustomizableEnumType_throwsIllegalArgumentException() { () -> victim.map(new ValuePatchRequest().setValue("VALUE").setTargetType(UnregisteredEnum.class))); } - @Test void map_matchByValue_returnsEnumValue() { // PREPARE @@ -108,7 +103,6 @@ void map_matchByCaptionWithAccents_returnsEnumValue() { assertEquals(expected, actual); } - @Test void map_notFoundInDefaultLanguage_foundByInputLanguage_returnsEnumValue() { // PREPARE @@ -155,7 +149,6 @@ void map_notFoundInDefaultLanguage_noInputLanguages_usesUserLanguage() { } } - @Test void map_noMatch_fallbackAllowed_otherPresent_returnsOtherEnumValue() { // PREPARE @@ -215,7 +208,6 @@ void map_noMatch_fallbackDisabled_returnsFailureCause() { } } - private static OccupationType occupationType(String value, String caption) { OccupationType occupationType = new OccupationType(); occupationType.setValue(value); diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumMapperTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumMapperTest.java index 86d1a20d87d..e51a0183a25 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumMapperTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/EnumMapperTest.java @@ -18,8 +18,6 @@ class EnumMapperTest extends AbstractUnitTest { @InjectMocks private EnumPatchMapper victim; - // getSupportedTypes - @Test void getSupportedTypes_containsEnumClass() { // PREPARE @@ -32,8 +30,6 @@ void getSupportedTypes_containsEnumClass() { assertEquals(expected, actual); } - // map - exact match (Sex enum, no OTHER/fallback ambiguity) - @Test void map_sex_exactMatch_male() { // EXECUTE & CHECK @@ -70,8 +66,6 @@ void map_sex_trimsWhitespace() { assertEquals(Sex.MALE, victim.map(" MALE ", Sex.class).getData()); } - // map - OTHER fallback (Sex has OTHER constant) - @Test void map_sex_unknownValue_fallsBackToOther() { // EXECUTE & CHECK @@ -96,8 +90,6 @@ void map_infectionSetting_unknownValue_fallsBackToAnnotatedDefault() { assertEquals(InfectionSetting.UNKNOWN, victim.map("SOMETHING_UNKNOWN", InfectionSetting.class).getData()); } - // map - @ValueMapperDefault fallback (Trimester, no OTHER constant) - @Test void map_trimester_exactMatch_first() { // EXECUTE & CHECK diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImplTest.java index e4455415124..fa7b26a4fc8 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImplTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImplTest.java @@ -315,6 +315,17 @@ void retrievePartial_epiData_exposureType() { () -> Assertions.assertEquals(ExposureType.WORK, exposureTypeFieldInfo.getFieldValue())); } + @org.junit.jupiter.params.ParameterizedTest + @org.junit.jupiter.params.provider.CsvSource({ + "bats, Bats", + "exposureDetailsKnown, Exposure details known", + "admissionDate, Admission date", + "firstName, First name", + "myUntranslatedField, My untranslated field" }) + void humanizeCamelCase_variousInputs_returnsHumanReadableLabel(String input, String expected) { + Assertions.assertEquals(expected.strip(), PartialRetrieverImpl.humanizeCamelCase(input)); + } + private static String toFieldName(String prefix, String fieldName) { return prefix + '.' + fieldName; } diff --git a/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java index 3363e3b30ca..7012cd44986 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java @@ -73,7 +73,6 @@ void patch_noErrorsReplaceAlways() { DataPatchResponse response = victim().patch(request); // CHECK - logger.info("response: [{}]", response); CaseDataDto actualCase = getCaseFacade().getByUuid(originalCase.getUuid()); PersonDto actualPerson = getPersonFacade().getByUuid(originalCase.getPerson().getUuid()); @@ -102,7 +101,6 @@ void patch_aliasUsage() { DataPatchResponse response = victim().patch(request); // CHECK - logger.info("response: [{}]", response); CaseDataDto actual = getCaseFacade().getByUuid(originalCase.getUuid()); @@ -135,7 +133,6 @@ void patch_noErrorsReplaceAlwaysPersonContactDetails() { DataPatchResponse response = victim().patch(request); // CHECK - logger.info("response: [{}]", response); PersonDto actualPerson = getPersonFacade().getByUuid(originalCase.getPerson().getUuid()); @@ -243,7 +240,6 @@ void patch_enum(String femaleValue) { DataPatchResponse response = victim().patch(request); // CHECK - logger.info("response: [{}]", response); PersonDto actualPerson = getPersonFacade().getByUuid(originalCase.getPerson().getUuid()); @@ -339,7 +335,7 @@ void patch_customizableEnu_default_enum() { PersonDto person = getPersonFacade().getByUuid(originalCase.getPerson().getUuid()); // CHECK - logger.info("response: [{}]", response); + Assertions.assertAll( () -> Assertions.assertTrue(response.getFailures().isEmpty(), "Failure found, but should be empty"), @@ -396,7 +392,7 @@ void patch_customizableEnu_default_enum_other() { PersonDto person = getPersonFacade().getByUuid(originalCase.getPerson().getUuid()); // CHECK - logger.info("response: [{}]", response); + Assertions.assertAll( () -> Assertions.assertTrue(response.getFailures().isEmpty(), "Failure found, but should be empty"), @@ -436,7 +432,7 @@ void patch_referenceData() { DataPatchResponse response = victim().patch(request); // CHECK - logger.info("response: [{}]", response); + Assertions.assertAll( () -> Assertions.assertTrue(response.getFailures().isEmpty(), "Failure found, but should be empty"), @@ -468,7 +464,7 @@ void patch_referenceData_country() { PersonDto actualPerson = getPersonFacade().getByUuid(originalCase.getPerson().getUuid()); // CHECK - logger.info("response: [{}]", response); + Assertions.assertAll( () -> Assertions.assertTrue(response.getFailures().isEmpty(), "Failure found, but should be empty"), @@ -756,7 +752,6 @@ void patch_epiData() { DataPatchResponse response = victim().patch(request); // CHECK - logger.info("response: [{}]", response); CaseDataDto actualCase = getCaseFacade().getByUuid(originalCase.getUuid()); @@ -786,7 +781,6 @@ void patch_ifNotAlreadyPresent_sameDayDifferentTime_noForbiddenValueOverride() { DataPatchResponse response = victim().patch(request); // CHECK - logger.info("response: [{}]", response); Assertions.assertAll( () -> Assertions.assertTrue(response.getFailures().isEmpty(), "FORBIDDEN_VALUE_OVERRIDE must not fire for same-day dates"), @@ -821,7 +815,6 @@ void patch_hospitalization() { "ISOLATION"))); // CHECK - logger.info("response: [{}]", response); CaseDataDto actualCase = getCaseFacade().getByUuid(originalCase.getUuid()); Assertions.assertAll( @@ -1025,7 +1018,6 @@ void patch_previousHospitalization_admissionAndDischargeDates() { dischargeDate))); // CHECK - logger.info("response: [{}]", response); CaseDataDto actualCase = getCaseFacade().getByUuid(originalCase.getUuid()); List previousHospitalizations = actualCase.getHospitalization().getPreviousHospitalizations(); diff --git a/sormas-base/setup/keycloak/keycloak-setup.sh b/sormas-base/setup/keycloak/keycloak-setup.sh index a611423a59e..4efde00e6f4 100644 --- a/sormas-base/setup/keycloak/keycloak-setup.sh +++ b/sormas-base/setup/keycloak/keycloak-setup.sh @@ -1,5 +1,4 @@ #!/bin/bash -#!/bin/bash #******************************************************************************* # SORMAS® - Surveillance Outbreak Response Management & Analysis System # Copyright © 2016-2018 Helmholtz-Zentrum für Infektionsforschung GmbH (HZI) @@ -41,7 +40,12 @@ else fi - +if [ -x "$(command -v docker)" ]; then + echo "Found docker" +else + echo "Docker not installed. Please install before setting up Keycloak" + exit 2 +fi echo "# Checking if the Payara server is up and running" @@ -55,14 +59,12 @@ if [[ -z "$PORT_ADMIN" ]]; then PORT_ADMIN=6048 echo "Using default Payara PORT_ADMIN ${PORT_ADMIN}" fi - -PAYARA_HOME=/c/Users/VRJ736/opt/payara5 if [[ -z "$PAYARA_HOME" ]]; then - PAYARA_HOME=/c/Users/VRJ736/opt/payara5 + PAYARA_HOME=${ROOT_PREFIX}/opt/payara5 echo "Using default PAYARA_HOME ${PAYARA_HOME}" fi if [[ -z "$DOMAINS_HOME" ]]; then - DOMAINS_HOME=/c/Users/VRJ736/opt/domains + DOMAINS_HOME=${ROOT_PREFIX}/opt/domains echo "Using default DOMAINS_HOME ${DOMAINS_HOME}" fi if [[ -z "$DOMAIN_NAME" ]]; then @@ -80,15 +82,15 @@ if [[ ! -d ${PAYARA_HOME} ]];then echo "Payara not found ${PAYARA_HOME}" exit 2 fi -# -#${PAYARA_HOME}/bin/asadmin restart-domain --domaindir ${DOMAINS_HOME} ${DOMAIN_NAME} -#PAYARA_STATUS=$? -#if [[ 0 != $PAYARA_STATUS ]]; then -# echo "ERROR: Cannot start payara. Status ${PAYARA_STATUS}" -# exit 2 -#fi - -ASADMIN="${PAYARA_HOME}/bin/asadmin.bat --port ${PORT_ADMIN}" + +${PAYARA_HOME}/bin/asadmin restart-domain --domaindir ${DOMAINS_HOME} ${DOMAIN_NAME} +PAYARA_STATUS=$? +if [[ 0 != $PAYARA_STATUS ]]; then + echo "ERROR: Cannot start payara. Status ${PAYARA_STATUS}" + exit 2 +fi + +ASADMIN="${PAYARA_HOME}/bin/asadmin --port ${PORT_ADMIN}" # Keycloak settings if [[ -z "$KEYCLOAK_PORT" ]]; then diff --git a/sormas-rest/src/main/java/de/symeda/sormas/rest/resources/LabMessageResource.java b/sormas-rest/src/main/java/de/symeda/sormas/rest/resources/LabMessageResource.java index a6b81e571c5..543c2643577 100644 --- a/sormas-rest/src/main/java/de/symeda/sormas/rest/resources/LabMessageResource.java +++ b/sormas-rest/src/main/java/de/symeda/sormas/rest/resources/LabMessageResource.java @@ -15,14 +15,7 @@ package de.symeda.sormas.rest.resources; -import java.util.List; - -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; +import javax.ws.rs.*; import javax.ws.rs.core.MediaType; import de.symeda.sormas.api.FacadeProvider; @@ -43,12 +36,6 @@ public ExternalMessageDto getByUuid(@PathParam("uuid") String uuid) { return FacadeProvider.getExternalMessageFacade().getByUuid(uuid); } - @POST - @Path("/surveyResponses/process") - public List saveAndProcessSurveyResponses() { - return FacadeProvider.getExternalMessageFacade().saveAndProcessSurveyResponses(); - } - @POST @Path("/indexList") public Page getIndexList( diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/configuration/infrastructure/ImportSurveyTokensLayout.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/configuration/infrastructure/ImportSurveyTokensLayout.java index e1b4f02ef6b..36cf81e3034 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/configuration/infrastructure/ImportSurveyTokensLayout.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/configuration/infrastructure/ImportSurveyTokensLayout.java @@ -15,13 +15,10 @@ package de.symeda.sormas.ui.configuration.infrastructure; -import java.io.IOException; - import com.opencsv.exceptions.CsvValidationException; import com.vaadin.server.ClassResource; import com.vaadin.server.Page; import com.vaadin.ui.Notification; - import de.symeda.sormas.api.FacadeProvider; import de.symeda.sormas.api.i18n.I18nProperties; import de.symeda.sormas.api.i18n.Strings; @@ -33,7 +30,8 @@ import de.symeda.sormas.ui.importer.ImportReceiver; import de.symeda.sormas.ui.importer.SurveyTokenImporter; -// TODO: this is entry point to understand +import java.io.IOException; + public class ImportSurveyTokensLayout extends AbstractImportLayout { public ImportSurveyTokensLayout(SurveyDto survey) { From f34e18c663384965be9030820a081cfaa7e11457 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Tue, 12 May 2026 10:15:51 +0200 Subject: [PATCH 126/134] fix hardcoded translations --- README.md | 105 ++++++++++++------ .../symeda/sormas/ui/SormasErrorHandler.java | 3 - .../SurveyResponseDetailsWindow.java | 21 ++-- .../ui/survey/SurveyQuestionnaireWindow.java | 2 + 4 files changed, 87 insertions(+), 44 deletions(-) diff --git a/README.md b/README.md index b48eeef2cfb..395d4738756 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,3 @@ -https://github.com/SORMAS-Foundation/SORMAS-Project/compare/feat/13832-ngsurvey-integration?expand=1 - -

Wiki. +We provide an extensive documentation of SORMAS for users, system administrators, Developers and DevOps in +our Wiki. ### How Does it Work? @@ -32,54 +32,93 @@ You can give SORMAS a try on our demo server at ! ### How Can I Get Involved? -Read through our [*Contributing Readme*](docs/CONTRIBUTING.md) and contact us at info@sormas.org to learn how you can help to drive the development of SORMAS forward, -or check out our [Discussions](https://github.com/sormas-foundation/SORMAS-Project/discussions) to get development support from the core developers and other community members. +Read through our [*Contributing Readme*](docs/CONTRIBUTING.md) and contact us at info@sormas.org to learn how you can +help to drive the development of SORMAS forward, +or check out our [Discussions](https://github.com/sormas-foundation/SORMAS-Project/discussions) to get development +support from the core developers and other community members. SORMAS is a community-driven project, and we'd love to have you on board! -If you want to contribute to the code, please strictly adhere to the [*Development Environment*](docs/DEVELOPMENT_ENVIRONMENT.md) guide to ensure that everything is set up correctly. -Please also make sure that you've read the [*Development Contributing Guidelines*](docs/CONTRIBUTING.md#development-contributing-guidelines) before you start to develop. +If you want to contribute to the code, please strictly adhere to the [*Development +Environment*](docs/DEVELOPMENT_ENVIRONMENT.md) guide to ensure that everything is set up correctly. +Please also make sure that you've read the [*Development Contributing +Guidelines*](docs/CONTRIBUTING.md#development-contributing-guidelines) before you start to develop. ### How Can I Report a Bug or Request a Feature? -If you want to report a **security issue**, please read and follow our [*Security Policies*](docs/SECURITY.md). For bugs without security implications, change and feature requests, please [create a new issue](https://github.com/sormas-foundation/SORMAS-Project/issues/new/choose) and -read the [*Submitting an Issue*](docs/CONTRIBUTING.md#submitting-an-issue) guide for more detailed instructions. We appreciate your help! +If you want to report a **security issue**, please read and follow our [*Security Policies*](docs/SECURITY.md). For bugs +without security implications, change and feature requests, +please [create a new issue](https://github.com/sormas-foundation/SORMAS-Project/issues/new/choose) and +read the [*Submitting an Issue*](docs/CONTRIBUTING.md#submitting-an-issue) guide for more detailed instructions. We +appreciate your help! ### Which Browsers and Android Versions are Supported? -SORMAS officially supports and is tested on **Chromium-based browsers** (like Google Chrome) and **Mozilla Firefox**, and all Android versions starting from **Android 7.0** (Nougat). In principle, SORMAS should be usable with all web browsers that are supported by Vaadin 8 (Chrome, Firefox, Safari, Edge, Internet Explorer 11; see ). +SORMAS officially supports and is tested on **Chromium-based browsers** (like Google Chrome) and **Mozilla Firefox**, +and all Android versions starting from **Android 7.0** (Nougat). In principle, SORMAS should be usable with all web +browsers that are supported by Vaadin 8 (Chrome, Firefox, Safari, Edge, Internet Explorer 11; +see ). -Making use of the SORMAS web application through a mobile device web browser is possible and acceptable also in countries that are subject to the General Data Protection Regulation (GDPR) as enforced by the European Union. However, in such countries that are subject to the GDPR, the Android application (.apk file) for SORMAS should not be used on mobile devices until further notice. +Making use of the SORMAS web application through a mobile device web browser is possible and acceptable also in +countries that are subject to the General Data Protection Regulation (GDPR) as enforced by the European Union. However, +in such countries that are subject to the GDPR, the Android application (.apk file) for SORMAS should not be used on +mobile devices until further notice. ### Is there a ReST API documentation? -Yes! Please download the [latest release](https://github.com/sormas-foundation/SORMAS-Project/releases/latest) and copy the content of /deploy/openapi/sormas-rest.yaml to an editor that generates a visual API documentation(e.g. ). -A runtime Swagger documentation of the External Visits Resource (used by external symptom journals such as CLIMEDO or PIA) is available at ``<>/sormas-rest/openapi.json`` or ``<>/sormas-rest/openapi.yaml`` +Yes! Please download the [latest release](https://github.com/sormas-foundation/SORMAS-Project/releases/latest) and copy +the content of /deploy/openapi/sormas-rest.yaml to an editor that generates a visual API documentation( +e.g. ). +A runtime Swagger documentation of the External Visits Resource (used by external symptom journals such as CLIMEDO or +PIA) is available at ``<>/sormas-rest/openapi.json`` or ``<>/sormas-rest/openapi.yaml`` ### Who is responsible for Data Protection and Data Security? -We herewith explicitly would like to draw your attention to the fact, that the respective public health agency running SORMAS is in charge of data security and data protection and has to ensure compliance with national data protection and data security regulations in their respective jurisdiction. -It has to ensure that state-of-the art requirements for data protection and data security are fulfilled. All those prerequisites and examinations have to be done in the context of the country and its respective legal framework. -For these reasons, HZI cannot take the responsibility from the respective public health agency running the SORMAS systems and is not liable for any violation of data protection of the agency as the data generated by SORMAS belong to that very agency. +We herewith explicitly would like to draw your attention to the fact, that the respective public health agency running +SORMAS is in charge of data security and data protection and has to ensure compliance with national data protection and +data security regulations in their respective jurisdiction. +It has to ensure that state-of-the art requirements for data protection and data security are fulfilled. All those +prerequisites and examinations have to be done in the context of the country and its respective legal framework. +For these reasons, HZI cannot take the responsibility from the respective public health agency running the SORMAS +systems and is not liable for any violation of data protection of the agency as the data generated by SORMAS belong to +that very agency.

## Guidelines and Resources -If you want to learn more about the development and contribution process, setting up or customizing your own system, or technical details, please consider the following guides and resources available in this repository. You can also view this readme and all guides outside the Wiki with a full table of content and search functionality here: - -* **[GitHub Wiki](https://github.com/sormas-foundation/SORMAS-Project/wiki) - Our wiki contains additional guides for server customization and development instructions. Please have a look at it if you need information on anything that this readme does not contain.** -* [Contributing Guidelines](docs/CONTRIBUTING.md) - These are mandatory literature if you want to contribute to this repository in any way (e.g. by submitting issues, developing code, or translating SORMAS into new languages). -* [Development Environment Setup Instructions](docs/DEVELOPMENT_ENVIRONMENT.md) - If you want to get involved with development, this guide tells you how to correctly set up your system in order to contribute to the code in adherence with codestyle guidelines, development practices, etc. -* [Troubleshooting](docs/TROUBLESHOOTING.md) - A collection of solutions to common (mostly development) problems. Please consult this readme when encountering issues before issuing a support request. -* [Server Customization](docs/SERVER_CUSTOMIZATION.md) - If you are maintaining a SORMAS server or are a developer, this guide explains core concepts such as turning features on or off, importing infrastructure data or adjusting the configuration file. -* [Internationalization](docs/I18N.md) - SORMAS can be translated in any language by using the open source tool [Crowdin](https://crowdin.com/project/sormas); this resource explains how this process is working. -* [Disease Definition Instructions](docs/SOP_DISEASES.md) - We already support a large number of diseases, but not all of them are fully configured for case-based surveillance, and some might not be part of SORMAS at all yet; if you need SORMAS to support a specific disease, please use these instructions to give us all the information we need in order to extend the software with your requested disease. +If you want to learn more about the development and contribution process, setting up or customizing your own system, or +technical details, please consider the following guides and resources available in this repository. You can also view +this readme and all guides outside the Wiki with a full table of content and search functionality +here: + +* **[GitHub Wiki](https://github.com/sormas-foundation/SORMAS-Project/wiki) - Our wiki contains additional guides for + server customization and development instructions. Please have a look at it if you need information on anything that + this readme does not contain.** +* [Contributing Guidelines](docs/CONTRIBUTING.md) - These are mandatory literature if you want to contribute to this + repository in any way (e.g. by submitting issues, developing code, or translating SORMAS into new languages). +* [Development Environment Setup Instructions](docs/DEVELOPMENT_ENVIRONMENT.md) - If you want to get involved with + development, this guide tells you how to correctly set up your system in order to contribute to the code in adherence + with codestyle guidelines, development practices, etc. +* [Troubleshooting](docs/TROUBLESHOOTING.md) - A collection of solutions to common (mostly development) problems. Please + consult this readme when encountering issues before issuing a support request. +* [Server Customization](docs/SERVER_CUSTOMIZATION.md) - If you are maintaining a SORMAS server or are a developer, this + guide explains core concepts such as turning features on or off, importing infrastructure data or adjusting the + configuration file. +* [Internationalization](docs/I18N.md) - SORMAS can be translated in any language by using the open source + tool [Crowdin](https://crowdin.com/project/sormas); this resource explains how this process is working. +* [Disease Definition Instructions](docs/SOP_DISEASES.md) - We already support a large number of diseases, but not all + of them are fully configured for case-based surveillance, and some might not be part of SORMAS at all yet; if you need + SORMAS to support a specific disease, please use these instructions to give us all the information we need in order to + extend the software with your requested disease. * [Sormas2Sormas](docs/SORMAS2SORMAS.md) - The Sormas2Sormas API is used to share entities between SORMAS instances. -* [Security Policies](docs/SECURITY.md) - These contain important information about how to report security problems and the processes we are using to take care of them. -* [Third-Party License Acknowledgement](docs/3RD_PARTY_ACK.md) - This resource contains the names and license copies of external resources that SORMAS is using. +* [Security Policies](docs/SECURITY.md) - These contain important information about how to report security problems and + the processes we are using to take care of them. +* [Third-Party License Acknowledgement](docs/3RD_PARTY_ACK.md) - This resource contains the names and license copies of + external resources that SORMAS is using. -If you want to set up a SORMAS instance for production, testing or development purposes, please refer to the following guides: +If you want to set up a SORMAS instance for production, testing or development purposes, please refer to the following +guides: * [Installing a SORMAS Server](docs/SERVER_SETUP.md) * [Updating a SORMAS Server](docs/SERVER_UPDATE.md) @@ -95,8 +134,10 @@ The project consists of the following modules: - [**sormas-backend:**](/sormas-backend) Server entity services, facades, etc. - [**sormas-base:**](/sormas-base) Base project that also contains build scripts - [**sormas-cargoserver:**](/sormas-cargoserver) Setup for a local dev server using maven-cargo -- [**sormas-e2e-performance-tests:**](/sormas-e2e-performance-tests) Automated performance tests addressing the ReST interface (sormas-rest) -- [**sormas-e2e-tests:**](/sormas-e2e-tests) Automated frontend tests addressing sormas-ui **and** API tests against sormas-rest. The API steps are partly used to prepare data for UI tests. +- [**sormas-e2e-performance-tests:**](/sormas-e2e-performance-tests) Automated performance tests addressing the ReST + interface (sormas-rest) +- [**sormas-e2e-tests:**](/sormas-e2e-tests) Automated frontend tests addressing sormas-ui **and** API tests against + sormas-rest. The API steps are partly used to prepare data for UI tests. - [**sormas-ear:**](/sormas-ear) The ear needed to build the application - [**sormas-keycloak-service-provider:**](/sormas-keycloak-service-provider) Custom Keycloak SPI for SORMAS - [**sormas-rest:**](/sormas-rest) The REST interface; see [`sormas-rest/README.md`](sormas-rest/README.md) diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/SormasErrorHandler.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/SormasErrorHandler.java index fe746ad00e1..eb900b30e2d 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/SormasErrorHandler.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/SormasErrorHandler.java @@ -40,7 +40,6 @@ import com.vaadin.shared.ui.ErrorLevel; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.Notification; -import com.vaadin.ui.UI; import com.vaadin.v7.data.Buffered; import com.vaadin.v7.data.Validator; import com.vaadin.v7.ui.AbstractField; @@ -77,8 +76,6 @@ public static void handleError(ErrorEvent event) { return; } - UI.getCurrent().getPage().getJavaScript().execute("Java exception: " + ExceptionUtils.getRootCauseMessage(t)); - ErrorMessage errorMessage = getErrorMessageForException(t); if (t != null) { diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseDetailsWindow.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseDetailsWindow.java index f5c5b142db0..234d22e21f5 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseDetailsWindow.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseDetailsWindow.java @@ -72,7 +72,7 @@ public SurveyResponseDetailsWindow(ExternalMessageDto externalMessage, Runnable CssStyles.style(generalInfoHeading, CssStyles.H3); layout.addComponent(generalInfoHeading); - addReadOnlyField(layout, "UUID", externalMessage.getUuid()); + addReadOnlyField(layout, I18nProperties.getCaption(Captions.surveyResponseUuid), externalMessage.getUuid()); addReadOnlyField( layout, I18nProperties.getPrefixCaption(ExternalMessageDto.I18N_PREFIX, ExternalMessageDto.DISEASE), @@ -88,13 +88,13 @@ public SurveyResponseDetailsWindow(ExternalMessageDto externalMessage, Runnable CssStyles.style(metadataHeading, CssStyles.H3); layout.addComponent(metadataHeading); - addReadOnlyField(layout, "External Survey ID", request.getExternalSurveyId()); - addReadOnlyField(layout, "Token", request.getToken()); - addReadOnlyField(layout, "Respondent ID", request.getExternalRespondentId()); - addReadOnlyField(layout, "Response Received", toStringOrEmpty(request.getResponseReceivedDate())); - addReadOnlyField(layout, "Replacement Strategy", toStringOrEmpty(request.getReplacementStrategy())); - addReadOnlyField(layout, "Empty Value Behavior", toStringOrEmpty(request.getEmptyValueBehavior())); - addReadOnlyField(layout, "Patched in Case of Failures", String.valueOf(request.isPatchedInCaseOfFailures())); + addReadOnlyField(layout, I18nProperties.getCaption(Captions.surveyResponseExternalSurveyId), request.getExternalSurveyId()); + addReadOnlyField(layout, I18nProperties.getCaption(Captions.surveyResponseToken), request.getToken()); + addReadOnlyField(layout, I18nProperties.getCaption(Captions.surveyResponseRespondentId), request.getExternalRespondentId()); + addReadOnlyField(layout, I18nProperties.getCaption(Captions.surveyResponseResponseReceivedDate), toStringOrEmpty(request.getResponseReceivedDate())); + addReadOnlyField(layout, I18nProperties.getCaption(Captions.surveyResponseReplacementStrategy), toStringOrEmpty(request.getReplacementStrategy())); + addReadOnlyField(layout, I18nProperties.getCaption(Captions.surveyResponseEmptyValueBehavior), toStringOrEmpty(request.getEmptyValueBehavior())); + addReadOnlyField(layout, I18nProperties.getCaption(Captions.surveyResponsePatchedInCaseOfFailures), String.valueOf(request.isPatchedInCaseOfFailures())); // --- Patch Dictionary section --- Label dictionaryHeading = new Label(I18nProperties.getCaption(Captions.surveyResponsePatchDictionary)); @@ -170,7 +170,10 @@ public SurveyResponseDetailsWindow(ExternalMessageDto externalMessage, Runnable DataPatchResponse patchResponse = result.getPatchResponse(); if (patchResponse != null) { - addReadOnlyField(layout, I18nProperties.getCaption(Captions.surveyResponseApplied), patchResponse.isApplied() ? "Yes" : "No"); + addReadOnlyField( + layout, + I18nProperties.getCaption(Captions.surveyResponseApplied), + patchResponse.isApplied() ? I18nProperties.getCaption(Captions.actionYes) : I18nProperties.getCaption(Captions.actionNo)); if (patchResponse.hasFailures()) { Label failuresHeading = new Label(I18nProperties.getString(Strings.headingSurveyResponseFailures)); diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/survey/SurveyQuestionnaireWindow.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/survey/SurveyQuestionnaireWindow.java index 43544f4d404..8e4f8f04aa4 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/survey/SurveyQuestionnaireWindow.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/survey/SurveyQuestionnaireWindow.java @@ -32,6 +32,8 @@ /** * Modal window displaying a survey questionnaire as a structured HTML view. * Shows questions, their answers and nested subquestions. + * + * @implNote this was inspired from a survey tool's simplified view within EMAL. */ public class SurveyQuestionnaireWindow { From b4da2d80d2e0a487f0fd0651b0dafaa48467a3cb Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Tue, 12 May 2026 11:23:15 +0200 Subject: [PATCH 127/134] merged sql migrations --- .../externalmessage/ExternalMessageDto.java | 11 ++- .../de/symeda/sormas/api/i18n/Captions.java | 2 +- .../src/main/resources/captions.properties | 8 ++ .../src/test/resources/logback-test.xml | 18 ++-- .../src/main/resources/sql/sormas_schema.sql | 97 +++++++++++++++++++ .../main/resources/sql/sormas_schema_next.sql | 11 +-- 6 files changed, 129 insertions(+), 18 deletions(-) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageDto.java index 73ab053ac05..6c106da573e 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageDto.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageDto.java @@ -18,7 +18,6 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.Objects; import javax.annotation.Nullable; import javax.validation.constraints.Size; @@ -1033,4 +1032,14 @@ public String getModeOfTransmissionType() { public void setModeOfTransmissionType(String modeOfTransmissionType) { this.modeOfTransmissionType = modeOfTransmissionType; } + + @Nullable + public ExternalSurveyResponseData getSurveyResponseData() { + return surveyResponseData; + } + + public ExternalMessageDto setSurveyResponseData(@Nullable ExternalSurveyResponseData surveyResponseData) { + this.surveyResponseData = surveyResponseData; + return this; + } } diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java index b19045f7468..c2e561b34c9 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java @@ -686,7 +686,6 @@ public interface Captions { String CaseData_department = "CaseData.department"; String CaseData_differentPlaceOfStayJurisdiction = "CaseData.differentPlaceOfStayJurisdiction"; String CaseData_differentPointOfEntryJurisdiction = "CaseData.differentPointOfEntryJurisdiction"; - String CaseData_disease = "CaseData.disease"; String CaseData_diseaseDetails = "CaseData.diseaseDetails"; String CaseData_diseaseVariant = "CaseData.diseaseVariant"; String CaseData_district = "CaseData.district"; @@ -2965,6 +2964,7 @@ public interface Captions { String surveyResponsePatchDictionary = "surveyResponsePatchDictionary"; String surveyResponseProcessingResult = "surveyResponseProcessingResult"; String surveyResponseSubmittedValue = "surveyResponseSubmittedValue"; + String surveyResponseUuid = "surveyResponseUuid"; String surveyResponseValidFields = "surveyResponseValidFields"; String surveySend = "surveySend"; String surveySurveyList = "surveySurveyList"; diff --git a/sormas-api/src/main/resources/captions.properties b/sormas-api/src/main/resources/captions.properties index a82e3af95f7..0e52609720c 100644 --- a/sormas-api/src/main/resources/captions.properties +++ b/sormas-api/src/main/resources/captions.properties @@ -3831,6 +3831,7 @@ surveyResponseFailureCause=Failure Cause surveyResponseDescription=Description surveyResponseCaseLink=Case surveyResponseApplied=Applied +surveyResponseUuid=Survey Response ID surveyResponseGeneralInfo=External Message General Info surveyResponseMetadata=Metadata surveyResponsePatchDictionary=Patch Dictionary @@ -3841,3 +3842,10 @@ surveyResponseIgnoreField=Ignore surveyResponseKeyName=Field Key actionCorrectAndReprocess=Correct & Reprocess actionSaveAndReprocess=Save & Reprocess +surveyResponseExternalSurveyId=External Survey ID +surveyResponseToken=Token +surveyResponseRespondentId=Respondent ID +surveyResponseResponseReceivedDate=Response Received +surveyResponseReplacementStrategy=Replacement Strategy +surveyResponseEmptyValueBehavior=Empty Value Behavior +surveyResponsePatchedInCaseOfFailures=Patched in Case of Failures diff --git a/sormas-api/src/test/resources/logback-test.xml b/sormas-api/src/test/resources/logback-test.xml index d14c2698929..1987e45de0a 100644 --- a/sormas-api/src/test/resources/logback-test.xml +++ b/sormas-api/src/test/resources/logback-test.xml @@ -6,17 +6,21 @@ - - - %date %-5level \(%C.java:%L\) - %msg%n + + + %date %-5level \(%C.java:%L\) - %msg%n - + + - - + + + + + - + diff --git a/sormas-backend/src/main/resources/sql/sormas_schema.sql b/sormas-backend/src/main/resources/sql/sormas_schema.sql index 9914c2d0034..7a9d799f6aa 100644 --- a/sormas-backend/src/main/resources/sql/sormas_schema.sql +++ b/sormas-backend/src/main/resources/sql/sormas_schema.sql @@ -15886,4 +15886,101 @@ ALTER TABLE symptoms_history ADD COLUMN IF NOT EXISTS dysuria varchar(255 ALTER TABLE symptoms_history ADD COLUMN IF NOT EXISTS eyeirritation varchar(255); INSERT INTO schema_version (version_number, comment) VALUES (628, '#13917 - Salmonellosis Symptoms: constipation, dysuria, eye irritation'); + +-- Surveys +ALTER TABLE surveys + ADD COLUMN externalid TEXT; + +-- Survey tokens +ALTER TABLE surveytokens + ADD COLUMN externalrespondentid TEXT; + +-- Surveys +ALTER TABLE symptoms + ADD COLUMN IF NOT EXISTS lossOfAppetite TEXT; +ALTER TABLE symptoms + ADD COLUMN IF NOT EXISTS flatulence TEXT; +ALTER TABLE symptoms + ADD COLUMN IF NOT EXISTS smellyBurps TEXT; +ALTER TABLE symptoms + ADD COLUMN IF NOT EXISTS coughingAttacks TEXT; +ALTER TABLE symptoms + ADD COLUMN IF NOT EXISTS coughingAtNight TEXT; +ALTER TABLE symptoms + ADD COLUMN IF NOT EXISTS abdominalCramps TEXT; + +-- ExternalMessage +ALTER TABLE externalmessage + ADD COLUMN IF NOT EXISTS additionalDataType TEXT; +ALTER TABLE externalmessage + ADD COLUMN IF NOT EXISTS additionalDataJson JSONB; + + +-- system configuration for surveys + +DO +$$ DECLARE +general_category_id bigint; + +BEGIN +-- Get GENERAL category id +-- General category should always exist +SELECT id +INTO general_category_id +FROM systemconfigurationcategory +WHERE name = 'GENERAL_CATEGORY'; + +INSERT INTO systemconfigurationvalue(config_key, config_value, value_description, category_id, value_optional, value_pattern, + value_encrypt, data_provider, validation_message, changedate, creationdate, id, + uuid) +VALUES ('NG_SUVEY_BASE_URI', null, 'i18n/infoSystemConfigurationValueDescriptionNgSurveyBaseURI', general_category_id, true, + '', false, null, + 'i18n/systemConfigurationValueInvalidValue', now(), now(), nextval('entity_seq'), generate_base32_uuid()); + + +INSERT INTO systemconfigurationvalue(config_key, config_value, value_description, category_id, value_optional, value_pattern, + value_encrypt, data_provider, validation_message, changedate, creationdate, id, + uuid) +VALUES ('NG_SUVEY_ENCRYPTED_TOKEN', null, 'i18n/infoSystemConfigurationValueDescriptionNgSurveyEncryptedToken', general_category_id, true, + '', true, null, + 'i18n/systemConfigurationValueInvalidValue', now(), now(), nextval('entity_seq'), generate_base32_uuid()); + +INSERT INTO systemconfigurationvalue(config_key, config_value, value_description, category_id, value_optional, value_pattern, + value_encrypt, data_provider, validation_message, changedate, creationdate, id, + uuid) +VALUES ('NG_SUVEY_FIELD_PREFIX', '_so', 'i18n/infoSystemConfigurationValueDescriptionNgSurveyFieldPrefix', general_category_id, true, + '', true, null, + 'i18n/systemConfigurationValueInvalidValue', now(), now(), nextval('entity_seq'), generate_base32_uuid()); + + + +INSERT INTO systemconfigurationvalue(config_key, config_value, value_description, category_id, value_optional, value_pattern, + value_encrypt, data_provider, validation_message, changedate, creationdate, id, + uuid) +VALUES ('SURVEY_PERIOD_INTERVAL_DAYS', '5', 'i18n/infoSystemConfigurationValueDescriptionSurveyPeriodIntervalDays', general_category_id, true, + '', true, null, + 'i18n/systemConfigurationValueInvalidValue', now(), now(), nextval('entity_seq'), generate_base32_uuid()); + + + +END $$ +LANGUAGE plpgsql; + +-- index to avoid full table scan when checking for survey duplicates +CREATE INDEX idx_externalmessage_report_id + ON externalmessage (reportid); + +UPDATE featureconfiguration +SET properties = '{"FETCH_MODE":false,"FORCE_AUTOMATIC_PROCESSING":true,"SURVEY_FETCH_ENABLED":true}' +where featuretype = 'EXTERNAL_MESSAGES'; + + +INSERT INTO userroles_userrights (userrole_id, userright) SELECT id, 'EXTERNAL_MESSAGE_SURVEY_RESPONSE_VIEW' FROM public.userroles WHERE userroles.linkeddefaultuserrole in ('ADMIN'); +INSERT INTO userroles_userrights (userrole_id, userright) SELECT id, 'EXTERNAL_MESSAGE_SURVEY_RESPONSE_PROCESS' FROM public.userroles WHERE userroles.linkeddefaultuserrole in ('ADMIN'); +INSERT INTO userroles_userrights (userrole_id, userright) SELECT id, 'EXTERNAL_MESSAGE_SURVEY_RESPONSE_DELETE' FROM public.userroles WHERE userroles.linkeddefaultuserrole in ('ADMIN'); + + +INSERT INTO schema_version (version_number, comment) +VALUES (629, '#13832 - External Survey facade'); + -- *** Insert new sql commands BEFORE this line. Remember to always consider _history tables. *** diff --git a/sormas-backend/src/main/resources/sql/sormas_schema_next.sql b/sormas-backend/src/main/resources/sql/sormas_schema_next.sql index 9d276dfed92..f730ea38db4 100644 --- a/sormas-backend/src/main/resources/sql/sormas_schema_next.sql +++ b/sormas-backend/src/main/resources/sql/sormas_schema_next.sql @@ -6,7 +6,7 @@ ALTER TABLE surveys -- Survey tokens ALTER TABLE surveytokens - ADD COLUMN external_respondent_id TEXT; + ADD COLUMN externalrespondentid TEXT; -- Surveys ALTER TABLE symptoms @@ -65,19 +65,12 @@ VALUES ('NG_SUVEY_FIELD_PREFIX', '_so', 'i18n/infoSystemConfigurationValueDescri '', true, null, 'i18n/systemConfigurationValueInvalidValue', now(), now(), nextval('entity_seq'), generate_base32_uuid()); -INSERT INTO systemconfigurationvalue(config_key, config_value, value_description, category_id, value_optional, value_pattern, - value_encrypt, data_provider, validation_message, changedate, creationdate, id, - uuid) -VALUES ('SURVEY_AS_EXTERNAL_MESSAGE_ADAPTER_JNDI_KEY', 'java:global/sormas-esante-adapter/SurveyExternalMessageAdapterFacadeEjb', 'i18n/infoSystemConfigurationValueDescriptionSurveyJDNI', general_category_id, true, - '', true, null, - 'i18n/systemConfigurationValueInvalidValue', now(), now(), nextval('entity_seq'), generate_base32_uuid()); - INSERT INTO systemconfigurationvalue(config_key, config_value, value_description, category_id, value_optional, value_pattern, value_encrypt, data_provider, validation_message, changedate, creationdate, id, uuid) -VALUES ('SURVEY_PERIOD_INTERVAL_DAYS', '4', 'i18n/infoSystemConfigurationValueDescriptionSurveyPeriodIntervalDays', general_category_id, true, +VALUES ('SURVEY_PERIOD_INTERVAL_DAYS', '5', 'i18n/infoSystemConfigurationValueDescriptionSurveyPeriodIntervalDays', general_category_id, true, '', true, null, 'i18n/systemConfigurationValueInvalidValue', now(), now(), nextval('entity_seq'), generate_base32_uuid()); From cf9b9c45ba9d199271961c62cc1eb6e38b39dc03 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Tue, 12 May 2026 13:47:46 +0200 Subject: [PATCH 128/134] Fixed broken unit tests --- .../java/de/symeda/sormas/api/i18n/Captions.java | 7 +++++++ .../survey/AutomaticSurveyResponseProcessor.java | 12 ++++++++++++ .../survey/AutomaticSurveyResponseProcessorTest.java | 8 ++++++-- .../valuemapper/CustomizableEnumPatchMapperTest.java | 3 ++- 4 files changed, 27 insertions(+), 3 deletions(-) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java index c2e561b34c9..46a9f65a9e9 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java @@ -2954,7 +2954,9 @@ public interface Captions { String surveyResponseCaseLink = "surveyResponseCaseLink"; String surveyResponseCurrentCaseValue = "surveyResponseCurrentCaseValue"; String surveyResponseDescription = "surveyResponseDescription"; + String surveyResponseEmptyValueBehavior = "surveyResponseEmptyValueBehavior"; String surveyResponseExcludedFieldsDictionary = "surveyResponseExcludedFieldsDictionary"; + String surveyResponseExternalSurveyId = "surveyResponseExternalSurveyId"; String surveyResponseFailureCause = "surveyResponseFailureCause"; String surveyResponseField = "surveyResponseField"; String surveyResponseGeneralInfo = "surveyResponseGeneralInfo"; @@ -2962,8 +2964,13 @@ public interface Captions { String surveyResponseKeyName = "surveyResponseKeyName"; String surveyResponseMetadata = "surveyResponseMetadata"; String surveyResponsePatchDictionary = "surveyResponsePatchDictionary"; + String surveyResponsePatchedInCaseOfFailures = "surveyResponsePatchedInCaseOfFailures"; String surveyResponseProcessingResult = "surveyResponseProcessingResult"; + String surveyResponseReplacementStrategy = "surveyResponseReplacementStrategy"; + String surveyResponseRespondentId = "surveyResponseRespondentId"; + String surveyResponseResponseReceivedDate = "surveyResponseResponseReceivedDate"; String surveyResponseSubmittedValue = "surveyResponseSubmittedValue"; + String surveyResponseToken = "surveyResponseToken"; String surveyResponseUuid = "surveyResponseUuid"; String surveyResponseValidFields = "surveyResponseValidFields"; String surveySend = "surveySend"; diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java index ba4efdcbb5d..f6df2a5e71d 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessor.java @@ -49,6 +49,18 @@ public class AutomaticSurveyResponseProcessor { @EJB private SurveyTokenFacadeEjb.SurveyTokenFacadeEjbLocal surveyTokenFacade; + public AutomaticSurveyResponseProcessor() { + } + + public AutomaticSurveyResponseProcessor( + DataPatcher dataPatcher, + SurveyFacadeEjb.SurveyFacadeEjbLocal surveyFacade, + SurveyTokenFacadeEjb.SurveyTokenFacadeEjbLocal surveyTokenFacade) { + this.dataPatcher = dataPatcher; + this.surveyFacade = surveyFacade; + this.surveyTokenFacade = surveyTokenFacade; + } + @Transactional(Transactional.TxType.REQUIRES_NEW) public List processSurveyResponses(List externalMessages) throws InterruptedException, ExecutionException { diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessorTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessorTest.java index d0dd95ecf8c..fe99f9cbb0c 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessorTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/externalmessage/survey/AutomaticSurveyResponseProcessorTest.java @@ -9,6 +9,10 @@ import java.util.List; import java.util.Map; +import de.symeda.sormas.backend.survey.SurveyFacadeEjb; +import de.symeda.sormas.backend.survey.SurveyTokenFacadeEjb; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.InjectMocks; @@ -37,10 +41,10 @@ class AutomaticSurveyResponseProcessorTest extends AbstractUnitTest { private DataPatcher dataPatcher; @Mock - private SurveyFacade surveyFacade; + private SurveyFacadeEjb.SurveyFacadeEjbLocal surveyFacade; @Mock - private SurveyTokenFacade surveyTokenFacade; + private SurveyTokenFacadeEjb.SurveyTokenFacadeEjbLocal surveyTokenFacade; @InjectMocks private AutomaticSurveyResponseProcessor victim; diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapperTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapperTest.java index e566259d356..433e987cd78 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapperTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/CustomizableEnumPatchMapperTest.java @@ -10,6 +10,7 @@ import java.util.Map; import java.util.Set; +import de.symeda.sormas.backend.customizableenum.CustomizableEnumFacadeEjb; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; import org.mockito.Mock; @@ -29,7 +30,7 @@ class CustomizableEnumPatchMapperTest extends AbstractUnitTest { @Mock - private CustomizableEnumFacade customizableEnumFacade; + private CustomizableEnumFacadeEjb.CustomizableEnumFacadeEjbLocal customizableEnumFacade; @InjectMocks private CustomizableEnumPatchMapper victim; From 4411fb20ed4061ff9222fb7b791b3aed9a3087d2 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Tue, 12 May 2026 14:00:13 +0200 Subject: [PATCH 129/134] revert formatting --- .../main/resources/sql/sormas_schema_next.sql | 97 ------------------- 1 file changed, 97 deletions(-) delete mode 100644 sormas-backend/src/main/resources/sql/sormas_schema_next.sql diff --git a/sormas-backend/src/main/resources/sql/sormas_schema_next.sql b/sormas-backend/src/main/resources/sql/sormas_schema_next.sql deleted file mode 100644 index f730ea38db4..00000000000 --- a/sormas-backend/src/main/resources/sql/sormas_schema_next.sql +++ /dev/null @@ -1,97 +0,0 @@ --- TODO: meant to be merged into sormas_schema.sql - used to avoid conflicts with development branch - --- Surveys -ALTER TABLE surveys - ADD COLUMN externalid TEXT; - --- Survey tokens -ALTER TABLE surveytokens - ADD COLUMN externalrespondentid TEXT; - --- Surveys -ALTER TABLE symptoms - ADD COLUMN IF NOT EXISTS lossOfAppetite TEXT; -ALTER TABLE symptoms - ADD COLUMN IF NOT EXISTS flatulence TEXT; -ALTER TABLE symptoms - ADD COLUMN IF NOT EXISTS smellyBurps TEXT; -ALTER TABLE symptoms - ADD COLUMN IF NOT EXISTS coughingAttacks TEXT; -ALTER TABLE symptoms - ADD COLUMN IF NOT EXISTS coughingAtNight TEXT; -ALTER TABLE symptoms - ADD COLUMN IF NOT EXISTS abdominalCramps TEXT; - --- ExternalMessage -ALTER TABLE externalmessage - ADD COLUMN IF NOT EXISTS additionalDataType TEXT; -ALTER TABLE externalmessage - ADD COLUMN IF NOT EXISTS additionalDataJson JSONB; - - --- system configuration for surveys - -DO -$$ DECLARE -general_category_id bigint; - -BEGIN --- Get GENERAL category id --- General category should always exist -SELECT id -INTO general_category_id -FROM systemconfigurationcategory -WHERE name = 'GENERAL_CATEGORY'; - -INSERT INTO systemconfigurationvalue(config_key, config_value, value_description, category_id, value_optional, value_pattern, - value_encrypt, data_provider, validation_message, changedate, creationdate, id, - uuid) -VALUES ('NG_SUVEY_BASE_URI', null, 'i18n/infoSystemConfigurationValueDescriptionNgSurveyBaseURI', general_category_id, true, - '', false, null, - 'i18n/systemConfigurationValueInvalidValue', now(), now(), nextval('entity_seq'), generate_base32_uuid()); - - -INSERT INTO systemconfigurationvalue(config_key, config_value, value_description, category_id, value_optional, value_pattern, - value_encrypt, data_provider, validation_message, changedate, creationdate, id, - uuid) -VALUES ('NG_SUVEY_ENCRYPTED_TOKEN', null, 'i18n/infoSystemConfigurationValueDescriptionNgSurveyEncryptedToken', general_category_id, true, - '', true, null, - 'i18n/systemConfigurationValueInvalidValue', now(), now(), nextval('entity_seq'), generate_base32_uuid()); - -INSERT INTO systemconfigurationvalue(config_key, config_value, value_description, category_id, value_optional, value_pattern, - value_encrypt, data_provider, validation_message, changedate, creationdate, id, - uuid) -VALUES ('NG_SUVEY_FIELD_PREFIX', '_so', 'i18n/infoSystemConfigurationValueDescriptionNgSurveyFieldPrefix', general_category_id, true, - '', true, null, - 'i18n/systemConfigurationValueInvalidValue', now(), now(), nextval('entity_seq'), generate_base32_uuid()); - - - -INSERT INTO systemconfigurationvalue(config_key, config_value, value_description, category_id, value_optional, value_pattern, - value_encrypt, data_provider, validation_message, changedate, creationdate, id, - uuid) -VALUES ('SURVEY_PERIOD_INTERVAL_DAYS', '5', 'i18n/infoSystemConfigurationValueDescriptionSurveyPeriodIntervalDays', general_category_id, true, - '', true, null, - 'i18n/systemConfigurationValueInvalidValue', now(), now(), nextval('entity_seq'), generate_base32_uuid()); - - - -END $$ -LANGUAGE plpgsql; - --- index to avoid full table scan when checking for survey duplicates -CREATE INDEX idx_externalmessage_report_id - ON externalmessage (reportid); - -UPDATE featureconfiguration -SET properties = '{"FETCH_MODE":false,"FORCE_AUTOMATIC_PROCESSING":true,"SURVEY_FETCH_ENABLED":true}' -where featuretype = 'EXTERNAL_MESSAGES'; - - -INSERT INTO userroles_userrights (userrole_id, userright) SELECT id, 'EXTERNAL_MESSAGE_SURVEY_RESPONSE_VIEW' FROM public.userroles WHERE userroles.linkeddefaultuserrole in ('ADMIN'); -INSERT INTO userroles_userrights (userrole_id, userright) SELECT id, 'EXTERNAL_MESSAGE_SURVEY_RESPONSE_PROCESS' FROM public.userroles WHERE userroles.linkeddefaultuserrole in ('ADMIN'); -INSERT INTO userroles_userrights (userrole_id, userright) SELECT id, 'EXTERNAL_MESSAGE_SURVEY_RESPONSE_DELETE' FROM public.userroles WHERE userroles.linkeddefaultuserrole in ('ADMIN'); - - -INSERT INTO schema_version (version_number, comment) -VALUES (609, '#13832 - External Survey facade'); \ No newline at end of file From ba77f2f80e853bfc3e5d6a091ccf2b2bc3904e0e Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Tue, 12 May 2026 14:00:36 +0200 Subject: [PATCH 130/134] revert changes --- README.md | 2 +- sormas-api/src/test/resources/logback-test.xml | 18 +++++++----------- .../ImportSurveyTokensLayout.java | 15 ++++++++++----- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 395d4738756..73f497201ca 100644 --- a/README.md +++ b/README.md @@ -144,4 +144,4 @@ The project consists of the following modules: - [**sormas-serverlibs:**](/sormas-serverlibs) Dependencies to be deployed with the payara server - [**sormas-ui:**](/sormas-ui) The web application - [**sormas-widgetset:**](/sormas-widgetset) The GWT widgetset generated by Vaadin -- [**sormas-e2e-tests:**](/sormas-e2e-tests) Automated tests addressing the sormas-ui, and the ReST interface +- [**sormas-e2e-tests:**](/sormas-e2e-tests) Automated tests addressing the sormas-ui, and the ReST interface \ No newline at end of file diff --git a/sormas-api/src/test/resources/logback-test.xml b/sormas-api/src/test/resources/logback-test.xml index 1987e45de0a..d14c2698929 100644 --- a/sormas-api/src/test/resources/logback-test.xml +++ b/sormas-api/src/test/resources/logback-test.xml @@ -6,21 +6,17 @@ - - - %date %-5level \(%C.java:%L\) - %msg%n + + + %date %-5level \(%C.java:%L\) - %msg%n - - + - - - - - + + - + diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/configuration/infrastructure/ImportSurveyTokensLayout.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/configuration/infrastructure/ImportSurveyTokensLayout.java index 36cf81e3034..b471504a8bc 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/configuration/infrastructure/ImportSurveyTokensLayout.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/configuration/infrastructure/ImportSurveyTokensLayout.java @@ -34,6 +34,7 @@ public class ImportSurveyTokensLayout extends AbstractImportLayout { + public ImportSurveyTokensLayout(SurveyDto survey) { super(); SurveyTokenFacade surveyTokenFacade = FacadeProvider.getSurveyTokenFacade(); @@ -47,14 +48,18 @@ public ImportSurveyTokensLayout(SurveyDto survey) { addImportCsvComponent(3, new ImportReceiver(fileNameAddition, file -> { resetDownloadErrorReportButton(); try { - DataImporter importer = new SurveyTokenImporter(file, currentUser, survey, (ValueSeparator) separator.getValue()); + DataImporter importer = new SurveyTokenImporter( + file, + currentUser, + survey, + (ValueSeparator) separator.getValue()); importer.startImport(this::extendDownloadErrorReportButton, currentUI, false); } catch (IOException | CsvValidationException e) { new Notification( - I18nProperties.getString(Strings.headingImportFailed), - I18nProperties.getString(Strings.messageImportFailed), - Notification.Type.ERROR_MESSAGE, - false).show(Page.getCurrent()); + I18nProperties.getString(Strings.headingImportFailed), + I18nProperties.getString(Strings.messageImportFailed), + Notification.Type.ERROR_MESSAGE, + false).show(Page.getCurrent()); } })); addDownloadErrorReportComponent(4); From d1bf9cbb066363df0127db00ad5e722b3696db12 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Tue, 12 May 2026 14:06:13 +0200 Subject: [PATCH 131/134] README format revert --- README.md | 114 ++++++++++++++---------------------------------------- 1 file changed, 30 insertions(+), 84 deletions(-) diff --git a/README.md b/README.md index 73f497201ca..a95e659dbd3 100644 --- a/README.md +++ b/README.md @@ -15,118 +15,66 @@ # SORMAS -**SORMAS** (Surveillance Outbreak Response Management and Analysis System) is an open source eHealth system - consisting -of separate web and mobile apps - that is geared towards optimizing the processes used in monitoring the spread of -infectious diseases and responding to outbreak situations. +**SORMAS** (Surveillance Outbreak Response Management and Analysis System) is an open source eHealth system - consisting of separate web and mobile apps - that is geared towards optimizing the processes used in monitoring the spread of infectious diseases and responding to outbreak situations. ## FAQ (Frequently Asked Questions) ### Where can I find the documentation? - -We provide an extensive documentation of SORMAS for users, system administrators, Developers and DevOps in -our Wiki. +We provide an extensive documentation of SORMAS for users, system administrators, Developers and DevOps in our Wiki. ### How Does it Work? - You can give SORMAS a try on our demo server at ! ### How Can I Get Involved? - -Read through our [*Contributing Readme*](docs/CONTRIBUTING.md) and contact us at info@sormas.org to learn how you can -help to drive the development of SORMAS forward, -or check out our [Discussions](https://github.com/sormas-foundation/SORMAS-Project/discussions) to get development -support from the core developers and other community members. +Read through our [*Contributing Readme*](docs/CONTRIBUTING.md) and contact us at info@sormas.org to learn how you can help to drive the development of SORMAS forward, +or check out our [Discussions](https://github.com/sormas-foundation/SORMAS-Project/discussions) to get development support from the core developers and other community members. SORMAS is a community-driven project, and we'd love to have you on board! -If you want to contribute to the code, please strictly adhere to the [*Development -Environment*](docs/DEVELOPMENT_ENVIRONMENT.md) guide to ensure that everything is set up correctly. -Please also make sure that you've read the [*Development Contributing -Guidelines*](docs/CONTRIBUTING.md#development-contributing-guidelines) before you start to develop. +If you want to contribute to the code, please strictly adhere to the [*Development Environment*](docs/DEVELOPMENT_ENVIRONMENT.md) guide to ensure that everything is set up correctly. +Please also make sure that you've read the [*Development Contributing Guidelines*](docs/CONTRIBUTING.md#development-contributing-guidelines) before you start to develop. ### How Can I Report a Bug or Request a Feature? - -If you want to report a **security issue**, please read and follow our [*Security Policies*](docs/SECURITY.md). For bugs -without security implications, change and feature requests, -please [create a new issue](https://github.com/sormas-foundation/SORMAS-Project/issues/new/choose) and -read the [*Submitting an Issue*](docs/CONTRIBUTING.md#submitting-an-issue) guide for more detailed instructions. We -appreciate your help! +If you want to report a **security issue**, please read and follow our [*Security Policies*](docs/SECURITY.md). For bugs without security implications, change and feature requests, please [create a new issue](https://github.com/sormas-foundation/SORMAS-Project/issues/new/choose) and +read the [*Submitting an Issue*](docs/CONTRIBUTING.md#submitting-an-issue) guide for more detailed instructions. We appreciate your help! ### Which Browsers and Android Versions are Supported? +SORMAS officially supports and is tested on **Chromium-based browsers** (like Google Chrome) and **Mozilla Firefox**, and all Android versions starting from **Android 7.0** (Nougat). In principle, SORMAS should be usable with all web browsers that are supported by Vaadin 8 (Chrome, Firefox, Safari, Edge, Internet Explorer 11; see ). -SORMAS officially supports and is tested on **Chromium-based browsers** (like Google Chrome) and **Mozilla Firefox**, -and all Android versions starting from **Android 7.0** (Nougat). In principle, SORMAS should be usable with all web -browsers that are supported by Vaadin 8 (Chrome, Firefox, Safari, Edge, Internet Explorer 11; -see ). - -Making use of the SORMAS web application through a mobile device web browser is possible and acceptable also in -countries that are subject to the General Data Protection Regulation (GDPR) as enforced by the European Union. However, -in such countries that are subject to the GDPR, the Android application (.apk file) for SORMAS should not be used on -mobile devices until further notice. +Making use of the SORMAS web application through a mobile device web browser is possible and acceptable also in countries that are subject to the General Data Protection Regulation (GDPR) as enforced by the European Union. However, in such countries that are subject to the GDPR, the Android application (.apk file) for SORMAS should not be used on mobile devices until further notice. ### Is there a ReST API documentation? - -Yes! Please download the [latest release](https://github.com/sormas-foundation/SORMAS-Project/releases/latest) and copy -the content of /deploy/openapi/sormas-rest.yaml to an editor that generates a visual API documentation( -e.g. ). -A runtime Swagger documentation of the External Visits Resource (used by external symptom journals such as CLIMEDO or -PIA) is available at ``<>/sormas-rest/openapi.json`` or ``<>/sormas-rest/openapi.yaml`` +Yes! Please download the [latest release](https://github.com/sormas-foundation/SORMAS-Project/releases/latest) and copy the content of /deploy/openapi/sormas-rest.yaml to an editor that generates a visual API documentation(e.g. ). +A runtime Swagger documentation of the External Visits Resource (used by external symptom journals such as CLIMEDO or PIA) is available at ``<>/sormas-rest/openapi.json`` or ``<>/sormas-rest/openapi.yaml`` ### Who is responsible for Data Protection and Data Security? - -We herewith explicitly would like to draw your attention to the fact, that the respective public health agency running -SORMAS is in charge of data security and data protection and has to ensure compliance with national data protection and -data security regulations in their respective jurisdiction. -It has to ensure that state-of-the art requirements for data protection and data security are fulfilled. All those -prerequisites and examinations have to be done in the context of the country and its respective legal framework. -For these reasons, HZI cannot take the responsibility from the respective public health agency running the SORMAS -systems and is not liable for any violation of data protection of the agency as the data generated by SORMAS belong to -that very agency. +We herewith explicitly would like to draw your attention to the fact, that the respective public health agency running SORMAS is in charge of data security and data protection and has to ensure compliance with national data protection and data security regulations in their respective jurisdiction. +It has to ensure that state-of-the art requirements for data protection and data security are fulfilled. All those prerequisites and examinations have to be done in the context of the country and its respective legal framework. +For these reasons, HZI cannot take the responsibility from the respective public health agency running the SORMAS systems and is not liable for any violation of data protection of the agency as the data generated by SORMAS belong to that very agency.

## Guidelines and Resources - -If you want to learn more about the development and contribution process, setting up or customizing your own system, or -technical details, please consider the following guides and resources available in this repository. You can also view -this readme and all guides outside the Wiki with a full table of content and search functionality -here: - -* **[GitHub Wiki](https://github.com/sormas-foundation/SORMAS-Project/wiki) - Our wiki contains additional guides for - server customization and development instructions. Please have a look at it if you need information on anything that - this readme does not contain.** -* [Contributing Guidelines](docs/CONTRIBUTING.md) - These are mandatory literature if you want to contribute to this - repository in any way (e.g. by submitting issues, developing code, or translating SORMAS into new languages). -* [Development Environment Setup Instructions](docs/DEVELOPMENT_ENVIRONMENT.md) - If you want to get involved with - development, this guide tells you how to correctly set up your system in order to contribute to the code in adherence - with codestyle guidelines, development practices, etc. -* [Troubleshooting](docs/TROUBLESHOOTING.md) - A collection of solutions to common (mostly development) problems. Please - consult this readme when encountering issues before issuing a support request. -* [Server Customization](docs/SERVER_CUSTOMIZATION.md) - If you are maintaining a SORMAS server or are a developer, this - guide explains core concepts such as turning features on or off, importing infrastructure data or adjusting the - configuration file. -* [Internationalization](docs/I18N.md) - SORMAS can be translated in any language by using the open source - tool [Crowdin](https://crowdin.com/project/sormas); this resource explains how this process is working. -* [Disease Definition Instructions](docs/SOP_DISEASES.md) - We already support a large number of diseases, but not all - of them are fully configured for case-based surveillance, and some might not be part of SORMAS at all yet; if you need - SORMAS to support a specific disease, please use these instructions to give us all the information we need in order to - extend the software with your requested disease. +If you want to learn more about the development and contribution process, setting up or customizing your own system, or technical details, please consider the following guides and resources available in this repository. You can also view this readme and all guides outside the Wiki with a full table of content and search functionality here: + +* **[GitHub Wiki](https://github.com/sormas-foundation/SORMAS-Project/wiki) - Our wiki contains additional guides for server customization and development instructions. Please have a look at it if you need information on anything that this readme does not contain.** +* [Contributing Guidelines](docs/CONTRIBUTING.md) - These are mandatory literature if you want to contribute to this repository in any way (e.g. by submitting issues, developing code, or translating SORMAS into new languages). +* [Development Environment Setup Instructions](docs/DEVELOPMENT_ENVIRONMENT.md) - If you want to get involved with development, this guide tells you how to correctly set up your system in order to contribute to the code in adherence with codestyle guidelines, development practices, etc. +* [Troubleshooting](docs/TROUBLESHOOTING.md) - A collection of solutions to common (mostly development) problems. Please consult this readme when encountering issues before issuing a support request. +* [Server Customization](docs/SERVER_CUSTOMIZATION.md) - If you are maintaining a SORMAS server or are a developer, this guide explains core concepts such as turning features on or off, importing infrastructure data or adjusting the configuration file. +* [Internationalization](docs/I18N.md) - SORMAS can be translated in any language by using the open source tool [Crowdin](https://crowdin.com/project/sormas); this resource explains how this process is working. +* [Disease Definition Instructions](docs/SOP_DISEASES.md) - We already support a large number of diseases, but not all of them are fully configured for case-based surveillance, and some might not be part of SORMAS at all yet; if you need SORMAS to support a specific disease, please use these instructions to give us all the information we need in order to extend the software with your requested disease. * [Sormas2Sormas](docs/SORMAS2SORMAS.md) - The Sormas2Sormas API is used to share entities between SORMAS instances. -* [Security Policies](docs/SECURITY.md) - These contain important information about how to report security problems and - the processes we are using to take care of them. -* [Third-Party License Acknowledgement](docs/3RD_PARTY_ACK.md) - This resource contains the names and license copies of - external resources that SORMAS is using. - -If you want to set up a SORMAS instance for production, testing or development purposes, please refer to the following -guides: +* [Security Policies](docs/SECURITY.md) - These contain important information about how to report security problems and the processes we are using to take care of them. +* [Third-Party License Acknowledgement](docs/3RD_PARTY_ACK.md) - This resource contains the names and license copies of external resources that SORMAS is using. +If you want to set up a SORMAS instance for production, testing or development purposes, please refer to the following guides: * [Installing a SORMAS Server](docs/SERVER_SETUP.md) * [Updating a SORMAS Server](docs/SERVER_UPDATE.md) * [Setup Development environment](docs/DEVELOPMENT_ENVIRONMENT.md) * [Creating a Demo Android App](docs/DEMO_APP.md) ## Project Structure - The project consists of the following modules: - [**sormas-api:**](/sormas-api) General business logic and definitions for data exchange between app and server @@ -134,14 +82,12 @@ The project consists of the following modules: - [**sormas-backend:**](/sormas-backend) Server entity services, facades, etc. - [**sormas-base:**](/sormas-base) Base project that also contains build scripts - [**sormas-cargoserver:**](/sormas-cargoserver) Setup for a local dev server using maven-cargo -- [**sormas-e2e-performance-tests:**](/sormas-e2e-performance-tests) Automated performance tests addressing the ReST - interface (sormas-rest) -- [**sormas-e2e-tests:**](/sormas-e2e-tests) Automated frontend tests addressing sormas-ui **and** API tests against - sormas-rest. The API steps are partly used to prepare data for UI tests. +- [**sormas-e2e-performance-tests:**](/sormas-e2e-performance-tests) Automated performance tests addressing the ReST interface (sormas-rest) +- [**sormas-e2e-tests:**](/sormas-e2e-tests) Automated frontend tests addressing sormas-ui **and** API tests against sormas-rest. The API steps are partly used to prepare data for UI tests. - [**sormas-ear:**](/sormas-ear) The ear needed to build the application - [**sormas-keycloak-service-provider:**](/sormas-keycloak-service-provider) Custom Keycloak SPI for SORMAS - [**sormas-rest:**](/sormas-rest) The REST interface; see [`sormas-rest/README.md`](sormas-rest/README.md) - [**sormas-serverlibs:**](/sormas-serverlibs) Dependencies to be deployed with the payara server - [**sormas-ui:**](/sormas-ui) The web application - [**sormas-widgetset:**](/sormas-widgetset) The GWT widgetset generated by Vaadin -- [**sormas-e2e-tests:**](/sormas-e2e-tests) Automated tests addressing the sormas-ui, and the ReST interface \ No newline at end of file +- [**sormas-e2e-tests:**](/sormas-e2e-tests) Automated tests addressing the sormas-ui, and the ReST interface From 061dd30d9ad28c9433123050c04d27687bd4c33a Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Tue, 12 May 2026 15:48:37 +0200 Subject: [PATCH 132/134] =?UTF-8?q?=F0=9F=90=9B=20removed=20"encrypted"=20?= =?UTF-8?q?system-config=20values?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sormas-backend/src/main/resources/sql/sormas_schema.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sormas-backend/src/main/resources/sql/sormas_schema.sql b/sormas-backend/src/main/resources/sql/sormas_schema.sql index 7a9d799f6aa..ab461e4fadc 100644 --- a/sormas-backend/src/main/resources/sql/sormas_schema.sql +++ b/sormas-backend/src/main/resources/sql/sormas_schema.sql @@ -15949,7 +15949,7 @@ INSERT INTO systemconfigurationvalue(config_key, config_value, value_description value_encrypt, data_provider, validation_message, changedate, creationdate, id, uuid) VALUES ('NG_SUVEY_FIELD_PREFIX', '_so', 'i18n/infoSystemConfigurationValueDescriptionNgSurveyFieldPrefix', general_category_id, true, - '', true, null, + '', false, null, 'i18n/systemConfigurationValueInvalidValue', now(), now(), nextval('entity_seq'), generate_base32_uuid()); From 0f698e01323576e1b451667b687d47bb1e2e4c23 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Wed, 13 May 2026 08:49:59 +0200 Subject: [PATCH 133/134] fixed broken tests --- .../ExternalMessageFacadeEjb.java | 66 +++++++++---------- .../sormas/backend/ArchitectureTest.java | 13 ++-- .../PartialRetrieverImplTest.java | 18 ++--- .../sormas/patch/DataPatcherImplTest.java | 45 ++----------- 4 files changed, 55 insertions(+), 87 deletions(-) diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java index 2098ca40569..aa60826060c 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java @@ -111,7 +111,8 @@ @RightsAllowed({ UserRight._EXTERNAL_MESSAGE_ACCESS, UserRight._EXTERNAL_MESSAGE_LABORATORY_VIEW, - UserRight._EXTERNAL_MESSAGE_DOCTOR_DECLARATION_VIEW }) + UserRight._EXTERNAL_MESSAGE_DOCTOR_DECLARATION_VIEW, + UserRight._EXTERNAL_MESSAGE_SURVEY_RESPONSE_VIEW }) public class ExternalMessageFacadeEjb implements ExternalMessageFacade { private static final String SURVEY_PERIOD_INTERVAL_DAYS_CONFIG_KEY = "SURVEY_PERIOD_INTERVAL_DAYS"; @@ -292,36 +293,7 @@ private ExternalMessageDto saveWithFallback(ExternalMessageDto dto) { } @Override - public ExternalMessageDto save(@Valid ExternalMessageDto dto) { - return save(dto, true, false); - } - - @Override - public ExternalMessageDto saveAndProcessLabmessage(@Valid ExternalMessageDto labMessage) { - if (!labMessage.isAutomaticProcessingPossible() || !checkAutomaticProcessingAllowed()) { - return save(labMessage); - } - - try { - ProcessingResult result = automaticLabMessageProcessor.processLabMessage(labMessage); - - if (result.getStatus().isCanceled()) { - logger.error("Processing of lab message with UUID {} has been canceled", labMessage.getUuid()); - } - } catch (ExecutionException e) { - logger.error("Could not process lab message with UUID " + labMessage.getUuid(), e); - } catch (InterruptedException e) { - logger.error("Could not process lab message with UUID " + labMessage.getUuid(), e); - Thread.currentThread().interrupt(); - } finally { - save(labMessage); - } - - return getByUuid(labMessage.getUuid()); - } - - @Override - @RightsAllowed(UserRight._EXTERNAL_MESSAGE_SURVEY_RESPONSE_VIEW) + @RightsAllowed(UserRight._EXTERNAL_MESSAGE_SURVEY_RESPONSE_PROCESS) public List saveAndProcessSurveyResponses(Date since) { if (since == null) { @@ -397,6 +369,35 @@ public List saveAndProcessSurveyResponses(Date since) { return savedDtos; } + @Override + public ExternalMessageDto save(@Valid ExternalMessageDto dto) { + return save(dto, true, false); + } + + @Override + public ExternalMessageDto saveAndProcessLabmessage(@Valid ExternalMessageDto labMessage) { + if (!labMessage.isAutomaticProcessingPossible() || !checkAutomaticProcessingAllowed()) { + return save(labMessage); + } + + try { + ProcessingResult result = automaticLabMessageProcessor.processLabMessage(labMessage); + + if (result.getStatus().isCanceled()) { + logger.error("Processing of lab message with UUID {} has been canceled", labMessage.getUuid()); + } + } catch (ExecutionException e) { + logger.error("Could not process lab message with UUID " + labMessage.getUuid(), e); + } catch (InterruptedException e) { + logger.error("Could not process lab message with UUID " + labMessage.getUuid(), e); + Thread.currentThread().interrupt(); + } finally { + save(labMessage); + } + + return getByUuid(labMessage.getUuid()); + } + private List extractUuids(List dtos) { return dtos.stream().map(EntityDto::getUuid).filter(Objects::nonNull).collect(toList()); } @@ -607,7 +608,7 @@ public ExternalMessageDto getByUuid(String uuid) { @RightsAllowed({ UserRight._EXTERNAL_MESSAGE_LABORATORY_DELETE, UserRight._EXTERNAL_MESSAGE_DOCTOR_DECLARATION_DELETE, - UserRight._EXTERNAL_MESSAGE_SURVEY_RESPONSE_DELETE, }) + UserRight._EXTERNAL_MESSAGE_SURVEY_RESPONSE_DELETE }) public void delete(String uuid) { externalMessageService.deletePermanent(externalMessageService.getByUuid(uuid)); } @@ -1039,7 +1040,6 @@ public ExternalMessageDto overwriteSurveyResponse(String uuid, java.util.Map Assertions.assertNotNull(caseDiseaseFieldInfo), - () -> Assertions.assertEquals("Disease", caseDiseaseFieldInfo.getTranslatedFieldName()), + () -> Assertions.assertEquals("Maladie", caseDiseaseFieldInfo.getTranslatedFieldName()), () -> Assertions.assertEquals("Paralysie Flasque Aiguë", caseDiseaseFieldInfo.getTranslatedFieldValue())); } @@ -158,17 +158,19 @@ void retrievePartial_null_value() { CaseDataDto originalCase = creator.createUnclassifiedCase(disease); // EXECUTE - String caseClassificationDateFieldName = toFieldName(CaseDataDto.I18N_PREFIX, CaseDataDto.CLASSIFICATION_DATE); + String caseFollowUpUntilFieldName = toFieldName(CaseDataDto.I18N_PREFIX, CaseDataDto.FOLLOW_UP_UNTIL); PartialRetrievalResponse actual = victim().retrievePartial( - new PartialRetrievalRequest().setCaseUuid(originalCase.getUuid()).setFieldsToRetrieve(Set.of(caseClassificationDateFieldName))); + new PartialRetrievalRequest().setCaseUuid(originalCase.getUuid()).setFieldsToRetrieve(Set.of(caseFollowUpUntilFieldName))); + + System.out.println("actual = " + actual); // CHECK - FieldInfo classificationDateFieldInfo = actual.getFieldInfoDictionary().get(caseClassificationDateFieldName); + FieldInfo followUpUntilFieldInfo = actual.getFieldInfoDictionary().get(caseFollowUpUntilFieldName); Assertions.assertAll( () -> Assertions.assertTrue(actual.getFailuresDictionary().isEmpty()), - () -> Assertions.assertTrue(actual.getFieldInfoDictionary().containsKey(caseClassificationDateFieldName)), - () -> Assertions.assertEquals("Date of classification", classificationDateFieldInfo.getTranslatedFieldName()), - () -> Assertions.assertNull(classificationDateFieldInfo.getFieldValue())); + () -> Assertions.assertTrue(actual.getFieldInfoDictionary().containsKey(caseFollowUpUntilFieldName)), + () -> Assertions.assertEquals("Follow-up until", followUpUntilFieldInfo.getTranslatedFieldName()), + () -> Assertions.assertNull(followUpUntilFieldInfo.getFieldValue())); } @Test diff --git a/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java b/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java index 7012cd44986..3c15966e147 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java @@ -36,7 +36,6 @@ import de.symeda.sormas.api.infrastructure.country.CountryDto; import de.symeda.sormas.api.infrastructure.country.CountryReferenceDto; import de.symeda.sormas.api.infrastructure.facility.FacilityDto; -import de.symeda.sormas.api.infrastructure.region.RegionFacade; import de.symeda.sormas.api.patch.*; import de.symeda.sormas.api.person.*; import de.symeda.sormas.api.symptoms.SymptomState; @@ -56,15 +55,12 @@ void patch_noErrorsReplaceAlways() { String newLastname = "toto"; String newSequelaeDetails = "Some very interesting sequelaeDetails"; - String classificationDate = "2030-02-01"; CaseDataPatchRequest request = new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()) .setReplacementStrategy(DataReplacementStrategy.ALWAYS) .setPatchDictionary( Map.of( "Person.lastName", newLastname, - "CaseData.classificationDate", - classificationDate, "CaseData.sequelaeDetails", newSequelaeDetails)); @@ -73,7 +69,6 @@ void patch_noErrorsReplaceAlways() { DataPatchResponse response = victim().patch(request); // CHECK - CaseDataDto actualCase = getCaseFacade().getByUuid(originalCase.getUuid()); PersonDto actualPerson = getPersonFacade().getByUuid(originalCase.getPerson().getUuid()); @@ -82,9 +77,6 @@ void patch_noErrorsReplaceAlways() { // PERSON () -> Assertions.assertEquals(newLastname, actualPerson.getLastName()), // CASE - () -> Assertions.assertEquals( - Date.from(LocalDate.parse(classificationDate).atStartOfDay(ZoneId.systemDefault()).toInstant()), - actualCase.getClassificationDate()), () -> Assertions.assertEquals(newSequelaeDetails, actualCase.getSequelaeDetails())); } @@ -411,34 +403,6 @@ void patch_customizableEnu_default_enum_other() { return e1; } - @Test - void patch_referenceData() { - // PREPARE - registerBeanForLookup(RegionFacade.class, getRegionFacade()); - - CaseDataDto originalCase = creator.createUnclassifiedCase(Disease.PERTUSSIS); - - FacilityDto healthFacility = getFacilityFacade().getByUuid(originalCase.getHealthFacility().getUuid()); - originalCase.setDistrict(healthFacility.getDistrict()); - getCaseFacade().save(originalCase); - - // must be able to ignore accents - whitespaces - case - Map patchDictionary = Map.of("CaseData.region", " régIoN "); - CaseDataPatchRequest request = new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()) - .setReplacementStrategy(DataReplacementStrategy.ALWAYS) - .setPatchDictionary(patchDictionary); - - // EXECUTE - DataPatchResponse response = victim().patch(request); - - // CHECK - - Assertions.assertAll( - () -> Assertions.assertTrue(response.getFailures().isEmpty(), "Failure found, but should be empty"), - - () -> Assertions.assertEquals(patchDictionary, response.getValidPatchDictionary())); - } - @Test void patch_referenceData_country() { // PREPARE @@ -767,21 +731,20 @@ void patch_ifNotAlreadyPresent_sameDayDifferentTime_noForbiddenValueOverride() { CaseDataDto originalCase = creator.createUnclassifiedCase(Disease.PERTUSSIS); // Set classificationDate to 08:30 on 2024-06-15 — a non-midnight timestamp on the same calendar day that will be patched - java.util.Date existingDate = java.util.Date.from(LocalDateTime.of(2024, 6, 15, 8, 30, 0).atZone(ZoneId.systemDefault()).toInstant()); - originalCase.setClassificationDate(existingDate); + java.util.Date existingDate = java.util.Date.from(LocalDateTime.of(2024, 6, 15, 12, 30, 0).atZone(ZoneId.systemDefault()).toInstant()); + originalCase.setReportDate(existingDate); getCaseFacade().save(originalCase); // Patch with the same calendar day as a plain date string — DatePatchMapper resolves this to midnight (00:00:00), // which differs in time from existingDate. Without DateEqualityChecker this would trigger FORBIDDEN_VALUE_OVERRIDE. String patchDate = "2024-06-15"; - CaseDataPatchRequest request = - new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()).setPatchDictionary(Map.of("CaseData.classificationDate", patchDate)); + CaseDataPatchRequest request = new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid()) + .setPatchDictionary(Map.of(toFieldName(CaseDataDto.I18N_PREFIX, CaseDataDto.REPORT_DATE), patchDate)); // EXECUTE DataPatchResponse response = victim().patch(request); // CHECK - Assertions.assertAll( () -> Assertions.assertTrue(response.getFailures().isEmpty(), "FORBIDDEN_VALUE_OVERRIDE must not fire for same-day dates"), () -> Assertions.assertTrue(response.isApplied())); From fcc92f8f0567071a4d86c68bd9b63ecfc9f3e493 Mon Sep 17 00:00:00 2001 From: Pa-Touche <47572440+Pa-Touche@users.noreply.github.com> Date: Wed, 13 May 2026 10:34:43 +0200 Subject: [PATCH 134/134] missing history columns --- .../src/main/resources/sql/sormas_schema.sql | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/sormas-backend/src/main/resources/sql/sormas_schema.sql b/sormas-backend/src/main/resources/sql/sormas_schema.sql index ab461e4fadc..a01412d5235 100644 --- a/sormas-backend/src/main/resources/sql/sormas_schema.sql +++ b/sormas-backend/src/main/resources/sql/sormas_schema.sql @@ -15974,13 +15974,29 @@ UPDATE featureconfiguration SET properties = '{"FETCH_MODE":false,"FORCE_AUTOMATIC_PROCESSING":true,"SURVEY_FETCH_ENABLED":true}' where featuretype = 'EXTERNAL_MESSAGES'; +-- user rights INSERT INTO userroles_userrights (userrole_id, userright) SELECT id, 'EXTERNAL_MESSAGE_SURVEY_RESPONSE_VIEW' FROM public.userroles WHERE userroles.linkeddefaultuserrole in ('ADMIN'); INSERT INTO userroles_userrights (userrole_id, userright) SELECT id, 'EXTERNAL_MESSAGE_SURVEY_RESPONSE_PROCESS' FROM public.userroles WHERE userroles.linkeddefaultuserrole in ('ADMIN'); INSERT INTO userroles_userrights (userrole_id, userright) SELECT id, 'EXTERNAL_MESSAGE_SURVEY_RESPONSE_DELETE' FROM public.userroles WHERE userroles.linkeddefaultuserrole in ('ADMIN'); +-- history tables +ALTER TABLE externalmessage_history ADD COLUMN IF NOT EXISTS additionaldatajson jsonb; +ALTER TABLE externalmessage_history ADD COLUMN IF NOT EXISTS additionaldatatype text; + +ALTER TABLE surveys_history ADD COLUMN IF NOT EXISTS externalid text; + +ALTER TABLE surveytokens_history ADD COLUMN IF NOT EXISTS externalrespondentid text; + +ALTER TABLE symptoms_history ADD COLUMN IF NOT EXISTS abdominalcramps text; +ALTER TABLE symptoms_history ADD COLUMN IF NOT EXISTS coughingatnight text; +ALTER TABLE symptoms_history ADD COLUMN IF NOT EXISTS coughingattacks text; +ALTER TABLE symptoms_history ADD COLUMN IF NOT EXISTS flatulence text; +ALTER TABLE symptoms_history ADD COLUMN IF NOT EXISTS lossofappetite text; +ALTER TABLE symptoms_history ADD COLUMN IF NOT EXISTS smellyburps text; + INSERT INTO schema_version (version_number, comment) -VALUES (629, '#13832 - External Survey facade'); +VALUES (629, '#13832 - External Survey integration'); -- *** Insert new sql commands BEFORE this line. Remember to always consider _history tables. ***