Skip to content

Date validations #13596

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KarnaiahPesula merged 1 commit into from
Sep 11, 2025
+10 −3
Merged

Date validations #13596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions sormas-ui/src/main/java/de/symeda/sormas/ui/ActivityAsCase/ActivityAsCaseForm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import com.vaadin.v7.data.util.converter.Converter;
import com.vaadin.v7.ui.AbstractSelect;
import com.vaadin.v7.ui.ComboBox;
import com.vaadin.v7.ui.DateField;
import com.vaadin.v7.ui.TextArea;
import com.vaadin.v7.ui.TextField;

Expand All @@ -59,6 +60,7 @@
import de.symeda.sormas.api.utils.fieldvisibility.FieldVisibilityCheckers;
import de.symeda.sormas.ui.location.LocationEditForm;
import de.symeda.sormas.ui.utils.AbstractEditForm;
import de.symeda.sormas.ui.utils.DateComparisonValidator;
import de.symeda.sormas.ui.utils.FieldHelper;

public class ActivityAsCaseForm extends AbstractEditForm<ActivityAsCaseDto> {
Expand Down Expand Up @@ -120,7 +122,10 @@ public ActivityAsCaseForm(boolean create, FieldVisibilityCheckers fieldVisibilit
protected void addFields() {
addHeadingsAndInfoTexts();
addBasicFields();
DateField startDate = addField(ActivityAsCaseDto.START_DATE);
DateField endDate = addField(ActivityAsCaseDto.END_DATE);

DateComparisonValidator.addStartEndValidators(startDate, endDate);
addField(ActivityAsCaseDto.DESCRIPTION, TextArea.class).setRows(5);

locationForm = addField(ActivityAsCaseDto.LOCATION, LocationEditForm.class);
Expand Down Expand Up @@ -155,8 +160,6 @@ private void addBasicFields() {
addFields(
ActivityAsCaseDto.UUID,
ActivityAsCaseDto.REPORTING_USER,
ActivityAsCaseDto.START_DATE,
ActivityAsCaseDto.END_DATE,
ActivityAsCaseDto.ACTIVITY_AS_CASE_TYPE,
ActivityAsCaseDto.ACTIVITY_AS_CASE_TYPE_DETAILS,
ActivityAsCaseDto.GATHERING_TYPE,
Expand Down
6 changes: 5 additions & 1 deletion sormas-ui/src/main/java/de/symeda/sormas/ui/exposure/ExposureForm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
import de.symeda.sormas.ui.utils.AbstractEditForm;
import de.symeda.sormas.ui.utils.ComboBoxWithPlaceholder;
import de.symeda.sormas.ui.utils.CssStyles;
import de.symeda.sormas.ui.utils.DateComparisonValidator;
import de.symeda.sormas.ui.utils.DateTimeField;
import de.symeda.sormas.ui.utils.FieldHelper;
import de.symeda.sormas.ui.utils.NullableOptionGroup;
Expand Down Expand Up @@ -219,7 +220,10 @@ private void addHeadingsAndInfoTexts() {
private void addBasicFields() {
addFields(ExposureDto.UUID, ExposureDto.REPORTING_USER, ExposureDto.PROBABLE_INFECTION_ENVIRONMENT);

addFields(DateTimeField.class, ExposureDto.START_DATE, ExposureDto.END_DATE);
DateTimeField startDate = addField(ExposureDto.START_DATE, DateTimeField.class);
DateTimeField endDate = addField(ExposureDto.END_DATE, DateTimeField.class);

DateComparisonValidator.addStartEndValidators(startDate, endDate);

addFields(
ExposureDto.EXPOSURE_TYPE,
Expand Down
Loading