Mercurial > dive4elements > river
changeset 8297:6f866709bbff
Official sedimentload epochs should be seperated from other data in datacage.
| author | "Tom Gottfried <tom@intevation.de>" |
|---|---|
| date | Fri, 19 Sep 2014 09:49:09 +0200 |
| parents | df5838cc7ecc |
| children | 5dfb3ff98bc6 |
| 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, 55 insertions(+), 40 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/doc/conf/meta-data.xml Thu Sep 18 18:41:14 2014 +0200 +++ b/artifacts/doc/conf/meta-data.xml Fri Sep 19 09:49:09 2014 +0200 @@ -1441,49 +1441,59 @@ </dc:macro> <dc:macro name="loads"> - <dc:if test="dc:has-result()"> - <dc:group expr="$fraction"> - <dc:variable name="fraction_name" expr="concat('${', dc:group-key(), '}')"/> - <fraction description="{$fraction_name}"> - <dc:for-each> - <dc:choose> - <dc:when test="string-length(dc:get('endyear')) = 0"> - <dc:variable name="timespan" type="string" - expr="dc:date-format('yyyy', $startyear)"/> - </dc:when> - <dc:otherwise> - <dc:variable name="timespan" type="string" - expr="concat(dc:date-format('yyyy', $startyear), - '-', dc:date-format('yyyy', $endyear))"/> - </dc:otherwise> - </dc:choose> - <dc:if test="$kind = 'official'"> - <dc:variable name="info" type="string" - expr="concat('Amtliche Epoche<BR>', dc:get('info'))"/> - </dc:if> - <dc:macro-body/> - </dc:for-each> - </fraction> - </dc:group> - </dc:if> + <dc:if test="dc:has-result()"> + <dc:group expr="concat('SQ ', dc:date-format('yyyy', $sqstart), '-', + dc:date-format('yyyy', $sqstop))"> + <sq_time description="{dc:group-key()}"> + <dc:group expr="$fraction"> + <dc:variable name="fraction_name" + expr="concat('${', dc:group-key(), '}')"/> + <fraction description="{$fraction_name}"> + <dc:for-each> + <dc:choose> + <dc:when test="string-length(dc:get('endyear')) = 0"> + <dc:variable name="timespan" type="string" + expr="dc:date-format('yyyy', $startyear)"/> + </dc:when> + <dc:otherwise> + <dc:variable name="timespan" type="string" + expr="concat(dc:date-format('yyyy', + $startyear), '-', + dc:date-format('yyyy', $endyear))"/> + </dc:otherwise> + </dc:choose> + <dc:if test="$kind = 'official'"> + <dc:variable name="info" type="string" + expr="concat('Amtliche Epoche<BR>', + dc:get('info'))"/> + </dc:if> + <dc:macro-body/> + </dc:for-each> + </fraction> + </dc:group> + </sq_time> + </dc:group> + </dc:if> </dc:macro> <dc:macro name="sedimentloads-filter"> - <dc:group expr="concat('SQ ', dc:date-format('yyyy', $sqstart), '-', - dc:date-format('yyyy', $sqstop))"> - <sq_time description="{dc:group-key()}"> - <years> - <dc:filter expr="string-length(dc:get('endyear')) = 0" > - <dc:macro-body/> - </dc:filter> - </years> - <epochs> - <dc:filter expr="string-length(dc:get('endyear')) > 0" > - <dc:macro-body/> - </dc:filter> - </epochs> - </sq_time> - </dc:group> + <years> + <dc:filter expr="string-length(dc:get('endyear')) = 0 and + $kind != 'official'" > + <dc:macro-body/> + </dc:filter> + </years> + <epochs> + <dc:filter expr="string-length(dc:get('endyear')) > 0 and + $kind != 'official'" > + <dc:macro-body/> + </dc:filter> + </epochs> + <off_epochs> + <dc:filter expr="$kind = 'official'" > + <dc:macro-body/> + </dc:filter> + </off_epochs> </dc:macro> <dc:macro name="sedimentloads">
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java Thu Sep 18 18:41:14 2014 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java Fri Sep 19 09:49:09 2014 +0200 @@ -980,6 +980,8 @@ String epochs(); + String off_epochs(); + String densities(); String sediment_load();
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties Thu Sep 18 18:41:14 2014 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties Fri Sep 19 09:49:09 2014 +0200 @@ -523,6 +523,7 @@ sources_sinks = sources_sinks years = years epochs = epochs +off_epochs = official epochs densities = Sediment Densities sediment_load = Sediment Load
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties Thu Sep 18 18:41:14 2014 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties Fri Sep 19 09:49:09 2014 +0200 @@ -528,6 +528,7 @@ sources_sinks = Quellen_Senken years = Einzeljahre epochs = Epochen +off_epochs = Amtliche Epochen densities = Sedimentdichte sediment_load = Sedimentfracht
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_en.properties Thu Sep 18 18:41:14 2014 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_en.properties Fri Sep 19 09:49:09 2014 +0200 @@ -508,6 +508,7 @@ sources_sinks = sources_sinks years = years epochs = epochs +off_epochs = official epochs densities = Sediment Densities sediment_load = Sediment Load