Mercurial > dive4elements > river

changeset 9640:68d7b09a47b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
zu pos 20 little fixes
author dnt_bjoernsen <d.tironi@bjoernsen.de>
date Tue, 12 Nov 2019 10:07:09 +0100
parents df668014016e
children f96be528ee35
files artifacts/doc/conf/meta-data.xml artifacts/src/main/resources/messages.properties artifacts/src/main/resources/messages_de.properties 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
diffstat 6 files changed, 9 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/artifacts/doc/conf/meta-data.xml	Tue Nov 12 09:24:07 2019 +0100
+++ b/artifacts/doc/conf/meta-data.xml	Tue Nov 12 10:07:09 2019 +0100
@@ -1415,7 +1415,7 @@
     </dc:macro>
 
     <dc:macro name="predefined_infrastructures">
-      <sinfo.flood_duration.infrastructures>
+      <sinfo_flood_duration_infrastructures>
         <dc:choose>
           <dc:when test="dc:contains($riverside, 'left')">
             <dc:context connection="system">
@@ -1440,16 +1440,16 @@
             </dc:context>
           </dc:otherwise>
         </dc:choose>
-      </sinfo.flood_duration.infrastructures>
+      </sinfo_flood_duration_infrastructures>
     </dc:macro>
     
     <dc:macro name="infrastructures_groups_fill">
       <dc:group expr="$group_label">
         <infrastructure_group name="{dc:group-key()}" description="{dc:group-key()}">
           <dc:for-each>
-            <!-- name="{$annotation_type_id}" -->
-             <!-- not necessary: target_out="{$out}" -->
-            <infrastructure_type name="{$type_label}" description="{$filename}" factory="FAKE_FACTORY" group_label="{$group_label}" group_id="{$group_id}" type_id="{$type_id}" type_label="{$type_label}" />
+             <!--target_out MUST BE DEFINED -->
+            <infrastructure_type name="{$type_label}" factory="FAKE_FACTORY"  target_out="{$out}" description="{$filename}" 
+            group_label="{$group_label}" group_id="{$group_id}" type_id="{$type_id}" type_label="{$type_label}" />
           </dc:for-each>
         </infrastructure_group>
       </dc:group>
--- a/artifacts/src/main/resources/messages.properties	Tue Nov 12 09:24:07 2019 +0100
+++ b/artifacts/src/main/resources/messages.properties	Tue Nov 12 10:07:09 2019 +0100
@@ -1070,7 +1070,6 @@
 sinfo.flood_duration.absolute.height.right = Absolute Height Infrastructures BWaStr (right)
 sinfo.flood_duration.infrastructures.left = Flooding Durations Infrastructures BWaStr (left)
 sinfo.flood_duration.infrastructures.right = Flooding Durations Infrastructures BWaStr (right)
-sinfo.flood_duration.infrastructures=Infrastructures
 
 sinfo.export.flow_depth_minmax.csv.header.min = Minimum Flow Depth
 sinfo.export.flow_depth_minmax.csv.header.max = Maximum Flow Depth
--- a/artifacts/src/main/resources/messages_de.properties	Tue Nov 12 09:24:07 2019 +0100
+++ b/artifacts/src/main/resources/messages_de.properties	Tue Nov 12 10:07:09 2019 +0100
@@ -1070,7 +1070,6 @@
 sinfo.flood_duration.absolute.height.right = Absolute H\u00f6he Infrastrukturen BWaStr (rechts)
 sinfo.flood_duration.infrastructures.left = \u00dcberflutungsdauern Infrastrukturen BWaStr (links)
 sinfo.flood_duration.infrastructures.right = \u00dcberflutungsdauern Infrastrukturen BWaStr (rechts)
-sinfo.flood_duration.infrastructures=Infrastrukturen
 
 sinfo.export.flow_depth_minmax.csv.header.min = Minimale Flie\u00dftiefe
 sinfo.export.flow_depth_minmax.csv.header.max = Maximale Flie\u00dftiefe
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java	Tue Nov 12 09:24:07 2019 +0100
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java	Tue Nov 12 10:07:09 2019 +0100
@@ -1622,4 +1622,6 @@
     String vegetation_zones(); // Order für Datenkorb
 
     String uinfo_inundation_scenario_old_msg();
+
+    String sinfo_flood_duration_infrastructures();
 }
\ No newline at end of file
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties	Tue Nov 12 09:24:07 2019 +0100
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties	Tue Nov 12 10:07:09 2019 +0100
@@ -821,6 +821,7 @@
 sinfo_flood_duration = Flooding Durations of Infrastructures in BWaStr
 sinfo_flood_height = Height of Infrastructures in BWaStr
 sinfo_floodduration_curve = Flooding Durations of Infrastructures in BWaStr - Duration Curve
+sinfo_flood_duration_infrastructures=Infrastructures
 
 uinfo = U-INFO
 uinfo_salix_dmwspl_short = \u0394MW [cm]
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties	Tue Nov 12 09:24:07 2019 +0100
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties	Tue Nov 12 10:07:09 2019 +0100
@@ -821,6 +821,7 @@
 sinfo_flood_duration = \u00dcberflutungsdauer Infrastrukturen BWaStr
 sinfo_flood_height = H\u00f6he Infrastrukturen BWaStr
 sinfo_floodduration_curve = \u00dcberflutungsdauer Infrastrukturen BWaStr - Dauerlinie
+sinfo_flood_duration_infrastructures=Infrastrukturen
 
 uinfo = U-INFO
 uinfo_salix_dmwspl_short = \u0394MW [cm]
http://dive4elements.wald.intevation.org