#183 added validation for date of report, verication and occurrence i…

…n signal information form

sormas-ui/src/main/java/de/symeda/sormas/ui/ebs/TriagingDataForm.java

@@ -5,6 +5,7 @@
 import static de.symeda.sormas.ui.utils.LayoutUtil.loc;
 
 import java.util.Arrays;
+import java.util.Calendar;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashSet;
@@ -47,6 +48,7 @@
 import de.symeda.sormas.api.utils.fieldvisibility.FieldVisibilityCheckers;
 import de.symeda.sormas.ui.utils.AbstractEditForm;
 import de.symeda.sormas.ui.utils.CssStyles;
+import de.symeda.sormas.ui.utils.EbsDateValidator;
 import de.symeda.sormas.ui.utils.FieldHelper;
 import de.symeda.sormas.ui.utils.NullableOptionGroup;
 import de.symeda.sormas.ui.utils.VaadinUiUtil;
@@ -56,6 +58,8 @@ public class TriagingDataForm extends AbstractEditForm<TriagingDto> {
 	private static final long serialVersionUID = 1L;
 	private static final String SIGNAL_INFORMATION_LOC = "signalInformationLoc";
 	private static final String TRIAGING_DECISION_LOC = "triagingDecisionLoc";
+	public final String THE_DATE_OF_DECISION_CANNOT_BE_EARLIER_THAN_THE_DATE_OF_OCCURRENCE =
+		"The Date of Decision cannot be earlier than the Date of Report or Date of Occurrence.";
 
 	private final EbsDto ebs;
 	private final Class<? extends EntityDto> parentClass;
@@ -115,6 +119,7 @@ public class TriagingDataForm extends AbstractEditForm<TriagingDto> {
 	private OptionGroup poeCategoryDetails;
 	private NullableOptionGroup categoryLevel;
 	private ComboBox outcomeSupervisor;
+	EbsDateValidator validator = new EbsDateValidator(THE_DATE_OF_DECISION_CANNOT_BE_EARLIER_THAN_THE_DATE_OF_OCCURRENCE, false);
 
 	private static UiFieldAccessCheckers createFieldAccessCheckers(boolean isPseudonymized, boolean withPersonalAndSensitive) {
 
@@ -400,6 +405,10 @@ protected void addFields() {
 			categoryLevel.setVisible(false);
 			categoryLevel.setValue(null);
 		}
+		dateOfDecision.addValueChangeListener(e -> {
+			validateDateFields(selectedEbs);
+		});
+		validateDateFields(selectedEbs);
 		setRequired(true, TriagingDto.DATE_OF_DECISION, TriagingDto.TRIAGING_DECISION);
 		initializeVisibilitiesAndAllowedVisibilities();
 		initializeAccessAndAllowedAccesses();
@@ -567,4 +576,50 @@ private void handleNoCase(EbsDto selectedEbs) {
 		poeCategoryDetails.setVisible(false);
 	}
 
+	public void validateDateFields(EbsDto selectedEbs) {
+		Date dateOfReport = selectedEbs.getReportDateTime();
+		Date dateOfOccurrence = selectedEbs.getDateOnset();
+		DateField dateDecision = dateOfDecision;
+		Date dateOfDecisionDate = dateDecision.getValue();
+		if (dateOfOccurrence == null) {
+			dateOfOccurrence = new Date(0);
+		}
+		if (dateOfReport == null) {
+			dateOfReport = new Date(0);
+		}
+
+		Date dateOfReportDate = clearTime(dateOfReport);
+		Date dateOfOccurrenceDate = clearTime(dateOfOccurrence);
+		if (dateOfDecisionDate != null) {
+			dateOfDecisionDate = clearTime(dateOfDecisionDate);
+			if (dateOfDecisionDate.before(dateOfReportDate)) {
+				if (!dateOfReportDate.toString().equals(dateOfDecisionDate.toString())) {
+					dateDecision.addValidator(validator);
+					addDateValidator();
+				}
+			} else {
+				dateDecision.removeAllValidators();
+
+			}
+		} else {
+			dateDecision.removeAllValidators();
+		}
+	}
+
+	private Date clearTime(Date date) {
+		Calendar calendar = Calendar.getInstance();
+		calendar.setTime(date);
+		calendar.set(Calendar.HOUR_OF_DAY, 0);
+		calendar.set(Calendar.MINUTE, 0);
+		calendar.set(Calendar.SECOND, 0);
+		calendar.set(Calendar.MILLISECOND, 0);
+		return calendar.getTime();
+	}
+
+	private void addDateValidator() {
+		validator.setValidDate(false);
+		dateOfDecision.removeValidator(validator);
+		dateOfDecision.addValidator(validator);
+	}
+
 }