Mercurial > dive4elements > river
comparison artifacts/doc/conf/meta-data.xml @ 6324:3cf9e82b9c75
Add location handling in waterlevels-fix macro
For uesk calculations don't show locations
For everything else change the description when we are
at a location
author | Andre Heinecke <aheinecke@intevation.de> |
---|---|
date | Thu, 13 Jun 2013 10:01:01 +0200 |
parents | bc09f8fff694 |
children | abed7e091762 |
comparison
equal
deleted
inserted
replaced
6323:f49749526af4 | 6324:3cf9e82b9c75 |
---|---|
670 </dc:filter> | 670 </dc:filter> |
671 </dc:macro> | 671 </dc:macro> |
672 | 672 |
673 <dc:comment>TODO doesnt work nicely for fix/wq-diags. Aheinecke (27.5.2013): Why?</dc:comment> | 673 <dc:comment>TODO doesnt work nicely for fix/wq-diags. Aheinecke (27.5.2013): Why?</dc:comment> |
674 <dc:macro name="waterlevels-fix"> | 674 <dc:macro name="waterlevels-fix"> |
675 <dc:filter expr="$out_name = 'longitudinal_section' and $facet_name = 'longitudinal_section.w'"> | 675 <dc:filter expr="($out_name = 'longitudinal_section' and $facet_name = 'longitudinal_section.w') and |
676 (not ($current-state-id = 'state.winfo.uesk.wsp' and $ld_m = 'location'))"> | |
676 <dc:if test="dc:has-result()"> | 677 <dc:if test="dc:has-result()"> |
677 <waterlevels> | 678 <waterlevels> |
678 <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:m:s', $a_creation), ' ', $collection_name)"> | 679 <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:m:s', $a_creation), ' ', $collection_name)"> |
679 <waterlevels description="{dc:group-key()}"> | 680 <waterlevels description="{dc:group-key()}"> |
680 <dc:for-each> | 681 <dc:for-each> |
681 <dc:variable name="combined_desc" expr="concat($facet_description, ' von KM ', | 682 <dc:choose> |
682 $deffrom, ' bis KM ', $defto)"/> | 683 <dc:when test="$ld_m = 'location'"> |
684 <dc:variable name="combined_desc" expr="concat($facet_description, ' an KM ', $deffrom)"/> | |
685 </dc:when> | |
686 <dc:otherwise> | |
687 <dc:variable name="combined_desc" expr="concat($facet_description, ' von KM ', | |
688 $deffrom, ' bis KM ', $defto)"/> | |
689 </dc:otherwise> | |
690 </dc:choose> | |
683 <dc:element name="${facet_name}"> | 691 <dc:element name="${facet_name}"> |
684 <dc:attribute name="description" value="${combined_desc}"/> | 692 <dc:attribute name="description" value="${combined_desc}"/> |
685 <dc:attribute name="ids" value="${facet_num}"/> | 693 <dc:attribute name="ids" value="${facet_num}"/> |
686 <dc:attribute name="factory" value="winfo"/> | 694 <dc:attribute name="factory" value="winfo"/> |
687 <dc:attribute name="target_out" value="${out}"/> | 695 <dc:attribute name="target_out" value="${out}"/> |