Ignore:
Timestamp:
11/19/18 21:20:53 (4 years ago)
Author:
Garth Braithwaite
Message:

view - temp commit of map updates. moved showmap back to global to page.showmap so that the left nav could implement save map image. Tried interactive grid/chart highlight but need new version of kendo - code saved in the Graphic.xslt. Added script to disable q builder map selection if na.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/ibisph-view/src/main/webapp/xslt/html/indicator/profile/view/Page.xslt

    r17472 r17502  
    3737        <xsl:param name="Page.comparisonDimensionValue" select="'35'"/>
    3838
     39        <xsl:param name="Page.showMap" select="ibis:Graphic.showMap(
     40                        /INDICATOR_VIEW/MAP_NAME,
     41                        /INDICATOR_VIEW/DIMENSION_USAGES/DIMENSION_USAGE[USAGE='category']/NAME,
     42                        /INDICATOR_VIEW/DIMENSION_USAGES/DIMENSION_USAGE[USAGE='series']/NAME,
     43                        '',
     44                        $Indicator.dimensions
     45                )"
     46        />
     47
    3948        <xsl:param name="Indicator.contentBlockType" select="'fixed'"/>
    4049        <xsl:param name="Indicator.contentBlockTitleLevel" select="3"/>
     
    7483                        <xsl:with-param name="addWikiAttribute"  select="true()"/>
    7584                </xsl:call-template>
    76 
     85<!-- GARTH TODO: remove
    7786<xsl:message select="$indicatorView/MAP_NAME"/>
    7887<xsl:message select="$indicatorView/DIMENSION_USAGES/DIMENSION_USAGE[USAGE='category']/NAME"/>
    7988<xsl:message select="$indicatorView/DIMENSION_USAGES/DIMENSION_USAGE[USAGE='series']/NAME"/>
    8089<xsl:message select="$indicatorView/DIMENSION_USAGES/DIMENSION_USAGE[USAGE='constant']/NAME"/>
    81                 <xsl:variable name="showMap" select="ibis:Graphic.showMap($indicatorView/MAP_NAME,
    82                                 $indicatorView/DIMENSION_USAGES/DIMENSION_USAGE[USAGE='category']/NAME,
    83                                 $indicatorView/DIMENSION_USAGES/DIMENSION_USAGE[USAGE='series']/NAME,
    84                                 $indicatorView/DIMENSION_USAGES/DIMENSION_USAGE[USAGE='constant']/NAME,
    85                                 $Indicator.dimensions
    86                         )"
    87                 />
    88 
    89                 <xsl:if test="$showMap">
     90<xsl:message select="$Page.showMap"/>
     91-->
     92
     93                <xsl:if test="$Page.showMap">
    9094                        <xsl:call-template name="ContentContainer.expandable">
    9195                                <xsl:with-param name="title" select="'Map'"/>
     
    119123                                        </xsl:call-template>
    120124                                </xsl:with-param>
    121                                 <xsl:with-param name="show" select="not($showMap)"/>
     125                                <xsl:with-param name="show" select="not($Page.showMap)"/>
    122126                                <xsl:with-param name="addWikiAttribute" select="false()"/>
    123127                        </xsl:call-template>
     
    217221                        <xsl:with-param name="indicatorView" select="$indicatorView"/>
    218222                        <xsl:with-param name="measure"       select="$Indicator.measure"/>
    219                         <xsl:with-param name="showMap"       select="$showMap"/>
     223                        <xsl:with-param name="showMap"       select="$Page.showMap"/>
    220224                </xsl:call-template>
    221225        </xsl:template>
     
    338342
    339343<!-- =====================================================
     344
     345GARTH TODO:
     346
    340347// var firstSlot = $kendoChart.getKendoChart()._plotArea.axes[0].getSlot(0);
    341348// alert("first slot width" + firstSlot.width());
     
    426433-->
    427434
    428                         <xsl:if test="$showMap">
     435                        <xsl:if test="$Page.showMap">
    429436                                var leafletMapConstructorJSON = $.extend
    430437                                (true, {}
     
    458465
    459466                </script>
     467
    460468        </xsl:template>
    461469
Note: See TracChangeset for help on using the changeset viewer.