changeset 1065:7d87ddba5520

Validate against possible maxima. Actual maxima being less are handled by the generation of Probe objects.
author Tom Gottfried <tom@intevation.de>
date Thu, 29 Sep 2016 16:23:04 +0200
parents 8ec6a2a31171
children daca5c62356f
files db_schema/lada_schema.sql src/main/java/de/intevation/lada/validation/rules/messprogramm/SubIntervall.java
diffstat 2 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/db_schema/lada_schema.sql	Thu Sep 29 16:15:38 2016 +0200
+++ b/db_schema/lada_schema.sql	Thu Sep 29 16:23:04 2016 +0200
@@ -593,13 +593,13 @@
                AND teilintervall_bis BETWEEN 1 AND 365
                AND intervall_offset BETWEEN 0 AND 364
            OR probenintervall = 'H'
-               AND teilintervall_von BETWEEN 1 AND 183
-               AND teilintervall_bis BETWEEN 1 AND 183
-               AND intervall_offset BETWEEN 0 AND 182
+               AND teilintervall_von BETWEEN 1 AND 184
+               AND teilintervall_bis BETWEEN 1 AND 184
+               AND intervall_offset BETWEEN 0 AND 183
            OR probenintervall = 'Q'
-               AND teilintervall_von BETWEEN 1 AND 91
-               AND teilintervall_bis BETWEEN 1 AND 91
-               AND intervall_offset BETWEEN 0 AND 90
+               AND teilintervall_von BETWEEN 1 AND 92
+               AND teilintervall_bis BETWEEN 1 AND 92
+               AND intervall_offset BETWEEN 0 AND 91
            OR probenintervall = 'M'
                AND teilintervall_von BETWEEN 1 AND 31
                AND teilintervall_bis BETWEEN 1 AND 31
--- a/src/main/java/de/intevation/lada/validation/rules/messprogramm/SubIntervall.java	Thu Sep 29 16:15:38 2016 +0200
+++ b/src/main/java/de/intevation/lada/validation/rules/messprogramm/SubIntervall.java	Thu Sep 29 16:23:04 2016 +0200
@@ -28,8 +28,8 @@
         this.intervallMax = new Hashtable<String, Integer>();
 
         this.intervallMax.put("J",  365);
-        this.intervallMax.put("H",  183);
-        this.intervallMax.put("Q",  91);
+        this.intervallMax.put("H",  184);
+        this.intervallMax.put("Q",  92);
         this.intervallMax.put("M",  31);
         this.intervallMax.put("W4", 28);
         this.intervallMax.put("W2", 14);
This site is hosted by Intevation GmbH (Datenschutzerklärung und Impressum | Privacy Policy and Imprint)