Mercurial > dive4elements > river
changeset 7191:7bd19eff9bca
issue1435: In DC conf, show sedimentyields in yield/[year|epoch]- structure, i18n.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Fri, 27 Sep 2013 16:13:54 +0200 |
| parents | 851fc99be4bc |
| children | 5be5bf32bead |
| 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, 46 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/doc/conf/meta-data.xml Fri Sep 27 14:42:03 2013 +0200 +++ b/artifacts/doc/conf/meta-data.xml Fri Sep 27 16:13:54 2013 +0200 @@ -1230,6 +1230,8 @@ </dc:macro> <dc:macro name="yields"> + <yields> + <years> <dc:context> <dc:statement> SELECT DISTINCT @@ -1247,14 +1249,42 @@ <dc:if test="dc:has-result()"> <dc:for-each> <year description="{$description}" - factory="sedimentyield" - target_out="{$out}" - info="infome" + factory="sedimentyield" + target_out="{$out}" + info="infome" ids="{$syid}" /> -<!-- or epoch --> </dc:for-each> </dc:if> </dc:context> + </years> + <epochs> + <dc:context> + <dc:statement> + SELECT DISTINCT + sy.id AS syid, + sy.description AS description, + ti.start_time AS year + FROM sediment_yield sy + JOIN rivers r ON sy.river_id = r.id + JOIN sediment_yield_values syv ON sy.id = syv.sediment_yield_id + JOIN time_intervals ti ON sy.time_interval_id = ti.id + WHERE r.name = 'Elbe' + AND ti.stop_time IS NOT NULL + AND syv.station BETWEEN ${fromkm} AND ${tokm} + </dc:statement> + <dc:if test="dc:has-result()"> + <dc:for-each> + <epoch description="{$description}" + factory="sedimentyield" + target_out="{$out}" + info="infome" + ids="{$syid}" /> + </dc:for-each> + </dc:if> + </dc:context> + </epochs> + + </yields> </dc:macro>
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java Fri Sep 27 14:42:03 2013 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java Fri Sep 27 16:13:54 2013 +0200 @@ -940,6 +940,12 @@ String wlevel(); + String yields(); + + String years(); + + String epochs(); + // Capabilities Information Panel String addwmsInputTitle();
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties Fri Sep 27 14:42:03 2013 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties Fri Sep 27 16:13:54 2013 +0200 @@ -500,6 +500,9 @@ delta_w_cm = cm delta_w_cma = cm/a wlevel = Waterlevels +yields = sedimentyields +years = years +epochs = epochs # No translation for the pegelonline wms service layer names. gauge_points = Pegelpunkte (WSV) gauge_level = Aktueller Wasserstand (WSV)
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties Fri Sep 27 14:42:03 2013 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties Fri Sep 27 16:13:54 2013 +0200 @@ -505,6 +505,9 @@ delta_w_cm = cm delta_w_cma = cm/a wlevel = Wasserspiegellagen +yields = Frachten +years = Einzeljahre +epochs = Epochen gauge_points = Pegelmessstelle (WMS) gauge_level = Wasserstand (WMS) gauge_names = Pegelname (WMS)