Changeset 20667 in main


Ignore:
Timestamp:
06/01/20 12:31:23 (4 weeks ago)
Author:
GarthBraithwaite_STG
Message:

view - dim value sorting. reworked qm user selections. chart and map title xslt updates. MEASURE_VALUE_OVERRIDE for ipv and qm config.

Location:
trunk
Files:
2 deleted
16 edited

Legend:

Unmodified
Added
Removed
  • trunk/ibisph-view/src/main/webapp/xslt/_ibis-title.xslt

    r19867 r20667  
    4747        </xsl:function>
    4848
     49
    4950        <xsl:function name="ibis:getDimensionValueTitle" as="xs:string"
    50                 ibis:doc="localizes and getting the value TITLE."
     51                ibis:doc="localizes and getting the value TITLE.  If no TITLE then simply returns the VALUE's text()."
    5152        >
    52                 <xsl:param name="dimension"/>
    53                 <xsl:param name="dimensionValue" as="xs:string"/>
    54 
    55                 <xsl:value-of select="$dimension/VALUES/VALUE[normalize-space(text()[1]) = $dimensionValue]/TITLE"/>
     53                <xsl:param name="dimensionValue"/>
     54                <xsl:value-of select="if(0 != string-length($dimensionValue/TITLE)) then $dimensionValue/TITLE else $dimensionValue/text()[1]"/>
    5655        </xsl:function>
    5756
    58         <xsl:function name="ibis:getPeriodDimensionValuesTitle" as="xs:string"
     57
     58        <xsl:function name="ibis:getIndicatorViewPeriodDimensionValuesTitle" as="xs:string"
    5959                ibis:doc="Builds single or range of period dimension values."
    6060        >
     
    6363
    6464                <xsl:variable name="periodDimension" select="($dimensions/DIMENSION[NAME = $indicatorView/PERIOD_DIMENSION_NAME])[1]"/>
    65                 <xsl:variable name="indicatorViewDimensionValues" select="$indicatorView/DIMENSION_USAGES/DIMENSION_USAGE[NAME = $indicatorView/PERIOD_DIMENSION_NAME]/VALUES"/>
    66                 <xsl:variable name="firstDimensionValue" select="normalize-space($indicatorViewDimensionValues/VALUE[1]/text()[1])"/>
    67                 <xsl:variable name="lastDimensionValue"  select="normalize-space($indicatorViewDimensionValues/VALUE[last()]/text()[1])"/>
    68 <!-- GARTH TODO:
    69                 <xsl:variable name="firstDimensionValue"><xsl:copy select=      "$indicatorViewDimensionValues/VALUE[1]"/></xsl:variable>
    70                 <xsl:variable name="firstDimensionValue" select="normalize-space($indicatorViewDimensionValues/VALUE[1]/text()[1])"/>
    71                 <xsl:variable name="lastDimensionValue"  select="normalize-space($indicatorViewDimensionValues/VALUE[last()]/text()[1])"/>
    72 <xsl:message select="'~~~~~~~~~~~~~~~~~~~~~~~~~~~~~garth'"/>
    73 <xsl:message select="$indicatorView/NAME"/>
    74 <xsl:message select="$firstDimensionValue"/>
    75 <xsl:message select="$lastDimensionValue"/>
    76 <xsl:message select="count($dimensions/*)"/>
    77 -->
    78                 <xsl:value-of select="if($firstDimensionValue = $lastDimensionValue)
    79                         then ibis:getDimensionValueTitle($periodDimension, $firstDimensionValue)
    80                         else concat(ibis:getDimensionValueTitle($periodDimension, $firstDimensionValue),
     65                <xsl:variable name="indicatorViewDimensionUsageValues" select="$indicatorView/DIMENSION_USAGES/DIMENSION_USAGE[NAME = $indicatorView/PERIOD_DIMENSION_NAME]/VALUES"/>
     66
     67                <xsl:variable name="firstDimensionUsageValue" select="normalize-space($indicatorViewDimensionUsageValues/VALUE[1]/text()[1])"/>
     68                <xsl:variable name="lastDimensionUsageValue"  select="normalize-space($indicatorViewDimensionUsageValues/VALUE[last()]/text()[1])"/>
     69
     70                <xsl:variable name="firstDimensionValue" select="$periodDimension/VALUES/VALUE[normalize-space(text()[1]) = $firstDimensionUsageValue]"/>
     71                <xsl:variable name="lastDimensionValue"  select="$periodDimension/VALUES/VALUE[normalize-space(text()[1]) = $lastDimensionUsageValue]"/>
     72
     73                <xsl:value-of select="if($firstDimensionUsageValue = $lastDimensionUsageValue)
     74                        then ibis:getDimensionValueTitle($firstDimensionValue)
     75                        else concat(
     76                                ibis:getDimensionValueTitle($firstDimensionValue),
    8177                                ' to ',
    82                                 ibis:getDimensionValueTitle($periodDimension, $lastDimensionValue)
     78                                ibis:getDimensionValueTitle($lastDimensionValue)
    8379                        )"/>
     80        </xsl:function>
     81
     82
     83        <xsl:function name="ibis:getMeasureTitle" as="xs:string"
     84                ibis:doc="localizes the IP or QM config MEASURE_TITLE_OVERRIDE else use measure TITLE."
     85        >
     86                <xsl:param name="measureTitleOverride" ibis:doc="If specified this title value is returned."/>
     87                <xsl:param name="measure" ibis:doc="default measure title to use if no override value."/>
     88                <xsl:value-of select="
     89                        if(0 != string-length($measureTitleOverride))
     90                        then $measureTitleOverride
     91                        else $measure/TITLE
     92                "/>
    8493        </xsl:function>
    8594
     
    8897                ibis:doc="localizes and hides the if CHART_TITLE_OVERRIDE else built TITLE code."
    8998        >
    90                 <xsl:param name="indicator"     ibis:doc="Indicator Profile needed for complete IV title."/>
    9199                <xsl:param name="indicatorView" ibis:doc="Indicator Profile needed for CHART_TITLE_OVERRIDE and complete IV title."/>
    92                 <xsl:param name="dimensions"    ibis:doc="actual dimensions."/>
     100                <xsl:param name="completeIndicatorViewTitle" ibis:doc="default title."/>
    93101                <xsl:value-of select="
    94102                        if(0 != string-length($indicatorView/CHART_TITLE_OVERRIDE))
    95103                        then $indicatorView/CHART_TITLE_OVERRIDE
    96                         else ibis:getCompleteIndicatorViewTitle($indicator, $indicatorView, $dimensions)
     104                        else $completeIndicatorViewTitle
    97105                "/>
    98106        </xsl:function>
     
    101109                ibis:doc="localizes and hides the if MAP_TITLE_OVERRIDE else built TITLE code."
    102110        >
    103                 <xsl:param name="indicator"     ibis:doc="Indicator Profile needed for complete IV title."/>
    104111                <xsl:param name="indicatorView" ibis:doc="Indicator Profile needed for MAP_TITLE_OVERRIDE and complete IV title."/>
    105                 <xsl:param name="dimensions"    ibis:doc="actual dimensions."/>
     112                <xsl:param name="completeIndicatorViewTitle" ibis:doc="default title."/>
    106113                <xsl:value-of select="
    107114                        if(0 != string-length($indicatorView/MAP_TITLE_OVERRIDE))
    108115                        then $indicatorView/MAP_TITLE_OVERRIDE
    109                         else ibis:getCompleteIndicatorViewTitle($indicator, $indicatorView, $dimensions)
     116                        else $completeIndicatorViewTitle
    110117                "/>
    111 
    112118        </xsl:function>
    113119
     
    134140                        ibis:getIndicatorTitle($indicator),
    135141                        $delimiter, $indicatorView/TITLE, ', ',
    136                         ibis:getPeriodDimensionValuesTitle($indicatorView, $dimensions))"
     142                        ibis:getIndicatorViewPeriodDimensionValuesTitle($indicatorView, $dimensions))"
    137143                />
    138144        </xsl:function>
  • trunk/ibisph-view/src/main/webapp/xslt/html/DataViz.xslt

    r20385 r20667  
    270270
    271271                <xsl:param name="measure"/>
     272                <xsl:param name="measureTitle" select="$measure/TITLE"/>
    272273                <xsl:param name="measureValueFormatPattern"/>
    273274
     
    334335                        <xsl:with-param name="geoIDFieldName" select="$geoIDFieldName"/>
    335336                        <xsl:with-param name="geoIDFieldValuePrefixToRemove" select="$geoIDFieldValuePrefixToRemove"/>
    336                         <xsl:with-param name="legendTitle"    select="$measure/TITLE"/>
     337                        <xsl:with-param name="legendTitle"    select="$measureTitle"/>
    337338                        <xsl:with-param name="geoTypeTitle"   select="$geoTypeTitle"/>
    338339                        <xsl:with-param name="reverseColors"  select="$measure/DESIRABLE_VALUE = 'HIGH'"/>
     
    355356                ,<xsl:call-template name="Kendo.requestGridJSON">
    356357                        <xsl:with-param name="kendoDataSourceJavascriptVariableName" select="$externalDataVizKendoDataSourceReference"/>
    357                         <xsl:with-param name="measure" select="$measure"/>
     358                        <xsl:with-param name="measure"          select="$measure"/>
     359                        <xsl:with-param name="measureTitle" select="$measureTitle"/>
    358360                        <xsl:with-param name="recordDimensionFields"      select="$recordDimensionFields"/>
    359361                        <xsl:with-param name="recordAncillaryValueFields" select="$recordAncillaryValueFields"/>
     
    379381                        <xsl:with-param name="seriesTitle"   select="$recordDimensionFields/RECORD_DIMENSION_FIELD[USAGE='series']/TITLE"/>
    380382                        <xsl:with-param name="categoryTitle" select="$recordDimensionFields/RECORD_DIMENSION_FIELD[USAGE='category']/TITLE"/>
    381                         <xsl:with-param name="valueTitle"    select="$measure/TITLE"/>
     383                        <xsl:with-param name="valueTitle"    select="$measureTitle"/>
    382384
    383385                        <xsl:with-param name="seriesFieldName"    select="$recordDimensionFields/RECORD_DIMENSION_FIELD[USAGE='series']/NAME"/>
  • trunk/ibisph-view/src/main/webapp/xslt/html/community/facts/Page.xslt

    r20582 r20667  
    127127                                <xsl:sort select="INDICATOR_NAME" data-type="text" order="ascending"/>
    128128
    129                                 <xsl:call-template name="indicatorProfileRow">
     129                                <xsl:call-template name="Page.indicatorProfileRow">
    130130                                        <xsl:with-param name="indicatorName" select="current()"/>
    131131                                        <xsl:with-param name="measureName"  select="/HTML_CONTENT/PARAMETERS/PARAMETER[NAME='MeasureName']/VALUE"/>
     
    210210
    211211
    212         <xsl:template name="indicatorProfileRow"
     212        <xsl:template name="Page.indicatorProfileRow"
    213213                ibis:doc="Handles the xml/community/DIMENSION.xml type file.  Which is of
    214214                        the struct: COMMUNITY_PROFILE, OVERVIEWS, DIMENSION, INDICATOR_PROFILES
  • trunk/ibisph-view/src/main/webapp/xslt/html/community/indicator/Page.xslt

    r20582 r20667  
    204204                        <xsl:call-template name="DataViz.mapContainer">
    205205                                <xsl:with-param name="containerID" select="concat('map', position())"/>
    206                                 <xsl:with-param name="title" select="ibis:getIndicatorViewMapTitle($indicator, $indicatorView, $Indicator.dimensions)"/>
     206                                <xsl:with-param name="title" select="ibis:getIndicatorViewMapTitle($indicatorView, $completeIndicatorViewTitle)"/>
    207207                                <xsl:with-param name="footerContent" select="$indicatorView/MAP_NARRATIVE"/>
    208208                        </xsl:call-template>
     
    212212                        <xsl:call-template name="DataViz.chartContainer">
    213213                                <xsl:with-param name="containerID"   select="concat('chart', position())"/>
     214                                <xsl:with-param name="title" select="ibis:getIndicatorViewChartTitle($indicatorView, $completeIndicatorViewTitle)"/>
    214215                                <xsl:with-param name="footerContent" select="$indicatorView/CHART_NARRATIVE/text()"/>
    215216                        </xsl:call-template>
     
    269270        <xsl:with-param name="chartContainerID" select="concat('chart', position())"/>
    270271        <xsl:with-param name="chartName"     select="$indicatorView/CHART_NAME"/>
    271         <xsl:with-param name="chartTitle"    select="ibis:getIndicatorViewChartTitle($indicator, $indicatorView, $Indicator.dimensions)"/>
     272        <xsl:with-param name="chartTitle"    select="ibis:getIndicatorViewChartTitle($indicatorView, $complateIndicatorViewTitle)"/>
    272273
    273274        <xsl:with-param name="showGrid"      select="false()"/>
  • trunk/ibisph-view/src/main/webapp/xslt/html/indicator/profile/ContentBlocks.xslt

    r20374 r20667  
    4242                <xsl:param name="indicator"     select="$Indicator.indicator"/>
    4343                <xsl:param name="indicatorView" select="$Indicator.indicatorView"/>
     44                <xsl:param name="completeIndicatorViewTitle" select="ibis:getCompleteIndicatorViewTitle($indicator, $indicatorView, $Indicator.dimensions)"/>
     45
    4446
    4547                <!-- global error catcher... -->
     
    139141                        <xsl:call-template name="DataViz.mapContainer">
    140142                                <xsl:with-param name="containerID"   select="concat($DataVizContainerIDPrefix, '_map')"/>
    141                                 <xsl:with-param name="title"         select="ibis:getIndicatorViewMapTitle($indicator, $indicatorView, $Indicator.dimensions)"/>
     143                                <xsl:with-param name="title"         select="ibis:getIndicatorViewMapTitle($indicatorView, $completeIndicatorViewTitle)"/>
    142144                                <xsl:with-param name="footerContent" select="$indicatorView/MAP_NARRATIVE"/>
    143145                        </xsl:call-template>
     
    172174                                <xsl:with-param name="valueAttributes"       select="$Indicator.valueAttributes"/>
    173175
    174                                 <xsl:with-param name="measure" select="$Indicator.measure"/>
     176                                <xsl:with-param name="measure"          select="$Indicator.measure"/>
     177                                <xsl:with-param name="measureTitle" select="ibis:getMeasureTitle($indicatorView/MEASURE_TITLE_OVERRIDE, $measure)"/>
    175178                                <xsl:with-param name="measureValueFormatPattern" select="$Indicator.measureValueFormatPattern"/>
    176179
     
    197200                                <xsl:with-param name="showChart"     select="$Indicator.showChart"/>
    198201                                <xsl:with-param name="chartName"     select="$indicatorView/CHART_NAME"/>
    199                                 <xsl:with-param name="chartTitle"    select="ibis:getIndicatorViewChartTitle($indicator, $indicatorView, $Indicator.dimensions)"/>
     202                                <xsl:with-param name="chartTitle"    select="ibis:getIndicatorViewChartTitle($indicatorView, $completeIndicatorViewTitle)"/>
    200203
    201204                                <xsl:with-param name="showGrid"      select="$Indicator.showGrid"/>
    202205                                <xsl:with-param name="showValueAttributeColumn" select="exists($Indicator.indicatorViewDatasetRecords/RECORD[0 != string-length(VALUE_ATTRIBUTE_NAME)])"/>
    203206                                <xsl:with-param name="showLabelColumn"          select="exists($Indicator.indicatorViewDatasetRecords/RECORD[0 != string-length(LABEL)])"/>
    204                                 <xsl:with-param name="baseExportFilename" select="ibis:getCompleteIndicatorViewTitle($indicator, $indicatorView, $Indicator.dimensions)"/>
     207                                <xsl:with-param name="baseExportFilename" select="$completeIndicatorViewTitle"/>
    205208                        </xsl:call-template>
    206209
  • trunk/ibisph-view/src/main/webapp/xslt/html/indicator/profile/Page.xslt

    r20582 r20667  
    2424        </ibis:doc>
    2525
     26        <xsl:param name="Page.completeIndicatorViewTitle" select="ibis:getCompleteIndicatorViewTitle($Indicator.indicator, $Indicator.indicatorView, $Indicator.dimensions)"/>
     27
    2628        <xsl:param name="Page.contentTitle"
    2729                ibis:doc="Provides the page's content title text which is typically
  • trunk/ibisph-view/src/main/webapp/xslt/html/indicator/profile/complete_profile/Page.xslt

    r20582 r20667  
    8888                                <xsl:call-template name="DataViz.mapContainer">
    8989                                        <xsl:with-param name="containerID" select="concat($dataVizContainerIDPrefix, '_map')"/>
    90                                         <xsl:with-param name="title" select="ibis:getIndicatorViewMapTitle($indicator, $indicatorView, $Indicator.dimensions)"/>
     90                                        <xsl:with-param name="title" select="ibis:getIndicatorViewMapTitle($indicatorView, $Page.completeIndicatorViewTitle)"/>
    9191                                        <xsl:with-param name="footerContent" select="$indicatorView/MAP_NARRATIVE"/>
    9292                                </xsl:call-template>
     
    117117                                        <xsl:with-param name="valueAttributes" select="$Indicator.valueAttributes"/>
    118118
    119                                         <xsl:with-param name="measure" select="$measure"/>
     119                                        <xsl:with-param name="measure"          select="$measure"/>
     120                                        <xsl:with-param name="measureTitle" select="ibis:getMeasureTitle($indicatorView/MEASURE_TITLE_OVERRIDE, $measure)"/>
    120121                                        <xsl:with-param name="measureValueFormatPattern" select="$measureValueFormatPattern"/>
    121122
     
    129130                                        <xsl:with-param name="showChart"      select="$showChart"/>
    130131                                        <xsl:with-param name="chartName"      select="$indicatorView/CHART_NAME"/>
    131                                         <xsl:with-param name="chartTitle"     select="ibis:getIndicatorViewChartTitle($indicator, $indicatorView, $Indicator.dimensions)"/>
     132                                        <xsl:with-param name="chartTitle"     select="ibis:getIndicatorViewChartTitle($indicatorView, $Page.completeIndicatorViewTitle)"/>
    132133
    133134                                        <xsl:with-param name="showGrid"       select="$Indicator.showGrid"/>
     
    135136                                        <xsl:with-param name="showLabelColumn"          select="exists($indicatorViewDatasetRecords/RECORD[0 != string-length(LABEL)])"/>
    136137
    137                                         <xsl:with-param name="baseExportFilename" select="ibis:getCompleteIndicatorViewTitle($indicator, $indicatorView, $Indicator.dimensions)"/>
     138                                        <xsl:with-param name="baseExportFilename" select="$Page.completeIndicatorViewTitle"/>
    138139                                </xsl:call-template>
    139140
  • trunk/ibisph-view/src/main/webapp/xslt/html/indicator/profile/summary/Page.xslt

    r20374 r20667  
    9393                                        <xsl:call-template name="DataViz.mapContainer">
    9494                                                <xsl:with-param name="containerID" select="concat($dataVizContainerIDPrefix, '_map')"/>
    95                                                 <xsl:with-param name="title" select="ibis:getIndicatorViewMapTitle($indicator, $indicatorView, $Indicator.dimensions)"/>
     95                                                <xsl:with-param name="title" select="ibis:getIndicatorViewMapTitle($indicatorView, $Page.completeIndicatorViewTitle)"/>
    9696                                                <xsl:with-param name="footerContent" select="$indicatorView/MAP_NARRATIVE"/>
    9797                                        </xsl:call-template>
     
    117117                                                <xsl:with-param name="valueAttributes"       select="$Indicator.valueAttributes"/>
    118118
    119                                                 <xsl:with-param name="measure" select="$measure"/>
     119                                                <xsl:with-param name="measure"          select="$measure"/>
     120                                                <xsl:with-param name="measureTitle" select="ibis:getMeasureTitle($indicatorView/MEASURE_TITLE_OVERRIDE, $measure)"/>
    120121                                                <xsl:with-param name="measureValueFormatPattern" select="$measureValueFormatPattern"/>
    121122
     
    129130                                                <xsl:with-param name="showChart"     select="$showChart"/>
    130131                                                <xsl:with-param name="chartName"     select="$indicatorView/CHART_NAME"/>
    131                                                 <xsl:with-param name="chartTitle"    select="ibis:getIndicatorViewChartTitle($indicator, $indicatorView, $Indicator.dimensions)"/>
     132                                                <xsl:with-param name="chartTitle"    select="ibis:getIndicatorViewChartTitle($indicatorView, $Page.completeIndicatorViewTitle)"/>
    132133
    133134                                                <xsl:with-param name="showGrid"      select="$Indicator.showGrid"/>
     
    135136                                                <xsl:with-param name="showLabelColumn"          select="exists($indicatorViewDatasetRecords/RECORD[0 != string-length(LABEL)])"/>
    136137
    137                                                 <xsl:with-param name="baseExportFilename" select="ibis:getCompleteIndicatorViewTitle($indicator, $indicatorView, $Indicator.dimensions)"/>
     138                                                <xsl:with-param name="baseExportFilename" select="$Page.completeIndicatorViewTitle"/>
    138139                                        </xsl:call-template>
    139140
  • trunk/ibisph-view/src/main/webapp/xslt/html/indicator/profile/view/Page.xslt

    r20582 r20667  
    2020
    2121        <xsl:param name="Page.pageTitle" ibis:doc="Page's title text based on the 'INDICATOR/TITLE' element.">
    22                 Health Indicator Report - <xsl:value-of select="ibis:getCompleteIndicatorViewTitle($Indicator.indicator, $Indicator.indicatorView, $Indicator.dimensions)"/>
     22                Health Indicator Report - <xsl:value-of select="$Page.completeIndicatorViewTitle"/>
    2323        </xsl:param>
    2424        <xsl:param name="Page.contentTitle" ibis:doc="Page's content block title text based on the 'INDICATOR/TITLE' element.">
    25                 <xsl:value-of select="ibis:getCompleteIndicatorViewTitle($Indicator.indicator, $Indicator.indicatorView, $Indicator.dimensions)"/>
     25                <xsl:value-of select="$Page.completeIndicatorViewTitle"/>
    2626        </xsl:param>
    2727
     
    7272                        <xsl:call-template name="DataViz.mapContainer">
    7373                                <xsl:with-param name="containerID"   select="concat($dataVizContainerIDPrefix, '_map')"/>
    74                                 <xsl:with-param name="title"         select="ibis:getIndicatorViewMapTitle($indicator, $indicatorView, $Indicator.dimensions)"/>
     74                                <xsl:with-param name="title"         select="ibis:getIndicatorViewMapTitle($indicatorView, $Page.completeIndicatorViewTitle)"/>
    7575                                <xsl:with-param name="footerContent" select="$indicatorView/MAP_NARRATIVE"/>
    7676                        </xsl:call-template>
     
    126126                                <xsl:with-param name="valueAttributes"       select="$Indicator.valueAttributes"/>
    127127
    128                                 <xsl:with-param name="measure" select="$measure"/>
     128                                <xsl:with-param name="measure"          select="$measure"/>
     129                                <xsl:with-param name="measureTitle" select="ibis:getMeasureTitle($indicatorView/MEASURE_TITLE_OVERRIDE, $measure)"/>
    129130                                <xsl:with-param name="measureValueFormatPattern" select="$Indicator.measureValueFormatPattern"/>
    130131
     
    151152                                <xsl:with-param name="showChart"     select="$Indicator.showChart"/>
    152153                                <xsl:with-param name="chartName"     select="$indicatorView/CHART_NAME"/>
    153                                 <xsl:with-param name="chartTitle"    select="ibis:getIndicatorViewChartTitle($indicator, $indicatorView, $Indicator.dimensions)"/>
     154                                <xsl:with-param name="chartTitle"    select="ibis:getIndicatorViewChartTitle($indicatorView, $Page.completeIndicatorViewTitle)"/>
    154155
    155156                                <xsl:with-param name="showGrid"      select="$Indicator.showGrid"/>
    156157                                <xsl:with-param name="showValueAttributeColumn" select="exists($Indicator.indicatorViewDatasetRecords/RECORD[0 != string-length(VALUE_ATTRIBUTE_NAME)])"/>
    157158                                <xsl:with-param name="showLabelColumn"          select="exists($Indicator.indicatorViewDatasetRecords/RECORD[0 != string-length(LABEL)])"/>
    158                                 <xsl:with-param name="baseExportFilename" select="ibis:getCompleteIndicatorViewTitle($indicator, $indicatorView, $Indicator.dimensions)"/>
     159                                <xsl:with-param name="baseExportFilename" select="$Page.completeIndicatorViewTitle"/>
    159160                        </xsl:call-template>
    160161
  • trunk/ibisph-view/src/main/webapp/xslt/html/query/UserSelections.xslt

    r20639 r20667  
    2828                <xsl:for-each select="$selectedDimensionNames">
    2929                        <xsl:variable name="dimension"  select="$dimensions/DIMENSION[NAME=current()]"/>
    30                         <xsl:variable name="values"     select="$selectedDimensions/SELECTED_DIMENSION[NAME=current()]/VALUES"/>
     30                        <xsl:variable name="selectedDimensionValues" select="distinct-values($selectedDimensions/SELECTED_DIMENSION[NAME=current()]/VALUES/VALUE)"/>
    3131
    32                         <xsl:if test="exists($dimension) and exists($values/VALUE) and not(exists($dimensions/DIMENSION[PROXY_DIMENSION_NAME=$dimension/NAME]))">
     32                        <xsl:if test="exists($dimension) and (0 != count($selectedDimensionValues)) and not(exists($dimensions/DIMENSION[PROXY_DIMENSION_NAME=$dimension/NAME]))">
    3333                                <tr>
    3434                                        <th scope="row" title="Filtering criteria for dimension name: {$dimension/NAME}">
     
    3636                                        </th>
    3737                                        <td title="Comma separated list of all selected filtering values">
    38                                                 <xsl:call-template name="UserSelections.csvParametersTitleList">
     38                                                <xsl:call-template name="UserSelections.csvDimensionValuesTitleList">
    3939                                                        <xsl:with-param name="dimension" select="$dimension"/>
    40                                                         <xsl:with-param name="values"    select="$values"/>
     40                                                        <xsl:with-param name="selectedDimensionValues" select="$selectedDimensionValues"/>
    4141                                                </xsl:call-template>
    4242                                        </td>
     
    4848
    4949
    50         <xsl:template name="UserSelections.csvParametersTitleList"
     50        <xsl:template name="UserSelections.csvDimensionValuesTitleList"
    5151                ibis:doc="Internal template which builds a comma separated values
    5252                        (CSV) list of dimension value titles.  If no title is present then
     
    5454        >
    5555                <xsl:param name="dimension" ibis:doc="dimension element to look up value titles from."/>
    56                 <xsl:param name="values"    ibis:doc="VALUES to be displayed."/>
     56                <xsl:param name="selectedDimensionValues" ibis:doc="text nodes used as a key to get actual dim value."/>
    5757
    58                 <xsl:for-each select="distinct-values($values/VALUE)">
     58                <xsl:variable name="dimensionValues" select="$dimension/VALUES/VALUE[normalize-space(text()[1]) = $selectedDimensionValues]"/>
     59                <xsl:for-each select="$dimensionValues">
     60                        <xsl:sort select="SORT_ODRER" order="ascending" data-type="number"/>
    5961                        <xsl:if test="position() != 1">, </xsl:if>
    60                         <xsl:value-of select="if(exists($dimension/VALUES/VALUE[normalize-space(text()[1]) = current()]/TITLE))
    61                                 then $dimension/VALUES/VALUE[normalize-space(text()[1]) = current()]/TITLE
    62                                 else current()"
    63                         />
     62                        <xsl:value-of select="ibis:getDimensionValueTitle(.)"/>
    6463                </xsl:for-each>
    6564        </xsl:template>
  • trunk/ibisph-view/src/main/webapp/xslt/html/query/module/builder/Builder.xslt

    r20608 r20667  
    410410<xsl:message select="$Page.maps/MAP[not(exists(NAME = $Page.queryConfiguration/CRITERIA/EXCLUDE/MAP_NAMES/MAP_NAME))]"/>
    411411<xsl:message select="$Page.queryConfiguration"/>
     412
     413<xsl:message select="'~~~~~~~~~~~~~~~~~map name and page.maps:'"/>
     414<xsl:message select="$mapName"/>
     415<xsl:message select="$Page.maps"/>
    412416-->
    413 
    414417                <select name="_MapName" id="mapName" onchange="displayOptionsChangeHandler()" title="Selects the map to be displayed on the results page.">
    415418                        <xsl:for-each select="$Page.maps">
  • trunk/ibisph-view/src/main/webapp/xslt/html/query/module/builder/SectionSelections.xslt

    r20172 r20667  
    206206                                        <!-- take care of associated selectionS dimensions -->
    207207                                        <xsl:for-each select="/QUERY_MODULE/DIMENSIONS/DIMENSION[NAME=$selections/DIMENSION_NAME]/VALUES/VALUE">
     208                                                <xsl:sort select="SORT_ODRER" order="ascending" data-type="number"/>
    208209                                                <xsl:variable name="index" select="position()"/>
    209210                                                <li>
     
    435436                                        <xsl:otherwise>
    436437                                                <xsl:for-each select="$value">
     438                                                        <xsl:sort select="SORT_ODRER" order="ascending" data-type="number"/>
    437439                                                        <xsl:if test="position() != 1">, </xsl:if>
    438440<!-- GARTH TODO: normalize-space(text()[1]) -->
     
    487489                                <ul id="hiddenSelections.{$childIDSuffix}" class="Container Hide">
    488490                                        <xsl:for-each select="$value">
     491                                                <xsl:sort select="SORT_ODRER" order="ascending" data-type="number"/>
    489492                                                <li>
    490493                                                        <input id="hiddenInput.{$childIDSuffix}.{position()}" name="{$selectionsName}" type="hidden" value="{text()}"/>
  • trunk/ibisph-view/src/main/webapp/xslt/html/query/module/result/Result.xslt

    r20585 r20667  
    108108
    109109                <xsl:param name="measure"                               select="$Result.measure"/>
     110                <xsl:param name="measureTitle"                  select="ibis:getMeasureTitle($Result.queryConfiguration/MEASURE_TITLE_OVERRIDE, $measure)"/>
     111
    110112                <xsl:param name="valueTypes"                    select="$Result.valueTypes"/>
    111113                <xsl:param name="measureValueFormatPattern" select="($Result.valueTypes/VALUE_TYPE[NAME = $measure/VALUE_TYPE_NAME]/XSLT_FORMAT_PATTERN)[1]"/>
     
    193195                        <xsl:with-param name="valueAttributes"       select="$Result.valueAttributes"/>
    194196
    195                         <xsl:with-param name="measure" select="$measure"/>
     197                        <xsl:with-param name="measure"          select="$measure"/>
     198                        <xsl:with-param name="measureTitle"     select="$measureTitle"/>
    196199                        <xsl:with-param name="measureValueFormatPattern" select="$measureValueFormatPattern"/>
    197200
     
    222225                                <xsl:variable name="catDimensionTitle"   select="ibis:getDimensionTitle($dimensions/DIMENSION[NAME = $queryRequest/ACTUAL_GROUP_BY/CATEGORY_DIMENSION_NAME])"/>
    223226                                <xsl:variable name="serDimensionTitle"   select="ibis:getDimensionTitle($dimensions/DIMENSION[NAME = $queryRequest/ACTUAL_GROUP_BY/SERIES_DIMENSION_NAME])"/>
    224                                 <xsl:value-of select="concat($measure/TITLE, ' by ', $catDimensionTitle)"/>
     227                                <xsl:value-of select="concat($measureTitle, ' by ', $catDimensionTitle)"/>
    225228                                <xsl:if test="string-length($serDimensionTitle) != 0"> and <xsl:value-of select="$serDimensionTitle"/></xsl:if>
    226229                        </xsl:with-param>
  • trunk/ibisph-view/src/main/webapp/xslt/json/Kendo.xslt

    r20392 r20667  
    227227                <xsl:param name="recordAncillaryValueFields" ibis:doc="ancillary values struct."/>
    228228                <xsl:param name="measure" ibis:doc="measure info - NOT the measure value."/>
     229                <xsl:param name="measureTitle" select="$measure/TITLE"/>
     230
    229231                <xsl:param name="datasetRecordTotalValues"  ibis:doc="total values - typically from query result."/>
    230232
     
    238240                <xsl:param name="constantDimensionField" select="$recordDimensionFields/RECORD_DIMENSION_FIELD[USAGE='constant']"/>
    239241<!--
     242GARTH TODO: remove
    240243<xsl:message select="'444444444444444444444444444444'"/>
    241244<xsl:message select="$datasetRecordTotalValues"/>
     
    282285                ,{
    283286                        "field": "MeasureValueTitle"
    284                         ,"title": "<xsl:value-of select="$measure/TITLE"/>"
     287                        ,"title": "<xsl:value-of select="$measureTitle"/>"
    285288                        ,"template": "#=MeasureValueTitle#"
    286289                        ,"attributes": {"class": "Value"}
  • trunk/ibisph/src/main/java/org/ibisph/indicatorprofile/springmvc/databean/EditDatasetRecordsController.java

    r18881 r20667  
    7070  protected String maxDimensionValueCombinationsExceededModelName = "maxDimensionValueCombinationsExceeded";
    7171
    72 // protected String showPeriodSelectionsModelName    = "showPeriodSelections";
     72// GARTH TODO: protected String showPeriodSelectionsModelName    = "showPeriodSelections";
    7373 
    7474
  • trunk/ibisph/src/main/java/org/ibisph/querydefinition/service/QueryDefinitionXMLToQueryModuleXML.java

    r17645 r20667  
    145145        if(goodDimension) goodDimension = (null != XMLLib.getNode(queryModule, "/QUERY_MODULE/DIMENSIONS/DIMENSION[NAME='" + savedDefinitionSelectedDimensionName + "']"));
    146146        if(goodDimension) {
    147          
     147
    148148          // check for existing SELECTED_DIMENSIONs.  If does not exist create
    149149          // container if needed, create SD and add it.
     
    153153            XMLLib.addNode(queryModuleCriteriaSection, queryModuleCriteriaSectionSelectedDimensions);
    154154          }
    155  
     155
    156156          // check for an existing criteria SELECTED_DIMENSION with a matching
    157157          // dimension name.  If not found create one.
     
    162162            XMLLib.addNode(queryModuleCriteriaSectionSelectedDimension, XMLLib.newNode("NAME", savedDefinitionSelectedDimensionName));
    163163          }
    164  
     164
    165165          // check for a VALUES container.  If not found the create it.
    166166          queryModuleCriteriaSectionSelectedDimensionValueList = XMLLib.getNode(queryModuleCriteriaSectionSelectedDimension, "VALUES");
     
    169169            XMLLib.addNode(queryModuleCriteriaSectionSelectedDimension, queryModuleCriteriaSectionSelectedDimensionValueList);
    170170          }
    171  
     171
    172172          // next loop through the saved query definition's SELECTED_DIMENSION
    173173          // VALUEs and add if they do not already exist.
Note: See TracChangeset for help on using the changeset viewer.