From edd72b4e12e40b45e0c713d2585dc41eee8e0ef7 Mon Sep 17 00:00:00 2001 From: SergiuPacurariu Date: Wed, 6 Nov 2024 09:51:00 +0200 Subject: [PATCH 1/2] Birthdate month does not show "Empty" instead of "confidential" when restrictions apply #13179 --- .../de/symeda/sormas/api/person/PersonDto.java | 2 ++ .../symeda/sormas/ui/person/PersonEditForm.java | 17 ++++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/person/PersonDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/person/PersonDto.java index 27363cfeeed..a4895af076b 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/person/PersonDto.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/person/PersonDto.java @@ -195,6 +195,8 @@ public class PersonDto extends PseudonymizableDto implements IsPerson { @SensitiveData private Integer birthdateDD; @Outbreaks + @PersonalData + @SensitiveData private Integer birthdateMM; @Outbreaks private Integer birthdateYYYY; diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/person/PersonEditForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/person/PersonEditForm.java index 4367a571630..b423a712dd5 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/person/PersonEditForm.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/person/PersonEditForm.java @@ -296,13 +296,13 @@ protected void addFields() { ComboBox birthDateMonth = addField(PersonDto.BIRTH_DATE_MM, ComboBox.class); // @TODO: Done for nullselection Bug, fixed in Vaadin 7.7.3 birthDateMonth.setNullSelectionAllowed(true); - birthDateMonth.addItems(DateHelper.getMonthsInYear()); - birthDateMonth.setPageLength(12); +// birthDateMonth.addItems(DateHelper.getMonthsInYear()); +// birthDateMonth.setPageLength(12); birthDateMonth.setInputPrompt(I18nProperties.getString(Strings.month)); birthDateMonth.setCaption(""); - DateHelper.getMonthsInYear() - .forEach(month -> birthDateMonth.setItemCaption(month, de.symeda.sormas.api.Month.values()[month - 1].toString())); - setItemCaptionsForMonths(birthDateMonth); +// DateHelper.getMonthsInYear() +// .forEach(month -> birthDateMonth.setItemCaption(month, de.symeda.sormas.api.Month.values()[month - 1].toString())); +// setItemCaptionsForMonths(birthDateMonth); ComboBox birthDateYear = addField(PersonDto.BIRTH_DATE_YYYY, ComboBox.class); birthDateYear.setCaption(I18nProperties.getPrefixCaption(PersonDto.I18N_PREFIX, PersonDto.BIRTH_DATE)); // @TODO: Done for nullselection Bug, fixed in Vaadin 7.7.3 @@ -446,6 +446,13 @@ protected void addFields() { initializeVisibilitiesAndAllowedVisibilities(); initializeAccessAndAllowedAccesses(); + if (isEditableAllowed(PersonDto.BIRTH_DATE_MM)) { + birthDateMonth.addItems(DateHelper.getMonthsInYear()); + birthDateMonth.setPageLength(13); + DateHelper.getMonthsInYear() + .forEach(month -> birthDateMonth.setItemCaption(month, de.symeda.sormas.api.Month.values()[month - 1].toString())); + } + if (!getField(PersonDto.OCCUPATION_TYPE).isVisible() && !getField(PersonDto.ARMED_FORCES_RELATION_TYPE).isVisible() && !getField(PersonDto.EDUCATION_TYPE).isVisible()) From a682d07f52efd8bad3d393d52952bd43e18a4016 Mon Sep 17 00:00:00 2001 From: SergiuPacurariu Date: Thu, 7 Nov 2024 11:16:59 +0200 Subject: [PATCH 2/2] Birthdate month does not show "Empty" instead of "confidential" when restrictions apply #13179 --- .../main/java/de/symeda/sormas/ui/person/PersonEditForm.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/person/PersonEditForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/person/PersonEditForm.java index b423a712dd5..5507feb83ec 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/person/PersonEditForm.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/person/PersonEditForm.java @@ -296,13 +296,8 @@ protected void addFields() { ComboBox birthDateMonth = addField(PersonDto.BIRTH_DATE_MM, ComboBox.class); // @TODO: Done for nullselection Bug, fixed in Vaadin 7.7.3 birthDateMonth.setNullSelectionAllowed(true); -// birthDateMonth.addItems(DateHelper.getMonthsInYear()); -// birthDateMonth.setPageLength(12); birthDateMonth.setInputPrompt(I18nProperties.getString(Strings.month)); birthDateMonth.setCaption(""); -// DateHelper.getMonthsInYear() -// .forEach(month -> birthDateMonth.setItemCaption(month, de.symeda.sormas.api.Month.values()[month - 1].toString())); -// setItemCaptionsForMonths(birthDateMonth); ComboBox birthDateYear = addField(PersonDto.BIRTH_DATE_YYYY, ComboBox.class); birthDateYear.setCaption(I18nProperties.getPrefixCaption(PersonDto.I18N_PREFIX, PersonDto.BIRTH_DATE)); // @TODO: Done for nullselection Bug, fixed in Vaadin 7.7.3