# HG changeset patch
# User Tim Englich <tim.englich@intevation.de>
# Date 1260888942 0
# Node ID 3eee1369c79bd56dd6b9b1a730ce296213caad2a
# Parent  fce70ff3486bd8ec2d1d910992d1ac84206f61cb
Added the Unit of the Parameter to the Query for Parameters in
all Parameterqueries where it was still missing. Now the Unit will
be displaied in the Combobox and in the Diagramm-Axis-Description

gnv-artifacts/trunk@429 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r fce70ff3486b -r 3eee1369c79b gnv-artifacts/ChangeLog
--- a/gnv-artifacts/ChangeLog	Tue Dec 15 14:35:41 2009 +0000
+++ b/gnv-artifacts/ChangeLog	Tue Dec 15 14:55:42 2009 +0000
@@ -1,3 +1,10 @@
+2009-12-15  Tim Englich  <tim.englich@intevation.de>
+
+	* doc/conf/queries.properties: 
+	  Added the Unit of the Parameter to the Query for Parameters in 
+	  all Parameterqueries where it was still missing. Now the Unit will 
+	  be displaied in the Combobox and in the Diagramm-Axis-Description. 
+
 2009-12-15	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
 
 	* pom.xml: Upgraded to Apache Commons Math 2.0. Needed for
@@ -9,7 +16,9 @@
 	  math api.
 
 2009-12-15  Tim Englich  <tim.englich@intevation.de>
-
+Added the Unit of the Parameter to the Query for Parameters in 
+      TimeSeries. Now teh Unit will be displaied in the Combobox and
+      in the Diagramm-Axis-Description.
 	* src/main/resources/lang/artifactMessages*.properties: 
 	  Added the name Productname for "horizontale Schnittprofile". to the
 	  Resources so that it could be displaied properly in the GUI
diff -r fce70ff3486b -r 3eee1369c79b gnv-artifacts/doc/conf/queries.properties
--- a/gnv-artifacts/doc/conf/queries.properties	Tue Dec 15 14:35:41 2009 +0000
+++ b/gnv-artifacts/doc/conf/queries.properties	Tue Dec 15 14:55:42 2009 +0000
@@ -148,7 +148,8 @@
 
 timeseries_mesh_parameter=SELECT distinct \
         p.PARAMETERID KEY, \
-        p.GERMANNAME VALUE \
+        p.GERMANNAME || '  ['|| p.UNIT ||']' VALUE, \
+        p.GERMANNAME \
     from MEDIAN.PARAMETER p, \
          MEDIAN.MESHSCALARVALUE msc, \
          MEDIAN.MESH m \
@@ -238,7 +239,8 @@
 
 verticalprofile_parameter=SELECT DISTINCT \
            p.PARAMETERID KEY, \
-           p.GERMANNAME VALUE \
+           p.GERMANNAME || '  ['|| p.UNIT ||']' VALUE, \
+           p.GERMANNAME \
     from MEDIAN.PARAMETER p, \
            MEDIAN.TIMESERIES ts, \
            MEDIAN.TIMESERIESVALUE tsv, \
@@ -387,7 +389,8 @@
     
 verticalprofile_mesh_parameter=SELECT distinct \
         p.PARAMETERID KEY, \
-        p.GERMANNAME VALUE \
+        p.GERMANNAME || '  ['|| p.UNIT ||']' VALUE, \
+        p.GERMANNAME \
     from MEDIAN.PARAMETER p, \
          MEDIAN.MESHSCALARVALUE msc, \
          MEDIAN.MESH m  \
@@ -530,7 +533,8 @@
 
 verticalprofile_instantaneouspoint_parameter = SELECT DISTINCT \
         P.PARAMETERID KEY, \
-        P.GERMANNAME VALUE \
+        p.GERMANNAME || '  ['|| p.UNIT ||']' VALUE, \
+        p.GERMANNAME \
     FROM MEDIAN.PARAMETER P, \
          MEDIAN.INSTANTANEOUSPOINT IP, \
          MEDIAN.MEASUREMENT M, \
@@ -723,7 +727,8 @@
              DESCRIPTION
 horizontalprofile_instantaneouspoint_parameter = SELECT DISTINCT \
         P.PARAMETERID KEY, \
-        P.GERMANNAME VALUE \
+        p.GERMANNAME || '  ['|| p.UNIT ||']' VALUE, \
+        p.GERMANNAME \
     FROM MEDIAN.PARAMETER P, \
          MEDIAN.MEASUREMENT M, \
          MEDIAN.INSTANTANEOUSPOINT IP, \