Ignore:
Timestamp:
10/11/18 22:00:43 (4 years ago)
Author:
Garth Braithwaite
Message:

view - temp commit of ip and qm integration. Dataset and grid working for some. Removed the query interactive view and made it the default. Cleaned out newer but now unused java dataset related xml service code.

File:
1 edited

Legend:

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

    r17123 r17255  
    99>
    1010        <xsl:import href="../Page.xslt"/>
    11         <xsl:import href="../../../../xml/indicator/profile/InteractiveXML.xslt"/>
     11        <xsl:import href="../../../../xml/Interactive.xslt"/>
    1212        <xsl:import href="../../../../json/indicator/profile/InteractiveJSON.xslt"/>
    1313        <xsl:import href="../../../Kendo.xslt"/>
     
    237237
    238238                <xsl:variable name="recordDimensionFields">
    239                         <xsl:call-template name="InteractiveXML.getRecordDimensionFieldElements">
    240                                 <xsl:with-param name="indicatorView" select="$indicatorView"/>
     239                        <xsl:call-template name="Interactive.getRecordDimensionFields">
     240                                <xsl:with-param name="dimensions"      select="$Indicator.dimensions"/>
     241                                <xsl:with-param name="dimensionUsages" select="$indicatorView/DIMENSION_USAGES"/>
    241242                        </xsl:call-template>
    242243                </xsl:variable>
    243244
    244                 <xsl:variable name="ancillaryValueNames" select="distinct-values($indicator/DATASETS/DATASET[NAME = $indicatorView/DATASET_NAMES/DATASET_NAME]/ANCILLARY_VALUES/ANCILLARY_VALUE/NAME)"/>
     245                <xsl:variable name="ancillaryValueNames" select="distinct-values($indicator/DATASETS/DATASET[NAME = $indicatorView/DATASET_NAMES/DATASET_NAME]/ANCILLARY_VALUE_USAGES/ANCILLARY_VALUE_USAGE/NAME)"/>
    245246                <xsl:variable name="recordAncillaryValueFields">
    246                         <xsl:call-template name="InteractiveXML.getRecordAncillaryValueFieldElements">
     247                        <xsl:call-template name="Interactive.getIndicatorRecordAncillaryValueFields">
    247248                                <xsl:with-param name="indicator"     select="$indicator"/>
    248249                                <xsl:with-param name="indicatorView" select="$indicatorView"/>
     250                                <xsl:with-param name="ancillaryValues" select="$Indicator.ancillaryValues"/>
    249251                                <xsl:with-param name="ancillaryValueNames" select="$ancillaryValueNames"/>
    250252                                <xsl:with-param name="measureValueFormatPattern" select="$measureValueFormatPattern"/>
     
    252254                </xsl:variable>
    253255
    254                 <xsl:variable name="datasetRecords" select="$indicator/DATASETS/DATASET[NAME = $indicatorView/DATASET_NAMES/DATASET_NAME]/RECORDS/RECORD"/>
     256                <xsl:variable name="datasetRecords" select="$indicator/DATASETS/DATASET[NAME = $indicatorView/DATASET_NAMES/DATASET_NAME]/RECORDS"/>
    255257                <xsl:variable name="indicatorViewDatasetRecords">
    256                         <xsl:call-template name="InteractiveXML.getIndicatorViewDatasetRecords">
    257                                 <xsl:with-param name="indicatorView"  select="$indicatorView"/>
    258                                 <xsl:with-param name="datasetRecords" select="$datasetRecords"/>
     258                        <xsl:call-template name="Interactive.getIndicatorViewDatasetRecords">
     259                                <xsl:with-param name="datasetRecords"  select="$datasetRecords"/>
     260                                <xsl:with-param name="dimensionUsages" select="$indicatorView/DIMENSION_USAGES"/>
    259261                                <xsl:with-param name="recordDimensionFields" select="$recordDimensionFields"/>
    260262                        </xsl:call-template>
     
    262264
    263265<!--
     266<xsl:message select="'************** GARTH'"/>
     267<xsl:message select="$indicatorViewDatasetRecords"/>
     268
     269<xsl:message select="concat('Page.leafletKendoScript - Records count: ', count($indicatorViewDatasetRecords/*), ', recordDimensionFields: ', count($recordDimensionFields/NAME))"/>
    264270<xsl:message select="'============= start of IV datasetRecords'"/>
    265 <xsl:message select="$datasetRecords"/>
     271<xsl:message select="$recordDimensionFields"/>
    266272<xsl:message select="'============= end of IV datasetRecords'"/>
    267273-->
     
    274280                        var records =
    275281                        [<xsl:text>&#10;</xsl:text>
    276                                 <xsl:call-template name="InteractiveJSON.getIndicatorViewDataRecords">
     282                                <xsl:call-template name="InteractiveJSON.getDatasetRecords">
     283                                        <xsl:with-param name="dimensions"                 select="$Indicator.dimensions"/>
    277284                                        <xsl:with-param name="datasetRecords"             select="$indicatorViewDatasetRecords"/>
    278285                                        <xsl:with-param name="recordDimensionFields"      select="$recordDimensionFields"/>
     
    352359                        exists(GEOGRAPHY_FLAG)
    353360                        and
    354                         NAME = $indicatorView//DATASET_DIMENSION_USAGE/DIMENSION_NAME
     361                        NAME = $indicatorView//DIMENSION_USAGE/NAME
    355362                ])[1]/NAME"
    356363/>
    357364
    358365<xsl:message select="$Indicator.dimensions/DIMENSION[exists(GEOGRAPHY_FLAG)]/NAME"/>
    359 <xsl:message select="exists($indicatorView/DATASET_DIMENSION_USAGES/DATASET_DIMENSION_USAGES[DIMENSION_NAME = $Indicator.dimensions/DIMENSION[exists(GEOGRAPHY_FLAG)]/NAME])"/>
    360 <xsl:message select="exists($indicatorView/DATASET_DIMENSION_USAGES/DATASET_DIMENSION_USAGES[DIMENSION_NAME = $Indicator.dimensions/DIMENSION[exists(GEOGRAPHY_FLAG)]/NAME])"/>
    361 <xsl:message select="exists($indicatorView/DATASET_DIMENSION_USAGES/DATASET_DIMENSION_USAGES[DIMENSION_NAME = $Indicator.dimensions/DIMENSION[exists(GEOGRAPHY_FLAG)]])"/>
     366<xsl:message select="exists($indicatorView/DIMENSION_USAGES/DIMENSION_USAGE[DIMENSION_NAME = $Indicator.dimensions/DIMENSION[exists(GEOGRAPHY_FLAG)]/NAME])"/>
     367<xsl:message select="exists($indicatorView/DIMENSION_USAGES/DIMENSION_USAGE[DIMENSION_NAME = $Indicator.dimensions/DIMENSION[exists(GEOGRAPHY_FLAG)]/NAME])"/>
     368<xsl:message select="exists($indicatorView/DIMENSION_USAGES/DIMENSION_USAGE[DIMENSION_NAME = $Indicator.dimensions/DIMENSION[exists(GEOGRAPHY_FLAG)]])"/>
    362369<xsl:message select="$Indicator.dimensions/DIMENSION[exists(GEOGRAPHY_FLAG)]/NAME"/>
    363370<xsl:message select="concat('Interactive - Show Map: ', $Interactive.showMap, ', geoDimensionName:', $geoDimensionName)"/>
     
    401408        GeoJSON GeoID Prefix to add when doing comparison???
    402409
    403 <xsl:variable name="communityDatasets"     select="$indicator/DATASETS/DATASET[DIMENSION_COMBINATIONS/DIMENSION_COMBINATION[not(DIMENSION_2/NAME) and DIMENSION_1/NAME = $communityDimensionName]]"/>
    404 <xsl:variable name="communityDataset" select="$communityDatasets[(MEASURE_NAME = $measureName) and DIMENSION_COMBINATIONS/DIMENSION_COMBINATION[PERIOD_DIMENSION/NAME = $periodName]]"/>
    405 <xsl:variable name="stateRecord"     select="$communityDataset/RECORDS/RECORD[ DIMENSIONS[ (2 = count(DIMENSION)) and DIMENSION[(NAME = $stateDimensionName)     and (VALUE = $stateDimensionValue)]     and DIMENSION[(NAME = $periodName) and (VALUE = $periodValue)]]]"/>
    406 
    407 <xsl:message select="'XXXXXXXXXXXXXXXXXXXXXXXXXXXXX'"/>
     410        <xsl:variable name="communityDatasets" select="$indicator/DATASETS/DATASET[DIMENSION_COMBINATIONS/DIMENSION_COMBINATION[not(DIMENSION_2/NAME) and DIMENSION_1/NAME = $communityDimensionName]]"/>
     411        <xsl:variable name="communityDataset"  select="$communityDatasets[(MEASURE_NAME = $measureName) and DIMENSION_COMBINATIONS/DIMENSION_COMBINATION[PERIOD_DIMENSION/NAME = $periodName]]"/>
     412        <xsl:variable name="stateRecord"       select="$communityDataset/RECORDS/RECORD[ DIMENSIONS[ (2 = count(DIMENSION)) and DIMENSION[(NAME = $stateDimensionName)     and (VALUE = $stateDimensionValue)]     and DIMENSION[(NAME = $periodName) and (VALUE = $periodValue)]]]"/>
     413
     414
     415GARTH TODO:
     416        <xsl:message select="'XXXXXXXXXXXXXXXXXXXXXXXXXXXXX'"/>
    408417<xsl:message select="$indicatorViewDatasetRecords[1]"/>
     418
    409419
    410420
Note: See TracChangeset for help on using the changeset viewer.