Changeset 18890 in main


Ignore:
Timestamp:
08/07/19 16:45:49 (2 weeks ago)
Author:
GarthBraithwaite_STG
Message:

db, view - IPV title xslt rules and data updates.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/db/src/main/scripts/mysql/data-cleanup.sql

    r18703 r18890  
    180180
    181181
    182 /* SUB_TITLE is now TITLE.  Remove trailing "," */
     182/* SUB_TITLE is now TITLE.  Remove leading " ", "- ", trailing "," */
    183183update INDICATOR_VIEW set TITLE = substring(SUB_TITLE, 1, length(SUB_TITLE) - 1)
    184184where SUB_TITLE like '% '
     
    186186update INDICATOR_VIEW set TITLE = substring(SUB_TITLE, 1, length(SUB_TITLE) - 1)
    187187where SUB_TITLE like '%,'
     188;
     189update INDICATOR_VIEW set TITLE = substring(SUB_TITLE, 2, length(SUB_TITLE) - 1)
     190where SUB_TITLE like ' %'
     191;
     192update INDICATOR_VIEW set TITLE = substring(SUB_TITLE, 2, length(SUB_TITLE) - 1)
     193where SUB_TITLE like '-%'
     194;
     195update INDICATOR_VIEW set TITLE = substring(SUB_TITLE, 2, length(SUB_TITLE) - 1)
     196where SUB_TITLE like ' %'
    188197;
    189198
  • trunk/ibisph-view/src/main/webapp/xslt/_ibis-title.xslt

    r17645 r18890  
    120120                <xsl:param name="indicatorView" ibis:doc="Indicator Profile View to be used to build the title from."/>
    121121                <xsl:param name="dimensions"    ibis:doc="actual dimensions."/>
    122                 <xsl:value-of select="concat(ibis:getIndicatorTitle($indicator), ' ',
    123                         $indicatorView/TITLE, ', ',
    124                         ibis:getPeriodDimensionValuesTitle($indicatorView, $dimensions))"
    125                 />
     122
     123                <xsl:if test="starts-with($indicatorView/TITLE, 'by')">
     124                        <xsl:value-of select="concat(ibis:getIndicatorTitle($indicator), ' ',
     125                                $indicatorView/TITLE, ', ',
     126                                ibis:getPeriodDimensionValuesTitle($indicatorView, $dimensions))"
     127                        />
     128                </xsl:if>
     129                <xsl:if test="not(starts-with($indicatorView/TITLE, 'by'))">
     130                        <xsl:value-of select="concat(ibis:getIndicatorTitle($indicator), '. ',
     131                                $indicatorView/TITLE, ', ',
     132                                ibis:getPeriodDimensionValuesTitle($indicatorView, $dimensions))"
     133                        />
     134                </xsl:if>
    126135        </xsl:function>
    127136
Note: See TracChangeset for help on using the changeset viewer.