Changeset 17502 in main for trunk/ibisph-view/src/main/webapp/xslt/html/indicator/profile/view/Page.xslt

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:

• trunk/ibisph-view/src/main/webapp/xslt/html/indicator/profile/view/Page.xslt (modified) (7 diffs)

trunk/ibisph-view/src/main/webapp/xslt/html/indicator/profile/view/Page.xslt

@@ -37 +37 @@
         <xsl:param name="Page.comparisonDimensionValue" select="'35'"/>
 
+        <xsl:param name="Page.showMap" select="ibis:Graphic.showMap(
+                        /INDICATOR_VIEW/MAP_NAME, 
+                        /INDICATOR_VIEW/DIMENSION_USAGES/DIMENSION_USAGE[USAGE='category']/NAME,
+                        /INDICATOR_VIEW/DIMENSION_USAGES/DIMENSION_USAGE[USAGE='series']/NAME,
+                        '',
+                        $Indicator.dimensions
+                )"
+        /> 
+
         <xsl:param name="Indicator.contentBlockType" select="'fixed'"/>
         <xsl:param name="Indicator.contentBlockTitleLevel" select="3"/>
@@ -74 +83 @@
                         <xsl:with-param name="addWikiAttribute"  select="true()"/>
                 </xsl:call-template>
-
+<!-- GARTH TODO: remove
 <xsl:message select="$indicatorView/MAP_NAME"/>
 <xsl:message select="$indicatorView/DIMENSION_USAGES/DIMENSION_USAGE[USAGE='category']/NAME"/>
 <xsl:message select="$indicatorView/DIMENSION_USAGES/DIMENSION_USAGE[USAGE='series']/NAME"/>
 <xsl:message select="$indicatorView/DIMENSION_USAGES/DIMENSION_USAGE[USAGE='constant']/NAME"/>
-                <xsl:variable name="showMap" select="ibis:Graphic.showMap($indicatorView/MAP_NAME, 
-                                $indicatorView/DIMENSION_USAGES/DIMENSION_USAGE[USAGE='category']/NAME,
-                                $indicatorView/DIMENSION_USAGES/DIMENSION_USAGE[USAGE='series']/NAME,
-                                $indicatorView/DIMENSION_USAGES/DIMENSION_USAGE[USAGE='constant']/NAME,
-                                $Indicator.dimensions
-                        )"
-                /> 
-
-                <xsl:if test="$showMap">
+<xsl:message select="$Page.showMap"/>
+-->
+
+                <xsl:if test="$Page.showMap">
                         <xsl:call-template name="ContentContainer.expandable">
                                 <xsl:with-param name="title" select="'Map'"/>
@@ -119 +123 @@
                                         </xsl:call-template>
                                 </xsl:with-param>
-                                <xsl:with-param name="show" select="not($showMap)"/>
+                                <xsl:with-param name="show" select="not($Page.showMap)"/>
                                 <xsl:with-param name="addWikiAttribute" select="false()"/>
                         </xsl:call-template>
@@ -217 +221 @@
                         <xsl:with-param name="indicatorView" select="$indicatorView"/>
                         <xsl:with-param name="measure"       select="$Indicator.measure"/>
-                        <xsl:with-param name="showMap"       select="$showMap"/>
+                        <xsl:with-param name="showMap"       select="$Page.showMap"/>
                 </xsl:call-template>
         </xsl:template>
@@ -338 +342 @@
 
 <!-- =====================================================
+
+GARTH TODO:
+
 // var firstSlot = $kendoChart.getKendoChart()._plotArea.axes[0].getSlot(0);
 // alert("first slot width" + firstSlot.width());
@@ -426 +433 @@
 -->
 
-                        <xsl:if test="$showMap">
+                        <xsl:if test="$Page.showMap">
                                 var leafletMapConstructorJSON = $.extend
                                 (true, {}
@@ -458 +465 @@
 
                 </script>
+
         </xsl:template>