Changeset 21049 in main


Ignore:
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:
1 added
1 edited

Legend:

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

    r17911 r21049  
    180180        </xsl:template>
    181181        <!-- END of HAWAII MOD to change default values of UCI and LCI if non-existent -->
    182        
    183         <!-- HAWAII MOD - CHANGE ORDER OF DATA Sources and DATA Issues AND don't display map if ACTUAL GROUP BY DIMENSION = StateOverall-->
     182
     183
     184        <!-- HAWAII MOD - CHANGE ORDER OF DATA Sources and DATA Issues AND don't display map if ACTUAL GROUP BY DIMENSION begins with State -->
    184185        <!-- HAWAII MOD - NEED TO VERIFY that this template does not change in  Core  \ibisph-view\xslt\html\query\module\result\interactive\Page.xslt -->
    185186       
     
    258259                </xsl:call-template>
    259260
    260                 <xsl:call-template name="Interactive.leafletKendoScript">
    261                         <xsl:with-param name="queryModule" select="$Result.queryModule"/>
    262                 </xsl:call-template>
    263                
    264261                <!-- Debug     
    265                          xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
     262                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx 
    266263                         <xsl:value-of select="$Result.queryModule/REQUEST/ACTUAL_GROUP_BY/CATEGORY_DIMENSION_NAME"/><br/>
    267264                 -->
    268265                <!-- HI MODS 5/7/2018 - If REQUEST/ACTUAL_GROUP_BY/CATEGORY_DIMENSION_NAME starts with State then don't display map -->
    269                 <xsl:if test="$LeafletMap.showMap and not (starts-with($Result.queryModule/REQUEST/ACTUAL_GROUP_BY/CATEGORY_DIMENSION_NAME, 'State'))">
    270                 <!-- <xsl:if test="$LeafletMap.showMap and not($Result.queryModule/REQUEST/ACTUAL_GROUP_BY/CATEGORY_DIMENSION_NAME='StateOverall')"> -->
    271                 <!-- <xsl:if test="$LeafletMap.showMap"> this was the original-->
     266                                <!-- <xsl:if test="$LeafletMap.showMap and not($Result.queryModule/REQUEST/ACTUAL_GROUP_BY/CATEGORY_DIMENSION_NAME='StateOverall')"> -->
     267                                <!-- <xsl:if test="$LeafletMap.showMap"> this was the original-->
     268               
     269<!-- 7/18/2020 Under some conditions the test below did not work correctly, the fix was to version Interactive.xslt and add
     270                 and not(starts-with($Result.queryModule/REQUEST/ACTUAL_GROUP_BY/CATEGORY_DIMENSION_NAME, 'State'))">
     271        to the test on current line 229 of Interactive.xslt in this directory
     272-->
     273               
     274               
     275                <xsl:if test="$LeafletMap.showMap and not(starts-with($Result.queryModule/REQUEST/ACTUAL_GROUP_BY/CATEGORY_DIMENSION_NAME, 'State'))">
     276
    272277                        <xsl:call-template name="ContentContainer.contentBlock">
    273278                                <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
     
    290295                        </xsl:call-template>
    291296                </xsl:if>
    292 
     297               
     298                <xsl:call-template name="Interactive.leafletKendoScript">
     299                        <xsl:with-param name="queryModule" select="$Result.queryModule"/>
     300                </xsl:call-template>
     301               
    293302                <!-- Data Notes -->
    294303                <xsl:call-template name="ContentContainer.contentBlockWithDelimitedTitleTextsNodesets">
     
    336345
    337346                <a href="#top" class="Top">Top</a>
    338                
    339                
    340                
    341                
    342                
    343347
    344348<xsl:call-template name="SiteSpecific.showAnnouncement"/>               
    345                
    346                
    347                
    348                
    349                
    350                
    351                
     349
    352350        </xsl:template>
    353351
Note: See TracChangeset for help on using the changeset viewer.