# HG changeset patch # User Michael Stanko # Date 1430340914 -7200 # Node ID 76f08c40a13ad01f200b23680ac6934fb3d0ed4d # Parent 4211a1e32f51a3dd2f76b8117a9c4100bce1689c Added column probe_id_alt in query 4 in probequery.json diff -r 4211a1e32f51 -r 76f08c40a13a src/main/resources/probequery.json --- a/src/main/resources/probequery.json Mon Apr 27 18:51:23 2015 +0200 +++ b/src/main/resources/probequery.json Wed Apr 29 22:55:14 2015 +0200 @@ -43,7 +43,7 @@ { "id": "4", "name": "alle Proben mit Ort", "description": "alle Proben mit Entnahmeort", - "sql": "select p.id as id, 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 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", + "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", "result": [ {"dataIndex": "probeId", "header": "ProbeId", "width": 100}, {"dataIndex": "netzbetreiberId", "header": "Land", "width": 50},