Changeset 25134 in main


Ignore:
Timestamp:
04/28/22 17:10:28 (3 weeks ago)
Author:
Kristine Hironaka
Message:

Created new query module files and updated query module files for year, text changes for BRFSS2020. Deleted obsolete query module files. Also, created new year dimension and section files.

Location:
adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/brfss
Files:
59 added
13 deleted
44 edited

Legend:

Unmodified
Added
Removed
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/brfss/AlcoholMaxDrinks.xml

    r24296 r25134  
    129129                        -->
    130130                        <!-- Include all other sections needed for this module, and excluded unwanted sections as needed in each configuration -->
    131                         <ibis:include href="section/Year15_19.xml"/>
     131                        <ibis:include href="section/Year15_20.xml"/>
    132132                        <ibis:include href="section/Geo.xml"/>
    133133                        <ibis:include href="section/Age.xml"/>
     
    143143
    144144                <ibis:include href="dimension/YearProxy.xml"/>
    145                 <ibis:include href="dimension/Year15_19.xml"/>
     145                <ibis:include href="dimension/Year15_20.xml"/>
    146146           
    147147                <ibis:include href="dimension/GeoProxy.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/brfss/AmbulDisab.xml

    r24153 r25134  
    174174                        </SECTION>
    175175                        <!-- Include all other sections needed for this module, and excluded unwanted sections as needed in each configuration -->
    176                         <ibis:include href="section/Year13_19.xml"/>
     176                        <ibis:include href="section/Year13_20.xml"/>
    177177                        <ibis:include href="section/Geo.xml"/>
    178178                        <ibis:include href="section/Age.xml" configuration-name-list="AmbulDisabCrude11_"/>
     
    188188
    189189                <ibis:include href="dimension/YearProxy.xml"/>
    190                 <ibis:include href="dimension/Year13_19.xml"/>
     190                <ibis:include href="dimension/Year13_20.xml"/>
    191191           
    192192                <ibis:include href="dimension/GeoProxy.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/brfss/AuditoryDisab.xml

    r24153 r25134  
    174174                        </SECTION>
    175175                        <!-- Include all other sections needed for this module, and excluded unwanted sections as needed in each configuration -->
    176                         <ibis:include href="section/Year16_19.xml"/>
     176                        <ibis:include href="section/Year16_20.xml"/>
    177177                        <ibis:include href="section/Geo.xml"/>
    178178                        <ibis:include href="section/Age.xml" configuration-name-list="AuditoryDisabCrude11_"/>
     
    188188
    189189                <ibis:include href="dimension/YearProxy.xml"/>
    190                 <ibis:include href="dimension/Year16_19.xml"/>
     190                <ibis:include href="dimension/Year16_20.xml"/>
    191191           
    192192                <ibis:include href="dimension/GeoProxy.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/brfss/BloodStool1Yr5075.xml

    r24153 r25134  
    4343
    4444                <CONFIGURATION><NAME>BloodStool1Yr5075Crude11_</NAME>
    45                         <TITLE>Blood stool test - within past year (50-75)</TITLE>
     45                        <TITLE>Colorectal screening - blood stool test in past year (50-75)</TITLE>
    4646                        <DESCRIPTION><ibis:include href="text/BloodStool1Yr5075.xml"/></DESCRIPTION>
    4747                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    4848                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    49                         <MEASURE_TITLE_OVERRIDE>Blood stool test - within past year (50-75)</MEASURE_TITLE_OVERRIDE>
     49                        <MEASURE_TITLE_OVERRIDE>Colorectal screening - blood stool test in past year (50-75)</MEASURE_TITLE_OVERRIDE>
    5050                        <MEASURE_NAME>Pct</MEASURE_NAME>
    5151                        <DATASET_ANCILLARY_VALUES>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/brfss/Cncrdiff.xml

    r24296 r25134  
    9494                        </DATA_ISSUES>
    9595                        <CRITERIA>
    96                                 <EXCLUDE/>
     96                                <EXCLUDE>
     97                                        <SELECTIONS>
     98                                                <SELECTION>
     99                                                        <NAME>Year12_20</NAME>
     100                                                        <VALUE>2019</VALUE>
     101                                                        <VALUE>2018</VALUE>
     102                                                        <VALUE>2017</VALUE>
     103                                                        <VALUE>2016</VALUE>
     104                                                        <VALUE>2015</VALUE>
     105                                                        <VALUE>2014</VALUE>
     106                                                        <VALUE>2013</VALUE>
     107                                                </SELECTION>
     108                                        </SELECTIONS>                           
     109                                </EXCLUDE>
    97110                        </CRITERIA>
    98111                </CONFIGURATION>
     
    129142                        -->
    130143                        <!-- Include all other sections needed for this module, and excluded unwanted sections as needed in each configuration -->
    131                         <ibis:include href="section/Year12_Only.xml"/>
     144                        <ibis:include href="section/Year12_20_Selected_12_20.xml"/>
    132145                        <ibis:include href="section/Geo.xml"/>
    133146                        <ibis:include href="section/Age.xml"/>
     
    143156
    144157                <ibis:include href="dimension/YearProxy.xml"/>
    145                 <ibis:include href="dimension/Year12_Only.xml"/>
     158                <ibis:include href="dimension/Year12_20.xml"/>
    146159           
    147160                <ibis:include href="dimension/GeoProxy.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/brfss/CognitiveDisab.xml

    r24153 r25134  
    174174                        </SECTION>
    175175                        <!-- Include all other sections needed for this module, and excluded unwanted sections as needed in each configuration -->
    176                         <ibis:include href="section/Year13_19.xml"/>
     176                        <ibis:include href="section/Year13_20.xml"/>
    177177                        <ibis:include href="section/Geo.xml"/>
    178178                        <ibis:include href="section/Age.xml" configuration-name-list="CognitiveDisabCrude11_"/>
     
    188188
    189189                <ibis:include href="dimension/YearProxy.xml"/>
    190                 <ibis:include href="dimension/Year13_19.xml"/>
     190                <ibis:include href="dimension/Year13_20.xml"/>
    191191           
    192192                <ibis:include href="dimension/GeoProxy.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/brfss/ColonScope.xml

    r24153 r25134  
    4444
    4545                <CONFIGURATION><NAME>ColonScopeCrude11_</NAME>
    46                         <TITLE>Colorectal screening (50-75)</TITLE>
     46                        <TITLE>Colorectal screening - meets old guidelines (50-75)</TITLE>
    4747                        <DESCRIPTION><ibis:include href="text/ColonScope.xml"/></DESCRIPTION>
    4848                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    4949                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    50                         <MEASURE_TITLE_OVERRIDE>Colorectal screening (50-75)</MEASURE_TITLE_OVERRIDE>
     50                        <MEASURE_TITLE_OVERRIDE>Colorectal screening - meets old guidelines (50-75)</MEASURE_TITLE_OVERRIDE>
    5151                        <MEASURE_NAME>Pct</MEASURE_NAME>
    5252                        <DATASET_ANCILLARY_VALUES>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/brfss/ColonSigmoidLast5075.xml

    r24296 r25134  
    4747
    4848                <CONFIGURATION><NAME>ColonSigmoidLast5075Crude11_</NAME>
    49                         <TITLE>Sigmoid/colonoscopy - last exam (50-75)</TITLE>
     49                        <TITLE>Colorectal screening - most recent sigmoid/colonoscopy (50-75)</TITLE>
    5050                        <DESCRIPTION><ibis:include href="text/ColonSigmoidLast5075.xml"/></DESCRIPTION>
    5151                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    5252                        <DEFAULT_SERIES_DIMENSION_NAME>ColonSigmoidLast5075</DEFAULT_SERIES_DIMENSION_NAME>
    5353                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    54                         <MEASURE_TITLE_OVERRIDE>Sigmoid/colonoscopy - last exam (50-75)</MEASURE_TITLE_OVERRIDE>
     54                        <MEASURE_TITLE_OVERRIDE>Colorectal screening - most recent sigmoid/colonoscopy (50-75)</MEASURE_TITLE_OVERRIDE>
    5555                        <MEASURE_NAME>Pct</MEASURE_NAME>
    5656                        <DATASET_ANCILLARY_VALUES>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/brfss/DXCOPD.xml

    r24153 r25134  
    155155                        <SECTION>
    156156                                <NAME>FocusLevel</NAME>
    157                                 <TITLE>INDICATOR: Adults with COPD, Yes versus No.</TITLE> <!-- Step 1 -->
     157                                <TITLE>INDICATOR: Adults with chronic obstructive pulmonary disease, emphysema or chronic bronchitis, Yes versus No.</TITLE> <!-- Step 1 -->
    158158                                <SELECTED_DIMENSIONS>
    159159                                        <SELECTED_DIMENSION>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/brfss/DXCncrInstr.xml

    r24153 r25134  
    9393                                        <SELECTIONS>
    9494                                                <SELECTION>
    95                                                         <NAME>Year12_18</NAME>
     95                                                        <NAME>Year12_20</NAME>
    9696                                                        <VALUE>2013</VALUE>
    9797                                                        <VALUE>2014</VALUE>
    9898                                                        <VALUE>2015</VALUE>
    9999                                                        <VALUE>2017</VALUE>
     100                                                        <VALUE>2019</VALUE>
    100101                                                </SELECTION>
    101102                                        </SELECTIONS>                           
     
    154155                                        <SELECTIONS>
    155156                                                <SELECTION>
    156                                                         <NAME>Year12_18</NAME>
     157                                                        <NAME>Year12_20</NAME>
    157158                                                        <VALUE>2013</VALUE>
    158159                                                        <VALUE>2014</VALUE>
    159160                                                        <VALUE>2015</VALUE>
    160161                                                        <VALUE>2017</VALUE>
     162                                                        <VALUE>2019</VALUE>
    161163                                                </SELECTION>
    162164                                        </SELECTIONS>                           
     
    194196                        </SECTION>
    195197                        <!-- Include all other sections needed for this module, and excluded unwanted sections as needed in each configuration -->
    196                         <ibis:include href="section/Year12_18_Selected_12_16_18.xml"/>
     198                        <ibis:include href="section/Year12_20_Even.xml"/>
    197199                        <ibis:include href="section/Geo.xml"/>
    198200                        <ibis:include href="section/Age.xml" configuration-name-list="DXCncrInstrCrude11_"/>
     
    208210
    209211                <ibis:include href="dimension/YearProxy.xml"/>
    210                 <ibis:include href="dimension/Year12_18.xml"/>
     212                <ibis:include href="dimension/Year12_20.xml"/>
    211213           
    212214                <ibis:include href="dimension/GeoProxy.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/brfss/DXDiabBloodTest3Yr.xml

    r24153 r25134  
    9393                                        <SELECTIONS>
    9494                                                <SELECTION>
    95                                                         <NAME>Year11_19</NAME>
     95                                                        <NAME>Year11_20</NAME>
    9696                                                        <VALUE>2015</VALUE>
    9797                                                </SELECTION>
     
    130130                        </SECTION>
    131131                        <!-- Include all other sections needed for this module, and excluded unwanted sections as needed in each configuration -->
    132                         <ibis:include href="section/Year11_19.xml"/>
     132                        <ibis:include href="section/Year11_20.xml"/>
    133133                        <ibis:include href="section/Geo.xml"/>
    134134                        <ibis:include href="section/AgeDiab40-70.xml"/>
     
    144144
    145145                <ibis:include href="dimension/YearProxy.xml"/>
    146                 <ibis:include href="dimension/Year11_19.xml"/>
     146                <ibis:include href="dimension/Year11_20.xml"/>
    147147           
    148148                <ibis:include href="dimension/GeoProxy.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/brfss/DXDiabCat.xml

    r24296 r25134  
    9797                                        <SELECTIONS>
    9898                                                <SELECTION>
    99                                                         <NAME>Year11_19</NAME>
     99                                                        <NAME>Year11_20</NAME>
    100100                                                        <VALUE>2015</VALUE>
    101101                                                </SELECTION>
     
    136136                        -->
    137137                        <!-- Include all other sections needed for this module, and excluded unwanted sections as needed in each configuration -->
    138                         <ibis:include href="section/Year11_19.xml"/>
     138                        <ibis:include href="section/Year11_20.xml"/>
    139139                        <ibis:include href="section/Geo.xml"/>
    140140                        <ibis:include href="section/Age.xml"/>
     
    150150
    151151                <ibis:include href="dimension/YearProxy.xml"/>
    152                 <ibis:include href="dimension/Year11_19.xml"/>
     152                <ibis:include href="dimension/Year11_20.xml"/>
    153153           
    154154                <ibis:include href="dimension/GeoProxy.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/brfss/DXDiabSMgtPl.xml

    r24153 r25134  
    4444
    4545                <CONFIGURATION><NAME>DXDiabSMgtPlCrude11_</NAME>
    46                         <TITLE>Diabetes - self-management plan ever</TITLE>
     46                        <TITLE>Diabetes - self-management plan, ever</TITLE>
    4747                        <DESCRIPTION><ibis:include href="text/DXDiabSMgtPl.xml"/></DESCRIPTION>
    4848                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    4949                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    50                         <MEASURE_TITLE_OVERRIDE>Diabetes - self-management plan ever</MEASURE_TITLE_OVERRIDE>
     50                        <MEASURE_TITLE_OVERRIDE>Diabetes - self-management plan, ever</MEASURE_TITLE_OVERRIDE>
    5151                        <MEASURE_NAME>Pct</MEASURE_NAME>
    5252                        <DATASET_ANCILLARY_VALUES>
     
    9595               
    9696                <CONFIGURATION><NAME>DXDiabSMgtPlAA11_</NAME>
    97                         <TITLE>Diabetes - self-management plan ever, Age Adjusted</TITLE>
     97                        <TITLE>Diabetes - self-management plan, ever, Age Adjusted</TITLE>
    9898                        <DESCRIPTION><ibis:include href="text/DXDiabSMgtPl.xml"/></DESCRIPTION>
    9999                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    100100                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    101                         <MEASURE_TITLE_OVERRIDE>Diabetes - self-management plan ever, Age Adjusted</MEASURE_TITLE_OVERRIDE>
     101                        <MEASURE_TITLE_OVERRIDE>Diabetes - self-management plan, ever, Age Adjusted</MEASURE_TITLE_OVERRIDE>
    102102                        <MEASURE_NAME>PctAA</MEASURE_NAME>
    103103                        <DATASET_ANCILLARY_VALUES>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/brfss/Disability1.xml

    r24153 r25134  
    174174                        </SECTION>
    175175                        <!-- Include all other sections needed for this module, and excluded unwanted sections as needed in each configuration -->
    176                         <ibis:include href="section/Year16_19.xml"/>
     176                        <ibis:include href="section/Year16_20.xml"/>
    177177                        <ibis:include href="section/Geo.xml"/>
    178178                        <ibis:include href="section/Age.xml" configuration-name-list="Disability1Crude11_"/>
     
    188188
    189189                <ibis:include href="dimension/YearProxy.xml"/>
    190                 <ibis:include href="dimension/Year16_19.xml"/>
     190                <ibis:include href="dimension/Year16_20.xml"/>
    191191           
    192192                <ibis:include href="dimension/GeoProxy.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/brfss/FamPlan.xml

    r24153 r25134  
    9797                                        <SELECTIONS>  <!-- These limit the selections a user can make - limited to available data -->
    9898                                                <SELECTION>
    99                                                         <NAME>Year17_19</NAME> <!-- Dimension Name -->
     99                                                        <NAME>Year17_20</NAME> <!-- Dimension Name -->
    100100                                                        <VALUE>2018</VALUE>
    101101                                                </SELECTION>
     
    134134                        </SECTION>
    135135                        <!-- Include all other sections needed for this module, and excluded unwanted sections as needed in each configuration -->
    136                         <ibis:include href="section/Year17_19_No18.xml"/>
     136                        <ibis:include href="section/Year17_20_No18.xml"/>
    137137                        <ibis:include href="section/Geo.xml"/>
    138138                        <ibis:include href="section/AgeReproductive.xml"/>
     
    147147
    148148                <ibis:include href="dimension/YearProxy.xml"/>
    149                 <ibis:include href="dimension/Year17_19.xml"/>
     149                <ibis:include href="dimension/Year17_20.xml"/>
    150150           
    151151                <ibis:include href="dimension/GeoProxy.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/brfss/FamPlanNoBC.xml

    r24296 r25134  
    101101                                        <SELECTIONS>  <!-- These limit the selections a user can make - limited to available data -->
    102102                                                <SELECTION>
    103                                                         <NAME>Year17_19</NAME> <!-- Dimension Name -->
     103                                                        <NAME>Year17_20</NAME> <!-- Dimension Name -->
    104104                                                        <VALUE>2018</VALUE>
    105105                                                </SELECTION>
     
    140140                        -->
    141141                        <!-- Include all other sections needed for this module, and excluded unwanted sections as needed in each configuration -->
    142                         <ibis:include href="section/Year17_19_No18.xml"/>
     142                        <ibis:include href="section/Year17_20_No18.xml"/>
    143143                        <ibis:include href="section/Geo.xml"/>
    144144                        <ibis:include href="section/AgeReproductive.xml"/>
     
    153153
    154154                <ibis:include href="dimension/YearProxy.xml"/>
    155                 <ibis:include href="dimension/Year17_19.xml"/>
     155                <ibis:include href="dimension/Year17_20.xml"/>
    156156           
    157157                <ibis:include href="dimension/GeoProxy.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/brfss/FamPlanType.xml

    r24296 r25134  
    101101                                        <SELECTIONS>  <!-- These limit the selections a user can make - limited to available data -->
    102102                                                <SELECTION>
    103                                                         <NAME>Year17_19</NAME> <!-- Dimension Name -->
     103                                                        <NAME>Year17_20</NAME> <!-- Dimension Name -->
    104104                                                        <VALUE>2018</VALUE>
    105105                                                </SELECTION>
     
    140140                        -->
    141141                        <!-- Include all other sections needed for this module, and excluded unwanted sections as needed in each configuration -->
    142                         <ibis:include href="section/Year17_19_No18.xml"/>
     142                        <ibis:include href="section/Year17_20_No18.xml"/>
    143143                        <ibis:include href="section/Geo.xml"/>
    144144                        <ibis:include href="section/AgeReproductive.xml"/>
     
    153153
    154154                <ibis:include href="dimension/YearProxy.xml"/>
    155                 <ibis:include href="dimension/Year17_19.xml"/>
     155                <ibis:include href="dimension/Year17_20.xml"/>
    156156           
    157157                <ibis:include href="dimension/GeoProxy.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/brfss/Fell12Mo.xml

    r24153 r25134  
    9393                                    <SELECTIONS>  <!-- These limit the selections a user can make - limited to available data -->
    9494                                                <SELECTION>
    95                                                         <NAME>Year12_19</NAME> <!-- Dimension Name -->
     95                                                        <NAME>Year12_20</NAME> <!-- Dimension Name -->
    9696                                                        <VALUE>2013</VALUE>
    9797                                                        <VALUE>2015</VALUE>
     
    132132                        </SECTION>
    133133                        <!-- Include all other sections needed for this module, and excluded unwanted sections as needed in each configuration -->
    134                         <ibis:include href="section/Year12_19_No17.xml"/>
     134                        <ibis:include href="section/Year12_20.xml"/>
    135135                        <ibis:include href="section/Geo.xml"/>
    136136                        <ibis:include href="section/AgeBRFSS45_.xml"/>
     
    146146
    147147                <ibis:include href="dimension/YearProxy.xml"/>
    148                 <ibis:include href="dimension/Year12_19.xml"/>
     148                <ibis:include href="dimension/Year12_20.xml"/>
    149149           
    150150                <ibis:include href="dimension/GeoProxy.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/brfss/FellInjured12Mo.xml

    r24153 r25134  
    9393                                    <SELECTIONS>  <!-- These limit the selections a user can make - limited to available data -->
    9494                                                <SELECTION>
    95                                                         <NAME>Year12_19</NAME> <!-- Dimension Name -->
     95                                                        <NAME>Year12_20</NAME> <!-- Dimension Name -->
    9696                                                        <VALUE>2013</VALUE>
    9797                                                        <VALUE>2015</VALUE>
     
    132132                        </SECTION>
    133133                        <!-- Include all other sections needed for this module, and excluded unwanted sections as needed in each configuration -->
    134                         <ibis:include href="section/Year12_19_No17.xml"/>
     134                        <ibis:include href="section/Year12_20.xml"/>
    135135                        <ibis:include href="section/Geo.xml"/>
    136136                        <ibis:include href="section/AgeBRFSS45_.xml"/>
     
    146146
    147147                <ibis:include href="dimension/YearProxy.xml"/>
    148                 <ibis:include href="dimension/Year12_19.xml"/>
     148                <ibis:include href="dimension/Year12_20.xml"/>
    149149           
    150150                <ibis:include href="dimension/GeoProxy.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/brfss/FreeFood12Mo.xml

    r24153 r25134  
    123123                        </SECTION>
    124124                        <!-- Include all other sections needed for this module, and excluded unwanted sections as needed in each configuration -->
    125                         <ibis:include href="section/Year18_19.xml"/>
     125                        <ibis:include href="section/Year18_20.xml"/>
    126126                        <ibis:include href="section/Geo.xml"/>
    127127                        <ibis:include href="section/Age.xml"/>
     
    137137
    138138                <ibis:include href="dimension/YearProxy.xml"/>
    139                 <ibis:include href="dimension/Year18_19.xml"/>
     139                <ibis:include href="dimension/Year18_20.xml"/>
    140140           
    141141                <ibis:include href="dimension/GeoProxy.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/brfss/HPVTest3065.xml

    r24153 r25134  
    4848
    4949                <CONFIGURATION><NAME>HPVTest3065Crude11_</NAME>
    50                         <TITLE>HPV test last 5 years (women 30-65)</TITLE>
     50                        <TITLE>HPV test - within the past 5 years (women 30-65)</TITLE>
    5151                        <DESCRIPTION><ibis:include href="text/HPVTest3065.xml"/></DESCRIPTION>
    5252                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    5353                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    54                         <MEASURE_TITLE_OVERRIDE>HPV test last 5 years (women 30-65)</MEASURE_TITLE_OVERRIDE>
     54                        <MEASURE_TITLE_OVERRIDE>HPV test - within the past 5 years (women 30-65)</MEASURE_TITLE_OVERRIDE>
    5555                        <MEASURE_NAME>Pct</MEASURE_NAME>
    5656                        <DATASET_ANCILLARY_VALUES>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/brfss/IndLivDisab.xml

    r24153 r25134  
    174174                        </SECTION>
    175175                        <!-- Include all other sections needed for this module, and excluded unwanted sections as needed in each configuration -->
    176                         <ibis:include href="section/Year13_19.xml"/>
     176                        <ibis:include href="section/Year13_20.xml"/>
    177177                        <ibis:include href="section/Geo.xml"/>
    178178                        <ibis:include href="section/Age.xml" configuration-name-list="IndLivDisabCrude11_"/>
     
    188188
    189189                <ibis:include href="dimension/YearProxy.xml"/>
    190                 <ibis:include href="dimension/Year13_19.xml"/>
     190                <ibis:include href="dimension/Year13_20.xml"/>
    191191           
    192192                <ibis:include href="dimension/GeoProxy.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/brfss/InjOceanAct.xml

    r24153 r25134  
    4444
    4545                <CONFIGURATION><NAME>InjOceanActCrude11_</NAME>
    46                         <TITLE>Injury - ocean-based recreation</TITLE>
     46                        <TITLE>Physical Activity - ocean-based recreation</TITLE>
    4747                        <DESCRIPTION><ibis:include href="text/InjOceanAct.xml"/></DESCRIPTION>
    4848                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    4949                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    50                         <MEASURE_TITLE_OVERRIDE>Injury - ocean-based recreation</MEASURE_TITLE_OVERRIDE>
     50                        <MEASURE_TITLE_OVERRIDE>Physical Activity - ocean-based recreation</MEASURE_TITLE_OVERRIDE>
    5151                        <MEASURE_NAME>Pct</MEASURE_NAME>
    5252                        <DATASET_ANCILLARY_VALUES>
     
    9595               
    9696                <CONFIGURATION><NAME>InjOceanActAA11_</NAME>
    97                         <TITLE>Injury - ocean-based recreation, Age Adjusted</TITLE>
     97                        <TITLE>Physical Activity - ocean-based recreation, Age Adjusted</TITLE>
    9898                        <DESCRIPTION><ibis:include href="text/InjOceanAct.xml"/></DESCRIPTION>
    9999                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    100100                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    101                         <MEASURE_TITLE_OVERRIDE>Injury - ocean-based recreation, Age Adjusted</MEASURE_TITLE_OVERRIDE>
     101                        <MEASURE_TITLE_OVERRIDE>Physical Activity - ocean-based recreation, Age Adjusted</MEASURE_TITLE_OVERRIDE>
    102102                        <MEASURE_NAME>PctAA</MEASURE_NAME>
    103103                        <DATASET_ANCILLARY_VALUES>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/brfss/InjSwim.xml

    r24153 r25134  
    4444
    4545                <CONFIGURATION><NAME>InjSwimCrude11_</NAME>
    46                         <TITLE>Injury - can swim</TITLE>
     46                        <TITLE>Physical Activity - can swim</TITLE>
    4747                        <DESCRIPTION><ibis:include href="text/InjSwim.xml"/></DESCRIPTION>
    4848                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    4949                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    50                         <MEASURE_TITLE_OVERRIDE>Injury - can swim</MEASURE_TITLE_OVERRIDE>
     50                        <MEASURE_TITLE_OVERRIDE>Physical Activity - can swim</MEASURE_TITLE_OVERRIDE>
    5151                        <MEASURE_NAME>Pct</MEASURE_NAME>
    5252                        <DATASET_ANCILLARY_VALUES>
     
    9595               
    9696                <CONFIGURATION><NAME>InjSwimAA11_</NAME>
    97                         <TITLE>Injury - can swim, Age Adjusted</TITLE>
     97                        <TITLE>Physical Activity - can swim, Age Adjusted</TITLE>
    9898                        <DESCRIPTION><ibis:include href="text/InjSwim.xml"/></DESCRIPTION>
    9999                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    100100                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    101                         <MEASURE_TITLE_OVERRIDE>Injury - can swim, Age Adjusted</MEASURE_TITLE_OVERRIDE>
     101                        <MEASURE_TITLE_OVERRIDE>Physical Activity - can swim, Age Adjusted</MEASURE_TITLE_OVERRIDE>
    102102                        <MEASURE_NAME>PctAA</MEASURE_NAME>
    103103                        <DATASET_ANCILLARY_VALUES>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/brfss/InsureType2017.xml

    r24296 r25134  
    129129                        -->
    130130                        <!-- Include all other sections needed for this module, and excluded unwanted sections as needed in each configuration -->
    131                         <ibis:include href="section/Year17_19.xml"/>
     131                        <ibis:include href="section/Year17_20.xml"/>
    132132                        <ibis:include href="section/Geo.xml"/>
    133133                        <ibis:include href="section/Age.xml"/>
     
    143143
    144144                <ibis:include href="dimension/YearProxy.xml"/>
    145                 <ibis:include href="dimension/Year17_19.xml"/>
     145                <ibis:include href="dimension/Year17_20.xml"/>
    146146           
    147147                <ibis:include href="dimension/GeoProxy.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/brfss/MammoLast5074.xml

    r24296 r25134  
    5151
    5252                <CONFIGURATION><NAME>MammoLast5074Crude11_</NAME>
    53                         <TITLE>Mammogram - last mammo (50-74)</TITLE>
     53                        <TITLE>Mammogram - last test (50-74)</TITLE>
    5454                        <DESCRIPTION><ibis:include href="text/MammoLast5074.xml"/></DESCRIPTION>
    5555                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    5656                        <DEFAULT_SERIES_DIMENSION_NAME>MammoLast5074</DEFAULT_SERIES_DIMENSION_NAME>
    5757                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    58                         <MEASURE_TITLE_OVERRIDE>Mammogram - last mammo (50-74)</MEASURE_TITLE_OVERRIDE>
     58                        <MEASURE_TITLE_OVERRIDE>Mammogram - last test (50-74)</MEASURE_TITLE_OVERRIDE>
    5959                        <MEASURE_NAME>Pct</MEASURE_NAME>
    6060                        <DATASET_ANCILLARY_VALUES>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/brfss/MedicaidNew.xml

    r24153 r25134  
    174174                        </SECTION>
    175175                        <!-- Include all other sections needed for this module, and excluded unwanted sections as needed in each configuration -->
    176                         <ibis:include href="section/Year17_19.xml"/>
     176                        <ibis:include href="section/Year17_20.xml"/>
    177177                        <ibis:include href="section/Geo.xml"/>
    178178                        <ibis:include href="section/Age.xml" configuration-name-list="MedicaidNewCrude11_"/>
     
    188188
    189189                <ibis:include href="dimension/YearProxy.xml"/>
    190                 <ibis:include href="dimension/Year17_19.xml"/>
     190                <ibis:include href="dimension/Year17_20.xml"/>
    191191           
    192192                <ibis:include href="dimension/GeoProxy.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/brfss/PreDiabetes.xml

    r24153 r25134  
    9393                                        <SELECTIONS>
    9494                                                <SELECTION>
    95                                                         <NAME>Year11_19</NAME>
     95                                                        <NAME>Year11_20</NAME>
    9696                                                        <VALUE>2015</VALUE>
    9797                                                </SELECTION>
     
    151151                                        <SELECTIONS>
    152152                                                <SELECTION>
    153                                                         <NAME>Year11_19</NAME>
     153                                                        <NAME>Year11_20</NAME>
    154154                                                        <VALUE>2015</VALUE>
    155155                                                </SELECTION>
     
    188188                        </SECTION>
    189189                        <!-- Include all other sections needed for this module, and excluded unwanted sections as needed in each configuration -->
    190                         <ibis:include href="section/Year11_19.xml"/>
     190                        <ibis:include href="section/Year11_20.xml"/>
    191191                        <ibis:include href="section/Geo.xml"/>
    192192                        <ibis:include href="section/Age.xml" configuration-name-list="PreDiabetesCrude11_"/>
     
    202202
    203203                <ibis:include href="dimension/YearProxy.xml"/>
    204                 <ibis:include href="dimension/Year11_19.xml"/>
     204                <ibis:include href="dimension/Year11_20.xml"/>
    205205           
    206206                <ibis:include href="dimension/GeoProxy.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/brfss/PrevSvcMen65.xml

    r24153 r25134  
    108108                        <SECTION>
    109109                                <NAME>FocusLevel</NAME>
    110                                 <TITLE>INDICATOR: Men (age 65+) reporting flu shot in past year, pneumonia vaccination ever, and who have had a blood stool test in the past year, sigmoidoscopy in the past 5 years and blood stool test in the past 3 years, or a colonoscopy in the past 10 years, Yes versus No.</TITLE> <!-- Step 1 -->
     110                                <TITLE>INDICATOR: Men (age 65+) reporting flu shot in past year, pneumonia vaccination ever, and blood stool test in past year, sigmoidoscopy in past 5 years and blood stool test in past 3 years, or colonoscopy in past 10 years, Yes versus No.</TITLE> <!-- Step 1 -->
    111111                                <SELECTED_DIMENSIONS>
    112112                                        <SELECTED_DIMENSION>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/brfss/PrevSvcWomen65.xml

    r24153 r25134  
    108108                        <SECTION>
    109109                                <NAME>FocusLevel</NAME>
    110                                 <TITLE>INDICATOR: Women (age 65+) reporting flu shot in past year, pneumonia vaccination ever, and who have had a blood stool test in the past year, sigmoidoscopy in the past 5 years and blood stool test in the past 3 years, or a colonoscopy in the past 10 years, plus a mammogram in past 2 years, Yes versus No.</TITLE> <!-- Step 1 -->
     110                                <TITLE>INDICATOR: Women (age 65+) reporting flu shot in past year, pneumonia vaccination ever, and blood stool test in past year, sigmoidoscopy in past 5 years and blood stool test in past 3 years, or colonoscopy in past 10 years, plus mammogram in past 2 years, Yes versus No.</TITLE> <!-- Step 1 -->
    111111                                <SELECTED_DIMENSIONS>
    112112                                        <SELECTED_DIMENSION>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/brfss/PrimeCare.xml

    r24153 r25134  
    4444
    4545                <CONFIGURATION><NAME>PrimeCareCrude11_</NAME>
    46                         <TITLE>Health care access - have personal doctor </TITLE>
     46                        <TITLE>Health care access - have personal doctor</TITLE>
    4747                        <DESCRIPTION><ibis:include href="text/PrimeCare.xml"/></DESCRIPTION>
    4848                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    4949                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    50                         <MEASURE_TITLE_OVERRIDE>Health care access - have personal doctor </MEASURE_TITLE_OVERRIDE>
     50                        <MEASURE_TITLE_OVERRIDE>Health care access - have personal doctor</MEASURE_TITLE_OVERRIDE>
    5151                        <MEASURE_NAME>Pct</MEASURE_NAME>
    5252                        <DATASET_ANCILLARY_VALUES>
     
    9595               
    9696                <CONFIGURATION><NAME>PrimeCareAA11_</NAME>
    97                         <TITLE>Health care access - have personal doctor , Age Adjusted</TITLE>
     97                        <TITLE>Health care access - have personal doctor, Age Adjusted</TITLE>
    9898                        <DESCRIPTION><ibis:include href="text/PrimeCare.xml"/></DESCRIPTION>
    9999                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    100100                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    101                         <MEASURE_TITLE_OVERRIDE>Health care access - have personal doctor , Age Adjusted</MEASURE_TITLE_OVERRIDE>
     101                        <MEASURE_TITLE_OVERRIDE>Health care access - have personal doctor, Age Adjusted</MEASURE_TITLE_OVERRIDE>
    102102                        <MEASURE_NAME>PctAA</MEASURE_NAME>
    103103                        <DATASET_ANCILLARY_VALUES>
     
    155155                        <SECTION>
    156156                                <NAME>FocusLevel</NAME>
    157                                 <TITLE>INDICATOR: Adults who have at least one personal doctor or health care provider, Yes versus No.</TITLE> <!-- Step 1 -->
     157                                <TITLE>INDICATOR: Adults who have one or more personal doctors or health care providers, Yes versus No.</TITLE> <!-- Step 1 -->
    158158                                <SELECTED_DIMENSIONS>
    159159                                        <SELECTED_DIMENSION>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/brfss/SeatBelt.xml

    r24153 r25134  
    9090                        </DATA_ISSUES>
    9191                        <CRITERIA>
    92                                 <EXCLUDE/>
     92                                <EXCLUDE>
     93                                        <SELECTIONS>
     94                                                <SELECTION>
     95                                                        <NAME>Year11_20</NAME>
     96                                                        <VALUE>2019</VALUE>
     97                                                </SELECTION>
     98                                        </SELECTIONS>                           
     99                                </EXCLUDE>
    93100                        </CRITERIA>
    94101                </CONFIGURATION>
     
    141148                        </DATA_ISSUES>
    142149                        <CRITERIA>
    143                                 <EXCLUDE/>
     150                                <EXCLUDE>
     151                                        <SELECTIONS>
     152                                                <SELECTION>
     153                                                        <NAME>Year11_20</NAME>
     154                                                        <VALUE>2019</VALUE>
     155                                                </SELECTION>
     156                                        </SELECTIONS>                           
     157                                </EXCLUDE>
    144158                        </CRITERIA>
    145159                </CONFIGURATION>
     
    174188                        </SECTION>
    175189                        <!-- Include all other sections needed for this module, and excluded unwanted sections as needed in each configuration -->
    176                         <ibis:include href="section/Year11_18.xml"/>
     190                        <ibis:include href="section/Year11_20_No19.xml"/>
    177191                        <ibis:include href="section/Geo.xml"/>
    178192                        <ibis:include href="section/Age.xml" configuration-name-list="SeatBeltCrude11_"/>
     
    188202
    189203                <ibis:include href="dimension/YearProxy.xml"/>
    190                 <ibis:include href="dimension/Year11_18.xml"/>
     204                <ibis:include href="dimension/Year11_20.xml"/>
    191205           
    192206                <ibis:include href="dimension/GeoProxy.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/brfss/SelfCareDisab.xml

    r24153 r25134  
    174174                        </SECTION>
    175175                        <!-- Include all other sections needed for this module, and excluded unwanted sections as needed in each configuration -->
    176                         <ibis:include href="section/Year13_19.xml"/>
     176                        <ibis:include href="section/Year13_20.xml"/>
    177177                        <ibis:include href="section/Geo.xml"/>
    178178                        <ibis:include href="section/Age.xml" configuration-name-list="SelfCareDisabCrude11_"/>
     
    188188
    189189                <ibis:include href="dimension/YearProxy.xml"/>
    190                 <ibis:include href="dimension/Year13_19.xml"/>
     190                <ibis:include href="dimension/Year13_20.xml"/>
    191191           
    192192                <ibis:include href="dimension/GeoProxy.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/brfss/SexGenMinority.xml

    r24153 r25134  
    122122                        </SECTION>
    123123                        <!-- Include all other sections needed for this module, and excluded unwanted sections as needed in each configuration -->
    124                         <ibis:include href="section/Year14_19.xml"/>
     124                        <ibis:include href="section/Year14_20.xml"/>
    125125                        <ibis:include href="section/Geo.xml"/>
    126126                        <ibis:include href="section/Age.xml"/>
     
    136136
    137137                <ibis:include href="dimension/YearProxy.xml"/>
    138                 <ibis:include href="dimension/Year14_19.xml"/>
     138                <ibis:include href="dimension/Year14_20.xml"/>
    139139           
    140140                <ibis:include href="dimension/GeoProxy.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/brfss/SmokeLGBT.xml

    r24153 r25134  
    155155                        <SECTION>
    156156                                <NAME>FocusLevel</NAME>
    157                                 <TITLE>INDICATOR: Cigarette smoking among LGBT, Yes versus No.</TITLE> <!-- Step 1 -->
     157                                <TITLE>INDICATOR: Cigarette smoking among LGBT adults, Yes versus No.</TITLE> <!-- Step 1 -->
    158158                                <SELECTED_DIMENSIONS>
    159159                                        <SELECTED_DIMENSION>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/brfss/SmokeNH.xml

    r24153 r25134  
    155155                        <SECTION>
    156156                                <NAME>FocusLevel</NAME>
    157                                 <TITLE>INDICATOR: Cigarette smoking among Native Hawaiians, Yes versus No.</TITLE> <!-- Step 1 -->
     157                                <TITLE>INDICATOR: Cigarette smoking among Native Hawaiian adults, Yes versus No.</TITLE> <!-- Step 1 -->
    158158                                <SELECTED_DIMENSIONS>
    159159                                        <SELECTED_DIMENSION>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/brfss/SnapFoodStmps.xml

    r24153 r25134  
    123123                        </SECTION>
    124124                        <!-- Include all other sections needed for this module, and excluded unwanted sections as needed in each configuration -->
    125                         <ibis:include href="section/Year17_19.xml"/>
     125                        <ibis:include href="section/Year17_20.xml"/>
    126126                        <ibis:include href="section/Geo.xml"/>
    127127                        <ibis:include href="section/Age.xml"/>
     
    137137
    138138                <ibis:include href="dimension/YearProxy.xml"/>
    139                 <ibis:include href="dimension/Year17_19.xml"/>
     139                <ibis:include href="dimension/Year17_20.xml"/>
    140140           
    141141                <ibis:include href="dimension/GeoProxy.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/brfss/SodaDaily.xml

    r24296 r25134  
    9797                                        <SELECTIONS>  <!-- These limit the selections a user can make - limited to available data -->
    9898                                                <SELECTION>
    99                                                         <NAME>Year11_19</NAME> <!-- Dimension Name -->
     99                                                        <NAME>Year11_20</NAME> <!-- Dimension Name -->
    100100                                                        <VALUE>2013</VALUE>
    101101                                                        <VALUE>2014</VALUE>
     
    140140                        -->
    141141                        <!-- Include all other sections needed for this module, and excluded unwanted sections as needed in each configuration -->
    142                         <ibis:include href="section/Year11_19_Selected_12_17_19.xml"/>
     142                        <ibis:include href="section/Year11_20_No18.xml"/>
    143143                        <ibis:include href="section/Geo.xml"/>
    144144                        <ibis:include href="section/Age.xml"/>
     
    154154
    155155                <ibis:include href="dimension/YearProxy.xml"/>
    156                 <ibis:include href="dimension/Year11_19.xml"/>
     156                <ibis:include href="dimension/Year11_20.xml"/>
    157157           
    158158                <ibis:include href="dimension/GeoProxy.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/brfss/TransgndrInd.xml

    r24153 r25134  
    123123                        </SECTION>
    124124                        <!-- Include all other sections needed for this module, and excluded unwanted sections as needed in each configuration -->
    125                         <ibis:include href="section/Year14_19.xml"/>
     125                        <ibis:include href="section/Year14_20.xml"/>
    126126                        <ibis:include href="section/Geo.xml"/>
    127127                        <ibis:include href="section/Age.xml"/>
     
    137137
    138138                <ibis:include href="dimension/YearProxy.xml"/>
    139                 <ibis:include href="dimension/Year14_19.xml"/>
     139                <ibis:include href="dimension/Year14_20.xml"/>
    140140           
    141141                <ibis:include href="dimension/GeoProxy.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/brfss/VisualDisab.xml

    r24153 r25134  
    174174                        </SECTION>
    175175                        <!-- Include all other sections needed for this module, and excluded unwanted sections as needed in each configuration -->
    176                         <ibis:include href="section/Year13_19.xml"/>
     176                        <ibis:include href="section/Year13_20.xml"/>
    177177                        <ibis:include href="section/Geo.xml"/>
    178178                        <ibis:include href="section/Age.xml" configuration-name-list="VisualDisabCrude11_"/>
     
    188188
    189189                <ibis:include href="dimension/YearProxy.xml"/>
    190                 <ibis:include href="dimension/Year13_19.xml"/>
     190                <ibis:include href="dimension/Year13_20.xml"/>
    191191           
    192192                <ibis:include href="dimension/GeoProxy.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/brfss/dimension/Year11_All.xml

    r24077 r25134  
    88        <PROXY_DIMENSION_NAME>YearProxy</PROXY_DIMENSION_NAME>
    99        <VALUES>
     10                <VALUE>2020<SORT_ORDER>10</SORT_ORDER></VALUE>
    1011                <VALUE>2019<SORT_ORDER>9</SORT_ORDER></VALUE>
    1112                <VALUE>2018<SORT_ORDER>8</SORT_ORDER></VALUE>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/brfss/dimension/Year11_Even.xml

    r24077 r25134  
    88        <PROXY_DIMENSION_NAME>YearProxy</PROXY_DIMENSION_NAME>
    99        <VALUES>
     10        <VALUE>2020<SORT_ORDER>5</SORT_ORDER></VALUE>
    1011        <VALUE>2018<SORT_ORDER>4</SORT_ORDER></VALUE>
    1112        <VALUE>2016<SORT_ORDER>3</SORT_ORDER></VALUE>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/brfss/section/Year11_All.xml

    r23590 r25134  
    1515                        <NAME>Year11_All</NAME>
    1616                        <VALUES>
     17                                <VALUE>2020</VALUE>
    1718                                <VALUE>2019</VALUE>
    18                                 <VALUE>2018</VALUE>
    19                                 <VALUE>2017</VALUE>                     
     19                                <VALUE>2018</VALUE>                     
    2020                        </VALUES>
    2121                </SELECTED_DIMENSION>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/brfss/section/Year11_Even.xml

    r23590 r25134  
    1515                        <NAME>Year11_Even</NAME>
    1616                        <VALUES>
     17                                <VALUE>2020</VALUE>
    1718                                <VALUE>2018</VALUE>
    18                                 <VALUE>2016</VALUE>
    19                                 <VALUE>2014</VALUE>                             
     19                                <VALUE>2016</VALUE>                             
    2020                        </VALUES>
    2121                </SELECTED_DIMENSION>
Note: See TracChangeset for help on using the changeset viewer.