#13190 - Add date range filter for birthdate (from-to) to Persons, Cases, and Contacts - changes after review

Author: SergiuPacurariu

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

@@ -557,7 +557,6 @@ public interface Captions {
 	String assignmentDate = "assignmentDate";
 	String assignToMe = "assignToMe";
 	String BAGExport = "BAGExport";
-	String birthdateFilter = "birthdateFilter";
 	String bulkActionCreatDocuments = "bulkActionCreatDocuments";
 	String bulkActions = "bulkActions";
 	String bulkCancelFollowUp = "bulkCancelFollowUp";

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

@@ -13,6 +13,7 @@ public interface Descriptions {
 	String aefiDashboardDiseaseFilter = "aefiDashboardDiseaseFilter";
 	String aefiDashboardDistrictFilter = "aefiDashboardDistrictFilter";
 	String aefiDashboardRegionFilter = "aefiDashboardRegionFilter";
+	String birthdateFilterPartialMatchDescription = "birthdateFilterPartialMatchDescription";
 	String Campaign_calculatedBasedOn = "Campaign.calculatedBasedOn";
 	String Campaign_campaignPhase = "Campaign.campaignPhase";
 	String CaseData_caseClassification = "CaseData.caseClassification";

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

@@ -922,7 +922,6 @@ public interface Strings {
 	String infoAutomaticDeletionTooltipYears = "infoAutomaticDeletionTooltipYears";
 	String infoBAGExport = "infoBAGExport";
 	String infoBasicExport = "infoBasicExport";
-	String infoBirthdateFilter = "infoBirthdateFilter";
 	String infoBulkProcess = "infoBulkProcess";
 	String infoBulkProcessCancelled = "infoBulkProcessCancelled";
 	String infoBulkProcessFinished = "infoBulkProcessFinished";

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

@@ -72,7 +72,6 @@ adoptHomeAddressOfCasePersonIfRelationMatches=Adopt home address of the case per
 casePersonAddress=Address of the case person
 viewMessage=View message
 primarySuffix=primary
-birthdateFilter = Birthdate filter
 # About
 about=About
 aboutAdditionalInfo=Additional Info

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

@@ -80,6 +80,7 @@ descContactOnlyWithReducedQuarantine = Only list contacts whose quarantine perio
 descContactIncludeContactsFromOtherJurisdictions = Include all contacts from other jurisdictions that you have access to, e.g. because you created them or their source case is in your jurisdiction
 descGdpr = Reminder: All comments entered must comply with GDPR rules as described during connection.
 discardDescription = Discards any unsaved changes
+birthdateFilterPartialMatchDescription = If checked the search will include also the persons that have incomplete birthdate and have only higher level match eg. only year or only year and month
 
 # EpiData
 EpiData.bats = Did you have contact with live or dead bats or their excreta during the incubation period?

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

@@ -1116,7 +1116,6 @@ infoAefiSelectPrimarySuspectVaccine = The list below contains all vaccinations o
 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.
-infoBirthdateFilter = If checked the search will include also the persons that have incomplete birthdate and have only higher level match eg. only year or only year and month
 
 # Messages
 messageActionOutsideJurisdictionDeletionDenied = The action outside user's jurisdiction cannot be deleted
@@ -1655,7 +1654,7 @@ promptActionChangeDateTo = ... to
 promptActionChangeEpiWeekFrom = Date of action change from epi week...
 promptActionChangeEpiWeekTo = ... to epi week
 promptBirthdateFrom = Birthdate from
-promptBirthdateTo = Birthdate to
+promptBirthdateTo = ... to
 promptCampaignSearch = ID, name
 promptCasesDateFrom = New cases from...
 promptCasesEpiWeekFrom = New cases from epi week...

sormas-ui/src/main/java/de/symeda/sormas/ui/utils/BirthdateRangeFilterComponent.java

@@ -1,22 +1,18 @@
 package de.symeda.sormas.ui.utils;
 
-import static de.symeda.sormas.ui.utils.CssStyles.CHECKBOX_FILTER_INLINE;
-import static de.symeda.sormas.ui.utils.CssStyles.LABEL_BOLD;
 import static de.symeda.sormas.ui.utils.CssStyles.VSPACE_TOP_4;
 
 import java.util.Calendar;
 import java.util.Date;
 
-import com.vaadin.icons.VaadinIcons;
 import com.vaadin.server.Page;
-import com.vaadin.shared.ui.ContentMode;
 import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.Label;
 import com.vaadin.ui.Notification;
 import com.vaadin.v7.ui.CheckBox;
 import com.vaadin.v7.ui.PopupDateField;
 
 import de.symeda.sormas.api.i18n.Captions;
+import de.symeda.sormas.api.i18n.Descriptions;
 import de.symeda.sormas.api.i18n.I18nProperties;
 import de.symeda.sormas.api.i18n.Strings;
 import de.symeda.sormas.api.utils.DateHelper;
@@ -39,13 +35,6 @@ public BirthdateRangeFilterComponent(boolean showCaption, AbstractFilterForm par
 		dateToFilter = new PopupDateField();
 		includePartialMatch = new CheckBox();
 
-		Label birthdateLabel = new Label();
-		birthdateLabel.setValue(I18nProperties.getCaption(Captions.birthdateFilter));
-		birthdateLabel.addStyleName(CHECKBOX_FILTER_INLINE);
-		birthdateLabel.addStyleName(LABEL_BOLD);
-		birthdateLabel.addStyleName(VSPACE_TOP_4);
-		addComponent(birthdateLabel);
-
 		addComponent(dateFromFilter);
 		addComponent(dateToFilter);
 
@@ -82,13 +71,8 @@ public BirthdateRangeFilterComponent(boolean showCaption, AbstractFilterForm par
 
 		includePartialMatch.setCaption(I18nProperties.getCaption(Captions.includePartialBirthdates));
 		includePartialMatch.addStyleName(VSPACE_TOP_4);
+		includePartialMatch.setDescription(I18nProperties.getDescription(Descriptions.birthdateFilterPartialMatchDescription));
 		addComponent(includePartialMatch);
-
-		Label infoLabel = new Label(VaadinIcons.INFO_CIRCLE.getHtml(), ContentMode.HTML);
-		infoLabel.setSizeUndefined();
-		infoLabel.setDescription(I18nProperties.getString(Strings.infoBirthdateFilter));
-		CssStyles.style(infoLabel, CssStyles.LABEL_XLARGE, CssStyles.LABEL_SECONDARY);
-		addComponent(infoLabel);
 	}
 
 	private static void notifyIfIncorrectRange(Date dateFrom, Date dateTo) {