From 47e9111e0da7888c680bc70e62ad488865633455 Mon Sep 17 00:00:00 2001 From: anthony4m Date: Thu, 28 Nov 2024 15:35:43 +0000 Subject: [PATCH] #183 added validation definition --- .../src/main/java/de/symeda/sormas/api/i18n/Validations.java | 5 ++++- sormas-api/src/main/resources/validations.properties | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Validations.java b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Validations.java index a36315a1f36..8f2fe5ddd8e 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Validations.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Validations.java @@ -44,6 +44,8 @@ public interface Validations { String contactWithoutInfrastructureData = "contactWithoutInfrastructureData"; String duplicateEpidNumber = "duplicateEpidNumber"; String duplicateExternalToken = "duplicateExternalToken"; + String ebsDecisionDateValidation = "ebsDecisionDateValidation"; + String ebsSignalDateValidation = "ebsSignalDateValidation"; String emptyOverwrittenFollowUpUntilDate = "emptyOverwrittenFollowUpUntilDate"; String errorsInForm = "errorsInForm"; String eventSubordinateEventFromDateFilterValidation = "eventSubordinateEventFromDateFilterValidation"; @@ -152,6 +154,7 @@ public interface Validations { String numberNotInRange = "numberNotInRange"; String numberTooBig = "numberTooBig"; String numberTooSmall = "numberTooSmall"; + String numberOfDeathMoreThanCases = "numberOfDeathMoreThanCases"; String onlyDecimalNumbersAllowed = "onlyDecimalNumbersAllowed"; String onlyGeoCoordinatesAllowed = "onlyGeoCoordinatesAllowed"; String onlyIntegerNumbersAllowed = "onlyIntegerNumbersAllowed"; @@ -250,5 +253,5 @@ public interface Validations { String visitDate = "visitDate"; String visitStatus = "visitStatus"; String visitSymptoms = "visitSymptoms"; - String numberOfDeathPersonGreaterThanNumberOfPersonCases = "numberOfDeathPersonGreaterThanNumberOfPersonCases"; + String numberOfDeathPersonGreaterThanNumberOfPersonCases = "numberOfDeathPersonGreaterThanNumberOfPersonCases"; } diff --git a/sormas-api/src/main/resources/validations.properties b/sormas-api/src/main/resources/validations.properties index 682ee3d3afc..f4471bfe27e 100644 --- a/sormas-api/src/main/resources/validations.properties +++ b/sormas-api/src/main/resources/validations.properties @@ -23,6 +23,8 @@ beforeDate = %s has to be before or on the same day as %s beforeDateSoft = %s should normally not be after %s. You are still allowed to save. duplicateEpidNumber = This EPID number already exists. duplicateExternalToken = This external token already exists. +ebsDecisionDateValidation = The Date of Decision cannot be earlier than the Date of Report or Date of Occurrence. +ebsSignalDateValidation = The Date of Report cannot be earlier than the Date of Occurrence. futureDate = %s cannot be more than %s days in the future futureDateStrict = %s cannot be in the future importCasesPropertyTypeNotAllowed = Property type %s not allowed when importing cases @@ -158,6 +160,7 @@ eventSubordinateEventFromDateFilterValidation = The Start Date of the Filter Ran textTooLong = The text you entered is too long. Maximum allowed length is {max} textSizeNotInRange = The text you entered is not valid. It's length must be between {min} and {max} numberTooSmall = The number you entered is too small. The minimum allowed is {value} +numberOfDeathMoreThanCases = The number of death cannot be more than cases numberTooBig = The number you entered is too big. The maximum allowed is {value} numberNotInRange = The number you entered is not valid. It should be between {min} and {max} uuidPatternNotMatching = The UUID you entered is not valid. Only numbers, letters and "-"(dash) is allowed