Mercurial > dive4elements > gnv-client

changeset 532:d2f97cb2ac32

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Splitted date selection of product 'Horizontalschnitt' into two steps. gnv-artifacts/trunk@628 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Tue, 26 Jan 2010 10:46:33 +0000
parents b80940231f6e
children 78e0e239a0b9
files gnv-artifacts/ChangeLog gnv-artifacts/doc/conf/products/horizontalcrosssection/conf_mesh.xml gnv-artifacts/doc/conf/queries.properties
diffstat 3 files changed, 41 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/gnv-artifacts/ChangeLog	Tue Jan 26 10:16:00 2010 +0000
+++ b/gnv-artifacts/ChangeLog	Tue Jan 26 10:46:33 2010 +0000
@@ -1,3 +1,11 @@
+2010-01-26  Ingo Weinzierl <ingo.weinzierl@intevation.de>
+
+	  Issue162
+
+	* doc/conf/products/horizontalcrosssection/conf_mesh.xml,
+	  doc/conf/queries.properties: Adapted transition model. Splitted date
+	  selection of 'Horizontalschnitte' into two steps.
+
 2010-01-26  Ingo Weinzierl <ingo.weinzierl@intevation.de>
 
 	* doc/conf/products/verticalcrosssection/conf_mesh.xml: Removed csv export
--- a/gnv-artifacts/doc/conf/products/horizontalcrosssection/conf_mesh.xml	Tue Jan 26 10:16:00 2010 +0000
+++ b/gnv-artifacts/doc/conf/products/horizontalcrosssection/conf_mesh.xml	Tue Jan 26 10:46:33 2010 +0000
@@ -119,9 +119,28 @@
                  <inputvalue name="mesh_polygon" type="String" multiselect="false" usedinquery="0"/>
             </inputvalues>
         </state>
+
+        <transition transition="de.intevation.gnv.transition.DefaultTransition">
+            <from state="horizontalcrosssection_meshpoint_parameter"/>
+            <to state="horizontalcrosssection_mesh_year"/>
+        </transition>
+        
+        <state id="horizontalcrosssection_mesh_year" description="horizontalcrosssection_mesh_year" state="de.intevation.gnv.state.DefaultState">
+           <queryID>horizontalcrosssection_mesh_year</queryID>
+           <dataname>yearid</dataname>
+           <data-multiselect>false</data-multiselect>
+           <inputvalues>
+               <inputvalue name="meshid" type="Integer" multiselect="false" usedinquery="1"/>
+               <inputvalue name="depthid" type="Integer" multiselect="false" usedinquery="0"/>
+               <inputvalue name="parameterid" type="Integer" multiselect="false" usedinquery="1" />
+               <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
+               <inputvalue name="yearid" type="String" multiselect="true" usedinquery="0" />
+               <inputvalue name="mesh_polygon" type="String" multiselect="false" usedinquery="0"/>
+           </inputvalues>
+        </state>
         
         <transition transition="de.intevation.gnv.transition.DefaultTransition">
-            <from state="horizontalcrosssection_meshpoint_parameter"/>
+            <from state="horizontalcrosssection_mesh_year"/>
             <to state="horizontalcrosssection_mesh_date"/>
         </transition>
         
@@ -134,6 +153,7 @@
                <inputvalue name="depthid" type="Integer" multiselect="false" usedinquery="0"/>
                <inputvalue name="parameterid" type="Integer" multiselect="false" usedinquery="1" />
                <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
+               <inputvalue name="yearid" type="String" multiselect="true" usedinquery="1" />
                <inputvalue name="dateid" type="Date" multiselect="false" usedinquery="0" />
                <inputvalue name="mesh_polygon" type="String" multiselect="false" usedinquery="0"/>
            </inputvalues>
--- a/gnv-artifacts/doc/conf/queries.properties	Tue Jan 26 10:16:00 2010 +0000
+++ b/gnv-artifacts/doc/conf/queries.properties	Tue Jan 26 10:46:33 2010 +0000
@@ -1095,6 +1095,16 @@
           MP.MESHID = M.MESHID \
     ORDER BY MP.KPOSITION
     
+horizontalcrosssection_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 = ? \
+    order by to_char(msv.TIMEVALUE,'YYYY')
 horizontalcrosssection_mesh_date = select  distinct \
         msv.TIMEVALUE KEY, \
         msv.TIMEVALUE VALUE \
@@ -1103,7 +1113,8 @@
     where m.OBJECTID = ?  AND \
           msv.PARTID >= m.PARTIDMIN AND \
           msv.PARTID <= m.PARTIDMAX AND \
-          msv.PARAMETERID = ? \
+          msv.PARAMETERID = ? AND \
+          to_char(msv.TIMEVALUE,'YYYY') in (?) \
     order by msv.TIMEVALUE
     
 horizontalcrosssection_mesh_data = SELECT ST_ASTEXT(SHAPE), \
http://dive4elements.wald.intevation.org