Mercurial > dive4elements > river

changeset 7665:6d39b4066c91

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add sources/sinks to sediment yield datacage.
author Tom Gottfried <tom.gottfried@intevation.de>
date Fri, 06 Dec 2013 13:58:27 +0100
parents 877d558747c6
children c36aae57ad43
files artifacts/doc/conf/meta-data.xml gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_en.properties
diffstat 5 files changed, 24 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/artifacts/doc/conf/meta-data.xml	Fri Dec 06 13:17:05 2013 +0100
+++ b/artifacts/doc/conf/meta-data.xml	Fri Dec 06 13:58:27 2013 +0100
@@ -1434,6 +1434,7 @@
       
     <dc:macro name="yields">
       <yields>
+      <dc:call-macro name="annotations_sediment_yield"/>
       <years>
       <dc:context>
         <dc:statement>
@@ -1522,6 +1523,24 @@
       </annotations>
     </dc:macro>
 
+    <dc:macro name="annotations_sediment_yield">
+      <sources_sinks>
+        <dc:context>
+          <dc:statement>
+            SELECT id   AS anno_id,
+                   name AS anno_description
+            FROM annotation_types
+	    WHERE name IN ('Quelle', 'Senke')
+          </dc:statement>
+          <dc:for-each>
+            <annotation name="{$anno_description}"
+                        factory="annotations" target_out="{$out}"
+                        ids="{$river_id}:{$anno_description}"/>
+          </dc:for-each>
+        </dc:context>
+      </sources_sinks>
+    </dc:macro>
+
     <dc:macro name="basedata_2_fixations_relative_point">
       <dc:filter expr="$kind=2">
         <dc:if test="dc:has-result()">
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java	Fri Dec 06 13:17:05 2013 +0100
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java	Fri Dec 06 13:58:27 2013 +0100
@@ -962,6 +962,8 @@
 
     String yields();
 
+    String sources_sinks();
+
     String years();
 
     String epochs();
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties	Fri Dec 06 13:17:05 2013 +0100
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties	Fri Dec 06 13:58:27 2013 +0100
@@ -510,6 +510,7 @@
 delta_w_cma = cm/a
 wlevel = Waterlevels
 yields = sedimentyields
+sources_sinks = sources_sinks
 years = years
 epochs = epochs
 densities = Sediment Densities
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties	Fri Dec 06 13:17:05 2013 +0100
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties	Fri Dec 06 13:58:27 2013 +0100
@@ -515,6 +515,7 @@
 delta_w_cma = cm/a
 wlevel = Wasserspiegellagen
 yields = Frachten
+sources_sinks = Quellen_Senken
 years = Einzeljahre
 epochs = Epochen
 densities = Sedimentdichte
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_en.properties	Fri Dec 06 13:17:05 2013 +0100
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_en.properties	Fri Dec 06 13:58:27 2013 +0100
@@ -494,6 +494,7 @@
 delta_w_cma = cm/a
 wlevel = Waterlevels
 yields = sedimentyields
+sources_sinks = sources_sinks
 years = years
 epochs = epochs
 densities = Sediment Densities
http://dive4elements.wald.intevation.org