[PATCH] issue1521: Adhere more to dc 'spec', show discharges of flow velocity models

Wald Commits scm-commit at wald.intevation.org
Mon Oct 21 12:23:31 CEST 2013


# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller at intevation.de>
# Date 1382350900 -7200
# Node ID 93ae1aa8ade9734ab7c65b3e029317f9be0125fe
# Parent  bbf758e594bbe63c8fc013c7857bcf013fa09aa3
issue1521: Adhere more to dc 'spec', show discharges of flow velocity models.

diff -r bbf758e594bb -r 93ae1aa8ade9 artifacts/doc/conf/meta-data.xml
--- a/artifacts/doc/conf/meta-data.xml	Mon Oct 21 12:22:40 2013 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Mon Oct 21 12:21:40 2013 +0200
@@ -1728,7 +1728,9 @@
       <dc:context>
         <dc:statement>
           SELECT fvm.id          AS fvmid,
-                 fvm.description AS fvmd
+                 fvm.description AS fvmd,
+                 dz.upper_discharge AS upperQ,
+                 dz.lower_discharge AS lowerQ
           FROM flow_velocity_model fvm
           JOIN discharge_zone dz ON dz.id = fvm.discharge_zone_id 
           WHERE dz.river_id = ${river_id}
@@ -1736,9 +1738,11 @@
         <dc:if test="dc:has-result()">
           <flowvelocitymodel>
             <dc:for-each>
-                    <measurement_value name="{$fvmd}"
-                                       ids="{$fvmid}"
-                                       factory="flowvelocitymodel" target_out="{$out}" />
+              <measurement_value name="{$fvmd}"
+                                 ids="{$fvmid}"
+                                 factory="flowvelocitymodel"
+                                 info="{$lowerQ} - {$upperQ}"
+                                 target_out="{$out}" />
             </dc:for-each>
           </flowvelocitymodel>
         </dc:if>


More information about the Dive4elements-commits mailing list