Mercurial > dive4elements > gnv-client

changeset 523:c6249cb631df

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Splitted date selection of horizontal profile charts into two parts - selection of a year and selection of a concrete date of this year. gnv-artifacts/trunk@617 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Mon, 25 Jan 2010 11:04:52 +0000
parents c896282c2601
children d5a7608a4eea
files gnv-artifacts/ChangeLog gnv-artifacts/doc/conf/products/horizontalprofile/conf_mesh.xml gnv-artifacts/doc/conf/products/horizontalprofile/conf_mesh_cross.xml gnv-artifacts/doc/conf/queries.properties
diffstat 4 files changed, 65 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/gnv-artifacts/ChangeLog	Mon Jan 25 09:18:31 2010 +0000
+++ b/gnv-artifacts/ChangeLog	Mon Jan 25 11:04:52 2010 +0000
@@ -1,3 +1,13 @@
+2010-01-25  Ingo Weinzierl <ingo.weinzierl@intevation.de>
+
+	* doc/conf/products/horizontalprofile/conf_mesh_cross.xml,
+	  doc/conf/products/horizontalprofile/conf_mesh.xml: Added new state for
+	  splitting the date selection into two parts - selection of year and
+	  selection of a concrete date of this year.
+
+	* doc/conf/queries.properties: Added new sql statement for querying years
+	  and adapted statement to query concrete dates.
+
 2010-01-25  Ingo Weinzierl <ingo.weinzierl@intevation.de>
 
 	  Issue156
--- a/gnv-artifacts/doc/conf/products/horizontalprofile/conf_mesh.xml	Mon Jan 25 09:18:31 2010 +0000
+++ b/gnv-artifacts/doc/conf/products/horizontalprofile/conf_mesh.xml	Mon Jan 25 11:04:52 2010 +0000
@@ -157,6 +157,26 @@
        
        <transition transition="de.intevation.gnv.transition.DefaultTransition">
            <from state="horizontalprofile_meshpoint_depth"/>
+           <to state="horizontalprofile_mesh_year"/>
+       </transition>
+
+        <state id="horizontalprofile_mesh_year" description="horizontalprofile_mesh_year" state="de.intevation.gnv.state.DefaultState">
+           <queryID>verticalprofile_mesh_year</queryID>
+           <dataname>yearid</dataname>
+           <data-multiselect>true</data-multiselect>
+           <inputvalues>
+               <inputvalue name="meshid" type="Integer" multiselect="false" usedinquery="1"/>
+               <inputvalue name="mesh_point" type="Integer" multiselect="false" usedinquery="0"/>
+               <inputvalue name="axisid" type="AttributeName" multiselect="false" usedinquery="0"/>
+               <inputvalue name="parameterid" type="Integer" multiselect="true"  usedinquery="1"/>
+               <inputvalue name="depthid" type="Integer" multiselect="true"  usedinquery="0"/>
+               <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
+               <inputvalue name="yearid" type="String" multiselect="true" usedinquery="0"/>
+           </inputvalues>
+       </state>
+
+       <transition transition="de.intevation.gnv.transition.DefaultTransition">
+           <from state="horizontalprofile_mesh_year"/>
            <to state="horizontalprofile_mesh_date"/>
        </transition>
        
@@ -171,6 +191,7 @@
                <inputvalue name="parameterid" type="Integer" multiselect="true"  usedinquery="1"/>
                <inputvalue name="depthid" type="Integer" multiselect="true"  usedinquery="0"/>
                <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
+               <inputvalue name="yearid" type="String" multiselect="true" usedinquery="1"/>
                <inputvalue name="dateid" type="Date" multiselect="true" usedinquery="0"/>
            </inputvalues>
        </state>
--- a/gnv-artifacts/doc/conf/products/horizontalprofile/conf_mesh_cross.xml	Mon Jan 25 09:18:31 2010 +0000
+++ b/gnv-artifacts/doc/conf/products/horizontalprofile/conf_mesh_cross.xml	Mon Jan 25 11:04:52 2010 +0000
@@ -124,6 +124,26 @@
        
        <transition transition="de.intevation.gnv.transition.DefaultTransition">
            <from state="horizontalprofile_meshpoint_depth"/>
+           <to state="horizontalprofile_mesh_year"/>
+       </transition>
+
+       <state id="horizontalprofile_mesh_year" description="horizontalprofile_mesh_year" state="de.intevation.gnv.state.DefaultState">
+           <queryID>verticalprofile_mesh_year</queryID>
+           <dataname>yearid</dataname>
+           <data-multiselect>true</data-multiselect>
+           <inputvalues>
+               <inputvalue name="meshid" type="Integer" multiselect="false" usedinquery="1"/>
+               <inputvalue name="mesh_point" type="Integer" multiselect="false" usedinquery="0"/>
+               <inputvalue name="parameterid" type="Integer" multiselect="true"  usedinquery="1"/>
+               <inputvalue name="depthid" type="Integer" multiselect="true"  usedinquery="0"/>
+               <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
+               <inputvalue name="yearid" type="String" multiselect="true" usedinquery="0"/>
+               <inputvalue name="mesh_linestring" type="String" multiselect="false" usedinquery="0"/>
+           </inputvalues>
+       </state>
+
+       <transition transition="de.intevation.gnv.transition.DefaultTransition">
+           <from state="horizontalprofile_mesh_year"/>
            <to state="horizontalprofile_mesh_date"/>
        </transition>
        
@@ -136,6 +156,7 @@
                <inputvalue name="parameterid" type="Integer" multiselect="true"  usedinquery="1"/>
                <inputvalue name="depthid" type="Integer" multiselect="true"  usedinquery="0"/>
                <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
+               <inputvalue name="yearid" type="String" multiselect="true" usedinquery="1"/>
                <inputvalue name="dateid" type="Date" multiselect="true" usedinquery="0"/>
                <inputvalue name="mesh_linestring" type="String" multiselect="false" usedinquery="0"/>
            </inputvalues>
--- a/gnv-artifacts/doc/conf/queries.properties	Mon Jan 25 09:18:31 2010 +0000
+++ b/gnv-artifacts/doc/conf/queries.properties	Mon Jan 25 11:04:52 2010 +0000
@@ -412,6 +412,17 @@
           m.PARTIDMIN = msc.PARTID AND \
           msc.PARAMETERID = p.PARAMETERID \
     order by p.GERMANNAME
+
+verticalprofile_mesh_year= select  distinct \
+        to_char(msv.TIMEVALUE,'YYYY') KEY, \
+        to_char(msv.TIMEVALUE,'YYYY') VALUE \
+    from MEDIAN.MESHSCALARVALUE msv, \
+         MEDIAN.MESH m \
+    where m.OBJECTID = ?  AND \
+          msv.PARTID >= m.PARTIDMIN AND \
+          msv.PARTID <= m.PARTIDMAX AND \
+          msv.PARAMETERID in (?) \
+    order by to_char(msv.TIMEVALUE, 'YYYY')
           
 verticalprofile_mesh_date= select  distinct \
         msv.TIMEVALUE KEY, \
@@ -421,7 +432,8 @@
     where m.OBJECTID = ?  AND \
           msv.PARTID >= m.PARTIDMIN AND \
           msv.PARTID <= m.PARTIDMAX AND \
-          msv.PARAMETERID in (?) \
+          msv.PARAMETERID in (?) AND \
+          to_char(msv.TIMEVALUE,'YYYY') in (?) \
     order by msv.TIMEVALUE
 
 verticalprofile_mesh_chart_data=select ml.UPPERZLOCATION XORDINATE, \
http://dive4elements.wald.intevation.org