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

Commit 20be4ce

Browse files
lgallgal
authored andcommitted
3409 fixed prohibistion to work from-until validation
1 parent a6635aa commit 20be4ce

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseDataForm.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -535,8 +535,8 @@ protected void addFields() {
535535
addField(CaseDataDto.POINT_OF_ENTRY_DETAILS, TextField.class);
536536

537537
addField(CaseDataDto.PROHIBITION_TO_WORK, NullableOptionGroup.class).addStyleName(ValoTheme.OPTIONGROUP_HORIZONTAL);
538-
DateField prohibitionToWorkFrom = addField(CaseDataDto.PROHIBITION_TO_WORK_FROM);
539-
DateField prohibitionToWorkUntil = addField(CaseDataDto.PROHIBITION_TO_WORK_UNTIL);
538+
DateField prohibitionToWorkFrom = addField(CaseDataDto.PROHIBITION_TO_WORK_FROM, DateField.class);
539+
DateField prohibitionToWorkUntil = addDateField(CaseDataDto.PROHIBITION_TO_WORK_UNTIL, DateField.class, -1);
540540
FieldHelper.setVisibleWhen(
541541
getFieldGroup(),
542542
Arrays.asList(CaseDataDto.PROHIBITION_TO_WORK_FROM, CaseDataDto.PROHIBITION_TO_WORK_UNTIL),
@@ -548,14 +548,14 @@ protected void addFields() {
548548
prohibitionToWorkFrom,
549549
prohibitionToWorkUntil,
550550
true,
551-
true,
551+
false,
552552
I18nProperties.getValidationError(Validations.beforeDate, prohibitionToWorkFrom.getCaption(), prohibitionToWorkUntil.getCaption())));
553553
prohibitionToWorkUntil.addValidator(
554554
new DateComparisonValidator(
555555
prohibitionToWorkUntil,
556556
prohibitionToWorkFrom,
557557
false,
558-
true,
558+
false,
559559
I18nProperties.getValidationError(Validations.afterDate, prohibitionToWorkUntil.getCaption(), prohibitionToWorkFrom.getCaption())));
560560

561561
TextField tfReportLat = addField(CaseDataDto.REPORT_LAT, TextField.class);

0 commit comments

Comments
 (0)