Mercurial > dive4elements > river
changeset 9518:2e6fd354dd8e
Put iota cross section results in own data cage folder; working now
| author | gernotbelger |
|---|---|
| date | Mon, 01 Oct 2018 15:54:57 +0200 |
| parents | 17e4defa8dac |
| children | ec2ebbc49fbc |
| files | artifacts/doc/conf/meta-data.xml |
| diffstat | 1 files changed, 28 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/doc/conf/meta-data.xml Mon Oct 01 15:54:52 2018 +0200 +++ b/artifacts/doc/conf/meta-data.xml Mon Oct 01 15:54:57 2018 +0200 @@ -482,6 +482,7 @@ <dc:when test="starts-with($out, 'sq_relation') or $out = 'sq_overview'"> <dc:call-macro name="discharge-curve-user-prototype"/> </dc:when> + <dc:comment> Time series </dc:comment> <dc:when test="$out = 'fix_deltawt_curve'"> <dc:call-macro name="delta-wt"/> @@ -615,12 +616,13 @@ </dc:macro> <dc:macro name="cross_section_user_content"> - <dc:call-macro name="waterlevels"/> + <dc:call-macro name="cross_section_user_content_waterlevels"/> + <dc:call-macro name="cross_section_user_content_iota"/> <dc:call-macro name="vegetationzones"/> </dc:macro> - <dc:macro name="waterlevels"> - <dc:filter expr="$out_name = 'cross_section'"> + <dc:macro name="cross_section_user_content_waterlevels"> + <dc:filter expr="$out_name = 'cross_section' and $a_state != 'state.uinfo.salix_line'"> <dc:if test="dc:has-result()"> <waterlevels> <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:mm:ss', $a_creation))"> @@ -643,7 +645,29 @@ </dc:filter> </dc:macro> - + <dc:macro name="cross_section_user_content_iota"> + <dc:filter expr="$out_name = 'cross_section' and $a_state = 'state.uinfo.salix_line' and starts-with($facet_name, 'uinfo_facet_salix_')"> + <dc:if test="dc:has-result()"> + <uinfo_salix_lines> + <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:mm:ss', $a_creation))"> + <dc:comment>Aheinecke: Why is this grouping different from the rest?</dc:comment> + <longitudinal_section_columns description="{dc:group-key()}"> + <dc:for-each> + <dc:element name="${facet_name}"> + <dc:attribute name="description" value="${facet_description}"/> + <dc:attribute name="ids" value="${facet_num}"/> + <dc:attribute name="factory" value="uinfo"/> + <dc:attribute name="target_out" value="${out}"/> + <dc:attribute name="artifact-id" value="${a_gid}"/> + <dc:attribute name="out" value="cross_section"/> + </dc:element> + </dc:for-each> + </longitudinal_section_columns> + </dc:group> + </uinfo_salix_lines> + </dc:if> + </dc:filter> + </dc:macro> <dc:macro name="collection-group"> <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:mm:ss', $a_creation), ' ', $collection_name)">