From a997aa6539d1f0af4ab4fc395ff2033335da312a Mon Sep 17 00:00:00 2001 From: vlad Date: Fri, 30 Jun 2017 12:29:54 -0700 Subject: Latest PDS UI utils --- .../pdsuicommon/validation/AdditionalConstraints.scala | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src/main/scala/xyz/driver/pdsuicommon/validation/AdditionalConstraints.scala') diff --git a/src/main/scala/xyz/driver/pdsuicommon/validation/AdditionalConstraints.scala b/src/main/scala/xyz/driver/pdsuicommon/validation/AdditionalConstraints.scala index 115163c..cb1082f 100644 --- a/src/main/scala/xyz/driver/pdsuicommon/validation/AdditionalConstraints.scala +++ b/src/main/scala/xyz/driver/pdsuicommon/validation/AdditionalConstraints.scala @@ -5,17 +5,25 @@ import play.api.data.validation._ object AdditionalConstraints { + val nonNegativePrintedNumber: Constraint[String] = { + Constraints.pattern("^\\d+$".r, "printedInt.nonNegative", "must be a non-negative number") + } + + val positivePrintedNumber: Constraint[String] = { + Constraints.pattern("^[1-9]\\d*$".r, "printedInt.positive", "must be a positive number") + } + val optionNonEmptyConstraint: Constraint[Option[Any]] = { Constraint("option.nonEmpty") { case Some(x) => Valid - case None => Invalid("is empty") + case None => Invalid("is empty") } } val tristateSpecifiedConstraint: Constraint[Tristate[Any]] = { Constraint("tristate.specified") { case Tristate.Unspecified => Invalid("unspecified") - case _ => Valid + case _ => Valid } } -- cgit v1.2.3