# HG changeset patch
# User Michael Stanko <mstanko@bfs.de>
# Date 1442915510 -7200
# Node ID add3e994b4c451d77d987c3699231145b9668fdb
# Parent  1ed5e3692215911f0ff96ead5b32fd956f9ee8cc
add new search 'HP-Nr-Filter'

diff -r 1ed5e3692215 -r add3e994b4c4 pom.xml
--- a/pom.xml	Fri Sep 18 14:35:45 2015 +0200
+++ b/pom.xml	Tue Sep 22 11:51:50 2015 +0200
@@ -246,9 +246,11 @@
                         <artifactId>wildfly-maven-plugin</artifactId>
                         <configuration>
                             <hostname>localhost</hostname>
-                            <port>19990</port>
+                            <port>9990</port>
+<!--
                             <username>admin</username>
                             <password>secret</password>
+-->
                         </configuration>
                         <!-- <executions>
                             <execution>
diff -r 1ed5e3692215 -r add3e994b4c4 src/main/resources/probequery.json
--- a/src/main/resources/probequery.json	Fri Sep 18 14:35:45 2015 +0200
+++ b/src/main/resources/probequery.json	Tue Sep 22 11:51:50 2015 +0200
@@ -14,6 +14,21 @@
     ]
 },
 {   "id": "1",
+    "name": "HP-Nr-Filer",
+    "description": "Abfrage der Proben mit Wildcardfilter fuer 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)",
+    "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-Filer",
     "description": "Abfrage der Proben mit Wildcardfilter fuer 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)",
@@ -28,7 +43,7 @@
         {"dataIndex": "probe_id", "type": "text", "label": "Probe_id-Filter"}
     ]
 },
-{   "id": "2",
+{   "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)",
@@ -44,7 +59,7 @@
         {"dataIndex": "umw_id", "type": "listumw", "label": "Umweltbereich"}
     ]
 },
-{   "id": "3",
+{   "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)",
@@ -59,7 +74,7 @@
         {"dataIndex": "netz", "type": "listnetz", "label": "Land"}
     ]
 },
-{   "id": "4",
+{   "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",
@@ -75,7 +90,7 @@
     "filters": [
     ]
 },
-{   "id": "5",
+{   "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)",