# HG changeset patch # User Tom Gottfried # Date 1476372191 -7200 # Node ID 626ed546329fe19482af2f061f59c6f338dd8011 # Parent 259a6b638968d839f0b86689dcd93d03d662e940 Remove obsolete query configuration. diff -r 259a6b638968 -r 626ed546329f src/main/resources/messprogrammquery.json --- a/src/main/resources/messprogrammquery.json Thu Oct 13 17:10:02 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ -[ -{ "id": "1", - "name": "Kein Filter", - "description": "Abfrage der Messprogramme ohne Filter", - "sql": "select m.id as id, m.name as name, m.mst_id as mstId, m.umw_id as umwId from land.messprogramm m", - "type": "messprogramm", - "result": [ - {"dataIndex": "name", "header": "Name", "width": 100}, - {"dataIndex": "mstId", "header": "MST", "width": 100}, - {"dataIndex": "umwId", "header": "Umweltbereich", "width": 100} - ], - "filters": [ - ] -} -] diff -r 259a6b638968 -r 626ed546329f src/main/resources/probequery.json --- a/src/main/resources/probequery.json Thu Oct 13 17:10:02 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,144 +0,0 @@ -[ -{ "id": "0", - "name": "Kein Filter", - "description": "Abfrage der Proben ohne Filter", - "sql": "select p.id as id, pt.probe_id_alt as probeId, p.netzbetreiber_id as netzbetreiberId, p.mst_id as mstId, p.umw_id as umwId, p.hauptproben_nr as hauptprobenNr from land.probe p join land.probe_translation pt on p.id = pt.probe_id", - "type": "probe", - "result": [ - {"dataIndex": "probeId", "header": "ProbeId", "width": 120}, - {"dataIndex": "netzbetreiberId", "header": "Land", "width": 50}, - {"dataIndex": "mstId", "header": "MST", "width": 60}, - {"dataIndex": "umwId", "header": "Umw-ID", "width": 60}, - {"dataIndex": "hauptprobenNr", "header": "Proben-Nr", "width": 120} - ], - "filters": [ - ] -}, -{ "id": "1", - "name": "HP-Nr-Filter", - "description": "Abfrage der Proben mit Wildcardfilter für die Hauptproben-Nr.", - "sql": "select p.id as id, pt.probe_id_alt as probeId, p.netzbetreiber_id as netzbetreiberId, p.mst_id as mstId, p.umw_id as umwId, p.hauptproben_nr as hauptprobenNr from land.probe p join land.probe_translation pt on p.id = pt.probe_id where (p.hauptproben_nr like :hp_nr_id or '' = :hp_nr_id)", - "type": "probe", - "result": [ - {"dataIndex": "probeId", "header": "ProbeId", "width": 120}, - {"dataIndex": "netzbetreiberId", "header": "Land", "width": 50}, - {"dataIndex": "mstId", "header": "MST", "width": 60}, - {"dataIndex": "umwId", "header": "Umw-ID", "width": 60}, - {"dataIndex": "hauptprobenNr", "header": "Proben-Nr", "width": 120} - ], - "filters": [ - {"dataIndex": "hp_nr_id", "type": "text", "label": "Probe_id-Filter"} - ] -}, -{ "id": "2", - "name": "Probe-ID-Filter", - "description": "Abfrage der Proben mit Wildcardfilter für die Probe_id", - "sql": "select p.id as id, pt.probe_id_alt as probeId, p.netzbetreiber_id as netzbetreiberId, p.mst_id as mstId, p.umw_id as umwId, p.hauptproben_nr as hauptprobenNr from land.probe p join land.probe_translation pt on p.id = pt.probe_id where (pt.probe_id_alt like :probe_id or '' = :probe_id)", - "type": "probe", - "result": [ - {"dataIndex": "probeId", "header": "ProbeId", "width": 120}, - {"dataIndex": "netzbetreiberId", "header": "Land", "width": 50}, - {"dataIndex": "mstId", "header": "MST", "width": 60}, - {"dataIndex": "umwId", "header": "Umw-ID", "width": 60}, - {"dataIndex": "hauptprobenNr", "header": "Proben-Nr", "width": 120} - ], - "filters": [ - {"dataIndex": "probe_id", "type": "text", "label": "Probe_id-Filter"} - ] -}, -{ "id": "3", - "name": "MST und UMW", - "description": "Abfrage der Proben gefiltert nach Messtellen ID und ID des Umweltbereichs", - "sql": "select p.id as id, pt.probe_id_alt as probeId, p.netzbetreiber_id as netzbetreiberId, p.mst_id as mstId, p.umw_id as umwId, p.hauptproben_nr as hauptprobenNr from land.probe p join land.probe_translation pt on p.id = pt.probe_id where (p.mst_id = :mst_id OR '' = :mst_id) and (p.umw_id = :umw_id OR '' = :umw_id)", - "type": "probe", - "result": [ - {"dataIndex": "probeId", "header": "ProbeId", "width": 120}, - {"dataIndex": "netzbetreiberId", "header": "Land", "width": 50}, - {"dataIndex": "mstId", "header": "MST", "width": 60}, - {"dataIndex": "umwId", "header": "Umw-ID", "width": 60}, - {"dataIndex": "hauptprobenNr", "header": "Proben-Nr", "width": 120} - ], - "filters": [ - {"dataIndex": "mst_id", "type": "listmst", "label": "Messstelle"}, - {"dataIndex": "umw_id", "type": "listumw", "label": "Umweltbereich"} - ] -}, -{ "id": "4", - "name": "Proben pro Land", - "description": "Proben gefiltert nach Ländern", - "sql": "select p.id as id, pt.probe_id_alt as probeId, p.netzbetreiber_id as netzbetreiberId, p.mst_id as mstId, p.umw_id as umwId, p.hauptproben_nr as hauptprobenNr from land.probe p join land.probe_translation pt on p.id = pt.probe_id where (netzbetreiber_id = :netz OR '' = :netz)", - "type": "probe", - "result": [ - {"dataIndex": "probeId", "header": "ProbeId", "width": 100}, - {"dataIndex": "netzbetreiberId", "header": "Land", "width": 100}, - {"dataIndex": "mstId", "header": "MST", "width": 100}, - {"dataIndex": "umwId", "header": "Umweltbereich", "width": 100}, - {"dataIndex": "hauptprobenNr", "header": "Proben-Nr", "width": 100} - ], - "filters": [ - {"dataIndex": "netz", "type": "listnetz", "label": "Land"} - ] -}, -{ "id": "5", - "name": "alle Proben mit Ort", - "description": "alle Proben mit Entnahmeort", - "sql": "select p.id as id, pt.probe_id_alt as probeId, p.netzbetreiber_id as netzbetreiberId, p.mst_id as mstId, p.umw_id as umwId, p.hauptproben_nr as hauptprobenNr, so.gem_id as gemId, v.bezeichnung as bezeichnung from land.probe p join land.probe_translation pt on p.id = pt.probe_id left outer join land.ort o on (p.id = o.probe_id) left outer join stammdaten.ort so on (o.ort_id = so.id) left outer join stammdaten.verwaltungseinheit v on (so.gem_id = v.id) where o.orts_typ = 'E' or o.orts_typ is null", - "type": "probe", - "result": [ - {"dataIndex": "probeId", "header": "ProbeId", "width": 100}, - {"dataIndex": "netzbetreiberId", "header": "Land", "width": 50}, - {"dataIndex": "mstId", "header": "MST", "width": 60}, - {"dataIndex": "umwId", "header": "Umweltbereich", "width": 100}, - {"dataIndex": "hauptprobenNr", "header": "Proben-Nr", "width": 100}, - {"dataIndex": "gemId", "header": "Gem-ID", "width": 100}, - {"dataIndex": "bezeichnung", "header": "Gemeinde", "flex": 1} - ], - "filters": [ - ] -}, -{ "id": "6", - "name": "Proben pro Land und UMW (Multiselect)", - "description": "Abfrage aller Proben gefiltert pro Land und Umweltbereich (mit Mehrfachauswahl)", - "sql": "select p.id as id, pt.probe_id_alt as probeId, p.netzbetreiber_id as netzbetreiberId, p.mst_id as mstId, to_char(p.probeentnahme_beginn,'YYYY-mm-dd HH24:MI') entnahmeVon, to_char(p.probeentnahme_ende,'YYYY-mm-dd HH24:MI') entnahmeBis, p.umw_id as umwId, p.hauptproben_nr as hauptprobenNr, o.orts_typ as ortsTyp, so.gem_id as gemId, v.bezeichnung as bezeichnung from land.probe p join land.probe_translation pt on p.id = pt.probe_id left outer join land.ort o on (p.id = o.probe_id) left outer join stammdaten.ort so on (o.ort_id = so.id) left outer join stammdaten.verwaltungseinheit v on (so.gem_id = v.id) where (o.orts_typ = 'E' or o.orts_typ is null) and (p.netzbetreiber_id = :netz OR '' =:netz) and (p.umw_id similar to (:umw_id) OR '' = :umw_id)", - "type": "probe", - "result": [ - {"dataIndex": "probeId", "header": "ProbeId", "width": 100}, - {"dataIndex": "netzbetreiberId", "header": "Land", "width": 50}, - {"dataIndex": "mstId", "header": "MST", "width": 50}, - {"dataIndex": "entnahmeVon", "header": "Entnahme von", "width": 120}, - {"dataIndex": "entnahmeBis", "header": "Entnahme bis", "width": 120}, - {"dataIndex": "umwId", "header": "Umweltbereich", "width": 100}, - {"dataIndex": "hauptprobenNr", "header": "Proben-Nr", "width": 100}, - {"dataIndex": "ortsTyp", "header": "Ortstyp", "width": 50}, - {"dataIndex": "genId", "header": "Gemeinde-ID", "width": 100}, - {"dataIndex": "bezeichnung", "header": "Gemeinde", "flex": 1} - ], - "filters": [ - {"dataIndex": "netz", "type": "listnetz", "label": "Land"}, - {"dataIndex": "umw_id", "type": "listumw", "label": "Umweltbereich", "multiselect":true} - ] -}, -{ "id": "7", - "name": "Proben und Messungen pro Land und UMW (Multiselect)", - "description": "Abfrage aller Proben/Messungen gefiltert pro Land und Umweltbereich (mit Mehrfachauswahl)", - "sql": "select p.id as id, pt.probe_id_alt as probeId, p.netzbetreiber_id as netzbetreiberId, p.mst_id as mstId, to_char(p.probeentnahme_beginn,'YYYY-mm-dd HH24:MI') entnahmeVon, to_char(p.probeentnahme_ende,'YYYY-mm-dd HH24:MI') entnahmeBis, m.mmt_id as mmtId, p.umw_id as umwId, p.hauptproben_nr as hauptprobenNr, o.orts_typ as ortsTyp, so.gem_id as gemId, v.bezeichnung as bezeichnung from land.probe p left outer join land.probe_translation pt on p.id = pt.probe_id left outer join land.messung m on p.id = m.probe_id left outer join land.ort o on (p.id = o.probe_id) left outer join stammdaten.ort so on (o.ort_id = so.id) left outer join stammdaten.verwaltungseinheit v on (so.gem_id = v.id) where (o.orts_typ = 'E' or o.orts_typ is null) and (p.netzbetreiber_id = :netz OR '' =:netz) and (p.umw_id similar to (:umw_id) OR '' = :umw_id)", - "type": "probe", - "result": [ - {"dataIndex": "probeId", "header": "ProbeId", "width": 100}, - {"dataIndex": "netzbetreiberId", "header": "Land", "width": 50}, - {"dataIndex": "mstId", "header": "MST", "width": 50}, - {"dataIndex": "entnahmeVon", "header": "Entnahme von", "width": 120}, - {"dataIndex": "entnahmeBis", "header": "Entnahme bis", "width": 120}, - {"dataIndex": "mmtId", "header": "MMT", "width": 50}, - {"dataIndex": "umwId", "header": "Umweltbereich", "width": 100}, - {"dataIndex": "hauptprobenNr", "header": "Proben-Nr", "width": 100}, - {"dataIndex": "ortsTyp", "header": "Ortstyp", "width": 50}, - {"dataIndex": "genId", "header": "Gemeinde-ID", "width": 100}, - {"dataIndex": "bezeichnung", "header": "Gemeinde", "flex": 1} - ], - "filters": [ - {"dataIndex": "netz", "type": "listnetz", "label": "Land"}, - {"dataIndex": "umw_id", "type": "listumw", "label": "Umweltbereich", "multiselect":true} - ] -} -] diff -r 259a6b638968 -r 626ed546329f src/main/resources/stammdatenquery.json --- a/src/main/resources/stammdatenquery.json Thu Oct 13 17:10:02 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,42 +0,0 @@ -[ -{ "id": "1", - "name": "Orte", - "description": "Abfrage der Orte", - "sql": "", - "type": "ort", - "result": [ - ], - "filters": [ - ] -}, { - "id": "2", - "name": "Probenehmer", - "description": "Abfrage aller Probenehmer", - "sql": "", - "type": "probenehmer", - "result": [ - ], - "filters": [ - ] -}, { - "id": "3", - "name": "Datensatzerzeuger", - "description": "Abfrage aller Datensatzerzeuger", - "sql": "", - "type": "datensatzerzeuger", - "result": [ - ], - "filters": [ - ] -}, { - "id": "4", - "name": "Messprogrammkategorie", - "description": "Abfrage der Messprogrammkategorien", - "sql": "", - "type": "messprogrammkategorie", - "result": [ - ], - "filters": [ - ] -} -] diff -r 259a6b638968 -r 626ed546329f src/test/java/de/intevation/lada/BaseTest.java --- a/src/test/java/de/intevation/lada/BaseTest.java Thu Oct 13 17:10:02 2016 +0200 +++ b/src/test/java/de/intevation/lada/BaseTest.java Thu Oct 13 17:23:11 2016 +0200 @@ -45,8 +45,6 @@ .addPackages(true, Package.getPackage("de.intevation.lada")) .addAsResource("log4j.properties", "log4j.properties") .addAsResource("shibboleth.properties", "shibboleth.properties") - .addAsResource("probequery.json", "probequery.json") - .addAsResource("messprogrammquery.json", "messprogrammquery.json") .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") .addAsResource("META-INF/test-persistence.xml", "META-INF/persistence.xml"); diff -r 259a6b638968 -r 626ed546329f src/test/java/de/intevation/lada/ValidatorTest.java --- a/src/test/java/de/intevation/lada/ValidatorTest.java Thu Oct 13 17:10:02 2016 +0200 +++ b/src/test/java/de/intevation/lada/ValidatorTest.java Thu Oct 13 17:23:11 2016 +0200 @@ -76,8 +76,6 @@ .addPackages(true, Package.getPackage("de.intevation.lada")) .addAsResource("log4j.properties", "log4j.properties") .addAsResource("shibboleth.properties", "shibboleth.properties") - .addAsResource("probequery.json", "probequery.json") - .addAsResource("messprogrammquery.json", "messprogrammquery.json") .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") .addAsResource("META-INF/test-persistence.xml", "META-INF/persistence.xml"); diff -r 259a6b638968 -r 626ed546329f src/test/resources/messprogrammquery.json --- a/src/test/resources/messprogrammquery.json Thu Oct 13 17:10:02 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ -[ -{ "id": "1", - "name": "Kein Filter", - "type": "messprogramm", - "description": "Abfrage der Messprogramme ohne Filter", - "sql": "select m.id as id, m.name as name, m.mst_id as mstId, m.umw_id as umwId from land.messprogramm m", - "result": [ - {"dataIndex": "name", "header": "Name", "width": 100}, - {"dataIndex": "mstId", "header": "MST", "width": 100}, - {"dataIndex": "umwId", "header": "Umweltbereich", "width": 100} - ], - "filters": [ - ] -} -] diff -r 259a6b638968 -r 626ed546329f src/test/resources/probequery.json --- a/src/test/resources/probequery.json Thu Oct 13 17:10:02 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,85 +0,0 @@ -[ -{ "id": "1", - "name": "Kein Filter", - "description": "Abfrage der Proben ohne Filter", - "sql": "select p.id as id, pt.probe_id_alt as probeId, p.mst_id as mstId, p.umw_id as umwId from land.probe p join land.probe_translation pt on p.id = pt.probe_id", - "type": "probe", - "result": [ - {"dataIndex": "probeId", "header": "ProbeId", "width": 100}, - {"dataIndex": "mstId", "header": "MST", "width": 100}, - {"dataIndex": "umwId", "header": "Umweltbereich", "width": 100} - ], - "filters": [ - ] -}, -{ "id": "2", - "name": "MST und UMW", - "description": "Abfrage der Proben gefiltert nach Messtellen ID und ID des Umweltbereichs", - "sql": "select p.id as id, pt.probe_id_alt as probeId, p.mst_id as mstId, p.umw_id as umwId from land.probe p join land.probe_translation pt on p.id = pt.probe_id where (p.mst_id = :mst_id OR '' = :mst_id) and (p.umw_id = :umw_id OR '' = :umw_id)", - "type": "probe", - "result": [ - {"dataIndex": "probeId", "header": "ProbeId", "width": 100}, - {"dataIndex": "mstId", "header": "MST", "width": 100}, - {"dataIndex": "umwId", "header": "Umweltbereich", "width": 100} - ], - "filters": [ - {"dataIndex": "mst_id", "type": "listmst", "label": "Messstelle"}, - {"dataIndex": "umw_id", "type": "listumw", "label": "Umweltbereich"} - ] -}, -{ "id": "3", - "name": "Proben pro Land", - "description": "Proben gefiltert nach Ländern", - "sql": "select p.id as id, pt.probe_id_alt as probeId, p.netzbetreiber_id as netzbetreiberId, p.mst_id as mstId, p.umw_id as umwId, p.hauptproben_nr as hauptprobenNr from land.probe p join land.probe_translation pt on p.id = pt.probe_id where (netzbetreiber_id = :netz OR '' = :netz)", - "type": "probe", - "result": [ - {"dataIndex": "probeId", "header": "ProbeId", "width": 100}, - {"dataIndex": "netzbetreiberId", "header": "Land", "width": 100}, - {"dataIndex": "mstId", "header": "MST", "width": 100}, - {"dataIndex": "umwId", "header": "Umweltbereich", "width": 100}, - {"dataIndex": "hauptprobenNr", "header": "Proben-Nr", "width": 100} - ], - "filters": [ - {"dataIndex": "netz", "type": "listnetz", "label": "Land"} - ] -}, -{ "id": "4", - "name": "alle Proben mit Ort", - "description": "alle Proben mit Entnahmeort", - "sql": "select p.id as id, pt.probe_id_alt as probeId, p.netzbetreiber_id as netzbetreiberId, p.mst_id as mstId, p.umw_id as umwId, p.hauptproben_nr as hauptprobenNr, so.gem_id as gemId, v.bezeichnung as bezeichnung from land.probe p join land.probe_translation pt on p.id = pt.probe_id left outer join land.ort o on (p.id = o.probe_id) left outer join stammdaten.ort so on (o.ort_id = so.id) left outer join stammdaten.verwaltungseinheit v on (so.gem_id = v.id) where o.orts_typ = 'E' or o.orts_typ is null", - "type": "probe", - "result": [ - {"dataIndex": "probeId", "header": "ProbeId", "width": 100}, - {"dataIndex": "netzbetreiberId", "header": "Land", "width": 50}, - {"dataIndex": "mstId", "header": "MST", "width": 60}, - {"dataIndex": "umwId", "header": "Umweltbereich", "width": 100}, - {"dataIndex": "hauptprobenNr", "header": "Proben-Nr", "width": 100}, - {"dataIndex": "gemId", "header": "Gem-ID", "width": 100}, - {"dataIndex": "bezeichnung", "header": "Gemeinde", "flex": 1} - ], - "filters": [ - ] -}, -{ "id": "5", - "name": "Proben pro Land und UMW (Multiselect)", - "description": "Abfrage aller Proben gefiltert pro Land und Umweltbereich (mit Mehrfachauswahl)", - "sql": "select p.id as id, pt.probe_id_alt as probeId, p.netzbetreiber_id as netzbetreiberId, p.mst_id as mstId, to_char(p.probeentnahme_beginn,'YYYY-mm-dd HH24:MI') entnahmeVon, to_char(p.probeentnahme_ende,'YYYY-mm-dd HH24:MI') entnahmeBis, p.umw_id as umwId, p.hauptproben_nr as hauptprobenNr, o.orts_typ as ortsTyp, so.gem_id as gemId, v.bezeichnung as bezeichnung from land.probe p join land.probe_translation pt on p.id = pt.probe_id left outer join land.ort o on (p.id = o.probe_id) left outer join stammdaten.ort so on (o.ort_id = so.id) left outer join stammdaten.verwaltungseinheit v on (so.gem_id = v.id) where (o.orts_typ = 'E' or o.orts_typ is null) and (p.netzbetreiber_id = :netz OR '' =:netz) and (p.umw_id similar to (:umw_id) OR '' = :umw_id)", - "type": "probe", - "result": [ - {"dataIndex": "probeId", "header": "ProbeId", "width": 100}, - {"dataIndex": "netzbetreiberId", "header": "Land", "width": 50}, - {"dataIndex": "mstId", "header": "MST", "width": 50}, - {"dataIndex": "entnahmeVon", "header": "Entnahme von", "width": 120}, - {"dataIndex": "entnahmeBis", "header": "Entnahme bis", "width": 120}, - {"dataIndex": "umwId", "header": "Umweltbereich", "width": 100}, - {"dataIndex": "hauptprobenNr", "header": "Proben-Nr", "width": 100}, - {"dataIndex": "ortsTyp", "header": "Ortstyp", "width": 50}, - {"dataIndex": "genId", "header": "Gemeinde-ID", "width": 100}, - {"dataIndex": "bezeichnung", "header": "Gemeinde", "flex": 1} - ], - "filters": [ - {"dataIndex": "netz", "type": "listnetz", "label": "Land"}, - {"dataIndex": "umw_id", "type": "listumw", "label": "Umweltbereich", "multiselect":true} - ] -} -]