[PATCH] Tooltip for sediment loads in datacage
Wald Commits
scm-commit at wald.intevation.org
Fri Aug 22 18:00:38 CEST 2014
# HG changeset patch
# User "Tom Gottfried <tom at intevation.de>"
# Date 1408723235 -7200
# Node ID aca5d1c87755994f70bc04fb5ca37a1d4c8bafd9
# Parent 82af749d5ab320f186354fdf75f40e6d78d02c72
Tooltip for sediment loads in datacage.
diff -r 82af749d5ab3 -r aca5d1c87755 artifacts/doc/conf/meta-data.xml
--- a/artifacts/doc/conf/meta-data.xml Fri Aug 22 17:43:36 2014 +0200
+++ b/artifacts/doc/conf/meta-data.xml Fri Aug 22 18:00:35 2014 +0200
@@ -1413,7 +1413,7 @@
<year description="{$timespan}"
factory="sedimentload"
target_out="{$out}"
- info="{$description}"
+ info="{$info}"
ids="{$syid};{$fraction};{$timespan}" />
</dc:macro>
@@ -1421,7 +1421,7 @@
<year description="{$timespan}"
factory="sedimentload_ls"
target_out="{$out}"
- info="{$description}"
+ info="{$info}"
ids="{$syid};{$timespan}" />
</dc:macro>
@@ -1479,12 +1479,14 @@
<dc:statement>
SELECT DISTINCT
sy.id AS syid,
- sy.description AS description,
ti.start_time AS startyear,
ti.stop_time AS endyear,
sq.start_time AS sqstart,
sq.stop_time AS sqstop,
- gf.name AS fraction
+ gf.name AS fraction,
+ sy.description || '<BR>' ||
+ 'Fraktion: ' || gf.lower || ' bis ' || gf.upper ||
+ ' mm<BR>Einheit: t/a' AS info
FROM sediment_load sy
JOIN sediment_load_values syv
ON sy.id = syv.sediment_load_id
@@ -1511,12 +1513,14 @@
<dc:statement>
SELECT DISTINCT
sy.id AS syid,
- sy.description AS description,
ti.start_time AS startyear,
ti.stop_time AS endyear,
sq.start_time AS sqstart,
sq.stop_time AS sqstop,
- gf.name AS fraction
+ gf.name AS fraction,
+ sy.description || '<BR>' ||
+ 'Fraktion: ' || gf.lower || ' bis ' || gf.upper ||
+ ' mm<BR>Einheit: ' || u.name AS info
FROM sediment_load_ls sy
JOIN rivers r ON sy.river_id = r.id
JOIN sediment_load_ls_values syv
@@ -1524,6 +1528,7 @@
JOIN time_intervals ti ON sy.time_interval_id = ti.id
JOIN time_intervals sq ON sy.sq_time_interval_id = sq.id
JOIN grain_fraction gf ON gf.id = sy.grain_fraction_id
+ JOIN units u ON sy.unit_id = u.id
WHERE r.id = ${river_id}
AND syv.station BETWEEN ${fromkm} AND ${tokm}
ORDER BY sqstart DESC, sqstop DESC,
More information about the Dive4Elements-commits
mailing list