Changeset 21049 in main

Timestamp:

07/18/20 17:37:55 (2 weeks ago)

Author:

Paul Leo

Message:

Hawaii Query Results xslt files
Death queries were giving errors when displaying by geography but choosing State Geos.
Move the test to not display maps when Geo was the display by, but the value was a State overall/occurence/etc.
In order to make the fix, I had to version Interactive.xslt. In order to update, first rename Interactive.xslt to Interactive.Core.xslt and then update ibisph-view/xslt/html/query/module/result/interactive directory.

Location:

adopters/hi/branches/2.3/src/main/webapps/ibisph-view/xslt/html/query/module/result/interactive

Files:

• Interactive.xslt (added)
• SiteSpecific.xslt (modified) (4 diffs)

adopters/hi/branches/2.3/src/main/webapps/ibisph-view/xslt/html/query/module/result/interactive/SiteSpecific.xslt

@@ -180 +180 @@
         </xsl:template> 
         <!-- END of HAWAII MOD to change default values of UCI and LCI if non-existent -->
-        
-        <!-- HAWAII MOD - CHANGE ORDER OF DATA Sources and DATA Issues AND don't display map if ACTUAL GROUP BY DIMENSION = StateOverall-->
+
+
+        <!-- HAWAII MOD - CHANGE ORDER OF DATA Sources and DATA Issues AND don't display map if ACTUAL GROUP BY DIMENSION begins with State -->
         <!-- HAWAII MOD - NEED TO VERIFY that this template does not change in  Core  \ibisph-view\xslt\html\query\module\result\interactive\Page.xslt -->
         
@@ -258 +259 @@
                 </xsl:call-template>
 
-                <xsl:call-template name="Interactive.leafletKendoScript">
-                        <xsl:with-param name="queryModule" select="$Result.queryModule"/>
-                </xsl:call-template>
-                
                 <!-- Debug      
-                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx 
                          <xsl:value-of select="$Result.queryModule/REQUEST/ACTUAL_GROUP_BY/CATEGORY_DIMENSION_NAME"/><br/>
                  -->
                 <!-- HI MODS 5/7/2018 - If REQUEST/ACTUAL_GROUP_BY/CATEGORY_DIMENSION_NAME starts with State then don't display map -->
-                <xsl:if test="$LeafletMap.showMap and not (starts-with($Result.queryModule/REQUEST/ACTUAL_GROUP_BY/CATEGORY_DIMENSION_NAME, 'State'))"> 
-                <!-- <xsl:if test="$LeafletMap.showMap and not($Result.queryModule/REQUEST/ACTUAL_GROUP_BY/CATEGORY_DIMENSION_NAME='StateOverall')"> -->
-                <!-- <xsl:if test="$LeafletMap.showMap"> this was the original-->
+                                <!-- <xsl:if test="$LeafletMap.showMap and not($Result.queryModule/REQUEST/ACTUAL_GROUP_BY/CATEGORY_DIMENSION_NAME='StateOverall')"> -->
+                                <!-- <xsl:if test="$LeafletMap.showMap"> this was the original-->
+                
+<!-- 7/18/2020 Under some conditions the test below did not work correctly, the fix was to version Interactive.xslt and add 
+                 and not(starts-with($Result.queryModule/REQUEST/ACTUAL_GROUP_BY/CATEGORY_DIMENSION_NAME, 'State'))">
+        to the test on current line 229 of Interactive.xslt in this directory
+-->
+                
+                
+                <xsl:if test="$LeafletMap.showMap and not(starts-with($Result.queryModule/REQUEST/ACTUAL_GROUP_BY/CATEGORY_DIMENSION_NAME, 'State'))">
+
                         <xsl:call-template name="ContentContainer.contentBlock">
                                 <xsl:with-param name="title" select="'Map - NOTE: A color coded data map is shown only when County or Island (if available) is selected in Geography step, and if all data has not been supressed
@@ -290 +295 @@
                         </xsl:call-template>
                 </xsl:if>
-
+                
+                <xsl:call-template name="Interactive.leafletKendoScript">
+                        <xsl:with-param name="queryModule" select="$Result.queryModule"/>
+                </xsl:call-template>
+                
                 <!-- Data Notes -->
                 <xsl:call-template name="ContentContainer.contentBlockWithDelimitedTitleTextsNodesets">
@@ -336 +345 @@
 
                 <a href="#top" class="Top">Top</a>
-                
-                
-                
-                
-                
 
 <xsl:call-template name="SiteSpecific.showAnnouncement"/>               
-                
-                
-                
-                
-                
-                
-                
+
         </xsl:template>