Mercurial > lada > lada-server
changeset 1044:a796e68da1cf
A period with end before start is not meaningful.
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Wed, 07 Sep 2016 18:17:48 +0200 |
| parents | e192feaf916f |
| children | 61b94641cf99 |
| files | db_schema/lada_schema.sql src/main/java/de/intevation/lada/validation/rules/messprogramm/HasAllMandatory.java src/main/java/de/intevation/lada/validation/rules/messprogramm/ValidFromTo.java |
| diffstat | 3 files changed, 39 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/db_schema/lada_schema.sql Tue Jul 05 18:24:55 2016 +0200 +++ b/db_schema/lada_schema.sql Wed Sep 07 18:17:48 2016 +0200 @@ -587,7 +587,8 @@ gueltig_bis integer NOT NULL, probe_nehmer_id integer, probe_kommentar character varying(80), - letzte_aenderung timestamp without time zone DEFAULT now() NOT NULL + letzte_aenderung timestamp without time zone DEFAULT now() NOT NULL, + CHECK (gueltig_von <= gueltig_bis) ); CREATE TRIGGER letzte_aenderung_messprogramm BEFORE UPDATE ON messprogramm FOR EACH ROW EXECUTE PROCEDURE update_letzte_aenderung();
--- a/src/main/java/de/intevation/lada/validation/rules/messprogramm/HasAllMandatory.java Tue Jul 05 18:24:55 2016 +0200 +++ b/src/main/java/de/intevation/lada/validation/rules/messprogramm/HasAllMandatory.java Wed Sep 07 18:17:48 2016 +0200 @@ -14,7 +14,7 @@ /** * Validation rule for Messprogramm. - * Validates if the Messprogramm has Datenbasis. + * Validates if the Messprogramm has all mandatory fields set. */ @ValidationRule("Messprogramm") public class HasAllMandatory implements Rule {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/de/intevation/lada/validation/rules/messprogramm/ValidFromTo.java Wed Sep 07 18:17:48 2016 +0200 @@ -0,0 +1,36 @@ +/* Copyright (C) 2013 by Bundesamt fuer Strahlenschutz + * Software engineering by Intevation GmbH + * + * This file is Free Software under the GNU GPL (v>=3) + * and comes with ABSOLUTELY NO WARRANTY! Check out + * the documentation coming with IMIS-Labordaten-Application for details. + */ +package de.intevation.lada.validation.rules.messprogramm; + +import de.intevation.lada.model.land.Messprogramm; +import de.intevation.lada.validation.Violation; +import de.intevation.lada.validation.annotation.ValidationRule; +import de.intevation.lada.validation.rules.Rule; + +/** + * Validation rule for Messprogramm. + * Validates if the validity period is meaningful. + */ +@ValidationRule("Messprogramm") +public class ValidFromTo implements Rule { + + @Override + public Violation execute(Object object) { + Messprogramm messprogramm = (Messprogramm)object; + Violation violation = new Violation(); + + if (messprogramm.getGueltigVon() > messprogramm.getGueltigBis()) { + violation.addError("gueltigVon", 662); + violation.addError("gueltigBis", 662); + } + + return violation.hasErrors() + ? violation + :null; + } +}