# HG changeset patch # User Tom Gottfried # Date 1475158984 -7200 # Node ID 7d87ddba55202a14e3e3f6021e4a3f527ba1277a # Parent 8ec6a2a3117199107314d87b8a9452a3333cc426 Validate against possible maxima. Actual maxima being less are handled by the generation of Probe objects. diff -r 8ec6a2a31171 -r 7d87ddba5520 db_schema/lada_schema.sql --- 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 diff -r 8ec6a2a31171 -r 7d87ddba5520 src/main/java/de/intevation/lada/validation/rules/messprogramm/SubIntervall.java --- 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(); 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);