Ignore:
Timestamp:
11/14/18 07:14:57 (4 years ago)
Author:
Garth Braithwaite
Message:

view - Updated js console logs. Leaflet fixed code to handle # groups > # points for jenks. Updated the showmap call to include actual dimensions. Included unused QM config XML name and title so that have option to navigate to related QM "measures" w/o having to go back to the selection page.

File:
1 edited

Legend:

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

    r17433 r17472  
    7575                </xsl:call-template>
    7676
    77                 <xsl:variable name="showMap" select="ibis:Graphic.showMap($indicatorView/MAP_NAME)"/>
     77<xsl:message select="$indicatorView/MAP_NAME"/>
     78<xsl:message select="$indicatorView/DIMENSION_USAGES/DIMENSION_USAGE[USAGE='category']/NAME"/>
     79<xsl:message select="$indicatorView/DIMENSION_USAGES/DIMENSION_USAGE[USAGE='series']/NAME"/>
     80<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
    7889                <xsl:if test="$showMap">
    7990                        <xsl:call-template name="ContentContainer.expandable">
     
    8293                                        <xsl:call-template name="Graphic.mapContainer">
    8394                                                <xsl:with-param name="containerID" select="'map'"/>
    84                                                 <xsl:with-param name="title" select="ibis:getIndicatorViewMapTitle($indicator, $indicatorView, $Indicator.dimensions)"/>
     95                                                <xsl:with-param name="title" select="ibis:getIndicatorViewMapTitle($indicatorView, $Indicator.dimensions)"/>
    8596                                        </xsl:call-template>
    8697                                        <xsl:call-template name="Indicator.contentBlock">
     
    233244                        </xsl:call-template>
    234245                </xsl:variable>
    235 <xsl:message select="'77777777777777 IPIP IP - recordAncillaryValueFields'"/>
    236 <xsl:message select="$recordAncillaryValueFields"/>
    237246
    238247                <xsl:variable name="recordDimensionFields">
     
    251260                </xsl:variable>
    252261
    253 <!--
    254 <xsl:message select="'************** GARTH'"/>
    255 <xsl:message select="$indicatorViewDatasetRecords"/>
    256 
    257 <xsl:message select="concat('Page.leafletKendoScript - Records count: ', count($indicatorViewDatasetRecords/*), ', recordDimensionFields: ', count($recordDimensionFields/NAME))"/>
    258 <xsl:message select="'============= start of IV datasetRecords'"/>
    259 <xsl:message select="$recordDimensionFields"/>
    260 <xsl:message select="'============= end of IV datasetRecords'"/>
    261 -->
    262 
    263262                <!-- tried doing jsonp tech but callback func must be defined before doing the script jsonp
    264263                        so you'd have the variable = null, call back, end of script, include jsonp, then contructor
     
    296295                                        <xsl:with-param name="recordDimensionFields"      select="$recordDimensionFields"/>
    297296                                        <xsl:with-param name="recordAncillaryValueFields" select="$recordAncillaryValueFields"/>
    298 <!-- GARTH TODO: Total row, note and label,
    299 NEED VALUE ATTRIBUTE SUPPORT AS WELL.
     297<!-- GARTH TODO: note, label and VALUE ATTRIBUTE columns
    300298-->
    301299<xsl:with-param name="showFooterRow"   select="false()"/>
     
    326324                                </xsl:call-template>
    327325                        );
    328 //console.debug("%o", kendoChartConstructorJSON);
    329 //console.log(JSON.stringify(kendoChartConstructorJSON,null,2)); 
     326                        console.debug("IP.Page.xslt (%o, kendoChartConstructorJSON, (JSON.stringify(kendoChartConstructorJSON):");
     327                        console.debug("%o", kendoChartConstructorJSON);
     328                        console.debug(JSON.stringify(kendoChartConstructorJSON,null,2)); 
    330329
    331330                        var $kendoGrid;
     
    337336                                $kendoChart = $("#chart").kendoChart(kendoChartConstructorJSON);
    338337                                kendoDataSource.read();         // have to have after grid and chart because .autoBind = false.
    339 
    340 
    341338
    342339<!-- =====================================================
     
    423420==========================================================================
    424421<xsl:message select="$indicatorViewDatasetRecords/RECORD"/>
    425 -->
    426 
    427422
    428423<xsl:message select="'XXXXXXXXXXXXXXXXXXXXXXXXXXXXX interact.xslt'"/>
    429424<xsl:message select="$indicatorView/MAP_DIMENSION_NAME"/>
    430425<xsl:message select="$recordDimensionFields/RECORD_DIMENSION_FIELD[DIMENSION_NAMES/DIMENSION_NAME = $indicatorView/MAP_DIMENSION_NAME]/NAME"/>
    431 
     426-->
    432427
    433428                        <xsl:if test="$showMap">
Note: See TracChangeset for help on using the changeset viewer.