Mercurial > dive4elements > river
changeset 7223:2c26a7217732
issue1435: DC layout for sediment-loads more the way its requested.
author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
---|---|
date | Wed, 02 Oct 2013 11:44:23 +0200 |
parents | 7a6cb5b34bfc |
children | aae92f8bf6d1 |
files | artifacts/doc/conf/meta-data.xml |
diffstat | 1 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/doc/conf/meta-data.xml Tue Oct 01 10:06:11 2013 +0200 +++ b/artifacts/doc/conf/meta-data.xml Wed Oct 02 11:44:23 2013 +0200 @@ -1268,21 +1268,25 @@ SELECT DISTINCT sy.id AS syid, sy.description AS description, - ti.start_time AS year + ti.start_time AS year, + gf.name AS fraction 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 + JOIN grain_fraction gf ON gf.id = sy.grain_fraction_id WHERE r.id = ${river_id} AND ti.stop_time IS NULL AND syv.station BETWEEN ${fromkm} AND ${tokm} + ORDER BY fraction </dc:statement> <dc:if test="dc:has-result()"> <dc:for-each> - <year description="{$description}" + <dc:variable name="syear" type="string" expr="dc:date-format('yyyy', $year)"/> + <year description="{$syear} - {$description}" factory="sedimentyield" target_out="{$out}" - info="infome" + info="{$syear}-{$fraction}" ids="{$syid}" /> </dc:for-each> </dc:if>