Mercurial > dive4elements > river

changeset 8963:b98fbd91f64a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Configured SINFO-zusätzlich selektierte Längsschnitte in datacage
author gernotbelger
date Wed, 28 Mar 2018 17:04:20 +0200
parents 708f210ff242
children 45f1ad66560e
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
diffstat 4 files changed, 57 insertions(+), 33 deletions(-) [+]
line wrap: on
line diff
--- a/artifacts/doc/conf/meta-data.xml	Wed Mar 28 17:03:11 2018 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Wed Mar 28 17:04:20 2018 +0200
@@ -274,8 +274,12 @@
                     </minfo>
                     <dc:call-macro name="basedata_3_officials"/>
                     <dc:call-macro name="basedata_2_fixations"/>
-                    <dc:call-macro name="basedata_1_additionals-sinfo-with-q"/>
-                    <dc:call-macro name="basedata_1_additionals-sinfo-without-q"/>
+                    <sinfo>
+                      <sinfo_additional_ls>
+                        <dc:call-macro name="basedata_1_additionals-sinfo-with-q"/>
+                        <dc:call-macro name="basedata_1_additionals-sinfo-without-q"/>
+                      </sinfo_additional_ls>
+                    </sinfo>
                   </dc:when>
 
                   <dc:when test="$out = 'sinfo_flow_depth'">
@@ -1299,7 +1303,7 @@
     <dc:macro name="basedata_1_additionals-sinfo-with-q_macro">
       <dc:filter expr="$kind=1 and $sinfo_selection='Q'">
         <dc:if test="dc:has-result()">
-          <additionals>
+          <sinfo_additional_ls_withQ>
             <dc:group expr="dc:replace($wst_description, 'Zus.Längsschnitte/', '')">
               <additional name="{dc:group-key()}">
                 <dc:for-each>
@@ -1307,7 +1311,7 @@
                 </dc:for-each>
               </additional>
             </dc:group>
-          </additionals>
+          </sinfo_additional_ls_withQ>
         </dc:if>
       </dc:filter>
     </dc:macro>
@@ -1321,7 +1325,7 @@
     <dc:macro name="basedata_1_additionals-sinfo-without-q_macro">
       <dc:filter expr="$kind=1 and $sinfo_selection='W'">
         <dc:if test="dc:has-result()">
-          <additionals>
+          <sinfo_additional_ls_withoutQ>
             <dc:group expr="dc:replace($wst_description, 'Zus.Längsschnitte/', '')">
               <additional name="{dc:group-key()}">
                 <dc:for-each>
@@ -1329,14 +1333,14 @@
                 </dc:for-each>
               </additional>
             </dc:group>
-          </additionals>
+          </sinfo_additional_ls_withoutQ>
         </dc:if>
       </dc:filter>
     </dc:macro>
 
     <dc:macro name="basedata_1_additionals-sinfo-without-q">
       <dc:call-macro name="basedata_1_additionals-sinfo-without-q_macro">
-        <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="staticwqkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/>
+        <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/>
       </dc:call-macro>
     </dc:macro>
 
@@ -1606,6 +1610,11 @@
       </minfo>
 
       <sinfo>
+        <sinfo_additional_ls>
+          <dc:call-macro name="basedata_1_additionals-sinfo-with-q"/>
+          <dc:call-macro name="basedata_1_additionals-sinfo-without-q"/>
+        </sinfo_additional_ls>
+
         <bed_heights_minmax>
           <dc:call-macro name="minfo-heights-max"/>
           <dc:call-macro name="minfo-heights-min"/>
@@ -2073,30 +2082,31 @@
 
     <dc:macro name="bed-heights-statement">
       <dc:statement>
-         SELECT bhs.id AS bedh_id,
-         bhs.year AS bedh_year,
-         bhs.description AS bedh_descr,
-         bhs.description || '&lt;BR&gt;Jahr: ' || bhs.year ||
-         '&lt;BR&gt;Aufnahmeart: ' || bht.name ||
-         '&lt;BR&gt;Lagesystem: ' || ls.name ||
-         '&lt;BR&gt;Höhensystem: ' || cur_em.name ||
-         '&lt;BR&gt;ursprüngliches Höhensystem: ' || old_em.name ||
-         '&lt;BR&gt;Strecke: ' || round(r.a, 1) || '-' || round(r.b, 1) ||
-         '&lt;BR&gt;Auswerter: ' || bhs.evaluation_by AS info,
-         bhv.height_count AS bedh_height_count,
-         bhv.min_count AS bedh_min_count,
-         bhv.max_count AS bedh_max_count
-         FROM bed_height bhs
-         JOIN bed_height_type bht ON bht.id = bhs.type_id
-         JOIN location_system ls ON ls.id = location_system_id
-         JOIN elevation_model cur_em ON cur_em.id = cur_elevation_model_id
-         LEFT JOIN elevation_model old_em
-         ON old_em.id = old_elevation_model_id
-         LEFT JOIN ranges r ON r.id = range_id
-         LEFT JOIN (SELECT bed_height_id, COUNT(height) AS height_count, COUNT(min_height) AS min_count, COUNT(max_height) AS max_count
-           FROM bed_height_values GROUP BY bed_height_id
-         ) bhv ON bhs.id = bhv.bed_height_id
-         WHERE bhs.river_id = ${river_id}
+        SELECT bhs.id AS bedh_id,
+        bhs.year AS bedh_year,
+        bhs.description AS bedh_descr,
+        bhs.description || '&lt;BR&gt;Jahr: ' || bhs.year ||
+        '&lt;BR&gt;Aufnahmeart: ' || bht.name ||
+        '&lt;BR&gt;Lagesystem: ' || ls.name ||
+        '&lt;BR&gt;Höhensystem: ' || cur_em.name ||
+        '&lt;BR&gt;ursprüngliches Höhensystem: ' || old_em.name ||
+        '&lt;BR&gt;Strecke: ' || round(r.a, 1) || '-' || round(r.b, 1) ||
+        '&lt;BR&gt;Auswerter: ' || bhs.evaluation_by AS info,
+        bhv.height_count AS bedh_height_count,
+        bhv.min_count AS bedh_min_count,
+        bhv.max_count AS bedh_max_count
+        FROM bed_height bhs
+        JOIN bed_height_type bht ON bht.id = bhs.type_id
+        JOIN location_system ls ON ls.id = location_system_id
+        JOIN elevation_model cur_em ON cur_em.id = cur_elevation_model_id
+        LEFT JOIN elevation_model old_em
+        ON old_em.id = old_elevation_model_id
+        LEFT JOIN ranges r ON r.id = range_id
+        LEFT JOIN (SELECT bed_height_id, COUNT(height) AS height_count, COUNT(min_height) AS min_count, COUNT(max_height) AS max_count
+        FROM bed_height_values GROUP
+        BY bed_height_id
+        ) bhv ON bhs.id = bhv.bed_height_id
+        WHERE bhs.river_id = ${river_id}
       </dc:statement>
     </dc:macro>
 
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java	Wed Mar 28 17:03:11 2018 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java	Wed Mar 28 17:04:20 2018 +0200
@@ -1479,4 +1479,10 @@
     String bedheights_max();
 
     String bedheights_min();
+
+    String sinfo_additional_ls();
+
+    String sinfo_additional_ls_withQ();
+
+    String sinfo_additional_ls_withoutQ();
 }
\ No newline at end of file
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties	Wed Mar 28 17:03:11 2018 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties	Wed Mar 28 17:04:20 2018 +0200
@@ -786,4 +786,8 @@
 
 bed_heights_minmax = Minimale/maximale Sohlh\u00f6he
 bedheights_max = Kammlage
-bedheights_min = Talweg
\ No newline at end of file
+bedheights_min = Talweg
+
+sinfo_additional_ls = Selektierte zus. L\u00e4ngsschnitte
+sinfo_additional_ls_withQ = mit Abfluss
+sinfo_additional_ls_withoutQ = ohne Abfluss
\ No newline at end of file
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties	Wed Mar 28 17:03:11 2018 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties	Wed Mar 28 17:04:20 2018 +0200
@@ -786,4 +786,8 @@
 
 bed_heights_minmax = Minimale/maximale Sohlh\u00f6he
 bedheights_max = Kammlage
-bedheights_min = Talweg
\ No newline at end of file
+bedheights_min = Talweg
+
+sinfo_additional_ls = Selektierte zus. L\u00e4ngsschnitte
+sinfo_additional_ls_withQ = mit Abfluss
+sinfo_additional_ls_withoutQ = ohne Abfluss
\ No newline at end of file
http://dive4elements.wald.intevation.org