Changeset 19880 in main

Timestamp:

02/20/20 23:17:05 (3 years ago)

Author:

GarthBraithwaite_STG

Message:

view - content control css tweak, qm result to access valid value xmls.

Location:

trunk/ibisph-view/src/main/webapp

Files:

• css/ContentOptions.css (modified) (1 diff)
• xslt/html/query/module/result/Result.xslt (modified) (3 diffs)

trunk/ibisph-view/src/main/webapp/css/ContentOptions.css

@@ -7 +7 @@
  *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#content header + .ContentOptions
+.ContentOptions
 {
         margin:                 1rem 0 1rem 0;

trunk/ibisph-view/src/main/webapp/xslt/html/query/module/result/Result.xslt

@@ -15 +15 @@
 
         <!-- ~~~~~~~~~~~~~~~~~~~~~~~ PARAMS / VARIABLES ~~~~~~~~~~~~~~~~~~~~~~~~ -->
+        <xsl:param name="Result.queryModule" select="/QUERY_MODULE" ibis:doc="query module with result."/>
 
         <xsl:param name="Result.useExternalXML" select="true()"
@@ -25 +26 @@
         />
         <xsl:param name="AncillaryValues"/>
-        <xsl:param name="Result.ancillaryValues" select="if($Result.useExternalXML) then $AncillaryValues/ANCILLARY_VALUES else queryModule/ANCILLARY_VALUES"/>
+        <xsl:param name="Result.ancillaryValues" select="if($Result.useExternalXML) then $AncillaryValues/ANCILLARY_VALUES else $Result.queryModule/ANCILLARY_VALUES"/>
         <xsl:param name="DataSources"/>
-        <xsl:param name="Result.dataSources"     select="if($Result.useExternalXML) then $DataSources/DATA_SOURCES else queryModule/DATA_SOURCES"/>
+        <xsl:param name="Result.dataSources"     select="if($Result.useExternalXML) then $DataSources/DATA_SOURCES else $Result.queryModule/DATA_SOURCES"/>
         <xsl:param name="Dimensions"/>
-        <xsl:param name="Result.dimensions"      select="if($Result.useExternalXML) then $Dimensions/DIMENSIONS else queryModule/DIMENSIONS"/>
+        <xsl:param name="Result.dimensions"      select="if($Result.useExternalXML) then $Dimensions/DIMENSIONS else $Result.queryModule/DIMENSIONS"/>
         <xsl:param name="Measures"/>
-        <xsl:param name="Result.measure"         select="if($Result.useExternalXML) then $Measures/MEASURES/MEASURE[NAME=queryModule/MEASURE_NAME] else queryModule/MEASURES/MEASURE[NAME=queryModule/MEASURE_NAME]"/>
+        <xsl:param name="Result.measure"         select="if($Result.useExternalXML) then $Measures/MEASURES/MEASURE[NAME=$Result.queryModule/CONFIGURATIONS/CONFIGURATION/MEASURE_NAME] else $Result.queryModule/MEASURES/MEASURE[NAME=$Result.queryModule/CONFIGURATIONS/CONFIGURATION/MEASURE_NAME]"/>
         <xsl:param name="ValueTypes"/>
-        <xsl:param name="Result.valueTypes"      select="if($Result.useExternalXML) then $ValueTypes/VALUE_TYPES else queryModule/VALUE_TYPES"/>
+        <xsl:param name="Result.valueTypes"      select="if($Result.useExternalXML) then $ValueTypes/VALUE_TYPES else $Result.queryModule/VALUE_TYPES"/>
         <xsl:param name="ValueAttributes"/>
-        <xsl:param name="Result.valueAttributes" select="if($Result.useExternalXML) then $ValueAttributes/VALUE_ATTRIBUTES else queryModule/VALUE_ATTRIBUTES"/>
+        <xsl:param name="Result.valueAttributes" select="if($Result.useExternalXML) then $ValueAttributes/VALUE_ATTRIBUTES else $Result.queryModule/VALUE_ATTRIBUTES"/>
 
 <!-- CLEAN UP ONCE DETERMINE USAGE
@@ -232 +233 @@
                 <xsl:param name="measureValueFormatPattern" select="($Result.valueTypes/VALUE_TYPE[NAME = $measure/VALUE_TYPE_NAME]/XSLT_FORMAT_PATTERN)[1]"/>
 
-
+<xsl:message select="'------------garth'"/>
+<xsl:message select="$measure"/>
                 <xsl:variable name="dimensionUsages" 
                         ibis:doc="Builds a dim usages struct like: